GNU bug report logs - #77564
[PATCH 0/2] Make GIMP 3 the new GIMP

Previous Next

To reply to this bug, email your comments to 77564 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Make GIMP 3 the new GIMP
Date: Sun, 6 Apr 2025 00:19:50 +0200

Hi Guix,

it's been a while since we bumped gimp-next to an actual release, so
I thought I'd update it.  I think it'll still be fine to keep GIMP 2
around, as many folks will be used to it, but it's also fair to expect
that "gimp" actually points to the new version.

Cheers

Liliana Marie Prikler (2):
  gnu: Make GIMP 3 the new gimp.
  gnu: gimp <at> 3: Wrap GI_TYPELIB_PATH and GUIX_PYTHONPATH.

 gnu/packages/gimp.scm | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)


base-commit: d473abf0b40fe4bedf9423a6822d067a9a7826cf
-- 
2.49.0

Message #8 received at 77564 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77564 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Make GIMP 3 the new gimp.
Date: Sat, 5 Apr 2025 23:44:58 +0200

* gnu/packages/gimp.scm (gimp-2, gimp-3): New variables.
(gimp): Move old definition to gimp-2, point to gimp-3.
(gimp-next): Deprecate in favor of gimp-3.
---
 gnu/packages/gimp.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 6e4916600f..ef03992f2d 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -335,7 +335,7 @@ (define-public gegl-0.4.44
      (modify-inputs (package-propagated-inputs gegl)
        (replace "babl" babl-0.1.96)))))
 
-(define-public gimp
+(define-public gimp-2
   (package
     (name "gimp")
     (version "2.10.38")
@@ -421,10 +421,10 @@ (define-public gimp
 that is extensible via a plugin system.")
     (license license:gpl3+))) ; some files are lgplv3
 
-(define-public gimp-next
+(define-public gimp-3
   (package
-    (inherit gimp)
-    (name "gimp-next")
+    (inherit gimp-2)
+    (name "gimp")
     (version "3.0.0")
     (source
      (origin
@@ -455,16 +455,20 @@ (define-public gimp-next
                    (mkdir-p (string-append #$output:doc "/share"))
                    (rename-file (string-append #$output "/share/doc")
                                 (string-append #$output:doc "/share/doc")))))))
-    (inputs (modify-inputs (package-inputs gimp)
+    (inputs (modify-inputs (package-inputs gimp-2)
               (replace "gtk+" gtk+)
               (prepend libxmu libxt)
               (prepend python python-pygobject gjs)
               (prepend libxslt)))
-    (native-inputs (modify-inputs (package-native-inputs gimp)
+    (native-inputs (modify-inputs (package-native-inputs gimp-2)
                      (prepend appstream-glib
                               gi-docgen
                               libarchive)))))
 
+(define-public gimp gimp-3)
+(define-public gimp-next
+  (deprecated-package "gimp-next" gimp-3))
+
 (define-public gimp-fourier
   (package
     (name "gimp-fourier")
-- 
2.49.0

Message #11 received at 77564 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 77564 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: gimp <at> 3: Wrap GI_TYPELIB_PATH and GUIX_PYTHONPATH.
Date: Sun, 6 Apr 2025 00:18:14 +0200

Without this, Python-Fu scripts will fail to import gi and GObject-related
packages.

* gnu/packages/gimp.scm (gimp-3)[#:phases]: Add ‘wrap’.
---
 gnu/packages/gimp.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index ef03992f2d..07f005bb18 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -454,7 +454,19 @@ (define-public gimp-3
                  (lambda _
                    (mkdir-p (string-append #$output:doc "/share"))
                    (rename-file (string-append #$output "/share/doc")
-                                (string-append #$output:doc "/share/doc")))))))
+                                (string-append #$output:doc "/share/doc"))))
+               (add-after 'install 'wrap
+                 (lambda* _
+                   (for-each
+                    (lambda (prog)
+                      (wrap-program prog
+                        `("GI_TYPELIB_PATH" suffix
+                          (,(getenv "GI_TYPELIB_PATH")))
+                        `("GUIX_PYTHONPATH" suffix
+                          (,(getenv "GUIX_PYTHONPATH")))))
+                    (find-files (string-append #$output "/bin")
+                                (lambda (_ stat)
+                                  (eq? 'regular (stat:type stat))))))))))
     (inputs (modify-inputs (package-inputs gimp-2)
               (replace "gtk+" gtk+)
               (prepend libxmu libxt)
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.