gnu: gtksheet: Update to 4.3.5.

* gnu/packages/gtk.scm (gtksheet): Update to 4.3.5.
[arguments]: Remove obsolete build phase "fix-typelib-version"; add phase
"rename-type".
This commit is contained in:
Ricardo Wurmus 2020-12-26 23:11:09 +01:00
parent 0190c9b212
commit 2f84a58d3b
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -8,7 +8,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.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, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
@ -2140,7 +2140,7 @@ (define-public goocanvas
(define-public gtksheet (define-public gtksheet
(package (package
(name "gtksheet") (name "gtksheet")
(version "4.3.4") (version "4.3.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2150,7 +2150,7 @@ (define-public gtksheet
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"10qzmdkjkkvkcadxn019cbyhwaahxcfv1apv54lc711bqvh63v8r")))) "13jwr1vly4ga3f09dajwky1cdrz5bmggwga3vnnd6j6zzia7dpyr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--enable-glade" `(#:configure-flags (list "--enable-glade"
@ -2164,6 +2164,11 @@ (define-public gtksheet
(lambda _ (lambda _
(delete-file "configure") (delete-file "configure")
#t)) #t))
(add-after 'unpack 'rename-type
(lambda _
(substitute* "glade/glade-gtksheet-editor.c"
(("GladeEditableIface") "GladeEditableInterface"))
#t))
;; Fix glade install directories. ;; Fix glade install directories.
(add-before 'bootstrap 'configure-glade-directories (add-before 'bootstrap 'configure-glade-directories
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -2174,15 +2179,6 @@ (define-public gtksheet
(string-append (assoc-ref outputs "out") "/lib/glade/modules")) (string-append (assoc-ref outputs "out") "/lib/glade/modules"))
(("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2.0`") (("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2.0`")
(string-append (assoc-ref outputs "out") "/share/pixmaps"))) (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))))) #t)))))
(inputs (inputs
`(("glade" ,glade3) `(("glade" ,glade3)