diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-29 17:37:17 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-29 17:37:17 +0100 |
| commit | a22e75c073c785a3a71c952d97fb7ab87dfd282d (patch) | |
| tree | c0ef12b8c271c9de37bcce9287b67adf8628ed93 /gnu/packages/gtk.scm | |
| parent | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (diff) | |
| parent | 789bf7fcc241d010cb583dc76c366110bfca8b35 (diff) | |
| download | guix-a22e75c073c785a3a71c952d97fb7ab87dfd282d.tar.gz | |
Merge branch 'master' into ungrafting
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b4472a5e98..b9a4d3858f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> -;;; Coypright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Coypright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> @@ -2151,7 +2151,7 @@ library for drawing.") (define-public gtksheet (package (name "gtksheet") - (version "4.3.4") + (version "4.3.5") (source (origin (method git-fetch) @@ -2161,7 +2161,7 @@ library for drawing.") (file-name (git-file-name name version)) (sha256 (base32 - "10qzmdkjkkvkcadxn019cbyhwaahxcfv1apv54lc711bqvh63v8r")))) + "13jwr1vly4ga3f09dajwky1cdrz5bmggwga3vnnd6j6zzia7dpyr")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-glade" @@ -2175,6 +2175,11 @@ library for drawing.") (lambda _ (delete-file "configure") #t)) + (add-after 'unpack 'rename-type + (lambda _ + (substitute* "glade/glade-gtksheet-editor.c" + (("GladeEditableIface") "GladeEditableInterface")) + #t)) ;; Fix glade install directories. (add-before 'bootstrap 'configure-glade-directories (lambda* (#:key outputs #:allow-other-keys) @@ -2185,15 +2190,6 @@ library for drawing.") (string-append (assoc-ref outputs "out") "/lib/glade/modules")) (("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2.0`") (string-append (assoc-ref outputs "out") "/share/pixmaps"))) - #t)) - ;; Fix incorrect typelib version. This is a known upstream bug. See - ;; https://github.com/fpaquet/gtksheet/issues/23 - (add-after 'install 'fix-typelib-version - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion (string-append (assoc-ref outputs "out") - "/lib/girepository-1.0") - (rename-file "GtkSheet-4.0.typelib" - (string-append "GtkSheet-" ,version ".typelib"))) #t))))) (inputs `(("glade" ,glade3) |