* [bug#61592] [PATCH] gnu: meld: Update to 3.22.0
@ 2023-02-18 2:12 Andy Tai
2023-02-18 7:28 ` Liliana Marie Prikler
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Andy Tai @ 2023-02-18 2:12 UTC (permalink / raw)
To: 61592; +Cc: Andy Tai
* gnu/packages/patchutils.scm (meld): Update to 3.22.0
---
gnu/packages/patchutils.scm | 87 +++++++++++++++++--------------------
1 file changed, 39 insertions(+), 48 deletions(-)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index dd5e6bae9a..b5347d6a22 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,8 @@ (define-module (gnu packages patchutils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages ed)
@@ -37,6 +40,7 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages file)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
@@ -47,8 +51,11 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages less)
#:use-module (gnu packages mail)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
@@ -214,7 +221,7 @@ (define-public vbindiff
(define-public meld
(package
(name "meld")
- (version "3.20.4")
+ (version "3.22.0")
(source
(origin
(method url-fetch)
@@ -222,66 +229,50 @@ (define-public meld
(version-major+minor version)
"/meld-" version ".tar.xz"))
(sha256
- (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
- (build-system python-build-system)
+ (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
+ (build-system meson-build-system)
(native-inputs
- `(("intltool" ,intltool)
- ("xmllint" ,libxml2)
- ("glib-compile-schemas" ,glib "bin")
- ("python-pytest" ,python-pytest)))
+ (list desktop-file-utils
+ intltool
+ itstool
+ libxml2
+ `(,glib "bin")
+ `(,gtk+ "bin") ; for gtk-update-icon-cache
+ gobject-introspection
+ pkg-config
+ python))
(inputs
- `(("python-cairo" ,python-pycairo)
- ("python-gobject" ,python-pygobject)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtksourceview" ,gtksourceview-3)))
+ (list bash-minimal
+ python
+ python-pycairo
+ python-pygobject
+ gsettings-desktop-schemas
+ gtksourceview-4))
(propagated-inputs
(list dconf))
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
- ,@%python-build-system-modules)
- #:modules ((guix build python-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (list
+ #:glib-or-gtk? #t
+ #:imported-modules `(,@%meson-build-system-modules
+ (guix build python-build-system))
+ #:modules '((guix build meson-build-system)
+ ((guix build python-build-system) #:prefix python:)
(guix build utils))
#:phases
- (modify-phases %standard-phases
- ;; This setup.py script does not support one of the Python build
- ;; system's default flags, "--single-version-externally-managed".
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "python" "setup.py"
- ;; This setup.py runs gtk-update-icon-cache which we don't want.
- "--no-update-icon-cache"
- ;; "--no-compile-schemas"
- "install"
- (string-append "--prefix=" (assoc-ref outputs "out"))
- "--root=/")))
- ;; The tests need to be run after installation.
- (delete 'check)
- (add-after 'install 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Tests look for installed package
- (add-installed-pythonpath inputs outputs)
- ;; The tests fail when HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")
- (invoke "py.test" "-v" "-k"
- ;; TODO: Those tests fail, why?
- "not test_classify_change_actions")))
+ #~(modify-phases %standard-phases
(add-after 'install 'copy-styles
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((styles "/share/gtksourceview-3.0/styles"))
+ (let ((styles "/share/gtksourceview-4/styles"))
(copy-recursively
(string-append (assoc-ref inputs "gtksourceview") styles)
(string-append (assoc-ref outputs "out") styles))
#t)))
- (add-after 'wrap 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'wrap 'wrap-typelib
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/meld")
- `("GI_TYPELIB_PATH" prefix
- ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH"))))
- #t))))))
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/meld")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
+ ,(python:site-packages inputs outputs)))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://meldmerge.org/")
(synopsis "Compare files, directories and working copies")
(description "Meld is a visual diff and merge tool targeted at
base-commit: c1303a914c172dc80166be22389e7032c5ea5e09
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH] gnu: meld: Update to 3.22.0
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
@ 2023-02-18 7:28 ` Liliana Marie Prikler
2023-02-23 6:37 ` [bug#61592] [PATCH v3 1/2] " Andy Tai
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2023-02-18 7:28 UTC (permalink / raw)
To: Andy Tai, 61592
Am Freitag, dem 17.02.2023 um 18:12 -0800 schrieb Andy Tai:
> * gnu/packages/patchutils.scm (meld): Update to 3.22.0
> ---
> gnu/packages/patchutils.scm | 87 +++++++++++++++++------------------
> --
> 1 file changed, 39 insertions(+), 48 deletions(-)
>
> diff --git a/gnu/packages/patchutils.scm
> b/gnu/packages/patchutils.scm
> index dd5e6bae9a..b5347d6a22 100644
> --- a/gnu/packages/patchutils.scm
> +++ b/gnu/packages/patchutils.scm
> @@ -5,6 +5,7 @@
> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
> ;;; Copyright © 2022 jgart <jgart@dismail.de>
> +;;; Copyright © 2023 Andy Tai <atai@atai.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils)
> #:use-module (guix download)
> #:use-module (guix git-download)
> #:use-module (guix build-system gnu)
> + #:use-module (guix build-system glib-or-gtk)
> + #:use-module (guix build-system meson)
> #:use-module (guix build-system python)
> #:use-module (gnu packages)
> #:use-module (gnu packages ed)
> @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils)
> #:use-module (gnu packages check)
> #:use-module (gnu packages databases)
> #:use-module (gnu packages django)
> + #:use-module (gnu packages freedesktop)
> #:use-module (gnu packages file)
> #:use-module (gnu packages gawk)
> #:use-module (gnu packages gettext)
> @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils)
> #:use-module (gnu packages less)
> #:use-module (gnu packages mail)
> #:use-module (gnu packages ncurses)
> + #:use-module (gnu packages package-management)
> #:use-module (gnu packages perl)
> + #:use-module (gnu packages pkg-config)
> #:use-module (gnu packages python)
> + #:use-module (gnu packages python-build)
> #:use-module (gnu packages python-xyz)
> #:use-module (gnu packages version-control)
> #:use-module (gnu packages xml))
> @@ -214,7 +221,7 @@ (define-public vbindiff
> (define-public meld
> (package
> (name "meld")
> - (version "3.20.4")
> + (version "3.22.0")
> (source
> (origin
> (method url-fetch)
> @@ -222,66 +229,50 @@ (define-public meld
> (version-major+minor version)
> "/meld-" version ".tar.xz"))
> (sha256
> - (base32
> "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
> - (build-system python-build-system)
> + (base32
> "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
> + (build-system meson-build-system)
> (native-inputs
> - `(("intltool" ,intltool)
> - ("xmllint" ,libxml2)
> - ("glib-compile-schemas" ,glib "bin")
> - ("python-pytest" ,python-pytest)))
> + (list desktop-file-utils
> + intltool
> + itstool
> + libxml2
> + `(,glib "bin")
> + `(,gtk+ "bin") ; for gtk-update-icon-cache
> + gobject-introspection
> + pkg-config
> + python)
Even if it's a chore, please separate style changes and actual changes
into two commits.
Cheers
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH v2 1/2] gnu: meld: Update to 3.22.0
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
2023-02-18 7:28 ` Liliana Marie Prikler
2023-02-23 6:37 ` [bug#61592] [PATCH v3 1/2] " Andy Tai
@ 2023-02-23 6:37 ` Andy Tai
2023-02-23 6:37 ` [bug#61592] [PATCH v3 2/2] gnu: meld: Use new package style Andy Tai
2023-02-23 6:37 ` [bug#61592] [PATCH v2 2/2] gnu: meld: Use new style inputs and gexps Andy Tai
4 siblings, 0 replies; 7+ messages in thread
From: Andy Tai @ 2023-02-23 6:37 UTC (permalink / raw)
To: liliana.prikler, 61592; +Cc: Andy Tai
* gnu/packages/patchutils.scm (meld): Update to 3.22.0
---
gnu/packages/patchutils.scm | 79 ++++++++++++++++---------------------
1 file changed, 35 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index dd5e6bae9a..d093391ce5 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,8 @@ (define-module (gnu packages patchutils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages ed)
@@ -37,6 +40,7 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages file)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
@@ -47,8 +51,11 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages less)
#:use-module (gnu packages mail)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
@@ -214,7 +221,7 @@ (define-public vbindiff
(define-public meld
(package
(name "meld")
- (version "3.20.4")
+ (version "3.22.0")
(source
(origin
(method url-fetch)
@@ -222,66 +229,50 @@ (define-public meld
(version-major+minor version)
"/meld-" version ".tar.xz"))
(sha256
- (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
- (build-system python-build-system)
+ (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
+ (build-system meson-build-system)
(native-inputs
- `(("intltool" ,intltool)
+ `(("desktop-file-utils" ,desktop-file-utils)
+ ("intltool" ,intltool)
+ ("itstool" ,itstool)
("xmllint" ,libxml2)
("glib-compile-schemas" ,glib "bin")
- ("python-pytest" ,python-pytest)))
+ ("gtk-update-icon-cache" ,gtk+ "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)))
(inputs
- `(("python-cairo" ,python-pycairo)
+ `(("bash-minimal" ,bash-minimal)
+ ("python" ,python)
+ ("python-cairo" ,python-pycairo)
("python-gobject" ,python-pygobject)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtksourceview" ,gtksourceview-3)))
+ ("gtksourceview" ,gtksourceview-4)))
(propagated-inputs
(list dconf))
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
- ,@%python-build-system-modules)
- #:modules ((guix build python-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (list
+ #:glib-or-gtk? #t
+ #:imported-modules `(,@%meson-build-system-modules
+ (guix build python-build-system))
+ #:modules '((guix build meson-build-system)
+ ((guix build python-build-system) #:prefix python:)
(guix build utils))
#:phases
- (modify-phases %standard-phases
- ;; This setup.py script does not support one of the Python build
- ;; system's default flags, "--single-version-externally-managed".
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "python" "setup.py"
- ;; This setup.py runs gtk-update-icon-cache which we don't want.
- "--no-update-icon-cache"
- ;; "--no-compile-schemas"
- "install"
- (string-append "--prefix=" (assoc-ref outputs "out"))
- "--root=/")))
- ;; The tests need to be run after installation.
- (delete 'check)
- (add-after 'install 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Tests look for installed package
- (add-installed-pythonpath inputs outputs)
- ;; The tests fail when HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")
- (invoke "py.test" "-v" "-k"
- ;; TODO: Those tests fail, why?
- "not test_classify_change_actions")))
+ #~(modify-phases %standard-phases
(add-after 'install 'copy-styles
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((styles "/share/gtksourceview-3.0/styles"))
+ (let ((styles "/share/gtksourceview-4/styles"))
(copy-recursively
(string-append (assoc-ref inputs "gtksourceview") styles)
(string-append (assoc-ref outputs "out") styles))
#t)))
- (add-after 'wrap 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'wrap 'wrap-typelib
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/meld")
- `("GI_TYPELIB_PATH" prefix
- ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH"))))
- #t))))))
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/meld")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
+ ,(python:site-packages inputs outputs)))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://meldmerge.org/")
(synopsis "Compare files, directories and working copies")
(description "Meld is a visual diff and merge tool targeted at
base-commit: 31735e0ccfbc61905eb8558c14747bfcaea9b50f
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH v3 1/2] gnu: meld: Update to 3.22.0
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
2023-02-18 7:28 ` Liliana Marie Prikler
@ 2023-02-23 6:37 ` Andy Tai
2023-03-04 17:37 ` [bug#61592] [PATCH] " Ludovic Courtès
2023-02-23 6:37 ` [bug#61592] [PATCH v2 1/2] " Andy Tai
` (2 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Andy Tai @ 2023-02-23 6:37 UTC (permalink / raw)
To: 61592; +Cc: Andy Tai
* gnu/packages/patchutils.scm (meld): Update to 3.22.0
[build-system]: Switch to meson-build-system.
[native-inputs]: Add desktop-file-utils, itstool, gobject-introspection,
pkg-config, and python.
[inputs]: Add bash-minimal, python, and python-pycairo.
Replace gtksourceview-3 with gtksourceview-4.
[arguments]: Add #:glib-or-gtk?, #:imported-modules, and #:modules.
<#:phases>: Remove custom ‘install’ and ‘check’.
Add ‘skip-gtk-update-icon-cache’.
Adjust ‘copy-styles’ to gtksourceview-4.
Replace ‘wrap-typelib’ with ‘python-and-gi-wrap’.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
Hi Andy,
this patch and the following one are the split I intended.
I also fixed up some other issues like the unnecessary gtk+:bin input.
Following standard procedure, I intend to leave this up for a little
over a week to get some proper review by others.
Cheers,
Liliana
gnu/packages/patchutils.scm | 78 +++++++++++++++++--------------------
1 file changed, 36 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index dd5e6bae9a..fd1ba83b3c 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,8 @@ (define-module (gnu packages patchutils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages ed)
@@ -37,6 +40,7 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages file)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
@@ -47,8 +51,11 @@ (define-module (gnu packages patchutils)
#:use-module (gnu packages less)
#:use-module (gnu packages mail)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
@@ -214,7 +221,7 @@ (define-public vbindiff
(define-public meld
(package
(name "meld")
- (version "3.20.4")
+ (version "3.22.0")
(source
(origin
(method url-fetch)
@@ -222,66 +229,53 @@ (define-public meld
(version-major+minor version)
"/meld-" version ".tar.xz"))
(sha256
- (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
- (build-system python-build-system)
+ (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
+ (build-system meson-build-system)
(native-inputs
- `(("intltool" ,intltool)
+ `(("desktop-file-utils" ,desktop-file-utils)
+ ("intltool" ,intltool)
+ ("itstool" ,itstool)
("xmllint" ,libxml2)
("glib-compile-schemas" ,glib "bin")
- ("python-pytest" ,python-pytest)))
+ ("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)))
(inputs
- `(("python-cairo" ,python-pycairo)
+ `(("bash-minimal" ,bash-minimal)
+ ("python" ,python)
+ ("python-cairo" ,python-pycairo)
("python-gobject" ,python-pygobject)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtksourceview" ,gtksourceview-3)))
+ ("gtksourceview" ,gtksourceview-4)))
(propagated-inputs
(list dconf))
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
- ,@%python-build-system-modules)
- #:modules ((guix build python-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ `(#:glib-or-gtk? #t
+ #:imported-modules (,@%meson-build-system-modules
+ (guix build python-build-system))
+ #:modules ((guix build meson-build-system)
+ ((guix build python-build-system) #:prefix python:)
(guix build utils))
#:phases
(modify-phases %standard-phases
- ;; This setup.py script does not support one of the Python build
- ;; system's default flags, "--single-version-externally-managed".
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "python" "setup.py"
- ;; This setup.py runs gtk-update-icon-cache which we don't want.
- "--no-update-icon-cache"
- ;; "--no-compile-schemas"
- "install"
- (string-append "--prefix=" (assoc-ref outputs "out"))
- "--root=/")))
- ;; The tests need to be run after installation.
- (delete 'check)
- (add-after 'install 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Tests look for installed package
- (add-installed-pythonpath inputs outputs)
- ;; The tests fail when HOME=/homeless-shelter.
- (setenv "HOME" "/tmp")
- (invoke "py.test" "-v" "-k"
- ;; TODO: Those tests fail, why?
- "not test_classify_change_actions")))
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") (which "true")))))
(add-after 'install 'copy-styles
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((styles "/share/gtksourceview-3.0/styles"))
+ (let ((styles "/share/gtksourceview-4/styles"))
(copy-recursively
(string-append (assoc-ref inputs "gtksourceview") styles)
(string-append (assoc-ref outputs "out") styles))
#t)))
- (add-after 'wrap 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'wrap 'wrap-typelib
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/meld")
- `("GI_TYPELIB_PATH" prefix
- ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH"))))
- #t))))))
+ (wrap-program (search-input-file outputs "bin/meld")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
+ ,(python:site-packages inputs outputs)))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://meldmerge.org/")
(synopsis "Compare files, directories and working copies")
(description "Meld is a visual diff and merge tool targeted at
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH v2 2/2] gnu: meld: Use new style inputs and gexps.
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
` (3 preceding siblings ...)
2023-02-23 6:37 ` [bug#61592] [PATCH v3 2/2] gnu: meld: Use new package style Andy Tai
@ 2023-02-23 6:37 ` Andy Tai
4 siblings, 0 replies; 7+ messages in thread
From: Andy Tai @ 2023-02-23 6:37 UTC (permalink / raw)
To: liliana.prikler, 61592; +Cc: Andy Tai
* gnu/packages/patchutils.scm (meld): Use new style and gexps.
[inputs]: Use new style
[native-inputs]: Use new style
---
gnu/packages/patchutils.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index d093391ce5..04761d5ef7 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -232,22 +232,22 @@ (define-public meld
(base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
(build-system meson-build-system)
(native-inputs
- `(("desktop-file-utils" ,desktop-file-utils)
- ("intltool" ,intltool)
- ("itstool" ,itstool)
- ("xmllint" ,libxml2)
- ("glib-compile-schemas" ,glib "bin")
- ("gtk-update-icon-cache" ,gtk+ "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (list desktop-file-utils
+ intltool
+ itstool
+ libxml2
+ `(,glib "bin") ; for glib-compile-schemas
+ `(,gtk+ "bin") ; for gtk-update-icon-cache
+ gobject-introspection
+ pkg-config
+ python))
(inputs
- `(("bash-minimal" ,bash-minimal)
- ("python" ,python)
- ("python-cairo" ,python-pycairo)
- ("python-gobject" ,python-pygobject)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtksourceview" ,gtksourceview-4)))
+ (list bash-minimal
+ python
+ python-pycairo
+ python-pygobject
+ gsettings-desktop-schemas
+ gtksourceview-4))
(propagated-inputs
(list dconf))
(arguments
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH v3 2/2] gnu: meld: Use new package style.
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
` (2 preceding siblings ...)
2023-02-23 6:37 ` [bug#61592] [PATCH v2 1/2] " Andy Tai
@ 2023-02-23 6:37 ` Andy Tai
2023-02-23 6:37 ` [bug#61592] [PATCH v2 2/2] gnu: meld: Use new style inputs and gexps Andy Tai
4 siblings, 0 replies; 7+ messages in thread
From: Andy Tai @ 2023-02-23 6:37 UTC (permalink / raw)
To: 61592; +Cc: Andy Tai
* gnu/packages/patchutils.scm (meld)[arguments]: Convert to list of
G-Expressions.
<#:phases>: Drop trailing #t.
[inputs, native-inputs]: Drop labels.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
gnu/packages/patchutils.scm | 74 ++++++++++++++++++-------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index fd1ba83b3c..05a9a62dbf 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -232,50 +232,50 @@ (define-public meld
(base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
(build-system meson-build-system)
(native-inputs
- `(("desktop-file-utils" ,desktop-file-utils)
- ("intltool" ,intltool)
- ("itstool" ,itstool)
- ("xmllint" ,libxml2)
- ("glib-compile-schemas" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (list desktop-file-utils
+ intltool
+ itstool
+ libxml2
+ `(,glib "bin") ; for glib-compile-schemas
+ gobject-introspection
+ pkg-config
+ python))
(inputs
- `(("bash-minimal" ,bash-minimal)
- ("python" ,python)
- ("python-cairo" ,python-pycairo)
- ("python-gobject" ,python-pygobject)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtksourceview" ,gtksourceview-4)))
+ (list bash-minimal
+ python
+ python-pycairo
+ python-pygobject
+ gsettings-desktop-schemas
+ gtksourceview-4))
(propagated-inputs
(list dconf))
(arguments
- `(#:glib-or-gtk? #t
- #:imported-modules (,@%meson-build-system-modules
+ (list
+ #:glib-or-gtk? #t
+ #:imported-modules `(,@%meson-build-system-modules
(guix build python-build-system))
- #:modules ((guix build meson-build-system)
+ #:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-gtk-update-icon-cache
- ;; Don't create 'icon-theme.cache'.
- (lambda _
- (substitute* "meson_post_install.py"
- (("gtk-update-icon-cache") (which "true")))))
- (add-after 'install 'copy-styles
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((styles "/share/gtksourceview-4/styles"))
- (copy-recursively
- (string-append (assoc-ref inputs "gtksourceview") styles)
- (string-append (assoc-ref outputs "out") styles))
- #t)))
- (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (search-input-file outputs "bin/meld")
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
- ,(python:site-packages inputs outputs)))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") (which "true")))))
+ (add-after 'install 'copy-styles
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((styles "/share/gtksourceview-4/styles"))
+ (copy-recursively
+ (string-append (assoc-ref inputs "gtksourceview") styles)
+ (string-append (assoc-ref outputs "out") styles)))))
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/meld")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")
+ ,(python:site-packages inputs outputs)))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://meldmerge.org/")
(synopsis "Compare files, directories and working copies")
(description "Meld is a visual diff and merge tool targeted at
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#61592] [PATCH] gnu: meld: Update to 3.22.0
2023-02-23 6:37 ` [bug#61592] [PATCH v3 1/2] " Andy Tai
@ 2023-03-04 17:37 ` Ludovic Courtès
0 siblings, 0 replies; 7+ messages in thread
From: Ludovic Courtès @ 2023-03-04 17:37 UTC (permalink / raw)
To: Andy Tai; +Cc: 61592, Liliana Marie Prikler, Andy Tai
Hi Liliana,
Andy Tai <liliana.prikler@gmail.com> skribis:
> Hi Andy,
>
> this patch and the following one are the split I intended.
> I also fixed up some other issues like the unnecessary gtk+:bin input.
> Following standard procedure, I intend to leave this up for a little
> over a week to get some proper review by others.
LGTM, please push!
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-04 17:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-18 2:12 [bug#61592] [PATCH] gnu: meld: Update to 3.22.0 Andy Tai
2023-02-18 7:28 ` Liliana Marie Prikler
2023-02-23 6:37 ` [bug#61592] [PATCH v3 1/2] " Andy Tai
2023-03-04 17:37 ` [bug#61592] [PATCH] " Ludovic Courtès
2023-02-23 6:37 ` [bug#61592] [PATCH v2 1/2] " Andy Tai
2023-02-23 6:37 ` [bug#61592] [PATCH v3 2/2] gnu: meld: Use new package style Andy Tai
2023-02-23 6:37 ` [bug#61592] [PATCH v2 2/2] gnu: meld: Use new style inputs and gexps Andy Tai
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.