diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-28 14:45:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-28 14:45:35 +0200 |
| commit | 7d62fa206b701504b110f253e3efb217eed475ad (patch) | |
| tree | 8a2e44fb2560144d3b029085a560c1042e163423 /gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch | |
| parent | c5db31d4141669d09c1cd8b37eb270c2fe23c7cf (diff) | |
| parent | cd8dce8ac4224d425f13b3c0776884c87ff43562 (diff) | |
| download | guix-7d62fa206b701504b110f253e3efb217eed475ad.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch')
| -rw-r--r-- | gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch b/gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch deleted file mode 100644 index e933555ffb..0000000000 --- a/gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch +++ /dev/null @@ -1,28 +0,0 @@ -Copied from <https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a>. -Fixes upstream bugs <https://gitlab.gnome.org/GNOME/gtk/issues/1523> -and <https://gitlab.gnome.org/GNOME/gtk/issues/1280>. - -diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 97ada6d73919fba3dfe192dd66929e90bc7677bb..764e39495f7edb0c3efe41cca25b8bee4778887d 100644 ---- a/gdk/x11/gdkwindow-x11.c -+++ b/gdk/x11/gdkwindow-x11.c -@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window, - double r, g, b, a; - cairo_surface_t *surface; - cairo_matrix_t matrix; -+ cairo_pattern_t *parent_relative_pattern; - - if (GDK_WINDOW_DESTROYED (window)) - return; -@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window, - } - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS -- if (pattern == gdk_x11_get_parent_relative_pattern ()) -+ parent_relative_pattern = gdk_x11_get_parent_relative_pattern (); - G_GNUC_END_IGNORE_DEPRECATIONS -+ -+ if (pattern == parent_relative_pattern) - { - GdkWindow *parent; - |