From unknown Sun Jun 15 01:08:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Nov 2021 23:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 51731@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163649944828731 (code B ref -1); Tue, 09 Nov 2021 23:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2021 23:10:48 +0000 Received: from localhost ([127.0.0.1]:36185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGN-0007TK-Em for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:46948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGL-0007TA-Mg for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkaGL-0000ki-CQ for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from [2a00:5881:4008:2810::309] (port=49734 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mkaGI-0002Ut-Sb for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 16924a2b for ; Tue, 9 Nov 2021 23:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=lZrpbwxgajNbwB/Ab5kV03gT+OU=; b=sJToqQ/veWDZ8Ewxb3fnpCu2chNR KFvXjvNzc02yxvKHc580wCpMqcUO7di7dZp8EEindOoYSP2DJp/cQ+9y0bjnU+YM mekVL0vSiwL5xTLz1TOAhWmqoCniYie1Ode+36xmCZnQjkoEkwWhqgiatarvCSCC HSic8OxpTKEQq+Q= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e551c127 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Tue, 9 Nov 2021 23:10:35 +0000 (UTC) From: Vivien Kraus Date: Tue, 09 Nov 2021 23:10:29 +0000 Message-ID: <87pmr9x6vu.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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"=E2=80=A6 S= hould we still keep the styled output? Best regards, Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnome-tweaks-Use-libhandy-1.patch Content-Transfer-Encoding: quoted-printable Content-Description: Update the libhandy dependency for gnome-tweaks From=204612c8235c14bcb9b7583746683e1d2559df390b Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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 libhan= dy 0. =2D-- 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 =2D-- 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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnome-tweaks-Set-the-python-path.patch Content-Transfer-Encoding: quoted-printable Content-Description: Wrap gnome-tweaks to set the python path too From=20cdb79baa5705adbfee8711e5698aa687fd3685f1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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_PYTHONPA= TH. =2D-- 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 =2D-- 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"))) =2D (wrap-program (string-append out "/bin/gnome-tweaks") =2D `("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnome-tweaks-gobject-introspection-should-be-a-n.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=204f5dc6bdb473380619b42986097b56e1ea305f13 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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) =2D ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) (inputs `(("gnome-desktop" ,gnome-desktop) ("gtk+" ,gtk+) =2D ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libhandy" ,libhandy) ("libnotify" ,libnotify) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gnome-tweaks-Add-bash-minimal-as-an-input-to-wra.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=20f45038630cff73514f24248684cb8c968106f225 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9806,7 +9806,8 @@ (define-public gnome-tweaks ("libsoup" ,libsoup) ("nautilus" ,nautilus) ("python" ,python) =2D ("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 =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-gnome-tweaks-Style-it.patch Content-Transfer-Encoding: quoted-printable Content-Description: Apply guix style to gnome-tweaks From=204c5d8d919d433d0669abc124eeb2692ae81739f5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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 =2D `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. =2D ("intltool" ,intltool) =2D ("pkg-config" ,pkg-config) =2D ("gobject-introspection" ,gobject-introspection))) =2D (inputs =2D `(("gnome-desktop" ,gnome-desktop) =2D ("gtk+" ,gtk+) =2D ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) =2D ("libhandy" ,libhandy) =2D ("libnotify" ,libnotify) =2D ("libsoup" ,libsoup) =2D ("nautilus" ,nautilus) =2D ("python" ,python) =2D ("python-pygobject" ,python-pygobject) =2D ("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 =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGK/+UACgkQO7C8EjLY uCz02wwA1krPKWO/WDD2UiMCUw9Ohh82QUffnKVp3nPO7TiPsvYJTVa1pT0+sMRV UvHVsS/Rk3F0jdxYogVRYf0L0Gz57kOXl3wt1oXWJQIm5h5p8mr399Nig2ZA/lki CF3GWnr7cEbPJVeMzgowzjtVTe2GekFppuVwNWqFnCFfP+/y2rz0QsYaSiBcUZGa kdGSwJJLLrFQMErZcGdkYhaxdYDlMLUgKluQ2jPyvUk+3+AFxZ6mXdZaSpRxKrZe IA1FxODeadgef4ZWSl1e15bSzm8X/iwkun6/wH67T1k+MC/pG0EawUkVAKKN1UzB OAlE+SCAwrageX4gk1vne6iUvgCxyEMqrsWTAe8wUCTIn/s0P3tgFi4Vyp3E6cdr 6xLQ2LXcddf5rAtx+NuaYzI084AT1CM6LGQrRwR1a3nq5vd9t97fobvBnXQaMIlT 8RfDBJfrLBrwsHhQFcUk82vls1VRxQl8oI8zX6n4KEzvu1ELgmVOCy9PZysoTP5I KgQc/RsG =j/9f -----END PGP SIGNATURE----- --==-=-=-- From unknown Sun Jun 15 01:08:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 10 Nov 2021 17:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Vivien Kraus , 51731@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 51731-submit@debbugs.gnu.org id=B51731.16365655659596 (code B ref 51731); Wed, 10 Nov 2021 17:33:02 +0000 Received: (at 51731) by debbugs.gnu.org; 10 Nov 2021 17:32:45 +0000 Received: from localhost ([127.0.0.1]:39111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkrSn-0002Ui-0a for submit@debbugs.gnu.org; Wed, 10 Nov 2021 12:32:45 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkrSl-0002UV-OP for 51731@debbugs.gnu.org; Wed, 10 Nov 2021 12:32:44 -0500 Received: by mail-wr1-f67.google.com with SMTP id u18so5358049wrg.5 for <51731@debbugs.gnu.org>; Wed, 10 Nov 2021 09:32:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=3SsksaCUa0oRUZ5/H9ZIFeS/eoerEarM1r2D0inoLr4=; b=hvxHxlK9yPdlhbAjlYkO5I3tfpoXTQ+tCfj6Z6Lfu/kRulAWL7W2ykyJiDwJsB636O wIgnBPoIhqCVgtZFgiZbd2mixGxwyunmLLfrIa8meWEe3YcriNHzEANDCJ4dnGFWmCLp X+sAEb4olGJfEjk1Qyi9lfIRqR+8cpSPPXGl75KQGU0eSyWDoxrg0v2KJb9iEaN0hyML 59+b3ho55xnWSjjmKKQhBPqi/FkfQk3RzVesOKcNRMb8bWSnLQS0N1mthcOfj7J3p8ft 7B0sUJcAyZJ/5IxHNU64LKElTBybfsov5KvtqlrojLds2dm0GL0q/3YPkQfFe7MWwcZB AnKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=3SsksaCUa0oRUZ5/H9ZIFeS/eoerEarM1r2D0inoLr4=; b=Q5dyPEbdBQUy1adjp0i79atvoOhaEEB+2XceLw12diWEXwpR7mDN+3y+/b5F4uU38L cAywJ02qvKGiWiLD8sccTUHjWghYYz70fUNMDdbZSiQoK7jL1SCxMW1tFZbhWljXWBCK AcKqHpJyN8JTr0cBJviqaPilkG3pTQOEJUOOlorgIj7zxagC04y0SkFQIAda1eWL6Rte je1YcQ5Zk9jNWQgYyj1kJ4dwlMIudGhJPCtNoNKvEcyycibBRdrTu/hLOnhZ8hJcYba6 ZxwVHxoqnxBfpRuA/UBtrdLbtsrQ2c1WHY7lyZB9lKL1r0wgm5COVLbYXhlUrF/5aCPE zRiA== X-Gm-Message-State: AOAM532bPJSNLXUw6RuPqZZRKaRDZq0tsV1y244S+fzs+Apqga/0JHkB FwnhuCehfQAY7e0hyxeQkuY= X-Google-Smtp-Source: ABdhPJwYVAetdlUFqLbrpSOO6jhFPS8BR5Wx6VnAToHyd1vCcw7Mmtj6T9muaS37JFAUdlkmlLkGSQ== X-Received: by 2002:a5d:6785:: with SMTP id v5mr893498wru.380.1636565557526; Wed, 10 Nov 2021 09:32:37 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p13sm6723227wmi.0.2021.11.10.09.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 09:32:37 -0800 (PST) Message-ID: <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 10 Nov 2021 18:32:35 +0100 In-Reply-To: <87pmr9x6vu.fsf@planete-kraus.eu> References: <87pmr9x6vu.fsf@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 15 01:08:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 10 Nov 2021 20:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51731@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 51731-submit@debbugs.gnu.org id=B51731.163657722328989 (code B ref 51731); Wed, 10 Nov 2021 20:48:01 +0000 Received: (at 51731) by debbugs.gnu.org; 10 Nov 2021 20:47:03 +0000 Received: from localhost ([127.0.0.1]:39274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkuUn-0007XE-Sh for submit@debbugs.gnu.org; Wed, 10 Nov 2021 15:47:03 -0500 Received: from planete-kraus.eu ([89.234.140.182]:36472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkuUk-0007Wy-23 for 51731@debbugs.gnu.org; Wed, 10 Nov 2021 15:47:00 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4d2ecaeb; Wed, 10 Nov 2021 20:46:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=mHW4m+OvTBOdRv5aSThP5EYdn 1M=; b=YlO0/9dy0z5nwKqx1XRLKRjeVv6d7D1/GgsV25enQJalwAk43r6O4PEiv A1GYsr6K8/j43CcRTu9l8cHueSU2HLZ6djcag+YgLSnk9AUdQnv1YANWJHBir3LL am000PGG2UADOiy1yU3QSn0XQb5vkRcTWdZRS46HbVinZQ+AeE= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 14068ef3 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Wed, 10 Nov 2021 20:46:52 +0000 (UTC) References: <87pmr9x6vu.fsf@planete-kraus.eu> <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> User-agent: mu4e 1.6.9; emacs 27.2 From: Vivien Kraus Date: Wed, 10 Nov 2021 20:20:38 +0000 In-reply-to: <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> Message-ID: <871r3nspqc.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Liliana Marie Prikler 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"=E2= =80=A6 >> 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=E2=80=99t 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=E2=80=99t update authenticator (gnu/packages/gnome.scm), because upstream switched to Rust and I don=E2=80=99t know how to package that; 2. Geary needs it too (and gmime 2, which we could drop the same way), but it=E2=80=99s a pain to upgrade. I went a long way, but there=E2=80=99s = some vala code that acts on strings as if they were arrays and I don=E2=80=99t know w= hat 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=E2=80=99s 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.=20 > 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=E2=80=99ll 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=E2=80=99s flagged by the linter, because wrapping a program produces a s= hell 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=E2=80=99ve 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=E2=80=99ll wait for more desalinated advice, because lumping commits toge= ther is easier than separating a big one. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnome-tweaks-Use-libhandy-1.patch Content-Transfer-Encoding: quoted-printable Content-Description: Use libhandy 1 in gnome-tweaks From=20af7235dc2bbfa84cc1c94792b9822c74db2baf60 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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 libhan= dy 0. =2D-- 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 =2D-- 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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnome-tweaks-Set-the-python-path.patch Content-Transfer-Encoding: quoted-printable Content-Description: Wrap the python path in gnome-tweaks From=20edc67015e65dfce75d1b2cd4317e1105d4730057 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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)) =2D (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"))) =2D (wrap-program (string-append out "/bin/gnome-tweaks") =2D `("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnome-tweaks-Add-bash-minimal-as-an-input.patch Content-Transfer-Encoding: quoted-printable Content-Description: Depend on bash-minimal to launch the wrapped program From=20f1f5fa31282f184649733157f56d63255944952e Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9806,7 +9806,9 @@ (define-public gnome-tweaks ("libsoup" ,libsoup) ("nautilus" ,nautilus) ("python" ,python) =2D ("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 =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gcr-Upgrade-to-3.41.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: Upgrade gcr From=20c5032164a1f55c71fe49b9ee6af6d5acae04903c Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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") =2D (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 =2D "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))= )) =2D (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 _ =2D (substitute* "Makefile.in" =2D (("[[: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 t= ests =2D ("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-seahorse-Upgrade-to-41.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: Upgrade seahorse so that it does not depend on libhandy 0 From=209a3cbae7896c9bba81c16ebb37656548e0110e57 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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") =2D (version "3.36.2") + (version "41.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" =2D (version-major+minor version) "/" name "-" + (version-major version) "/" name "-" version ".tar.xz")) (sha256 =2D (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")) =2D #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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libpwquality" ,libpwquality) ("libsecret" ,libsecret) ("libsoup" ,libsoup))) =2D-=20 2.33.1 --=-=-= Content-Type: text/plain Vivien --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGML7sACgkQO7C8EjLY uCzcuAv/fmFbklc2Dh3MepL0C50ubXvxo+8GtpCCh/LUBvh2mfeYtOwdt6ienbNV hGkRBhX6oKN+CcQZ/+CtoMwWrzx9+ngCG8v04X/M+V08AhyQmib4HVu5HyzvUUNA wx/EW4GqWfmu8W/iBMA/3qFifz+ITK6aWM6qkoX8FXpyKY8g1KM/0B35bMhokRf7 zUicGkeiMItfxD6bsUuamCSU20K85lJ8TjHFcdn6JnPsEzqx2b9+WpQwmrTZOOqt PG2aRVGfnlP0eGuDUJCHXFI/3PmOGfcGzyfGCP6TqpYcIZ/ep0HLQmLD3JSO5i8c dLaiQCP5io4KHF+LT0FeGfT//x4nzRmsvU6My16w+opFSUm5FuYd4rxErHKx+d0t kQM1UzI5pbbMoShDAE/Pd1EJzeKmOhAh4uhbkNT2CT/CH5J30k4ywxwQ1WiOEcIi tdIpLROh1Iw9tIX+ykhxQy43wbOXQsAENVsecHq0AArKQLa4dmEI2tFYa0REB+8i xOHhDrLg =kc36 -----END PGP SIGNATURE----- --==-=-=-- From unknown Sun Jun 15 01:08:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 11 Nov 2021 20:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Vivien Kraus Cc: 51731@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 51731-submit@debbugs.gnu.org id=B51731.163666342713760 (code B ref 51731); Thu, 11 Nov 2021 20:44:01 +0000 Received: (at 51731) by debbugs.gnu.org; 11 Nov 2021 20:43:47 +0000 Received: from localhost ([127.0.0.1]:42422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlGvD-0003Zr-5k for submit@debbugs.gnu.org; Thu, 11 Nov 2021 15:43:47 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlGvB-0003Zc-AE for 51731@debbugs.gnu.org; Thu, 11 Nov 2021 15:43:46 -0500 Received: by mail-wm1-f68.google.com with SMTP id i8-20020a7bc948000000b0030db7b70b6bso8252639wml.1 for <51731@debbugs.gnu.org>; Thu, 11 Nov 2021 12:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=PoX4ZVmVPXbrbWueTZh8t7uGDA3+Pek1TN6ZcBlrVuo=; b=eitdt3wQ7TR2aCYt4l3zyItJd0DqmbGQMw99L6HBhHAxdZaZVA3Qr6bMQpYi2z5pqe aJw7ArPn7sSxuH/U9RA/DouuyUYg51g+MgCYPTgx+VX87slE8R+w2gFKvcXpYk6s44eE vcNsFDFHV3hkwvYPskvXVyC1zfdYlNMM6wB8FQ3EWnpAkTjm6/xW4mdtfF509gn/WAGP vzjymVLSz44MDczqDoXEOw7ZNTD3YCHp5+JlAnXnKGakNT45rT+8RtkEm1Xta99WcPQ7 +RnHBEsKfnICJ08ok3f35h9S7tYhluhLX55rBCxsFqdiuEcB8GJD+zvg1dGyxJeavYv8 cyiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=PoX4ZVmVPXbrbWueTZh8t7uGDA3+Pek1TN6ZcBlrVuo=; b=vH0wwcKFi6Mm02QFpmprZLyseKzcXOm46+6ZyikqjkDDMK5LhIHvmr03uMqeld29Qp YRco5egUJC2IeDPrqso9tclZx73w36tU98n19JlVDmK5L4fIDINl5YAdnk/SjDw7OCH9 E1pClCX9x07nnmsc8u8UExA/sfRKNHl30qMctCcnmYhKd1yVx9rE29OBYuAwN1e39GIk SauPpMs8hovJXaW5tfnTvLYIVwSs2OUaffr4o+B82WngCnH4IU1OZeVeIk/DfhwuCPZN 4Gdyh3vSLk1WFsfH2X3iDGWXXDh1fxSkhFwTHhtYAHj9RmgHXNuurO3CFF9222iScLI8 pF5Q== X-Gm-Message-State: AOAM532L0tgHeOZbNPbNTDZl6QYMkKIQoUasg6spTWNJFfcClFYZhmwy x5/buVLQzI7QQGrwZp+fehE= X-Google-Smtp-Source: ABdhPJxcw+tvT3DpsK01b54IA5RL03PVt0Hw+cX0UttIS5pk1J/oQyuG2vmhrhsq+daE0A8XgMiTgA== X-Received: by 2002:a1c:cc19:: with SMTP id h25mr28956371wmb.57.1636663419408; Thu, 11 Nov 2021 12:43:39 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n15sm10461672wmq.38.2021.11.11.12.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 12:43:38 -0800 (PST) Message-ID: <202fa36515ed6ef320af31704fce6ff36f1ab10c.camel@gmail.com> From: Liliana Marie Prikler Date: Thu, 11 Nov 2021 21:43:37 +0100 In-Reply-To: <871r3nspqc.fsf@planete-kraus.eu> References: <87pmr9x6vu.fsf@planete-kraus.eu> <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> <871r3nspqc.fsf@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 15 01:08:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 13 Nov 2021 09:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51731 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51731@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 51731-submit@debbugs.gnu.org id=B51731.1636795795706 (code B ref 51731); Sat, 13 Nov 2021 09:30:01 +0000 Received: (at 51731) by debbugs.gnu.org; 13 Nov 2021 09:29:55 +0000 Received: from localhost ([127.0.0.1]:46484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlpMA-0000BH-5f for submit@debbugs.gnu.org; Sat, 13 Nov 2021 04:29:54 -0500 Received: from planete-kraus.eu ([89.234.140.182]:36478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlpM5-0000B2-Hg for 51731@debbugs.gnu.org; Sat, 13 Nov 2021 04:29:52 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 61fa78b7; Sat, 13 Nov 2021 09:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=LuB5Wk/oLXpAoFAnS/FNk94el aY=; b=pYhXFC72AybzurTpqJDiX34HLugoit2pQo6g/SH32X+HTx+Uuo8p60CN5 /qx9J3/F8rNNJp+HrvL2wZejtz2u2QAE4TPDGkdBJXdtk/XoUIjt3L/dVxxf2ITU OCT5/GBNbCt9iLrjSFG21dRoGJ12wi50Y/nUKZ73iLR9gmdza8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6ec86306 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sat, 13 Nov 2021 09:29:42 +0000 (UTC) References: <87pmr9x6vu.fsf@planete-kraus.eu> <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> <871r3nspqc.fsf@planete-kraus.eu> <202fa36515ed6ef320af31704fce6ff36f1ab10c.camel@gmail.com> User-agent: mu4e 1.6.9; emacs 27.2 From: Vivien Kraus Date: Sat, 13 Nov 2021 09:06:26 +0000 In-reply-to: <202fa36515ed6ef320af31704fce6ff36f1ab10c.camel@gmail.com> Message-ID: <871r3kl7y1.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello! Liliana Marie Prikler 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=E2=80=99s 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnome-tweaks-Use-libhandy-1.patch Content-Transfer-Encoding: quoted-printable Content-Description: Use libhandy 1 in gnome-tweaks From=20e0fd1eab227d720bd57ff8e9412d1ed0adc59bfb Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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 libhan= dy 0. =2D-- 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 =2D-- 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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnome-tweaks-Set-the-python-path.patch Content-Transfer-Encoding: quoted-printable Content-Description: Wrap python path in gnome-tweaks From=2065469d76bb1485281db8fba2ea15316a31cc1f67 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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)) =2D (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"))) =2D (wrap-program (string-append out "/bin/gnome-tweaks") =2D `("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnome-tweaks-Add-bash-minimal-as-an-input.patch Content-Transfer-Encoding: quoted-printable Content-Description: Use bash-minimal to run the wrapped gnome-tweaks From=205dcc96bc39f72e41c3c4ad524dbf23cc1952e5d8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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 =2D `(("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gnome-tweaks-Use-meson-0.59.patch Content-Transfer-Encoding: quoted-printable Content-Description: Use meson 0.59 in gnome-tweaks From=2007b11864df5ccef11659927de7fe49c97e3a7b3e Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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=3D/tmp" "-Dsysconfdir=3D/tmp") #:imported-modules ((guix build python-build-system) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-gcr-Upgrade-to-3.41.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: Upgrade gcr From=20f53a518d9ac03501e4273a3625efcc9c0ff5ca96 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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") =2D (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 =2D "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))= )) =2D (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 _ =2D (substitute* "Makefile.in" =2D (("[[: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 t= ests =2D ("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-gnu-seahorse-Use-libsoup-2.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix seahorse to use libsoup 2 From=207d85fa1df0efc8d34f69178f5ca65c0b345bde82 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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) =2D ("libsoup" ,libsoup))) + ("libsoup" ,libsoup-minimal-2))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0007-gnu-seahorse-Upgrade-to-41.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: Upgrade seahorse From=209629a56bd53eabf406c2d68e1bd8ac9acfd3cb38 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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") =2D (version "3.36.2") + (version "41.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" =2D (version-major+minor version) "/" name "-" + (version-major version) "/" name "-" version ".tar.xz")) (sha256 =2D (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")) =2D #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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libpwquality" ,libpwquality) ("libsecret" ,libsecret) ("libsoup" ,libsoup-minimal-2))) =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGPhYYACgkQO7C8EjLY uCw/VwwAk7i3uqyzm3LLff6E78dqEx+OhVJ1Tp6Z6/DLYIiCOpFQdxCwk6wTbQMD 5LiPSUT8TjLSxSp0Nht97n3eBwXclAWjbAO0n+qnlMtx+C/db+AEfgii4PMumnv4 0X2VGfe8LagsGBfNg1ZXLz+3jLscjNam/Koy6kQJyhFbXIb2Svs992quPhhttQTy D3+gqkBgYbu4pRa1dbmhuj8pXl/qn+PYLdiFHzMneUsU/EvRqGF9e2VV/+hzPJDR ui76NwGtWp79wXGxCZXuy9qhoxFSfbUEHEsgFbVL1q+Rsz+TezRuPSXJDiGNgfpj dAm2Ii+cumAhvVbGiRMUkys0hwNWfSrdTKMLj0I4VgT3ItdEb4WRUHQ9IAWvYE5M bGOiczalxrsT04rEee8C6vUGeiJgiM9gLtL0Ei5Z7BSO+YQYkuDEmpsFEhMHlFk8 Pfi2QkYE2G8cjQSXdBWD83C/TODHgQwllGeBEjCodgjQHSnjFPacmfym0+9qE1+P mBswya0t =5A59 -----END PGP SIGNATURE----- --==-=-=-- From unknown Sun Jun 15 01:08:17 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vivien Kraus Subject: bug#51731: closed (Re: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen) Message-ID: References: <87tugd659a.fsf@gnu.org> <87pmr9x6vu.fsf@planete-kraus.eu> X-Gnu-PR-Message: they-closed 51731 X-Gnu-PR-Package: guix X-Gnu-PR-Keywords: patch Reply-To: 51731@debbugs.gnu.org Date: Mon, 15 Nov 2021 11:14:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1636974842-31704-1" This is a multi-part message in MIME format... ------------=_1636974842-31704-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51731@debbugs.gnu.org. --=20 51731: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51731 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1636974842-31704-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51731-done) by debbugs.gnu.org; 15 Nov 2021 11:13:49 +0000 Received: from localhost ([127.0.0.1]:52802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmZvo-0008Eo-Pz for submit@debbugs.gnu.org; Mon, 15 Nov 2021 06:13:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmZvn-0008EZ-7w for 51731-done@debbugs.gnu.org; Mon, 15 Nov 2021 06:13:47 -0500 Received: from [2001:470:142:3::e] (port=58206 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmZvh-000735-IB; Mon, 15 Nov 2021 06:13:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=uXaDe8DffE9BK0JT11+kGvtNSUOgLnf4K3NxFDb3Hec=; b=mlGyjwvGhVIr0BtAgP8R X1wjrIMZnflZMz+M+a1tj1T3UG0KYavHoZauY9UvqTGNK+eeLqL6vSRwdpSkbw3EIJj3Sx61ixyE6 ctSb9UKbFvrAbaQ2Tv+klBoz3PQJlrtXfganwu3L1g2FGjrBO62UX9wV6Gn1dm4jtTdYQC12jPk8d m4Kb26g+83/gnW/HRcNG9iFDtwmdLuChnYozZuMivG21oVVWWEmhR/QigN2zZFZGyGTrNE/JQ6azA GzggGhjtvEZ13Pd8fjTwYGQhrU70QgMGtU9WO4XC16HKTTYqGKxOqBVHx9/WOp6+9QJwVtLPet/2l y9O/hvvparxu+A==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=41726 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmZvg-00007S-Mc; Mon, 15 Nov 2021 06:13:41 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Vivien Kraus Subject: Re: bug#51731: [PATCH] gnome-tweaks fails to start on core-updates-frozen References: <87pmr9x6vu.fsf@planete-kraus.eu> <73796631dd1dd39a638c948ca3273f5cd3423b88.camel@gmail.com> <871r3nspqc.fsf@planete-kraus.eu> <202fa36515ed6ef320af31704fce6ff36f1ab10c.camel@gmail.com> <871r3kl7y1.fsf@planete-kraus.eu> Date: Mon, 15 Nov 2021 12:13:37 +0100 In-Reply-To: <871r3kl7y1.fsf@planete-kraus.eu> (Vivien Kraus's message of "Sat, 13 Nov 2021 09:06:26 +0000") Message-ID: <87tugd659a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51731-done Cc: 51731-done@debbugs.gnu.org, Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Vivien Kraus 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=E2=80=99. ------------=_1636974842-31704-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Nov 2021 23:10:48 +0000 Received: from localhost ([127.0.0.1]:36185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGN-0007TK-Em for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:46948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkaGL-0007TA-Mg for submit@debbugs.gnu.org; Tue, 09 Nov 2021 18:10:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkaGL-0000ki-CQ for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from [2a00:5881:4008:2810::309] (port=49734 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mkaGI-0002Ut-Sb for bug-guix@gnu.org; Tue, 09 Nov 2021 18:10:45 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 16924a2b for ; Tue, 9 Nov 2021 23:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=lZrpbwxgajNbwB/Ab5kV03gT+OU=; b=sJToqQ/veWDZ8Ewxb3fnpCu2chNR KFvXjvNzc02yxvKHc580wCpMqcUO7di7dZp8EEindOoYSP2DJp/cQ+9y0bjnU+YM mekVL0vSiwL5xTLz1TOAhWmqoCniYie1Ode+36xmCZnQjkoEkwWhqgiatarvCSCC HSic8OxpTKEQq+Q= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e551c127 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Tue, 9 Nov 2021 23:10:35 +0000 (UTC) From: Vivien Kraus To: bug-guix@gnu.org Subject: [PATCH] gnome-tweaks fails to start on core-updates-frozen Date: Tue, 09 Nov 2021 23:10:29 +0000 Message-ID: <87pmr9x6vu.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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"=E2=80=A6 S= hould we still keep the styled output? Best regards, Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gnome-tweaks-Use-libhandy-1.patch Content-Transfer-Encoding: quoted-printable Content-Description: Update the libhandy dependency for gnome-tweaks From=204612c8235c14bcb9b7583746683e1d2559df390b Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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 libhan= dy 0. =2D-- 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 =2D-- 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) =2D ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libnotify" ,libnotify) ("libsoup" ,libsoup) ("nautilus" ,nautilus) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-gnome-tweaks-Set-the-python-path.patch Content-Transfer-Encoding: quoted-printable Content-Description: Wrap gnome-tweaks to set the python path too From=20cdb79baa5705adbfee8711e5698aa687fd3685f1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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_PYTHONPA= TH. =2D-- 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 =2D-- 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"))) =2D (wrap-program (string-append out "/bin/gnome-tweaks") =2D `("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) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-gnome-tweaks-gobject-introspection-should-be-a-n.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=204f5dc6bdb473380619b42986097b56e1ea305f13 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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) =2D ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) (inputs `(("gnome-desktop" ,gnome-desktop) ("gtk+" ,gtk+) =2D ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libhandy" ,libhandy) ("libnotify" ,libnotify) =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-gnome-tweaks-Add-bash-minimal-as-an-input-to-wra.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix a linter warning From=20f45038630cff73514f24248684cb8c968106f225 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9806,7 +9806,8 @@ (define-public gnome-tweaks ("libsoup" ,libsoup) ("nautilus" ,nautilus) ("python" ,python) =2D ("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 =2D-=20 2.33.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-gnome-tweaks-Style-it.patch Content-Transfer-Encoding: quoted-printable Content-Description: Apply guix style to gnome-tweaks From=204c5d8d919d433d0669abc124eeb2692ae81739f5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. =2D-- 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 =2D-- 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 =2D `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. =2D ("intltool" ,intltool) =2D ("pkg-config" ,pkg-config) =2D ("gobject-introspection" ,gobject-introspection))) =2D (inputs =2D `(("gnome-desktop" ,gnome-desktop) =2D ("gtk+" ,gtk+) =2D ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) =2D ("libhandy" ,libhandy) =2D ("libnotify" ,libnotify) =2D ("libsoup" ,libsoup) =2D ("nautilus" ,nautilus) =2D ("python" ,python) =2D ("python-pygobject" ,python-pygobject) =2D ("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 =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGK/+UACgkQO7C8EjLY uCz02wwA1krPKWO/WDD2UiMCUw9Ohh82QUffnKVp3nPO7TiPsvYJTVa1pT0+sMRV UvHVsS/Rk3F0jdxYogVRYf0L0Gz57kOXl3wt1oXWJQIm5h5p8mr399Nig2ZA/lki CF3GWnr7cEbPJVeMzgowzjtVTe2GekFppuVwNWqFnCFfP+/y2rz0QsYaSiBcUZGa kdGSwJJLLrFQMErZcGdkYhaxdYDlMLUgKluQ2jPyvUk+3+AFxZ6mXdZaSpRxKrZe IA1FxODeadgef4ZWSl1e15bSzm8X/iwkun6/wH67T1k+MC/pG0EawUkVAKKN1UzB OAlE+SCAwrageX4gk1vne6iUvgCxyEMqrsWTAe8wUCTIn/s0P3tgFi4Vyp3E6cdr 6xLQ2LXcddf5rAtx+NuaYzI084AT1CM6LGQrRwR1a3nq5vd9t97fobvBnXQaMIlT 8RfDBJfrLBrwsHhQFcUk82vls1VRxQl8oI8zX6n4KEzvu1ELgmVOCy9PZysoTP5I KgQc/RsG =j/9f -----END PGP SIGNATURE----- --==-=-=-- ------------=_1636974842-31704-1--