unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / Atom feed
* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
@ 2021-11-09 23:10 Vivien Kraus via Bug reports for GNU Guix
  2021-11-10 17:32 ` Liliana Marie Prikler
  0 siblings, 1 reply; 6+ messages in thread
From: Vivien Kraus via Bug reports for GNU Guix @ 2021-11-09 23:10 UTC (permalink / raw)
  To: 51731


[-- Attachment #1.1: Type: text/plain, Size: 488 bytes --]


Dear guix,

gnome-tweaks does not start on core-updates-frozen, because it needs
libhandy 1 and is given libhandy 0.0.

Also, it cannot find its own python module, so the python path needs to
be wrapped.

I fixed a couple of linter errors, and applied guix style to
it. However, now the linter complains that we have the "bin" output of
glib in something that would be called "glib" and not "glib:bin"… Should
we still keep the styled output?

Best regards,

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Update the libhandy dependency for gnome-tweaks --]
[-- Type: text/x-patch, Size: 922 bytes --]

From 4612c8235c14bcb9b7583746683e1d2559df390b Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:17:43 +0000
Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 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 3eafcc2f10..17dd87fd62 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,7 +9795,7 @@ (define-public gnome-tweaks
        ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libhandy" ,libhandy-0.0)
+       ("libhandy" ,libhandy)
        ("libnotify" ,libnotify)
        ("libsoup" ,libsoup)
        ("nautilus" ,nautilus)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Wrap gnome-tweaks to set the python path too --]
[-- Type: text/x-patch, Size: 1595 bytes --]

From cdb79baa5705adbfee8711e5698aa687fd3685f1 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:57:13 +0000
Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17dd87fd62..f725dfe981 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9784,8 +9784,14 @@ (define-public gnome-tweaks
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-               (wrap-program (string-append out "/bin/gnome-tweaks")
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
+               (let ((python-path
+                      (string-append out "/lib/python"
+                                     ,(version-major+minor
+                                       (package-version python))
+                                     "/site-packages")))
+                 (wrap-program (string-append out "/bin/gnome-tweaks")
+                   `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+                   `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
        ("intltool" ,intltool)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: Fix a linter warning --]
[-- Type: text/x-patch, Size: 1190 bytes --]

From 4f5dc6bdb473380619b42986097b56e1ea305f13 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:39:57 +0000
Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should be a
 native input.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Move gobject-introspection to
a native input.
---
 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 f725dfe981..ab16157fb5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,11 +9795,11 @@ (define-public gnome-tweaks
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
        ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)))
     (inputs
      `(("gnome-desktop" ,gnome-desktop)
        ("gtk+" ,gtk+)
-       ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("libhandy" ,libhandy)
        ("libnotify" ,libnotify)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: Fix a linter warning --]
[-- Type: text/x-patch, Size: 991 bytes --]

From f45038630cff73514f24248684cb8c968106f225 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 23:01:45 +0000
Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input to wrap
 the program.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab16157fb5..d0bd796fa4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9806,7 +9806,8 @@ (define-public gnome-tweaks
        ("libsoup" ,libsoup)
        ("nautilus" ,nautilus)
        ("python" ,python)
-       ("python-pygobject" ,python-pygobject)))
+       ("python-pygobject" ,python-pygobject)
+       ("bash-minimal" ,bash-minimal)))
     (synopsis "Customize advanced GNOME 3 options")
     (home-page "https://wiki.gnome.org/Apps/Tweaks")
     (description
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: Apply guix style to gnome-tweaks --]
[-- Type: text/x-patch, Size: 1888 bytes --]

From 4c5d8d919d433d0669abc124eeb2692ae81739f5 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 23:04:59 +0000
Subject: [PATCH 5/5] gnu: gnome-tweaks: Style it.

