diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-01 00:02:39 +0200 |
| commit | 571fb008a576378883c053be186d2c620290ea39 (patch) | |
| tree | 5279a2c2772a9b76299a48d697d568f208a89722 /gnu/packages/gtk.scm | |
| parent | 7c86fdda7ceed11377b0e17b47c91598be59be52 (diff) | |
| parent | f125c5a5ea03d53749f45d310694b79241d5888d (diff) | |
| download | guix-571fb008a576378883c053be186d2c620290ea39.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d1bcd2204..7527abbbac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> @@ -822,6 +822,18 @@ 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. ;;; |