From unknown Tue Jun 17 22:27:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jul 2021 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49670@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162682053019436 (code B ref -1); Tue, 20 Jul 2021 22:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jul 2021 22:35:30 +0000 Received: from localhost ([127.0.0.1]:35631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5yKn-00053P-Jw for submit@debbugs.gnu.org; Tue, 20 Jul 2021 18:35:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:54832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5yKl-00053H-Sk for submit@debbugs.gnu.org; Tue, 20 Jul 2021 18:35:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5yKk-0000io-AY for guix-patches@gnu.org; Tue, 20 Jul 2021 18:35:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:10362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5yKe-0004Ng-W2 for guix-patches@gnu.org; Tue, 20 Jul 2021 18:35:25 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GTtnr5N0zz3wGM for ; Wed, 21 Jul 2021 00:35:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1626820512; bh=gcUnvo43D/2w9w52Sb8Jh7JIbwA78HhEUIsznKeqGRA=; h=From:To:Subject:Date; b=R0gIB/313+EijKxqtAw0tt5TwpKRa4juGXDaHs0PVtfx1lALNPd9wMdB97AuLwQ7w QaR+/SueGHC2mOwnFEzrRVjH3Wpyo6ITYpvlSjViCSEyLWQmEEviDxHEIm2baqD7PH YZlkMF2tVxfn1+HRE16oKA7MsTpTN173Xzckp1DI= From: Leo Prikler Date: Wed, 21 Jul 2021 00:34:53 +0200 Message-Id: <20210720223452.9471-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) * gnu/packages/patches/gnome-maps-really-do-unregister.patch: New file. * gnu/packages/geo.scm (gnome-maps)[patches]: Add it here... * gnu/local.mk (dist_patch_DATA): ... and here. --- I've opened a separate merge request upsteam [1], but since their CI is currently failing, it will take some time for this patch to make it into a release. [1] https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/187 gnu/local.mk | 1 + gnu/packages/geo.scm | 5 ++++- .../patches/gnome-maps-really-do-unregister.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-maps-really-do-unregister.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a3d8f6eca..0743daf0f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1155,6 +1155,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ + %D%/packages/patches/gnome-maps-really-do-unregister.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-shell-CVE-2020-17489.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..9bf6749dca 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -218,7 +218,10 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")))) + "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")) + (patches + (search-patches + "gnome-maps-really-do-unregister.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-maps-really-do-unregister.patch b/gnu/packages/patches/gnome-maps-really-do-unregister.patch new file mode 100644 index 0000000000..3b201f363d --- /dev/null +++ b/gnu/packages/patches/gnome-maps-really-do-unregister.patch @@ -0,0 +1,13 @@ +Index: gnome-maps-3.36.7/src/application.js +=================================================================== +--- gnome-maps-3.36.7.orig/src/application.js ++++ gnome-maps-3.36.7/src/application.js +@@ -277,7 +277,7 @@ var Application = GObject.registerClass( + } + + vfunc_dbus_unregister(connection, path) { +- super.vfunc_dbus_register(connection, path); ++ super.vfunc_dbus_unregister(connection, path); + } + + vfunc_activate() { -- 2.32.0 From unknown Tue Jun 17 22:27:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Update to 3.38.5. References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> In-Reply-To: <20210720223452.9471-1-leo.prikler@student.tugraz.at> Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 11:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49670@debbugs.gnu.org Received: via spool by 49670-submit@debbugs.gnu.org id=B49670.162686556018259 (code B ref 49670); Wed, 21 Jul 2021 11:06:02 +0000 Received: (at 49670) by debbugs.gnu.org; 21 Jul 2021 11:06:00 +0000 Received: from localhost ([127.0.0.1]:36212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6A35-0004kR-Vu for submit@debbugs.gnu.org; Wed, 21 Jul 2021 07:06:00 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6A33-0004kH-4x for 49670@debbugs.gnu.org; Wed, 21 Jul 2021 07:05:58 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GVCS16Bbkz3x7s for <49670@debbugs.gnu.org>; Wed, 21 Jul 2021 13:05:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1626865553; bh=pVIb3J5f5BOfpSjTREJIHVzF/dkpACAwTGvVWOUd5ig=; h=From:To:Subject:Date; b=VJEF+AxyIsERZBxYsVSL9mfChRKJiXqbH6EN4BRt0Et4t+G8R4ZP/H+jCKt7naM6L Wiv3pFXC/aBhopEsOuzhpL+7QG/BKuwjIzYfRiYC9GdF7t+WJ19tQ7gtf4mB0xfO4n 6/k3aoEjOpw/VypOB9R0rx1ppjFf9Y1ocYRMtaJs= From: Leo Prikler Date: Wed, 21 Jul 2021 13:04:31 +0200 Message-Id: <20210721110431.21634-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) 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 (---) * gnu/packages/geo.scm (gnome-maps): Update to 3.38.5. --- As expected, 3.36 is quite dead and a fix for this issue already exists in 3.38. We could backport their patch, but it turns out 3.38.5 builds with a minor patch. gnu/packages/geo.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..8b71f5b03c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -210,7 +210,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.36.7") + (version "3.38.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -218,7 +218,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")))) + "1llgzm2ni3iy31dznqkc81vadv0fpqgpz2l9zzrj5jshvyq0akgh")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -236,6 +236,15 @@ topology functions.") (("@pkgdatadir@/org.gnome.Maps") (string-append (assoc-ref outputs "out") "/bin/gnome-maps"))) #t)) + (add-after 'unpack 'fix-broken-tests + (lambda _ + ;; For some reason setting LC_ALL=C and LANG=C as done in the + ;; build system does not prevent these gratuitous commas from + ;; being inserted. + (substitute* "tests/utilsTest.js" + (("1001 m") "1,001 m") + (("1000 ft") "1,000 ft") + (("5282 ft") "5,282 ft")))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- 2.32.0 From unknown Tue Jun 17 22:27:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 14:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Prikler Cc: 49670@debbugs.gnu.org Received: via spool by 49670-submit@debbugs.gnu.org id=B49670.162687769118132 (code B ref 49670); Wed, 21 Jul 2021 14:29:02 +0000 Received: (at 49670) by debbugs.gnu.org; 21 Jul 2021 14:28:11 +0000 Received: from localhost ([127.0.0.1]:38187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6DCl-0004iO-GS for submit@debbugs.gnu.org; Wed, 21 Jul 2021 10:28:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6DCk-0004iB-5t for 49670@debbugs.gnu.org; Wed, 21 Jul 2021 10:28:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49576) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6DCc-000629-Ui; Wed, 21 Jul 2021 10:28:02 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45266 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6DCc-00054F-Mw; Wed, 21 Jul 2021 10:28:02 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> Date: Wed, 21 Jul 2021 16:28:01 +0200 In-Reply-To: <20210720223452.9471-1-leo.prikler@student.tugraz.at> (Leo Prikler's message of "Wed, 21 Jul 2021 00:34:53 +0200") Message-ID: <87fsw7hhce.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-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! Leo Prikler skribis: > * gnu/packages/patches/gnome-maps-really-do-unregister.patch: New file. > * gnu/packages/geo.scm (gnome-maps)[patches]: Add it here... > * gnu/local.mk (dist_patch_DATA): ... and here. > --- > I've opened a separate merge request upsteam [1], but since their CI is > currently failing, it will take some time for this patch to make it into a > release. > > [1] https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/187 > + (patches > + (search-patches > + "gnome-maps-really-do-unregister.patch")))) This can all go on a single line. > +++ b/gnu/packages/patches/gnome-maps-really-do-unregister.patch > @@ -0,0 +1,13 @@ > +Index: gnome-maps-3.36.7/src/application.js Could you add a line at the top of this patch saying what it does along with a link to the merge request above? Apart from that the two patches LGTM, especially if it allows me to use gnome-maps again. :-) Thanks! Ludo=E2=80=99. From unknown Tue Jun 17 22:27:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jul 2021 08:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 49670@debbugs.gnu.org Received: via spool by 49670-submit@debbugs.gnu.org id=B49670.16269426873571 (code B ref 49670); Thu, 22 Jul 2021 08:32:01 +0000 Received: (at 49670) by debbugs.gnu.org; 22 Jul 2021 08:31:27 +0000 Received: from localhost ([127.0.0.1]:39342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6U75-0000vW-EH for submit@debbugs.gnu.org; Thu, 22 Jul 2021 04:31:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:42610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6U73-0000vN-05 for 49670@debbugs.gnu.org; Thu, 22 Jul 2021 04:31:26 -0400 Received: from nijino.local (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GVlzG00Phz1LWpG; Thu, 22 Jul 2021 10:31:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GVlzG00Phz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1626942682; bh=ejqL6lHnX7WofVWhCkqXU+uAy7lZNsSR7/NUbLEQXTo=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Jj1yHihB63/0cuk6ywZQ88ZxlPdX7gJZQ69mZITg8lOI2FhH8v9yJAekviaiKAHSy a9S2FLAuTNdC0+g08lgwkRvZ9Hle0hNmEDLcwdwbWgufVcDVncOSKKkduLZzGGPOwO Ot7OPO8hAkjRtySCQhUIbIFfUVbwRVQPPlKrFJeM= Message-ID: <5af9faa539c916abf3fce795e1e127614456fa43.camel@student.tugraz.at> From: Leo Prikler Date: Thu, 22 Jul 2021 10:31:21 +0200 In-Reply-To: <87fsw7hhce.fsf@gnu.org> References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> <87fsw7hhce.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) 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 (---) Am Mittwoch, den 21.07.2021, 16:28 +0200 schrieb Ludovic Courtès: > Hi! > > Leo Prikler skribis: > > > * gnu/packages/patches/gnome-maps-really-do-unregister.patch: New > > file. > > * gnu/packages/geo.scm (gnome-maps)[patches]: Add it here... > > * gnu/local.mk (dist_patch_DATA): ... and here. > > --- > > I've opened a separate merge request upsteam [1], but since their > > CI is > > currently failing, it will take some time for this patch to make it > > into a > > release. > > > > [1] https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/187 > > + (patches > > + (search-patches > > + "gnome-maps-really-do-unregister.patch")))) > > This can all go on a single line. Forgot to count there, but thanks. > > +++ b/gnu/packages/patches/gnome-maps-really-do-unregister.patch > > @@ -0,0 +1,13 @@ > > +Index: gnome-maps-3.36.7/src/application.js > > Could you add a line at the top of this patch saying what it does > along with a link to the merge request above? It turns out a similar fix already exists upstream [1], so if we decide to backport that to 3.36 instead of bumping the package to 3.38, I think we should pick the "official" one. > Apart from that the two patches LGTM, especially if it allows me to > use gnome-maps again. :-) Do "the two patches" refer to this one alone or also to the one bumping the package to 3.38? Again, I'm a little unsure what would be the preferred solution here, as either patch adds additional code that would probably need to be reverted by Raghav in their GNOME 40 work. Regards, [1] https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/2e64cf6909dfca559fcaf54c470134ecc4d64e9a From unknown Tue Jun 17 22:27:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 09:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Prikler Cc: 49670@debbugs.gnu.org Received: via spool by 49670-submit@debbugs.gnu.org id=B49670.162703256627162 (code B ref 49670); Fri, 23 Jul 2021 09:30:02 +0000 Received: (at 49670) by debbugs.gnu.org; 23 Jul 2021 09:29:26 +0000 Received: from localhost ([127.0.0.1]:42311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6rUj-000742-NF for submit@debbugs.gnu.org; Fri, 23 Jul 2021 05:29:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6rUg-00073p-0W for 49670@debbugs.gnu.org; Fri, 23 Jul 2021 05:29:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55702) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6rUZ-0001G2-2x; Fri, 23 Jul 2021 05:29:15 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=42906 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6rUY-00068M-RF; Fri, 23 Jul 2021 05:29:15 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> <87fsw7hhce.fsf@gnu.org> <5af9faa539c916abf3fce795e1e127614456fa43.camel@student.tugraz.at> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 5 Thermidor an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 23 Jul 2021 11:29:12 +0200 In-Reply-To: <5af9faa539c916abf3fce795e1e127614456fa43.camel@student.tugraz.at> (Leo Prikler's message of "Thu, 22 Jul 2021 10:31:21 +0200") Message-ID: <87tuklbcpj.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-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 Leo, Leo Prikler skribis: > Am Mittwoch, den 21.07.2021, 16:28 +0200 schrieb Ludovic Court=C3=A8s: [...] >> > +++ b/gnu/packages/patches/gnome-maps-really-do-unregister.patch >> > @@ -0,0 +1,13 @@ >> > +Index: gnome-maps-3.36.7/src/application.js >>=20 >> Could you add a line at the top of this patch saying what it does >> along with a link to the merge request above? > It turns out a similar fix already exists upstream [1], so if we decide > to backport that to 3.36 instead of bumping the package to 3.38, I > think we should pick the "official" one. Even better. >> Apart from that the two patches LGTM, especially if it allows me to >> use gnome-maps again. :-) > Do "the two patches" refer to this one alone or also to the one bumping > the package to 3.38? Both, but I hadn=E2=80=99t realized there=E2=80=99s was an exclusive choice. > Again, I'm a little unsure what would be the preferred solution here, > as either patch adds additional code that would probably need to be > reverted by Raghav in their GNOME 40 work. I don=E2=80=99t know, I think it=E2=80=99s good to have short-term fixes an= yway and it=E2=80=99s OK if they have to be undone when we eventually upgrade. Your call! Thanks, Ludo=E2=80=99. From unknown Tue Jun 17 22:27: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: Leo Prikler Subject: bug#49670: closed (Re: bug#49670: [PATCH] gnu: gnome-maps: Unregister from DBus when asked to.) Message-ID: References: <63a2a1a14cfcb6d9dfed2749ff5d93b2e9de72f8.camel@student.tugraz.at> <20210720223452.9471-1-leo.prikler@student.tugraz.at> X-Gnu-PR-Message: they-closed 49670 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49670@debbugs.gnu.org Date: Fri, 23 Jul 2021 10:53:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1627037581-11313-1" This is a multi-part message in MIME format... ------------=_1627037581-11313-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49670: [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49670@debbugs.gnu.org. --=20 49670: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49670 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1627037581-11313-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49670-done) by debbugs.gnu.org; 23 Jul 2021 10:52:16 +0000 Received: from localhost ([127.0.0.1]:42382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6smu-0002vV-6r for submit@debbugs.gnu.org; Fri, 23 Jul 2021 06:52:16 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:39411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6smq-0002vI-Mg for 49670-done@debbugs.gnu.org; Fri, 23 Jul 2021 06:52:14 -0400 Received: from [10.0.0.4] (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GWR3F5JwQz3wXd; Fri, 23 Jul 2021 12:52:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1627037529; bh=vBfBx09CmDhgVo0GcGH3ETdQTsXMk0pSdaeHqA0CK8M=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=vRlfu/9ldCRIPCgWSXEY9Rs6DsH1wWgD/A0wBgh7BPpJUy0VzmUJAmQ8Hh8tXbgBG 9WF7qQFbBvW5BBsJaJa8WnjgVe7HYoQR309TQQG0OF/Ih801i6cysnO1ft8rboDTDe 2EfwWXH0a5uGH+oY0OAmY2D+Z2YpE+BEezkQrVE0= Message-ID: <63a2a1a14cfcb6d9dfed2749ff5d93b2e9de72f8.camel@student.tugraz.at> Subject: Re: bug#49670: [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. From: Leo Prikler To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Date: Fri, 23 Jul 2021 12:51:43 +0200 In-Reply-To: <87tuklbcpj.fsf@gnu.org> References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> <87fsw7hhce.fsf@gnu.org> <5af9faa539c916abf3fce795e1e127614456fa43.camel@student.tugraz.at> <87tuklbcpj.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49670-done Cc: 49670-done@debbugs.gnu.org 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 (---) Am Freitag, den 23.07.2021, 11:29 +0200 schrieb Ludovic Courtès: > Hi Leo, > > Leo Prikler skribis: > > > Am Mittwoch, den 21.07.2021, 16:28 +0200 schrieb Ludovic Courtès: > > [...] > > > > > +++ b/gnu/packages/patches/gnome-maps-really-do- > > > > unregister.patch > > > > @@ -0,0 +1,13 @@ > > > > +Index: gnome-maps-3.36.7/src/application.js > > > > > > Could you add a line at the top of this patch saying what it does > > > along with a link to the merge request above? > > It turns out a similar fix already exists upstream [1], so if we > > decide > > to backport that to 3.36 instead of bumping the package to 3.38, I > > think we should pick the "official" one. > > Even better. > > > > Apart from that the two patches LGTM, especially if it allows me > > > to > > > use gnome-maps again. :-) > > Do "the two patches" refer to this one alone or also to the one > > bumping > > the package to 3.38? > > Both, but I hadn’t realized there’s was an exclusive choice. Well, the exclusive choice comes from the fact that the patch we would have to add to 3.36 is already present in 3.38.1+. So bumping to a sufficiently recent gnome-maps "voids" the patch in that it is already applied. > > Again, I'm a little unsure what would be the preferred solution > > here, > > as either patch adds additional code that would probably need to be > > reverted by Raghav in their GNOME 40 work. > > I don’t know, I think it’s good to have short-term fixes anyway and > it’s > OK if they have to be undone when we eventually upgrade. Your call! I went with bumping to 3.38. While I hope the test suite doesn't break in 40 the same way it does here, there is a slim chance the phase I've added needs to be kept. Thanks ------------=_1627037581-11313-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Jul 2021 22:35:30 +0000 Received: from localhost ([127.0.0.1]:35631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5yKn-00053P-Jw for submit@debbugs.gnu.org; Tue, 20 Jul 2021 18:35:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:54832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5yKl-00053H-Sk for submit@debbugs.gnu.org; Tue, 20 Jul 2021 18:35:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5yKk-0000io-AY for guix-patches@gnu.org; Tue, 20 Jul 2021 18:35:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:10362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5yKe-0004Ng-W2 for guix-patches@gnu.org; Tue, 20 Jul 2021 18:35:25 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GTtnr5N0zz3wGM for ; Wed, 21 Jul 2021 00:35:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1626820512; bh=gcUnvo43D/2w9w52Sb8Jh7JIbwA78HhEUIsznKeqGRA=; h=From:To:Subject:Date; b=R0gIB/313+EijKxqtAw0tt5TwpKRa4juGXDaHs0PVtfx1lALNPd9wMdB97AuLwQ7w QaR+/SueGHC2mOwnFEzrRVjH3Wpyo6ITYpvlSjViCSEyLWQmEEviDxHEIm2baqD7PH YZlkMF2tVxfn1+HRE16oKA7MsTpTN173Xzckp1DI= From: Leo Prikler To: guix-patches@gnu.org Subject: [PATCH] gnu: gnome-maps: Unregister from DBus when asked to. Date: Wed, 21 Jul 2021 00:34:53 +0200 Message-Id: <20210720223452.9471-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) * gnu/packages/patches/gnome-maps-really-do-unregister.patch: New file. * gnu/packages/geo.scm (gnome-maps)[patches]: Add it here... * gnu/local.mk (dist_patch_DATA): ... and here. --- I've opened a separate merge request upsteam [1], but since their CI is currently failing, it will take some time for this patch to make it into a release. [1] https://gitlab.gnome.org/GNOME/gnome-maps/-/merge_requests/187 gnu/local.mk | 1 + gnu/packages/geo.scm | 5 ++++- .../patches/gnome-maps-really-do-unregister.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-maps-really-do-unregister.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a3d8f6eca..0743daf0f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1155,6 +1155,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ + %D%/packages/patches/gnome-maps-really-do-unregister.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-shell-CVE-2020-17489.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..9bf6749dca 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -218,7 +218,10 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")))) + "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")) + (patches + (search-patches + "gnome-maps-really-do-unregister.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-maps-really-do-unregister.patch b/gnu/packages/patches/gnome-maps-really-do-unregister.patch new file mode 100644 index 0000000000..3b201f363d --- /dev/null +++ b/gnu/packages/patches/gnome-maps-really-do-unregister.patch @@ -0,0 +1,13 @@ +Index: gnome-maps-3.36.7/src/application.js +=================================================================== +--- gnome-maps-3.36.7.orig/src/application.js ++++ gnome-maps-3.36.7/src/application.js +@@ -277,7 +277,7 @@ var Application = GObject.registerClass( + } + + vfunc_dbus_unregister(connection, path) { +- super.vfunc_dbus_register(connection, path); ++ super.vfunc_dbus_unregister(connection, path); + } + + vfunc_activate() { -- 2.32.0 ------------=_1627037581-11313-1--