* gnu/packages/gnome.scm (gnome-tweaks): Apply the Guix style.
---
 gnu/packages/gnome.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d0bd796fa4..785492b186 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9793,21 +9793,19 @@ (define-public gnome-tweaks
                    `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
                    `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
-       ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("gobject-introspection" ,gobject-introspection)))
-    (inputs
-     `(("gnome-desktop" ,gnome-desktop)
-       ("gtk+" ,gtk+)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libhandy" ,libhandy)
-       ("libnotify" ,libnotify)
-       ("libsoup" ,libsoup)
-       ("nautilus" ,nautilus)
-       ("python" ,python)
-       ("python-pygobject" ,python-pygobject)
-       ("bash-minimal" ,bash-minimal)))
+     (list `(,glib "bin") ; for glib-compile-resources, etc.
+           intltool pkg-config gobject-introspection))
+    (inputs
+     (list gnome-desktop
+           gtk+
+           gsettings-desktop-schemas
+           libhandy
+           libnotify
+           libsoup
+           nautilus
+           python
+           python-pygobject
+           bash-minimal))
     (synopsis "Customize advanced GNOME 3 options")
     (home-page "https://wiki.gnome.org/Apps/Tweaks")
     (description
-- 
2.33.1


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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
  2021-11-09 23:10 bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Vivien Kraus via Bug reports for GNU Guix
@ 2021-11-10 17:32 ` Liliana Marie Prikler
  2021-11-10 20:20   ` Vivien Kraus via Bug reports for GNU Guix
  0 siblings, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2021-11-10 17:32 UTC (permalink / raw)
  To: Vivien Kraus, 51731

Hi,

Am Dienstag, den 09.11.2021, 23:10 +0000 schrieb Vivien Kraus:
> I fixed a couple of linter errors, and applied guix style to
> it. However, now the linter complains that we have the "bin" output
> of glib in something that would be called "glib" and not "glib:bin"…
> Should we still keep the styled output?
IIUC that's an issue with the linter or perhaps the implementation of
short input lists in general.  I've CC'd Ludo as he is the one who
allowed us to write inputs (list bash sed ...) in the first place,
perhaps he knows what to do here.  We probably ought to convert this to
short-style inputs anyway.

> Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.
Note, libhandy 0.0 only exists on master (and therefore core-updates),
because there are packages still using it.  If there's no more users
post updating gnome-tweaks, it is to be removed!

> Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.
Nice catch, I think this was previously done by a different phase. 
However...
> gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with
> GUIX_PYTHONPATH.
Please note the phase and perhaps change its name to reflect what it
does.

> Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should
> be a native input.
I'm not sure this is the correct move here.  Python uses GI at runtime,
not natively during build.  If gnome-tweaks requires GI at build time,
it's to be added as both inputs.

> Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input
> to wrap the program.
Split the long line.  Also perhaps add a comment in the file itself as
to why this is needed if it's not already obvious from best practises
in core-updates-frozen.

> Subject: [PATCH 5/5] gnu: gnome-tweaks: Style it.
This should probably done first, particularly if it helps avoid the
linter complaints you encounter.

In my personal opinion, 1, 3, 4 and 5 could also be done in a single
commit, though YMMV.  Also, I'm not active on core-updates-frozen, so
take everything I said as lexical analysis at best and with sufficient
amounts of salt.

Cheers,
Liliana





^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
  2021-11-10 17:32 ` Liliana Marie Prikler
@ 2021-11-10 20:20   ` Vivien Kraus via Bug reports for GNU Guix
  2021-11-11 20:43     ` Liliana Marie Prikler
  0 siblings, 1 reply; 6+ messages in thread
From: Vivien Kraus via Bug reports for GNU Guix @ 2021-11-10 20:20 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: 51731, Ludovic Courtès


[-- Attachment #1.1: Type: text/plain, Size: 3321 bytes --]

Hello,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Dienstag, den 09.11.2021, 23:10 +0000 schrieb Vivien Kraus:
>> I fixed a couple of linter errors, and applied guix style to
>> it. However, now the linter complains that we have the "bin" output
>> of glib in something that would be called "glib" and not "glib:bin"…
>> Should we still keep the styled output?
> IIUC that's an issue with the linter or perhaps the implementation of
> short input lists in general.  I've CC'd Ludo as he is the one who
> allowed us to write inputs (list bash sed ...) in the first place,
> perhaps he knows what to do here.  We probably ought to convert this to
> short-style inputs anyway.
Apparently, we shouldn’t apply guix style yet, we will apply it for all
packages at once some day.

>> Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.
> Note, libhandy 0.0 only exists on master (and therefore core-updates),
> because there are packages still using it.  If there's no more users
> post updating gnome-tweaks, it is to be removed!
I tried, but there are 2 problems:
1. I can’t update authenticator (gnu/packages/gnome.scm), because
upstream switched to Rust and I don’t know how to package that;
2. Geary needs it too (and gmime 2, which we could drop the same way),
but it’s a pain to upgrade. I went a long way, but there’s some vala
code that acts on strings as if they were arrays and I don’t know what
happens: maybe a newer vala is required, or the glib string type does
not apply for some reason.

However, I can provide an upgrade for seahorse (and its dependency
gcr). That’s a start, I guess.
:)

>> Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.
> Nice catch, I think this was previously done by a different phase. 
> However...
>> gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with
>> GUIX_PYTHONPATH.
> Please note the phase and perhaps change its name to reflect what it
> does.
Is the 'wrap-gi-typelib-and-python boring name appropriate?

>> Subject: [PATCH 3/5] gnu: gnome-tweaks: gobject-introspection should
>> be a native input.
> I'm not sure this is the correct move here.  Python uses GI at runtime,
> not natively during build.  If gnome-tweaks requires GI at build time,
> it's to be added as both inputs.
It does not, I’ll drop it.

>> Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an input
>> to wrap the program.
> Split the long line.  Also perhaps add a comment in the file itself as
> to why this is needed if it's not already obvious from best practises
> in core-updates-frozen.
It’s flagged by the linter, because wrapping a program produces a shell
script that needs to be executed.

>> Subject: [PATCH 5/5] gnu: gnome-tweaks: Style it.
> This should probably done first, particularly if it helps avoid the
> linter complaints you encounter.
I’ve dropped the guix style for the reason above.

> In my personal opinion, 1, 3, 4 and 5 could also be done in a single
> commit, though YMMV.  Also, I'm not active on core-updates-frozen, so
> take everything I said as lexical analysis at best and with sufficient
> amounts of salt.
I’ll wait for more desalinated advice, because lumping commits together
is easier than separating a big one.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Use libhandy 1 in gnome-tweaks --]
[-- Type: text/x-patch, Size: 922 bytes --]

From af7235dc2bbfa84cc1c94792b9822c74db2baf60 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:17:43 +0000
Subject: [PATCH 1/5] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 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 32f237e218..3903a00398 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9795,7 +9795,7 @@ (define-public gnome-tweaks
        ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libhandy" ,libhandy-0.0)
+       ("libhandy" ,libhandy)
        ("libnotify" ,libnotify)
        ("libsoup" ,libsoup)
        ("nautilus" ,nautilus)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Wrap the python path in gnome-tweaks --]
[-- Type: text/x-patch, Size: 1875 bytes --]

From edc67015e65dfce75d1b2cd4317e1105d4730057 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:57:13 +0000
Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phase wrap-gi-typelib-and-python]:
Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3903a00398..05750ea365 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9780,12 +9780,18 @@ (define-public gnome-tweaks
                (("gtk-update-icon-cache") "true"))))
          (add-after 'install 'wrap
            (@@ (guix build python-build-system) wrap))
-         (add-after 'wrap 'wrap-gi-typelib
+         (add-after 'wrap 'wrap-gi-typelib-and-python
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-               (wrap-program (string-append out "/bin/gnome-tweaks")
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
+               (let ((python-path
+                      (string-append out "/lib/python"
+                                     ,(version-major+minor
+                                       (package-version python))
+                                     "/site-packages")))
+                 (wrap-program (string-append out "/bin/gnome-tweaks")
+                   `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+                   `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
        ("intltool" ,intltool)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: Depend on bash-minimal to launch the wrapped program --]
[-- Type: text/x-patch, Size: 1026 bytes --]

From f1f5fa31282f184649733157f56d63255944952e Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 23:01:45 +0000
Subject: [PATCH 3/5] gnu: gnome-tweaks: Add bash-minimal as an input.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 05750ea365..fabeed03bd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9806,7 +9806,9 @@ (define-public gnome-tweaks
        ("libsoup" ,libsoup)
        ("nautilus" ,nautilus)
        ("python" ,python)
-       ("python-pygobject" ,python-pygobject)))
+       ("python-pygobject" ,python-pygobject)
+       ;; So that the wrapper program can be executed
+       ("bash-minimal" ,bash-minimal)))
     (synopsis "Customize advanced GNOME 3 options")
     (home-page "https://wiki.gnome.org/Apps/Tweaks")
     (description
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: Upgrade gcr --]
[-- Type: text/x-patch, Size: 3013 bytes --]

From c5032164a1f55c71fe49b9ee6af6d5acae04903c Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 10 Nov 2021 18:50:40 +0000
Subject: [PATCH 4/5] gnu: gcr: Upgrade to 3.41.0.

* gnu/packages/gnome.scm (gcr): Upgrade to 3.41.0.
---
 gnu/packages/gnome.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fabeed03bd..7c3f955937 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2397,7 +2397,7 @@ (define-public gnome-font-viewer
 (define-public gcr
   (package
     (name "gcr")
-    (version "3.34.0")
+    (version "3.41.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2405,8 +2405,8 @@ (define-public gcr
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))))
-    (build-system gnu-build-system)
+                "00fsf82ycac8qi0kkiq759p6jrn63pyz4ksn4wnq7m4ax94zq289"))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -2414,10 +2414,21 @@ (define-public gcr
          ;; build environment.
          (add-after 'unpack 'disable-failing-tests
            (lambda _
-             (substitute* "Makefile.in"
-               (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)")
+             (substitute* "gcr/meson.build"
+               (("[[:blank:]]+'system-prompt',")
                 ""))
              #t))
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           ;; Don't create 'icon-theme.cache'.
+           (lambda _
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache") "true"))
+             #t))
+         (add-after 'unpack 'fix-systemd-detection
+           (lambda _
+             (substitute* "gcr/gcr-ssh-agent-service.c"
+               (("#ifdef WITH_SYSTEMD")
+                "#if (WITH_SYSTEMD)"))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Some tests expect to write to $HOME.
@@ -2426,11 +2437,17 @@ (define-public gcr
     (inputs
      `(("dbus" ,dbus)
        ("gnupg" ,gnupg)                ;called as a child process during tests
-       ("libgcrypt" ,libgcrypt)))
+       ("libgcrypt" ,libgcrypt)
+       ("libsecret" ,libsecret)))
     (native-inputs
      `(("python" ,python-wrapper)       ;for tests
+       ("openssh" ,openssh)             ;for tests
        ("pkg-config" ,pkg-config)
        ("gettext" ,gettext-minimal)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("gtk-doc" ,gtk-doc)
        ("glib" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("libxml2" ,libxml2)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: Upgrade seahorse so that it does not depend on libhandy 0 --]
[-- Type: text/x-patch, Size: 2036 bytes --]

From 9a3cbae7896c9bba81c16ebb37656548e0110e57 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 10 Nov 2021 18:52:58 +0000
Subject: [PATCH 5/5] gnu: seahorse: Upgrade to 41.0.

* gnu/packages/gnome.scm (seahorse): Upgrade to 41.0.
---
 gnu/packages/gnome.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7c3f955937..debc800b1f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4329,15 +4329,15 @@ (define-public gnome-themes-standard
 (define-public seahorse
   (package
     (name "seahorse")
-    (version "3.36.2")
+    (version "41.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/" name "-"
+                           (version-major version) "/" name "-"
                            version ".tar.xz"))
        (sha256
-        (base32 "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"))))
+        (base32 "1x99i7kdvd8hbxcs5rfrq7nw6r9bfzaw263zaigjjj04h6gc1vp6"))))
     (build-system meson-build-system)
     (arguments
      '(#:glib-or-gtk? #t
@@ -4348,7 +4348,11 @@ (define-public seahorse
            (lambda _
              (substitute* "build-aux/meson_post_install.py"
                (("gtk-update-icon-cache") "true"))
-             #t)))))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a writable HOME.
+             (setenv "HOME" (getcwd)))))))
     (inputs
      `(("gtk+" ,gtk+)
        ("gcr" ,gcr)
@@ -4357,7 +4361,7 @@ (define-public seahorse
        ("openldap" ,openldap)
        ("openssh" ,openssh)
        ("avahi" ,avahi)
-       ("libhandy" ,libhandy-0.0)
+       ("libhandy" ,libhandy)
        ("libpwquality" ,libpwquality)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)))
