From patchwork Fri Nov 24 22:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56813 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C4FD027BBEA; Fri, 24 Nov 2023 22:39:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A335C27BBE2 for ; Fri, 24 Nov 2023 22:39:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6ep9-0002OT-Q4; Fri, 24 Nov 2023 17:38: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 1r6ep8-0002OL-JB for guix-patches@gnu.org; Fri, 24 Nov 2023 17: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 1r6ep8-0000hK-Ah for guix-patches@gnu.org; Fri, 24 Nov 2023 17:38:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6epC-0000Cw-LX for guix-patches@gnu.org; Fri, 24 Nov 2023 17:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67437] [PATCH qa-frontpage] gnu: mm-common: Update to 1.0.5. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Nov 2023 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67437 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67437@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1700865522763 (code B ref -1); Fri, 24 Nov 2023 22:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2023 22:38:42 +0000 Received: from localhost ([127.0.0.1]:37443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6eop-0000C2-9Z for submit@debbugs.gnu.org; Fri, 24 Nov 2023 17:38:42 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6eol-0000BW-0q for submit@debbugs.gnu.org; Fri, 24 Nov 2023 17:38:38 -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 1r6eoa-0002Ls-OV for guix-patches@gnu.org; Fri, 24 Nov 2023 17:38:24 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1r6eoY-0000dc-Nr for guix-patches@gnu.org; Fri, 24 Nov 2023 17:38:24 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e5e1de21; Fri, 24 Nov 2023 22:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=jtBnpn0Kvxc/rT7aJRmhnZi3seY=; b=yCH1DMHeQv0jtethOHqeLcrywBSH hIFKR04JrYYNYsTmxNTS7w8IDI9Xrbn+GMgWNc718LcaYKHKT5AEcOLVo29bzP11 UsPTMFsrKfPE8l90JTZuDTHQOh2DZViTr9HlfUeCD5YmwNMPD1orenR4Z7X5+jgG 2LoXxcavQ8kgsiXBnVQ4fTuQwcq3b99+Gnyx1w1zyskeZj+vY+Y20wxtnmXxHSop qFBcpmyM3EkiA/qtIsRdz1/8+HQIreyQTa5bi8lovGbGq84hoZUm+b9fsCVsmZN5 bXcfA8wxaL77Brt8EK9U7N8UMRIlp3gxLiI+VRJeIhLYXF5YiEglQPX2Fg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1b25ff64 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 24 Nov 2023 22:38:18 +0000 (UTC) Message-ID: <2a14cb5cd483d77444c2c467e425fd516269a855.1700865469.git.vivien@planete-kraus.eu> Date: Fri, 24 Nov 2023 23:31:31 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 Reviewed-by: Maxim Cournoyer --- 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 base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93 diff --git a/gnu/local.mk b/gnu/local.mk index 5cb9874d9f..41bbd2ad0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1659,7 +1659,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 194a443484..f3a1c0d157 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 -