GNU bug report logs - #69955
[PATCH gnome-team] gnu: shotwell: Update to 0.32.6.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69955 in the body.
You can then email your comments to 69955 AT debbugs.gnu.org in the normal way.

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

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

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: shotwell: Update to 0.32.6.
Date: Sat, 23 Mar 2024 09:29:29 +0100

* gnu/packages/gnome.scm (shotwell): Update to 0.32.6.
[arguments]: Convert to list of G-Expressions.
[#:phase 'skip-gtk-update-icon-cache]: Adjust to build system change.
[inputs]: Add libportal.

Change-Id: I5167d13d8514e278732459d1705f0041e3797894
---
Dear Guix,

This shotwell update fixes its build failure on gnome-team.

What do you think?

Best regards,

Vivien

 gnu/packages/gnome.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5432ebc27b..06ab604945 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7570,7 +7570,7 @@ (define-public gexiv2
 (define-public shotwell
   (package
     (name "shotwell")
-    (version "0.31.5")
+    (version "0.32.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/shotwell/"
@@ -7578,17 +7578,20 @@ (define-public shotwell
                                   "shotwell-" version ".tar.xz"))
               (sha256
                (base32
-                "06awlix23y1cd89n6v9vip48cg08fjq8v6zaw38k5clrrv38y11v"))))
+                "1dkh5bczf9k86akl70inpc2z98qkhg8g44jb2kc8rqcimkzs95vm"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           (lambda _
-             (substitute* "build-aux/meson/postinstall.py"
-               (("gtk-update-icon-cache") (which "true"))
-               (("update-desktop-database") (which "true"))))))))
+     (list
+      #:glib-or-gtk? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false")
+                (("update_desktop_database: true")
+                 "update_desktop_database: false")))))))
     (propagated-inputs
      (list dconf))
     (native-inputs
@@ -7604,6 +7607,7 @@ (define-public shotwell
            gst-plugins-base
            gstreamer
            json-glib
+           libportal
            libgdata
            libgee
            libgphoto2

base-commit: a9951a74a591a9b22ee2d93d8efe0523c6c42c97
-- 
2.41.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: Vivien Kraus <vivien <at> planete-kraus.eu>
Cc: rg <at> raghavgururajan.name, guix-patches <at> gnu.org, liliana.prikler <at> gmail.com,
 maxim.cournoyer <at> gmail.com, 69955-done <at> debbugs.gnu.org
Subject: Re: [bug#69955] [PATCH gnome-team] gnu: shotwell: Update to 0.32.6.
Date: Sun, 24 Mar 2024 10:32:39 +0000

[Message part 1 (text/plain, inline)]

Vivien Kraus via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/gnome.scm (shotwell): Update to 0.32.6.
> [arguments]: Convert to list of G-Expressions.
> [#:phase 'skip-gtk-update-icon-cache]: Adjust to build system change.
> [inputs]: Add libportal.
>
> Change-Id: I5167d13d8514e278732459d1705f0041e3797894
> ---
> Dear Guix,
>
> This shotwell update fixes its build failure on gnome-team.
>
> What do you think?

Looks good to me, I've pushed this to gnome-team as
beec25533869437b95735965ac130ea5f59f5aa0.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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