Bug#971420: jhbuild: please make the build reproducible

[Vagrant Cascadian]

Control: tags 971420 pending

On 2020-09-30, Chris Lamb wrote:
> Whilst working on the Reproducible Builds effort [0] we noticed that
> jhbuild could not be built reproducibly.
>
> This is because the /usr/bin/jhbuild binary embedded the absolute
> build to get it's "source" directory. A patch is attached that imports
> the jhbuild module and determines this location programmatically
> instead.

Uploaded an NMU to DELAYED/10 fixing this issue:

diff -Nru jhbuild-3.38.0/debian/changelog jhbuild-3.38.0/debian/changelog
--- jhbuild-3.38.0/debian/changelog	2020-10-11 14:41:31.000000000 -0700
+++ jhbuild-3.38.0/debian/changelog	2022-12-08 14:22:05.000000000 -0800
@@ -1,3 +1,12 @@
+jhbuild (3.38.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Chris Lamb ]
+  * Make the build reproducible (Closes: #971420)
+
+ -- Vagrant Cascadian <vagrant at reproducible-builds.org>  Thu, 08 Dec 2022 14:22:05 -0800
+
 jhbuild (3.38.0-3) unstable; urgency=medium
 
   * Fix typo in python3-distutils dependency.
diff -Nru jhbuild-3.38.0/debian/patches/make-the-build-reproducible-closes-97142.patch jhbuild-3.38.0/debian/patches/make-the-build-reproducible-closes-97142.patch
--- jhbuild-3.38.0/debian/patches/make-the-build-reproducible-closes-97142.patch	1969-12-31 16:00:00.000000000 -0800
+++ jhbuild-3.38.0/debian/patches/make-the-build-reproducible-closes-97142.patch	2022-12-08 14:22:05.000000000 -0800
@@ -0,0 +1,28 @@
+From: Chris Lamb <lamby at debian.org>
+Date: Wed, 30 Sep 2020 10:56:04 +0100
+X-Dgit-Generated: 3.38.0-3.1 420fe3c97b471d30e2ae455f67a1feae60f67b63
+Subject: Make the build reproducible (Closes: #971420)
+
+
+---
+
+diff --git a/scripts/jhbuild.in b/scripts/jhbuild.in
+index a24406f..ae1683f 100644
+--- a/scripts/jhbuild.in
++++ b/scripts/jhbuild.in
+@@ -20,13 +20,10 @@ if USE_CHECKOUT_SRC:
+ else:
+     pkgdatadir = "@pkgdatadir@"
+     datadir = "@datadir@"
+-    srcdir = "@srcdir@"
+     if '@pythondir@' not in sys.path:
+         sys.path.insert(0, '@pythondir@')
+-    try:
+-        import jhbuild
+-    except ImportError:
+-        sys.path.insert(0, srcdir)
++    import jhbuild
++    srcdir = os.path.abspath(os.path.dirname(jhbuild.__file__))
+ 
+ builtins.__dict__['PKGDATADIR'] = pkgdatadir
+ builtins.__dict__['DATADIR'] = datadir
diff -Nru jhbuild-3.38.0/debian/patches/series jhbuild-3.38.0/debian/patches/series
--- jhbuild-3.38.0/debian/patches/series	1969-12-31 16:00:00.000000000 -0800
+++ jhbuild-3.38.0/debian/patches/series	2022-12-08 14:22:05.000000000 -0800
@@ -0,0 +1 @@
+make-the-build-reproducible-closes-97142.patch


live well,
  vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-gnome-maintainers/attachments/20221208/17b57c44/attachment-0001.sig>