me
/
guix
Archived
1
0
Fork 0
Code

gnu: gimp: Drop Python 2 support. 

* gnu/packages/gimp.scm (gimp)[inputs]: Delete python-2 and python2-pygtk.
[configure-flags]: Use gexps.  Add "--disable-python".
[phases]: Delete argument.
[inputs, native-inputs]: Use new style.
Maxim Cournoyer 2022-05-01 01:27:04 -04:00
parent faefd4d1db
commit 8d71e5b2a5
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 45 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
gnu/packages/gimp.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,7 @@
(define-module (gnu packages gimp) (define-module (gnu packages gimp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -297,71 +299,55 @@ buffers.")
(base32 "1p375gaw2daip6aiv1icrlpws5m1my5kalxkxrvl4zgdfsm5v0c8")))) (base32 "1p375gaw2daip6aiv1icrlpws5m1my5kalxkxrvl4zgdfsm5v0c8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML "doc")) ; 9 MiB of gtk-doc HTML
(arguments (arguments
'(#:configure-flags (list
(list (string-append "--with-html-dir=" #:configure-flags
(assoc-ref %outputs "doc") #~(list (string-append "--with-html-dir=" #$output "/share/gtk-doc/html")
"/share/gtk-doc/html")
;; Prevent the build system from running 'gtk-update-icon-cache' ;; Prevent the build system from running 'gtk-update-icon-cache'
;; which is not needed during the build because Guix runs it at ;; which is not needed during the build because Guix runs it at
;; profile creation time. ;; profile creation time.
"ac_cv_path_GTK_UPDATE_ICON_CACHE=true" "ac_cv_path_GTK_UPDATE_ICON_CACHE=true"
;; Disable automatic network request on startup to check for ;; Disable automatic network request on startup to check for
;; version updates. ;; version updates.
"--disable-check-update" "--disable-check-update"
;; ./configure requests not to annoy upstream with packaging bugs. ;; Only Python 2 is supported; disable it.
"--with-bug-report-url=https://bugs.gnu.org/guix") "--disable-python"
#:phases
(modify-phases %standard-phases ;; ./configure requests not to annoy upstream with packaging bugs.
(add-after 'install 'install-sitecustomize.py "--with-bug-report-url=https://bugs.gnu.org/guix")))
;; Install 'sitecustomize.py' into gimp's python directory to
;; add pygobject and pygtk to pygimp's search path.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((pythonpath (getenv "GUIX_PYTHONPATH"))
(out (assoc-ref outputs "out"))
(sitecustomize.py
(string-append
out "/lib/gimp/2.0/python/sitecustomize.py")))
(call-with-output-file sitecustomize.py
(lambda (port)
(format port "import site~%")
(format port "for dir in '~a'.split(':'):~%" pythonpath)
(format port " site.addsitedir(dir)~%")))))))))
(inputs (inputs
`(("atk" ,atk) (list atk
("babl" ,babl) babl
("gegl" ,gegl) gegl
("gexiv2" ,gexiv2) gexiv2
("glib" ,glib) glib
("glib-networking" ,glib-networking) glib-networking
("gtk+" ,gtk+-2) gtk+-2
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libmypaint" ,libmypaint) libmypaint
("libtiff" ,libtiff) libtiff
("libwebp" ,libwebp) libwebp
("mypaint-brushes" ,mypaint-brushes-1.3) mypaint-brushes-1.3
("exif" ,libexif) ; optional, EXIF + XMP support libexif ;optional, EXIF + XMP support
("ghostscript" ,ghostscript) ; optional, EPS + PS support ghostscript ;optional, EPS + PS support
("lcms" ,lcms) ; optional, color management lcms ;optional, color management
("libheif" ,libheif) ; optional, HEIF + AVIF support libheif ;optional, HEIF + AVIF support
("libmng" ,libmng) ; optional, MNG support libmng ;optional, MNG support
("librsvg" ,librsvg) ; optional, SVG support librsvg ;optional, SVG support
("libxcursor" ,libxcursor) ; optional, Mouse Cursor support libxcursor ;optional, Mouse Cursor support
("openexr" ,openexr-2) ; optional, EXR support openexr-2 ;optional, EXR support
("openjpeg" ,openjpeg) ; optional, JPEG 2000 support openjpeg ;optional, JPEG 2000 support
("poppler" ,poppler) ; optional, PDF support poppler ;optional, PDF support
("poppler-data" ,poppler-data) ; optional, PDF support poppler-data)) ;optional, PDF support
("python" ,python-2) ; optional, Python support
("python2-pygtk" ,python2-pygtk))) ; optional, Python support
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) (list desktop-file-utils
("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen `(,glib "bin") ;for glib-compile-resources and gdbus-codegen
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config))) pkg-config))
(home-page "https://www.gimp.org") (home-page "https://www.gimp.org")
(synopsis "GNU Image Manipulation Program") (synopsis "GNU Image Manipulation Program")
(description (description