guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: geany: Fix crash when displaying file select


From: guix-commits
Subject: branch master updated: gnu: geany: Fix crash when displaying file selection
Date: Mon, 01 Jun 2020 17:34:10 -0400

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new f3ed529  gnu: geany: Fix crash when displaying file selection
f3ed529 is described below

commit f3ed5297392fd7fe9cb6fc003824ce34130e80bd
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon Jun 1 23:31:22 2020 +0200

    gnu: geany: Fix crash when displaying file selection
    
    * gnu/packages/text-editors.scm (geany)[arguments]: Wrap GTK to prevent 
errors
    when opening file selection menu.
---
 gnu/packages/text-editors.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 9e73959..0095fcd 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -821,7 +821,12 @@ and multiple fonts.")
      `(("gtk+" ,gtk+)
        ("scintilla" ,scintilla)))
     (arguments
-     `(#:phases
+     `(#:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%gnu-build-system-modules)
+       #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build gnu-build-system)
+                  (guix build utils))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'use-scintilla-shared-library
            (lambda* (#:key inputs #:allow-other-keys)
@@ -838,7 +843,9 @@ and multiple fonts.")
              (substitute* "tests/Makefile.am"
                (("AM_LDFLAGS =" all) (string-append all " -lscintilla")))
              (for-each delete-file (list "autogen.sh" "configure" 
"Makefile.in"))
-             #t)))))
+             #t))
+         (add-after 'install 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (home-page "https://www.geany.org";)
     (synopsis "Fast and lightweight IDE")
     (description "Geany is a small and fast Integrated Development



reply via email to

[Prev in Thread] Current Thread [Next in Thread]