me
/
guix
Archived
1
0
Fork 0
Code

gnu: gtksheet: Fix build. 

* gnu/packages/gtk.scm (gtksheet)[arguments]: Pass -fcommon option to GCC;
rename phase 'rename-type to 'patch-for-compatibility and update a reference
to a renamed macro.
master
Ricardo Wurmus 2021-10-21 15:58:06 +00:00
parent dd49a72af7
commit fc15512be4
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/gtk.scm
View File

@ -2853,7 +2853,8 @@ library for drawing.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--enable-glade" `(#:configure-flags (list "--enable-glade"
"--enable-introspection") "--enable-introspection"
"CFLAGS=-fcommon")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; The "configure" script is present, but otherwise the project is ;; The "configure" script is present, but otherwise the project is
@ -2863,11 +2864,14 @@ library for drawing.")
(lambda _ (lambda _
(delete-file "configure") (delete-file "configure")
#t)) #t))
(add-after 'unpack 'rename-type (add-after 'unpack 'patch-for-compatibility
(lambda _ (lambda _
(substitute* "glade/glade-gtksheet-editor.c" (substitute* "glade/glade-gtksheet-editor.c"
(("GladeEditableIface") "GladeEditableInterface")) (("GladeEditableIface") "GladeEditableInterface"))
#t)) ;; Glade 3.37 renamed the macro GWA_GET_CLASS to
;; GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS.
(substitute* "glade/glade-gtksheet-editor.c"
(("GWA_GET_CLASS") "GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"))))
;; 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)