From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>,67473@debbugs.gnu.org
Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com
Subject: [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5.
Date: Fri, 24 Nov 2023 23:31:31 +0100 [thread overview]
Message-ID: <d1051ab481cb82a22f3fb02ae867c311ebd4c992.1701174883.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
* 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 <vagrant@reproducible-builds.org>
-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
next prev parent reply other threads:[~2023-11-28 12:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
2023-11-14 11:35 ` [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
2023-11-14 20:17 ` [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0 Vivien Kraus via Guix-patches via
2023-11-23 18:22 ` [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38 Vivien Kraus via Guix-patches via
2023-11-23 18:32 ` [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
2023-11-23 23:37 ` [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3 Vivien Kraus via Guix-patches via
2023-11-23 23:58 ` [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4 Vivien Kraus via Guix-patches via
2023-11-24 22:31 ` Vivien Kraus via Guix-patches via [this message]
2023-11-26 15:18 ` [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3 Vivien Kraus via Guix-patches via
2023-11-26 18:01 ` [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1 Vivien Kraus via Guix-patches via
2023-11-26 18:02 ` [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: " Vivien Kraus via Guix-patches via
2023-11-28 7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
2023-11-28 20:05 ` Liliana Marie Prikler
2023-11-28 21:26 ` Vivien Kraus via Guix-patches via
2023-11-29 5:21 ` Liliana Marie Prikler
2023-11-29 6:25 ` Vivien Kraus via Guix-patches via
2023-11-29 16:22 ` Liliana Marie Prikler
2023-12-04 1:24 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1051ab481cb82a22f3fb02ae867c311ebd4c992.1701174883.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=67473@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.