[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: gnu: Remove gtk+/fixed.
From: |
guix-commits |
Subject: |
02/08: gnu: Remove gtk+/fixed. |
Date: |
Sun, 31 Mar 2019 19:47:45 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 3eed550072d6f71eff20de269d313fc1dfe3e332
Author: Marius Bakke <address@hidden>
Date: Mon Apr 1 00:03:36 2019 +0200
gnu: Remove gtk+/fixed.
The merge preceding this commit ignored the replacement part of commit
bc91562939ee002e84c95d13c907482b6d1e9339. This commit removes the remaining
bits, as the patch is already included in GTK3 since version 3.24.3.
* gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gtk.scm (gtk+/fixed): Remove variable.
---
gnu/local.mk | 1 -
gnu/packages/gtk.scm | 12 ----------
.../patches/gtk3-fix-deprecation-macro-use.patch | 28 ----------------------
3 files changed, 41 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c6cacd7..1332efd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -876,7 +876,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk2-theme-paths.patch \
- %D%/packages/patches/gtk3-fix-deprecation-macro-use.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 7527abb..6e63ca6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -822,18 +822,6 @@ application suites.")
(variable "GUIX_GTK3_PATH")
(files '("lib/gtk-3.0")))))))
-;; Fixes a bug in Gtk that causes crashes in IceCat and Emacs.
-;; See <https://bugs.gnu.org/34454>, <https://bugs.gnu.org/34658>,
-;; and <https://gitlab.gnome.org/GNOME/gtk/issues/1523>.
-(define gtk+/fixed
- (package
- (inherit gtk+)
- (source (origin
- (inherit (package-source gtk+))
- (patches
- (cons (search-patch "gtk3-fix-deprecation-macro-use.patch")
- (origin-patches (package-source gtk+))))))))
-
;;;
;;; Guile bindings.
;;;
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 e933555..0000000
--- 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;
-
- branch staging updated (7c86fdd -> 411c27e), guix-commits, 2019/03/31
- 02/08: gnu: Remove gtk+/fixed.,
guix-commits <=
- 04/08: gnu: tzdata: Update to 2019a., guix-commits, 2019/03/31
- 03/08: gnu: evolution-data-server: Remove obsolete phase., guix-commits, 2019/03/31
- 05/08: gnu: ImageMagick: Update to 6.9.10-35., guix-commits, 2019/03/31
- 01/08: Merge branch 'master' into staging, guix-commits, 2019/03/31
- 06/08: gnu: cups-filters: Update to 1.22.3., guix-commits, 2019/03/31
- 07/08: gnu: libinput: Do not propagate any inputs., guix-commits, 2019/03/31
- 08/08: gnu: libinput: Update to 1.13.0., guix-commits, 2019/03/31