From unknown Mon Jun 23 09:41:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#37275] [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37275@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156743323716316 (code B ref -1); Mon, 02 Sep 2019 14:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 14:07:17 +0000 Received: from localhost ([127.0.0.1]:58609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzE-0004F2-Jj for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:42939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzC-0004Ev-CF for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56664) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4mz8-0008GT-7z for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_20,RCVD_IN_DNSWL_MED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4mz6-0007gn-6t for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:10 -0400 Received: from mout01.posteo.de ([185.67.36.141]:49860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i4mz6-0007fQ-1o for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:08 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49758160070 for ; Mon, 2 Sep 2019 16:07:06 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 46MX2c5XX4z6tmR for ; Mon, 2 Sep 2019 16:07:04 +0200 (CEST) From: L p R n d n Date: Mon, 2 Sep 2019 16:06:59 +0200 Message-Id: <20190902140659.2506-1-guix@lprndn.info> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.141 X-Spam-Score: -1.6 (-) 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.6 (--) * gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata. [arguments] Add Fix-tzdata-path phase. --- gnu/packages/xfce.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 1a6de2e781..13a4cfd6ef 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -37,6 +37,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu artwork) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) #:use-module (gnu packages pkg-config) @@ -309,6 +310,15 @@ management D-Bus specification.") "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'Fix-tzdata-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append "plugins/clock/clock.c") + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zonei= nfo"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) @@ -317,7 +327,8 @@ management D-Bus specification.") `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.= pc ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.= pc (inputs - `(("exo" ,exo) + `(("tzdata" ,tzdata) ;; For Fix-tzdata-path phase only. + ("exo" ,exo) ("gtk+-2" ,gtk+-2) ("xfconf" ,xfconf) ("garcon" ,garcon) --=20 2.22.0 From unknown Mon Jun 23 09:41:00 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: L p R n d n Subject: bug#37275: closed (Re: [bug#37275] [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path.) Message-ID: References: <87blvxawai.fsf@gnu.org> <20190902140659.2506-1-guix@lprndn.info> X-Gnu-PR-Message: they-closed 37275 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 37275@debbugs.gnu.org Date: Fri, 06 Sep 2019 22:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1567809302-3096-1" This is a multi-part message in MIME format... ------------=_1567809302-3096-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37275: [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path. 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 37275@debbugs.gnu.org. --=20 37275: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37275 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1567809302-3096-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37275-done) by debbugs.gnu.org; 6 Sep 2019 22:34:54 +0000 Received: from localhost ([127.0.0.1]:37427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i6Mog-0000nX-9F for submit@debbugs.gnu.org; Fri, 06 Sep 2019 18:34:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i6Moe-0000nH-BY for 37275-done@debbugs.gnu.org; Fri, 06 Sep 2019 18:34:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i6MoZ-0006Nj-6X; Fri, 06 Sep 2019 18:34:47 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=42170 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1i6MoY-0007Lh-DR; Fri, 06 Sep 2019 18:34:46 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: L p R n d n Subject: Re: [bug#37275] [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path. References: <20190902140659.2506-1-guix@lprndn.info> Date: Sat, 07 Sep 2019 00:34:45 +0200 In-Reply-To: <20190902140659.2506-1-guix@lprndn.info> (L. p. R. n. d. n.'s message of "Mon, 2 Sep 2019 16:06:59 +0200") Message-ID: <87blvxawai.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37275-done Cc: 37275-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 (---) L p R n d n skribis: > * gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata. > [arguments] Add Fix-tzdata-path phase. I made the phase name lowercase and applied, thanks! ------------=_1567809302-3096-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 14:07:17 +0000 Received: from localhost ([127.0.0.1]:58609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzE-0004F2-Jj for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:42939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzC-0004Ev-CF for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56664) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4mz8-0008GT-7z for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_20,RCVD_IN_DNSWL_MED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4mz6-0007gn-6t for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:10 -0400 Received: from mout01.posteo.de ([185.67.36.141]:49860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i4mz6-0007fQ-1o for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:08 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49758160070 for ; Mon, 2 Sep 2019 16:07:06 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 46MX2c5XX4z6tmR for ; Mon, 2 Sep 2019 16:07:04 +0200 (CEST) From: L p R n d n To: guix-patches@gnu.org Subject: [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path. Date: Mon, 2 Sep 2019 16:06:59 +0200 Message-Id: <20190902140659.2506-1-guix@lprndn.info> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.67.36.141 X-Spam-Score: -1.6 (-) 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.6 (--) * gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata. [arguments] Add Fix-tzdata-path phase. --- gnu/packages/xfce.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 1a6de2e781..13a4cfd6ef 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -37,6 +37,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu artwork) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) #:use-module (gnu packages pkg-config) @@ -309,6 +310,15 @@ management D-Bus specification.") "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'Fix-tzdata-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append "plugins/clock/clock.c") + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zonei= nfo"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) @@ -317,7 +327,8 @@ management D-Bus specification.") `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.= pc ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.= pc (inputs - `(("exo" ,exo) + `(("tzdata" ,tzdata) ;; For Fix-tzdata-path phase only. + ("exo" ,exo) ("gtk+-2" ,gtk+-2) ("xfconf" ,xfconf) ("garcon" ,garcon) --=20 2.22.0 ------------=_1567809302-3096-1--