From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mDUtCtbIbGX5aQAA9RJhRA:P1 (envelope-from ) for ; Sun, 03 Dec 2023 19:28:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mDUtCtbIbGX5aQAA9RJhRA (envelope-from ) for ; Sun, 03 Dec 2023 19:28:38 +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 DA6873AE97 for ; Sun, 3 Dec 2023 19:28:37 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="G 0R5fQq"; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701628118; 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=l41fKMRibOFaxOGRYH3/EbgM+/UvjC5063/7XY/+bpU=; b=iF1gANWElCeIxmWYaDIU1LEhCStpR5TzSg+dV4JlTZhpyCFtrhpGIV4B/V3NOrYE2wfYWx N8HPcrt+SvjkRp1rPKhIr9ulwAQItNiZM2DrBzwm3S7ljRR1nXG7UOTKGT4JDaZu0PfBd1 7t04j61f1v6ulLOPwNnh+4x0c0g+xrFdtocNDTxb9u9bWTJS0OYONV+7m99u82/USvKzmR nz6ztGT/yS8i2fiuFfKrJIDSKgSVPpyAvNKHobhTNkYL0IjXHCILjzjGdJK5A1lsWMnXEX du08g62uALpnH6toMD/v5/JgktrCyP1jaa6zvh8K/zNAVL1WUajZzODZW995jw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701628118; a=rsa-sha256; cv=none; b=uL+/IRP38Hofm9AeWEwRf370VsLRVoTjqNIUxMRa0YEOagpvwRFVlZ8mLaCeIPygw+ZJEF 5lvDTeGJDFfQ8FsWWtHzHlcX2kk6hQRmo+91gPDDnFp1kGkdOUzX0VPoY42NP4yEGBFo0I G3THoBA6FiehFaPv3PyFE5zKkKTKtQEQRxwLYQE8pIbjZy97TFrOTYbmjolkc3B0C/BqH9 GpiGr4CYygFGAMuPdTal+BgXyJAKqHTmanjihVVrbmX04y20xLEnOJTSk2h+72Lbajhejx bRWt59vJ8KMEur7ChToMBTf0c4Bsq7btKvwGzOOni7x8IhJDpLUYTDdZigQwMg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="G 0R5fQq"; dmarc=pass (policy=none) header.from=gnu.org; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9rCB-000202-Hz; Sun, 03 Dec 2023 13:27:59 -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 1r9rC8-0001zD-Gq for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:57 -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 1r9rC8-0005g1-0W for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9rCI-0002z3-0r for guix-patches@gnu.org; Sun, 03 Dec 2023 13:28:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v4 11/14] gnu: mm-common: Update to 1.0.5. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Dec 2023 18:28:05 +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 , Maxim Cournoyer , 67473@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170162807711370 (code B ref 67473); Sun, 03 Dec 2023 18:28:05 +0000 Received: (at 67473) by debbugs.gnu.org; 3 Dec 2023 18:27:57 +0000 Received: from localhost ([127.0.0.1]:60883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rC8-0002xK-V5 for submit@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:57 -0500 Received: from planete-kraus.eu ([89.234.140.182]:38778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rC7-0002vA-8U for 67473@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:56 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 622a0bde; Sun, 3 Dec 2023 18:27:43 +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=albinoniB; bh=O1sn+P2PzdfUUUSxn+3IqYSNhC4=; b=G 0R5fQqvhbsRQONdNY4DUm/xMgYStNZk3IZRaTTv6NI7S6vFoFhOKDC8SxyDHMJjD 0JaagPkcKAlBQgU7lN7XowsVlR9Ku3/MmCKySAensDNKIOSYhB4O2IBJlCbgvH2I VOJLCS/8ExCxzymOKJfdN3WQ7lWC5JH2XYMWPX9vCZE2VVFCA5pArTV0jbC3cdFj lg/B/Km2DR/nEjZTIH/6iQ2ZUllHpjd89UHrg1Qz/6W8BFU4pm2OV3/fzf9WvDNG 9Fqd69DI7CKYmTm3A5YQuZ/rkgmTwalggevZPYifeTaQExZ3obtSHMBL38Frb9U4 c6f8Kj2HIsoj+kFNPnHMg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 53d93a01 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 3 Dec 2023 18:27:42 +0000 (UTC) Message-ID: <987a66cc1e82461675bed89b9bf377f6ff4e0aa2.1701626217.git.vivien@planete-kraus.eu> 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -4.15 X-Spam-Score: -4.15 X-Migadu-Queue-Id: DA6873AE97 X-TUID: eA4ENc9F3TNm * 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 977bcbb597..5739a1ab12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1664,7 +1664,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 062d27c8a1..9dd7cf9754 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1140,7 +1140,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/" @@ -1148,26 +1148,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