From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SLLwLWjfZWUfxgAAauVa8A:P1 (envelope-from ) for ; Tue, 28 Nov 2023 13:39:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SLLwLWjfZWUfxgAAauVa8A (envelope-from ) for ; Tue, 28 Nov 2023 13:39:04 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7559164816 for ; Tue, 28 Nov 2023 13:39:04 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="w CyyDRZ"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701175144; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=j5d2HpaAlrbt7ljyNAzZQfJL6M+Ncr4xq9QqC0LB2MI=; b=EpUlHJCG7TOoKpon6ztUZLc4Q2E474sKeUjwY7JQBg9GS3JzzX4W5TE3fFDnxuO4SomG5s GcHSjOADrgZmvm1s2Rned8bM7oOeLgx4I41MEPDc0PHRGjqi+shgdHDfWWCZyiaJFcOtoX gC5pWkbQaon8UZEYfRSQO4Coi2OUHew2PJpRrgZdYWeA8a5wHI97DaXH2cVDVEE81sghKs MXjJdYJN/IJOWLUeBEhVggPcjFyiP0j4JMbxHTKOZsIy9q9tgXy/yojojn91e/gXtR8YRG OJ3dACbwDjvLeY2TFTVjJ2+8/PDRTFZWI3YhB6gbWnngGj2k6gsk7DHNYq6p/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="w CyyDRZ"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701175144; a=rsa-sha256; cv=none; b=TkjV4aGNoKWiIeyRO607CDL4ZktVTDq/8tx+5mxLMbHhGUQwSHACRnDMfZSE+m2o9kIGVV eROoIslntXLTkiBiQj2fzRVE+ooc+E3GJYg3rtvHW/ttOE/telDHzp/byaXinO8/C1g6Gt rd5LTsDT7tiES9Ed4G30iY9e8PHmTOwthaSXnueytMB7eTCAEWGM9GA9LuF4elj3QENwIT 62XfYo0c6xHE21JS5u4U41QQQ6z8s7fQlRJDzPuiG68eRnppBrHjLdrepBCFGOtMcZgFVz 1djRtbIysAJIZPpDwkINlltlP9FLmo0Ddq/aCuzRNGamIM1LGKlBtn8k1TI8Pw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7xMj-0002Vo-NP; Tue, 28 Nov 2023 07:39:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r7xMg-0002Ku-L7 for guix-patches@gnu.org; Tue, 28 Nov 2023 07:38:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r7xMc-0004P5-Q9 for guix-patches@gnu.org; Tue, 28 Nov 2023 07:38:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7xMj-0007aq-JR for guix-patches@gnu.org; Tue, 28 Nov 2023 07:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 12:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler ,67473@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170117508829098 (code B ref 67473); Tue, 28 Nov 2023 12:39:01 +0000 Received: (at 67473) by debbugs.gnu.org; 28 Nov 2023 12:38:08 +0000 Received: from localhost ([127.0.0.1]:45743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7xLr-0007ZE-LJ for submit@debbugs.gnu.org; Tue, 28 Nov 2023 07:38:08 -0500 Received: from planete-kraus.eu ([89.234.140.182]:42910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7xLl-0007WM-Ic for 67473@debbugs.gnu.org; Tue, 28 Nov 2023 07:38:02 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 5c59f3c4; Tue, 28 Nov 2023 12:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=m3FNDg99VOBfoxbVbMRyE9tgkuM=; b=w CyyDRZemmUNAhFQqdHarym0jiYWvkJwW/f1WzLEqSPjZq61gxcUESBicgOIJVZjD YBkRowk1h6dygXndJ/buNTuBvGicKfYbLtTbVIJwewSNw16Ui4jvNKJUT5eiHfbN xiZ/F56g/jqKGl9Psw5Unr/PKE0VTVgl2Eytdy01PyckkT41bFN8nzor69U+O2Ym kY/hthrI53RT2kil4+xPfFkPfJuDVWxRydzSaNbEYxUQz80j8j4xP4SyF8RGifwP pnLrH8uxZxT7IBd/+5G6us89bCi9WAfI+I9lPX80AWfLmRe7AjPiHvpz9hdeCb52 zjN+lq5UtArWWO9beQFhg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d6c4b187 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 28 Nov 2023 12:37:53 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Fri, 24 Nov 2023 23:31:31 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.13 X-Spam-Score: -4.13 X-Migadu-Queue-Id: 7559164816 X-Migadu-Scanner: mx12.migadu.com X-TUID: RiNmscYzhkwW * gnu/packages/gnome.scm (mm-common): Update to 1.0.5. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. [source]: Remove mm-common-reproducible-tarball.patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete. Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0 --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 31 ++++++-------- .../mm-common-reproducible-tarball.patch | 40 ------------------- 3 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch diff --git a/gnu/local.mk b/gnu/local.mk index 53b4af09f7..3ba93fa1af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1658,7 +1658,6 @@ dist_patch_DATA = \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ - %D%/packages/patches/mm-common-reproducible-tarball.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/mpg321-gcc-10.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 904a8cacfe..8de1f1acf0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1136,7 +1136,7 @@ (define-public metacity (define-public mm-common (package (name "mm-common") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -1144,26 +1144,21 @@ (define-public mm-common "mm-common-" version ".tar.xz")) (sha256 (base32 - "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8")) - (patches - (search-patches - "mm-common-reproducible-tarball.patch")))) + "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "util/mm-common-prepare.in" - (("ln") (search-input-file inputs "/bin/ln")) - (("cp") (search-input-file inputs "/bin/cp")) - (("sed") (search-input-file inputs "/bin/sed")) - (("cat") (search-input-file inputs "/bin/cat")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "util/mm-common-prepare.in" + (("ln") (search-input-file inputs "/bin/ln")) + (("cp") (search-input-file inputs "/bin/cp")) + (("sed") (search-input-file inputs "/bin/sed")) + (("cat") (search-input-file inputs "/bin/cat")))))))) (native-inputs - `(("coreutils" ,coreutils) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("sed" ,sed))) + (list coreutils gettext-minimal pkg-config sed)) (inputs (list python)) (synopsis "Module of GNOME C++ bindings") diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch deleted file mode 100644 index f0890aaf57..0000000000 --- a/gnu/packages/patches/mm-common-reproducible-tarball.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001 -From: Vagrant Cascadian -Date: Sat, 12 Dec 2020 04:05:56 +0000 -Original-Patch: https://bugs.debian.org/977177 -Subject: [PATCH] Set uid, username, gid, and group name on files in - generated tarball. - -The user and group may otherwise vary between builds on different systems. - ---- - util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py -index db9e650..89049b6 100755 ---- a/util/meson_aux/skeletonmm-tarball.py -+++ b/util/meson_aux/skeletonmm-tarball.py -@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'): - else: - mode = 'w' - -+def reproducible(tarinfo): -+ # Set consistent user and group on files in the tar archive -+ tarinfo.uid = 0 -+ tarinfo.uname = 'root' -+ tarinfo.gid = 0 -+ tarinfo.gname = 'root' -+ return tarinfo -+ - with tarfile.open(output_file, mode=mode) as tar_file: - os.chdir(source_dir) # Input filenames are relative to source_dir. - for file in sys.argv[3:]: -- tar_file.add(file) -+ tar_file.add(file, filter=reproducible) - # Errors raise exceptions. If an exception is raised, Meson+ninja will notice - # that the command failed, despite exit(0). - sys.exit(0) --- -2.29.2 - -- 2.41.0