[bug#69489] [PATCH gnome-team 1/2] gnu: gnome-terminal: Update to 3.46.9.

[bug#69489] [PATCH gnome-team 1/2] gnu: gnome-terminal: Update to 3.46.9.

[Vivien Kraus via Guix-patches via]

The 3.44 series in gnome-terminal cannot build a nautilus extension for
nautilus 44.3.1.

* gnu/packages/gnome.scm (gnome-terminal): Update to 3.46.9.
[source]: Use the git-fetch method.

Change-Id: I44dee8cec5afbd4f5e7e486b54f893ce6a3e1d06
---
 gnu/packages/gnome.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f428bfeb78..00420bc247 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5475,16 +5475,19 @@ (define-public gnome-console
 (define-public gnome-terminal
   (package
     (name "gnome-terminal")
-    (version "3.44.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0yykb64yi1h0g65q890jf5awjr2sdvfda4xbxnmajcgj3zp20vzv"))))
+    (version "3.46.9")
+    ;; download.gnome.org does not have any version for gnome-terminal more
+    ;; recent than 3.44.1, but the repository has several tags newer than
+    ;; that.
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/gnome-terminal")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ph2kzzqbkcy9bk85pb4787qzl5m5fp1x1n1jz6fj7cy29jmcvvj"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#69489] [PATCH gnome-team v2 1/2] gnu: gnome-terminal: Update to 3.48.3.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-terminal): Update to 3.48.3.
[source]: Use the git-fetch method.

Change-Id: I44dee8cec5afbd4f5e7e486b54f893ce6a3e1d06
---
 gnu/packages/gnome.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f428bfeb78..9cd7c6ba5d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5475,16 +5475,19 @@ (define-public gnome-console
 (define-public gnome-terminal
   (package
     (name "gnome-terminal")
-    (version "3.44.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0yykb64yi1h0g65q890jf5awjr2sdvfda4xbxnmajcgj3zp20vzv"))))
+    (version "3.48.3")
+    ;; download.gnome.org does not have any version for gnome-terminal more
+    ;; recent than 3.44.1, but the repository has several tags newer than
+    ;; that.
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/gnome-terminal")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1cqh35j57a5ni4xlfjzl46kim6nbhqvxx3jql3gjk414z359i0j6"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#69489] [PATCH gnome-team 2/2] gnu: nautilus: Update search path specification.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (nautilus) [native-search-paths]: Change the
extensions directory from lib/nautilus/site-extensions to
lib/nautilus/extensions-4.

Change-Id: I16ea81406b53c251e1dd6922fc8fcc0aab60ce96
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 00420bc247..f92bb7f46e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9880,7 +9880,7 @@ (define-public nautilus
     (native-search-paths
      (list (search-path-specification
             (variable "NAUTILUS_EXTENSION_PATH")
-            (files '("lib/nautilus/site-extensions")))))
+            (files '("lib/nautilus/extensions-4")))))
     (synopsis "File manager for GNOME")
     (home-page "https://wiki.gnome.org/Apps/Nautilus")
     (description
-- 
2.41.0

[bug#69489] [PATCH gnome-team v2 2/2] gnu: nautilus: Update search path specification.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (nautilus) [native-search-paths]: Change the
extensions directory from lib/nautilus/site-extensions to
lib/nautilus/extensions-4.

Change-Id: I16ea81406b53c251e1dd6922fc8fcc0aab60ce96
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9cd7c6ba5d..d09eefe655 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9880,7 +9880,7 @@ (define-public nautilus
     (native-search-paths
      (list (search-path-specification
             (variable "NAUTILUS_EXTENSION_PATH")
-            (files '("lib/nautilus/site-extensions")))))
+            (files '("lib/nautilus/extensions-4")))))
     (synopsis "File manager for GNOME")
     (home-page "https://wiki.gnome.org/Apps/Nautilus")
     (description
-- 
2.41.0

[bug#69489] [PATCH gnome-team 0/2] Fixing Nautilus Extensions

[Vivien Kraus via Guix-patches via]

Dear Guix,

It flew under my radar that the nautilus upgrade from 44.2.1 to 44.3.1 changed
the extensions scheme.  This upgrade broke gnome-terminal who is expecting the
old scheme, and there is little chance compatibility with 44.3.1 will be
restored in a future release of gnome-terminal 3.44.something.  One option is
to downgrade nautilus back to 44.2.1, but I think the safest way is to use a
newer gnome-terminal.

What do you think?

Best regards,

Vivien

Vivien Kraus (2):
  gnu: gnome-terminal: Update to 3.46.9.
  gnu: nautilus: Update search path specification.

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


base-commit: 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b
-- 
2.41.0

[bug#69489] [PATCH gnome-team v2 0/2] Update gnome-terminal more

[Vivien Kraus via Guix-patches via]

Dear guix,

Gnome-terminal 3.48.3 also builds.  Why not do a slightly more ambitious
update?

Best regards,

Vivien

Vivien Kraus (2):
  gnu: gnome-terminal: Update to 3.48.3.
  gnu: nautilus: Update search path specification.

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


base-commit: 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b
-- 
2.41.0

[bug#69489] [PATCH gnome-team v2 0/2] Update gnome-terminal more

[Maxim Cournoyer]

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Dear guix,
>
> Gnome-terminal 3.48.3 also builds.  Why not do a slightly more ambitious
> update?
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (2):
>   gnu: gnome-terminal: Update to 3.48.3.
>   gnu: nautilus: Update search path specification.
>

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

bug#69489: [PATCH gnome-team v2 0/2] Update gnome-terminal more

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]


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

> Dear guix,
>
> Gnome-terminal 3.48.3 also builds.  Why not do a slightly more ambitious
> update?
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (2):
>   gnu: gnome-terminal: Update to 3.48.3.
>   gnu: nautilus: Update search path specification.
>
>  gnu/packages/gnome.scm | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
>
>
> base-commit: 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b

Looks like these have been applied to the gnome-team branch, closing.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]