GNU bug report logs - #65699
[PATCH gnome-team 0/7] Update Nautilus and Console

Previous Next

Package: guix-patches;

Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Date: Sat, 2 Sep 2023 12:04:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 12:04:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
New bug report received and forwarded. Copy sent to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org. (Sat, 02 Sep 2023 12:04:02 GMT) Full text and rfc822 format available.

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 gnome-team 0/7] Update Nautilus and Console
Date: Sat, 2 Sep 2023 14:01:57 +0200
Hi Guix,

this series updates Nautilus and Console.  Due to the tracker rebuils,
gtk4 and webkitgtk-next are also affected.

Cheers

Liliana Marie Prikler (7):
  gnu: gnome-autoar: Update to 0.4.4.
  gnu: tracker: Update to 3.5.3.
  gnu: tracker-miners: Update to 3.5.2.
  gnu: libadwaita: Update to 1.3.4.
  gnu: nautilus: Update to 44.2.
  gnu: vte: Update to 0.72.2.
  gnu: gnome-console: Update to 44.4.

 gnu/packages/gnome.scm                        | 72 +++++++++----------
 .../nautilus-extension-search-path.patch      | 64 +++++++++--------
 2 files changed, 70 insertions(+), 66 deletions(-)


base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
prerequisite-patch-id: afaee255d9c76105d3c075e3b1302efe2e720121
prerequisite-patch-id: 939c99edaaebbcf04c00d099004421e548082316
prerequisite-patch-id: c27258fdbc2dce067cbcadc0cbb79255131e7b13
prerequisite-patch-id: 17b7d0a8a3e698b5dac1e6e83448876cf7ed828a
prerequisite-patch-id: 904c70b8c150f8046b0779e1a109c89b58b1a6f3
prerequisite-patch-id: 4b1376cfe285b3ddabb88fab0ed8372effd33561
prerequisite-patch-id: 0238ddcf9e9140c7f3726b34a3ea51c4e0cec422
prerequisite-patch-id: 3149ef71903b81ee78ed180cea370852705a3cac
prerequisite-patch-id: 0c0e3b6be8544d07597c8eae54832136f5450887
prerequisite-patch-id: c6e6bfe44465fbf1477a8d379f821926037c2b9e
prerequisite-patch-id: ee43b1b9627833bd220c2a5987b1d4ca6ceeaf1c
prerequisite-patch-id: b48031f5489b0678ac7b63458cc35385834655b4
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 2/7] gnu: tracker: Update to 3.5.3.
Date: Sat, 2 Sep 2023 13:34:59 +0200
* gnu/packages/gnome.scm (tracker): Update to 3.5.3.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 03e0314d25..02a63e6ace 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9383,7 +9383,7 @@ (define-public gnome-autoar
 (define-public tracker
   (package
     (name "tracker")
-    (version "3.4.2")
+    (version "3.5.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker/"
@@ -9391,7 +9391,7 @@ (define-public tracker
                                   "tracker-" version ".tar.xz"))
               (sha256
                (base32
-                "0c8ppm03b9r6lyxalama8sjmw3km4jibbswqra7qf17pli1g2vaf"))))
+                "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 1/7] gnu: gnome-autoar: Update to 0.4.4.
Date: Sat, 2 Sep 2023 13:34:49 +0200
* gnu/packages/gnome.scm (gnome-autoar): Update to 0.4.4.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 40dafe891d..03e0314d25 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9357,7 +9357,7 @@ (define-public gtk-vnc
 (define-public gnome-autoar
   (package
     (name "gnome-autoar")
-    (version "0.4.3")
+    (version "0.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9365,7 +9365,7 @@ (define-public gnome-autoar
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "124y4j3wgb6axgfzw9f00865r033fg7b0qy9qgfsp5ilan4hgpvv"))))
+                "1hn3rzd6z2g2xvnx8icifybq26vvxk44qmqz392b2g6g7crvxby0"))))
     (build-system meson-build-system)
     (native-inputs
      (list gobject-introspection `(,glib "bin") pkg-config))
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:03 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 3/7] gnu: tracker-miners: Update to 3.5.2.
Date: Sat, 2 Sep 2023 13:35:12 +0200
* gnu/packages/gnome.scm (tracker-miners): Update to 3.5.2.
[#:phases]<fix-tests>: Adjust accordingly.
[inputs]: Add gst-plugins-base.
---
 gnu/packages/gnome.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 02a63e6ace..20489fc551 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9501,7 +9501,7 @@ (define-public tracker
 (define-public tracker-miners
   (package
     (name "tracker-miners")
-    (version "3.3.1")
+    (version "3.5.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker-miners/"
@@ -9509,7 +9509,7 @@ (define-public tracker-miners
                                   "/tracker-miners-" version ".tar.xz"))
               (sha256
                (base32
-                "151w6ljq1gk9idqfq9qs3w16vms91jnxy59c9kx6jaf0fb9cdp9y"))))
+                "0sbc3fmvqg5hvdl5sq8w77lqmk9i6vc13izcxck8winrrgx93ys0"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -9543,12 +9543,7 @@ (define-public tracker-miners
              ;; to be true and the UPower daemon to be started.
              (substitute* "examples/python/meson.build"
                (("foreach example_name:.*")
-                "foreach example_name: []"))
-             ;; Disable this test that is failing randomly:
-             ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/170.
-             (substitute* "tests/libtracker-miner/meson.build"
-               (("'miner-fs'.*")
-                ""))))
+                "foreach example_name: []"))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
@@ -9580,6 +9575,7 @@ (define-public tracker-miners
            giflib
            glib
            gstreamer
+           gst-plugins-base
            icu4c
            json-glib
            libcue
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:03 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Sat, 2 Sep 2023 13:36:12 +0200
* gnu/packages/gnome.scm (nautilus): Update to 44.2.
[#:phases]: Add ‘hardcode-tracker’.
Adjust ‘skip-gtk-update-icon-cache’ accordingly.
[inputs]: Remove gtk+ and libhandy.
Add gtk and libadwaita.
* gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
accordingly.
---
 gnu/packages/gnome.scm                        | 24 ++++---
 .../nautilus-extension-search-path.patch      | 64 +++++++++++--------
 2 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0d52058eb4..d550b204c3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9619,7 +9619,7 @@ (define-public tracker-miners
 (define-public nautilus
   (package
     (name "nautilus")
-    (version "42.2")
+    (version "44.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9627,7 +9627,7 @@ (define-public nautilus
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr"))
+                "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7"))
               (patches
                (search-patches "nautilus-extension-search-path.patch"))))
     (build-system meson-build-system)
@@ -9636,6 +9636,13 @@ (define-public nautilus
       #:glib-or-gtk? #t
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'hardcode-tracker
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/nautilus-tag-manager.c"
+                (("\"tracker3\"")
+                 (string-append "\""
+                                (search-input-file inputs "/bin/tracker3")
+                                "\"")))))
           (add-after 'unpack 'disable-tracker-tests
             ;; The tracker test hangs in the build container (see:
             ;; https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486).
@@ -9646,8 +9653,9 @@ (define-public nautilus
           (add-after 'unpack 'skip-gtk-update-icon-cache
             ;; Don't create 'icon-theme.cache'.
             (lambda _
-              (substitute* "build-aux/meson/postinstall.py"
-                (("gtk-update-icon-cache") "true"))))
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
           (delete 'check)
           (add-after 'install 'check
             (assoc-ref %standard-phases 'check))
@@ -9674,18 +9682,18 @@ (define-public nautilus
            gnome-autoar
            gst-plugins-base
            json-glib
-           libhandy
+           libadwaita
            libportal
            libseccomp
            libselinux
            tracker
            tracker-miners
-           ;; XXX: gtk+ is required by libnautilus-extension.pc
+           ;; XXX: gtk is required by libnautilus-extension.pc
            ;;
-           ;; Don't propagate it to reduces "profile pollution" of the 'gnome' meta
+           ;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta
            ;; package.  See:
            ;; <http://lists.gnu.org/archive/html/guix-devel/2016-03/msg00283.html>.
-           gtk+
+           gtk
            libexif
            libxml2))
     (native-search-paths
diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch
index d5dc35b241..1394956315 100644
--- a/gnu/packages/patches/nautilus-extension-search-path.patch
+++ b/gnu/packages/patches/nautilus-extension-search-path.patch
@@ -1,54 +1,62 @@
 Allow Nautilus to search for extensions in the directories listed
 in $NAUTILUS_EXTENSION_PATH.
 
-diff --git a/src/nautilus-module.c b/src/nautilus-module.c
-index bf474bd..42e2a4e 100644
---- a/src/nautilus-module.c
-+++ b/src/nautilus-module.c
-@@ -211,6 +211,10 @@ static void
+Index: nautilus-44.2/src/nautilus-module.c
+===================================================================
+--- nautilus-44.2.orig/src/nautilus-module.c
++++ nautilus-44.2/src/nautilus-module.c
+@@ -220,8 +220,16 @@ static void
  load_module_dir (const char *dirname)
  {
      GDir *dir;
+-
 +    static GHashTable *loaded = NULL;
+     g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new ();
++
++    if (installed_module_names != NULL)
++        g_strv_builder_addv (installed_module_name_builder,
++                             (const gchar **)installed_module_names);
 +
 +    if (loaded == NULL)
 +      loaded = g_hash_table_new (g_str_hash, g_str_equal);
- 
++
      dir = g_dir_open (dirname, 0, NULL);
  
-@@ -221,15 +225,22 @@ load_module_dir (const char *dirname)
-         while ((name = g_dir_read_name (dir)))
+     if (dir)
+@@ -232,16 +240,24 @@ load_module_dir (const char *dirname)
          {
              if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
--            {
+             {
 -                char *filename;
 -
 -                filename = g_build_filename (dirname,
 -                                             name,
 -                                             NULL);
--                nautilus_module_load_file (filename);
+-                nautilus_module_load_file (filename, installed_module_name_builder);
 -                g_free (filename);
--            }
-+	      {
-+		/* Make sure each module is loaded only twice or this could
-+		   lead to a crash.  Double loading can occur if DIRNAME
-+		   occurs more than once in $NAUTILUS_EXTENSION_PATH.  */
-+		if (!g_hash_table_contains (loaded, name))
-+		  {
-+		    char *filename;
++                /* Make sure each module is loaded only twice or this could
++                   lead to a crash.  Double loading can occur if DIRNAME
++                   occurs more than once in $NAUTILUS_EXTENSION_PATH.  */
++                if (!g_hash_table_contains (loaded, name))
++                {
++                    char *filename;
 +
-+		    filename = g_build_filename (dirname,
-+						 name,
-+						 NULL);
-+		    nautilus_module_load_file (filename);
-+		    g_hash_table_add (loaded, g_strdup (name));
-+		    g_free (filename);
-+		  }
-+	      }
-         }
++                    filename = g_build_filename (dirname,
++                                                 name,
++                                                 NULL);
++                    nautilus_module_load_file (filename,
++                                               installed_module_name_builder);
++                    g_hash_table_add (loaded, g_strdup (name));
++                    g_free (filename);
++                }
+             }
+-        }
  
++        }
          g_dir_close (dir);
-@@ -257,10 +268,24 @@ nautilus_module_setup (void)
+     }
+ 
+@@ -278,10 +294,24 @@ nautilus_module_setup (void)
  
      if (!initialized)
      {
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:03 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 6/7] gnu: vte: Update to 0.72.2.
Date: Sat, 2 Sep 2023 13:58:19 +0200
* gnu/packages/gnome.scm (vte): Update to 0.72.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d550b204c3..7a5d1c2ec7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4493,7 +4493,7 @@ (define-public vala-0.52
 (define-public vte
   (package
     (name "vte")
-    (version "0.70.2")
+    (version "0.72.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/vte/"
@@ -4501,7 +4501,7 @@ (define-public vte
                                   "vte-" version ".tar.xz"))
               (sha256
                (base32
-                "102d6cd9f96czlq01ixhymfp0z20khw0dl5bgvan9xg31lwb85ad"))))
+                "17hwfkb0vakjgf1gbmjma54hdrppzqfbfqj1jr9iz656hp8nz5pp"))))
     (build-system meson-build-system)
     (arguments
      (list #:configure-flags #~(list "-Dvapi=true"
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:04 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 7/7] gnu: gnome-console: Update to 44.4.
Date: Sat, 2 Sep 2023 13:59:59 +0200
* gnu/packages/gnome.scm (gnome-console): Update to 44.4.
[arguments]: Remove #:phases.
<#:configure-flas>: Remove “-Dnautilus=enabled”.
[inputs]: Remove gtk+, libhandy, nautilus and vte.
Add gtk, libadwaita and vte-with-gtk-4.
---
 gnu/packages/gnome.scm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7a5d1c2ec7..972de09a89 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5376,7 +5376,7 @@ (define-public gnome-sudoku
 (define-public gnome-console
   (package
     (name "gnome-console")
-    (version "42.2")
+    (version "44.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gnome-console/"
@@ -5384,28 +5384,20 @@ (define-public gnome-console
                                   "gnome-console-" version ".tar.xz"))
               (sha256
                (base32
-                "0jbh8g3hmc35fy5fbscqf0831xpg1kv66ci9hykpbia4hz0yc9kx"))))
+                "13asis4fabsm0wy3m6bk4k3bmnh6a9c9bwwpv6b3why0lvll87xr"))))
     (build-system meson-build-system)
     (arguments
      (list #:glib-or-gtk? #t
-           #:configure-flags #~(list "-Dtests=true"
-                                     "-Dnautilus=enabled")
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'patch-nautilus-extension-path
-                          (lambda _
-                            (substitute* "nautilus/meson.build"
-                              (("'extensions-[0-9.]*'")
-                               "'site-extensions'")))))))
+           #:configure-flags #~(list "-Dtests=true")))
     (native-inputs (list `(,glib "bin")
                          gettext-minimal
                          sassc
                          pkg-config
                          `(,gtk+ "bin")
                          desktop-file-utils))
-    (inputs (list gtk+
-                  libhandy
-                  nautilus
-                  vte
+    (inputs (list gtk
+                  libadwaita
+                  vte-with-gtk-4
                   libgtop
                   gsettings-desktop-schemas))
     (home-page "https://gitlab.gnome.org/GNOME/console")
-- 
2.41.0





Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Sat, 02 Sep 2023 13:25:04 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 65699 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 4/7] gnu: libadwaita: Update to 1.3.4.
Date: Sat, 2 Sep 2023 13:37:30 +0200
* gnu/packages/gnome.scm (libadwaita): Update to 1.3.4.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 20489fc551..0d52058eb4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13276,7 +13276,7 @@ (define-public ocrfeeder
 (define-public libadwaita
   (package
     (name "libadwaita")
-    (version "1.2.0")
+    (version "1.3.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libadwaita/"
@@ -13284,7 +13284,7 @@ (define-public libadwaita
                                   "libadwaita-" version ".tar.xz"))
               (sha256
                (base32
-                "0326qs0zhfi6zv52p90axnicmv0qb2l2hwpyv60pk9lvwcdkwbrj"))))
+                "1gdimh85f5hb6jhnivjaai4m08nz4x9iif5rxdckn8b0lzrwl740"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.41.0





Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 03:33:01 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Mon, 04 Sep 2023 23:31:48 -0400
Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/gnome.scm (nautilus): Update to 44.2.
> [#:phases]: Add ‘hardcode-tracker’.
> Adjust ‘skip-gtk-update-icon-cache’ accordingly.
> [inputs]: Remove gtk+ and libhandy.
> Add gtk and libadwaita.
> * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
> accordingly.
> ---
>  gnu/packages/gnome.scm                        | 24 ++++---
>  .../nautilus-extension-search-path.patch      | 64 +++++++++++--------
>  2 files changed, 52 insertions(+), 36 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 0d52058eb4..d550b204c3 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -9619,7 +9619,7 @@ (define-public tracker-miners
>  (define-public nautilus
>    (package
>      (name "nautilus")
> -    (version "42.2")
> +    (version "44.2")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnome/sources/" name "/"
> @@ -9627,7 +9627,7 @@ (define-public nautilus
>                                    name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr"))
> +                "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7"))
>                (patches
>                 (search-patches "nautilus-extension-search-path.patch"))))
>      (build-system meson-build-system)
> @@ -9636,6 +9636,13 @@ (define-public nautilus
>        #:glib-or-gtk? #t
>        #:phases
>        #~(modify-phases %standard-phases
> +          (add-after 'unpack 'hardcode-tracker
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (substitute* "src/nautilus-tag-manager.c"
> +                (("\"tracker3\"")
> +                 (string-append "\""
> +                                (search-input-file inputs "/bin/tracker3")
> +                                "\"")))))

The leading slash in search-input-file is unnecessary.  You can also use
'(format #f "~s" (search-input-file inputs "bin/tracker3"))', which is
shorter / more readable (?).

Otherwise LGTM.

-- 
Thanks,
Maxim




Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 03:34:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Mon, 04 Sep 2023 23:33:21 -0400
Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/gnome.scm (nautilus): Update to 44.2.
> [#:phases]: Add ‘hardcode-tracker’.

Ah, I forgot to mention a nitpick: 'patch-tracker' would be more
conventional than hardcode as naming phases goes (which should probably
be spelled hard-code anyway).

-- 
Thanks,
Maxim




Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 03:35:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 7/7] gnu: gnome-console: Update
 to 44.4.
Date: Mon, 04 Sep 2023 23:34:36 -0400
Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/gnome.scm (gnome-console): Update to 44.4.
> [arguments]: Remove #:phases.
> <#:configure-flas>: Remove “-Dnautilus=enabled”.

I suppose because it's no longer supported upstream?

LGTM.

-- 
Thanks,
Maxim




Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 03:36:01 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 0/7] Update Nautilus and Console
Date: Mon, 04 Sep 2023 23:35:21 -0400
Hello,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Hi Guix,
>
> this series updates Nautilus and Console.  Due to the tracker rebuils,
> gtk4 and webkitgtk-next are also affected.
>
> Cheers
>
> Liliana Marie Prikler (7):
>   gnu: gnome-autoar: Update to 0.4.4.
>   gnu: tracker: Update to 3.5.3.
>   gnu: tracker-miners: Update to 3.5.2.
>   gnu: libadwaita: Update to 1.3.4.
>   gnu: nautilus: Update to 44.2.
>   gnu: vte: Update to 0.72.2.
>   gnu: gnome-console: Update to 44.4.

Thank you for working on upgrading GNOME!  The series LGTM, apart from a
few comments sent earlier.

-- 
Thanks,
Maxim




Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 16:58:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 7/7] gnu: gnome-console: Update
 to 44.4.
Date: Tue, 05 Sep 2023 18:57:30 +0200
Am Montag, dem 04.09.2023 um 23:34 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:
> 
> > * gnu/packages/gnome.scm (gnome-console): Update to 44.4.
> > [arguments]: Remove #:phases.
> > <#:configure-flas>: Remove “-Dnautilus=enabled”.
> 
> I suppose because it's no longer supported upstream?
It was dropped already in 43 yes.  Not sure how nautilus does opening
stuff in Terminal right now; it doesn't seem to pull in console from
what I can see.

Cheers




Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Tue, 05 Sep 2023 17:00:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Tue, 05 Sep 2023 18:59:07 +0200
Am Montag, dem 04.09.2023 um 23:31 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:
> 
> > * gnu/packages/gnome.scm (nautilus): Update to 44.2.
> > [#:phases]: Add ‘hardcode-tracker’.
> > Adjust ‘skip-gtk-update-icon-cache’ accordingly.
> > [inputs]: Remove gtk+ and libhandy.
> > Add gtk and libadwaita.
> > * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
> > accordingly.
> > ---
> >  gnu/packages/gnome.scm                        | 24 ++++---
> >  .../nautilus-extension-search-path.patch      | 64 +++++++++++----
> > ----
> >  2 files changed, 52 insertions(+), 36 deletions(-)
> > 
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index 0d52058eb4..d550b204c3 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -9619,7 +9619,7 @@ (define-public tracker-miners
> >  (define-public nautilus
> >    (package
> >      (name "nautilus")
> > -    (version "42.2")
> > +    (version "44.2")
> >      (source (origin
> >                (method url-fetch)
> >                (uri (string-append "mirror://gnome/sources/" name
> > "/"
> > @@ -9627,7 +9627,7 @@ (define-public nautilus
> >                                    name "-" version ".tar.xz"))
> >                (sha256
> >                 (base32
> > -               
> > "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr"))
> > +               
> > "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7"))
> >                (patches
> >                 (search-patches "nautilus-extension-search-
> > path.patch"))))
> >      (build-system meson-build-system)
> > @@ -9636,6 +9636,13 @@ (define-public nautilus
> >        #:glib-or-gtk? #t
> >        #:phases
> >        #~(modify-phases %standard-phases
> > +          (add-after 'unpack 'hardcode-tracker
> > +            (lambda* (#:key inputs #:allow-other-keys)
> > +              (substitute* "src/nautilus-tag-manager.c"
> > +                (("\"tracker3\"")
> > +                 (string-append "\""
> > +                                (search-input-file inputs
> > "/bin/tracker3")
> > +                                "\"")))))
> 
> The leading slash in search-input-file is unnecessary.
I prefer it and search-input-file is explicitly coded to go both ways.

>   You can also use
> '(format #f "~s" (search-input-file inputs "bin/tracker3"))', which
> is shorter / more readable (?).
I see string-append preferred in the code base, but I can do either. 
How strongly do you feel I ought to use format?

Cheers

Information forwarded to guix-patches <at> gnu.org:
bug#65699; Package guix-patches. (Wed, 06 Sep 2023 01:07:02 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Tue, 05 Sep 2023 21:06:10 -0400
Hi,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

[...]

>> The leading slash in search-input-file is unnecessary.
> I prefer it and search-input-file is explicitly coded to go both ways.

I value consistency, but no big deal.

>>   You can also use
>> '(format #f "~s" (search-input-file inputs "bin/tracker3"))', which
>> is shorter / more readable (?).
> I see string-append preferred in the code base, but I can do either. 
> How strongly do you feel I ought to use format?

I don't mind, both are easy to understand :-).

-- 
Thanks,
Maxim




Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Thu, 07 Sep 2023 18:37:01 GMT) Full text and rfc822 format available.

Notification sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
bug acknowledged by developer. (Thu, 07 Sep 2023 18:37:02 GMT) Full text and rfc822 format available.

Message #52 received at 65699-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699-done <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 0/7] Update Nautilus and Console
Date: Thu, 07 Sep 2023 20:36:28 +0200
Am Montag, dem 04.09.2023 um 23:35 -0400 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:
> 
> > Hi Guix,
> > 
> > this series updates Nautilus and Console.  Due to the tracker
> > rebuils, gtk4 and webkitgtk-next are also affected.
> > 
> > Cheers
> > 
> > Liliana Marie Prikler (7):
> >   gnu: gnome-autoar: Update to 0.4.4.
> >   gnu: tracker: Update to 3.5.3.
> >   gnu: tracker-miners: Update to 3.5.2.
> >   gnu: libadwaita: Update to 1.3.4.
> >   gnu: nautilus: Update to 44.2.
> >   gnu: vte: Update to 0.72.2.
> >   gnu: gnome-console: Update to 44.4.
> 
> Thank you for working on upgrading GNOME!  The series LGTM, apart
> from a few comments sent earlier.
Pushed with the ‘patch-tracker’ nitpick, but without the rest.

Cheers





bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 06 Oct 2023 11:24:20 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 217 days ago.

Previous Next


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