-- 
2.33.1


[-- Attachment #1.7: Type: text/plain, Size: 9 bytes --]



Vivien

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
  2021-11-10 20:20   ` Vivien Kraus via Bug reports for GNU Guix
@ 2021-11-11 20:43     ` Liliana Marie Prikler
  2021-11-13  9:06       ` Vivien Kraus via Bug reports for GNU Guix
  0 siblings, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2021-11-11 20:43 UTC (permalink / raw)
  To: Vivien Kraus; +Cc: 51731

Hi,

Am Mittwoch, den 10.11.2021, 20:20 +0000 schrieb Vivien Kraus:
> Apparently, we shouldn’t apply guix style yet, we will apply it for
> all packages at once some day.
I don't think it's a rule that you can't at all; rather that you
shouldn't when you're not already touching that package.  Then again,
I'll leave the decision to you and the experts who actually work on
core-updates-frozen :)

> > Note, libhandy 0.0 only exists on master (and therefore core-
> > updates), because there are packages still using it.  If there's no
> > more users post updating gnome-tweaks, it is to be removed!
> I tried, but there are 2 problems:
> 1. I can’t update authenticator (gnu/packages/gnome.scm), because
> upstream switched to Rust and I don’t know how to package that;
> 2. Geary needs it too (and gmime 2, which we could drop the same
> way), but it’s a pain to upgrade. I went a long way, but there’s some
> vala code that acts on strings as if they were arrays and I don’t
> know what happens: maybe a newer vala is required, or the glib string
> type does not apply for some reason.
Fair enough, that's a few users more than I remembered.

> > > Subject: [PATCH 2/5] gnu: gnome-tweaks: Set the python path.
> > Nice catch, I think this was previously done by a different phase. 
> > However...
> > > gnu/packages/gnome.scm (gnome-tweaks)[phases]: Also wrap with
> > > GUIX_PYTHONPATH.
> > Please note the phase and perhaps change its name to reflect what
> > it
> > does.
> Is the 'wrap-gi-typelib-and-python boring name appropriate?
Good enough for me, there's some similar phase names flying around in
gnome.scm.

> > > Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an
> > > input to wrap the program.
> > Split the long line.  Also perhaps add a comment in the file itself
> > as to why this is needed if it's not already obvious from best
> > practises in core-updates-frozen.
> It’s flagged by the linter, because wrapping a program produces a
> shell script that needs to be executed.
"Flagged by the linter" is not a good description in a commit message
or elsewhere.  I think a few packages on c-u-frozen might have a
comment along the lines of "; for wrap-program" or similar.

Cheers





^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
  2021-11-11 20:43     ` Liliana Marie Prikler
@ 2021-11-13  9:06       ` Vivien Kraus via Bug reports for GNU Guix
  2021-11-15 11:13         ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Vivien Kraus via Bug reports for GNU Guix @ 2021-11-13  9:06 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: 51731, Ludovic Courtès


[-- Attachment #1.1: Type: text/plain, Size: 883 bytes --]


Hello!

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> > > Subject: [PATCH 4/5] gnu: gnome-tweaks: Add bash-minimal as an
>> > > input to wrap the program.
>> > Split the long line.  Also perhaps add a comment in the file itself
>> > as to why this is needed if it's not already obvious from best
>> > practises in core-updates-frozen.
>> It’s flagged by the linter, because wrapping a program produces a
>> shell script that needs to be executed.
> "Flagged by the linter" is not a good description in a commit message
> or elsewhere.  I think a few packages on c-u-frozen might have a
> comment along the lines of "; for wrap-program" or similar.
I wrote "to execute the wrapper program" in a comment.

I also updated it to the core-updates-frozen-batched-changes merge,
because we need an older meson now, and libsoup2 for seahorse.

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Use libhandy 1 in gnome-tweaks --]
[-- Type: text/x-patch, Size: 922 bytes --]

From e0fd1eab227d720bd57ff8e9412d1ed0adc59bfb Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:17:43 +0000
Subject: [PATCH 1/7] gnu: gnome-tweaks: Use libhandy 1.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Use libhandy 1, not libhandy
0.
---
 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 2340d2b391..13e6721597 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9872,7 +9872,7 @@ (define-public gnome-tweaks
        ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libhandy" ,libhandy-0.0)
+       ("libhandy" ,libhandy)
        ("libnotify" ,libnotify)
        ("libsoup" ,libsoup)
        ("nautilus" ,nautilus)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Wrap python path in gnome-tweaks --]
[-- Type: text/x-patch, Size: 1875 bytes --]

From 65469d76bb1485281db8fba2ea15316a31cc1f67 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 22:57:13 +0000
Subject: [PATCH 2/7] gnu: gnome-tweaks: Set the python path.

gnu/packages/gnome.scm (gnome-tweaks)[phase wrap-gi-typelib-and-python]:
Also wrap with GUIX_PYTHONPATH.
---
 gnu/packages/gnome.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 13e6721597..012a261a44 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9857,12 +9857,18 @@ (define-public gnome-tweaks
                (("gtk-update-icon-cache") "true"))))
          (add-after 'install 'wrap
            (@@ (guix build python-build-system) wrap))
-         (add-after 'wrap 'wrap-gi-typelib
+         (add-after 'wrap 'wrap-gi-typelib-and-python
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
-               (wrap-program (string-append out "/bin/gnome-tweaks")
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
+               (let ((python-path
+                      (string-append out "/lib/python"
+                                     ,(version-major+minor
+                                       (package-version python))
+                                     "/site-packages")))
+                 (wrap-program (string-append out "/bin/gnome-tweaks")
+                   `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+                   `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
        ("intltool" ,intltool)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: Use bash-minimal to run the wrapped gnome-tweaks --]
[-- Type: text/x-patch, Size: 1000 bytes --]

From 5dcc96bc39f72e41c3c4ad524dbf23cc1952e5d8 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 23:01:45 +0000
Subject: [PATCH 3/7] gnu: gnome-tweaks: Add bash-minimal as an input.

* gnu/packages/gnome.scm (gnome-tweaks)[inputs]: Add bash-minimal.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 012a261a44..3943e6e7cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9874,7 +9874,8 @@ (define-public gnome-tweaks
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("gnome-desktop" ,gnome-desktop)
+     `(("bash-minimal" ,bash-minimal) ; to execute the wrapper program
+       ("gnome-desktop" ,gnome-desktop)
        ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: Use meson 0.59 in gnome-tweaks --]
[-- Type: text/x-patch, Size: 859 bytes --]

From 07b11864df5ccef11659927de7fe49c97e3a7b3e Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 13 Nov 2021 09:05:27 +0000
Subject: [PATCH 4/7] gnu: gnome-tweaks: Use meson 0.59.

* gnu/packages/gnome.scm (gnome-tweaks) [arguments]: Use meson 0.59.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3943e6e7cc..b9aea90ae3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9844,6 +9844,7 @@ (define-public gnome-tweaks
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
+       #:meson ,meson-0.59
        #:configure-flags '("-Dlocalstatedir=/tmp"
                            "-Dsysconfdir=/tmp")
        #:imported-modules ((guix build python-build-system)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: Upgrade gcr --]
[-- Type: text/x-patch, Size: 3013 bytes --]

From f53a518d9ac03501e4273a3625efcc9c0ff5ca96 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 10 Nov 2021 18:50:40 +0000
Subject: [PATCH 5/7] gnu: gcr: Upgrade to 3.41.0.

* gnu/packages/gnome.scm (gcr): Upgrade to 3.41.0.
---
 gnu/packages/gnome.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b9aea90ae3..1ba38c14f9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2409,7 +2409,7 @@ (define-public gnome-font-viewer
 (define-public gcr
   (package
     (name "gcr")
-    (version "3.34.0")
+    (version "3.41.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2417,8 +2417,8 @@ (define-public gcr
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))))
-    (build-system gnu-build-system)
+                "00fsf82ycac8qi0kkiq759p6jrn63pyz4ksn4wnq7m4ax94zq289"))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -2426,10 +2426,21 @@ (define-public gcr
          ;; build environment.
          (add-after 'unpack 'disable-failing-tests
            (lambda _
-             (substitute* "Makefile.in"
-               (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)")
+             (substitute* "gcr/meson.build"
+               (("[[:blank:]]+'system-prompt',")
                 ""))
              #t))
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           ;; Don't create 'icon-theme.cache'.
+           (lambda _
+             (substitute* "meson_post_install.py"
+               (("gtk-update-icon-cache") "true"))
+             #t))
+         (add-after 'unpack 'fix-systemd-detection
+           (lambda _
+             (substitute* "gcr/gcr-ssh-agent-service.c"
+               (("#ifdef WITH_SYSTEMD")
+                "#if (WITH_SYSTEMD)"))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Some tests expect to write to $HOME.
@@ -2438,11 +2449,17 @@ (define-public gcr
     (inputs
      `(("dbus" ,dbus)
        ("gnupg" ,gnupg)                ;called as a child process during tests
-       ("libgcrypt" ,libgcrypt)))
+       ("libgcrypt" ,libgcrypt)
+       ("libsecret" ,libsecret)))
     (native-inputs
      `(("python" ,python-wrapper)       ;for tests
+       ("openssh" ,openssh)             ;for tests
        ("pkg-config" ,pkg-config)
        ("gettext" ,gettext-minimal)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("gtk-doc" ,gtk-doc)
        ("glib" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("libxml2" ,libxml2)
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.7: Fix seahorse to use libsoup 2 --]
[-- Type: text/x-patch, Size: 858 bytes --]

From 7d85fa1df0efc8d34f69178f5ca65c0b345bde82 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 13 Nov 2021 09:20:06 +0000
Subject: [PATCH 6/7] gnu: seahorse: Use libsoup 2.

* gnu/packages/gnome.scm (seahorse) [inputs]: Use libsoup 2.
---
 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 1ba38c14f9..67a23941ff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4370,7 +4370,7 @@ (define-public seahorse
        ("libhandy" ,libhandy-0.0)
        ("libpwquality" ,libpwquality)
        ("libsecret" ,libsecret)
-       ("libsoup" ,libsoup)))
+       ("libsoup" ,libsoup-minimal-2)))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("glib:bin" ,glib "bin")
-- 
2.33.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.8: Upgrade seahorse --]
[-- Type: text/x-patch, Size: 2046 bytes --]

From 9629a56bd53eabf406c2d68e1bd8ac9acfd3cb38 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Wed, 10 Nov 2021 18:52:58 +0000
Subject: [PATCH 7/7] gnu: seahorse: Upgrade to 41.0.

* gnu/packages/gnome.scm (seahorse): Upgrade to 41.0.
---
 gnu/packages/gnome.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 67a23941ff..7c6e10de33 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4339,15 +4339,15 @@ (define-public gnome-themes-standard
 (define-public seahorse
   (package
     (name "seahorse")
-    (version "3.36.2")
+    (version "41.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/" name "-"
+                           (version-major version) "/" name "-"
                            version ".tar.xz"))
        (sha256
-        (base32 "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"))))
+        (base32 "1x99i7kdvd8hbxcs5rfrq7nw6r9bfzaw263zaigjjj04h6gc1vp6"))))
     (build-system meson-build-system)
     (arguments
      '(#:glib-or-gtk? #t
@@ -4358,7 +4358,11 @@ (define-public seahorse
            (lambda _
              (substitute* "build-aux/meson_post_install.py"
                (("gtk-update-icon-cache") "true"))
-             #t)))))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; Tests require a writable HOME.
+             (setenv "HOME" (getcwd)))))))
     (inputs
      `(("gtk+" ,gtk+)
        ("gcr" ,gcr)
@@ -4367,7 +4371,7 @@ (define-public seahorse
        ("openldap" ,openldap)
        ("openssh" ,openssh)
        ("avahi" ,avahi)
-       ("libhandy" ,libhandy-0.0)
+       ("libhandy" ,libhandy)
        ("libpwquality" ,libpwquality)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup-minimal-2)))
-- 
2.33.1


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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen
  2021-11-13  9:06       ` Vivien Kraus via Bug reports for GNU Guix
@ 2021-11-15 11:13         ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2021-11-15 11:13 UTC (permalink / raw)
  To: Vivien Kraus; +Cc: 51731-done, Liliana Marie Prikler

Hi!

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

> I also updated it to the core-updates-frozen-batched-changes merge,
> because we need an older meson now, and libsoup2 for seahorse.

I applied the whole series as commit
6e40c00ad192bb625074a1e3fd49930a47528a81:

  6e40c00ad1 gnu: seahorse: Upgrade to 41.0.
  bfa3bf0ffc gnu: seahorse: Use libsoup 2.
  56f456315f gnu: gcr: Upgrade to 3.41.0.
  b699a4f186 gnu: gnome-tweaks: Add bash-minimal as an input.
  7978b6454b gnu: gnome-tweaks: Set the python path.
  e0b6318a5a gnu: gnome-tweaks: Use libhandy 1.

Ricardo had already pushed this:

  4c4f982c33 gnu: gnome-tweaks: Use meson 0.59.

Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-15 11:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-09 23:10 bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Vivien Kraus via Bug reports for GNU Guix
2021-11-10 17:32 ` Liliana Marie Prikler
2021-11-10 20:20   ` Vivien Kraus via Bug reports for GNU Guix
2021-11-11 20:43     ` Liliana Marie Prikler
2021-11-13  9:06       ` Vivien Kraus via Bug reports for GNU Guix
2021-11-15 11:13         ` Ludovic Courtès

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).