[med-svn] [Git][med-team/pixelmed-codec][master] d/patches: please make the build reproducible. Closes: #968185

[Mathieu Malaterre]

Mathieu Malaterre pushed to branch master at Debian Med / pixelmed-codec


Commits:
f55ac0c4 by Chris Lamb at 2020-08-18T10:53:18+02:00
d/patches: please make the build reproducible. Closes: #968185

Hi,

Whilst working on the Reproducible Builds effort [0] we noticed that
pixelmed-codec could not be built reproducibly.

This is because recently (?) upstream generated a new imageio .jar
file and my previous patch to ensure that the BUILDDATE file needed to
be updated.

Patch attached that abstracts out the generation and uses it two
places.

 [0] https://reproducible-builds.org/

Regards,

- - - - -


1 changed file:

- debian/patches/reproducible_build.patch


Changes:

=====================================
debian/patches/reproducible_build.patch
=====================================
@@ -1,19 +1,35 @@
 Description: Make the build reproducible
 Author: Chris Lamb <lamby at debian.org>
-Last-Update: 2016-08-11
-Bug-Debian: https://bugs.debian.org/834052
+Last-Update: 2020-08-10
+Bug-Debian: https://bugs.debian.org/834052, https://bugs.debian.org/968185
 
---- a/Makefile
-+++ b/Makefile
-@@ -67,7 +67,11 @@ metainf:
+Index: pixelmed-codec/Makefile
+===================================================================
+--- pixelmed-codec.orig/Makefile
++++ pixelmed-codec/Makefile
+@@ -65,16 +65,21 @@ metainf:
+ 	rm -f META-INF/services/javax.imageio.spi.ImageReaderSpi
+ 	echo >META-INF/services/javax.imageio.spi.ImageReaderSpi "com.pixelmed.imageio.JPEGLosslessImageReaderSpi"
  
- pixelmed_codec.jar:
- 	(cd com/pixelmed/codec/jpeg; make all)
+-pixelmed_codec.jar:
++BUILDDATE:
 +ifdef SOURCE_DATE_EPOCH
-+	LC_ALL=C date --utc --date="@$$SOURCE_DATE_EPOCH" >BUILDDATE
++	LC_ALL=C date --utc --date="@$$SOURCE_DATE_EPOCH" >$@
 +else
- 	date >BUILDDATE
++	date >$@
 +endif
++
++pixelmed_codec.jar: BUILDDATE
+ 	(cd com/pixelmed/codec/jpeg; make all)
+-	date >BUILDDATE
  	jar -cvf $@ BUILDDATE COPYRIGHT \
  		com/pixelmed/codec/jpeg/*.class
  
+-pixelmed_imageio.jar:	metainf
++pixelmed_imageio.jar: metainf BUILDDATE
+ 	(cd com/pixelmed/codec/jpeg; make all)
+ 	(cd com/pixelmed/imageio; make all)
+-	date >BUILDDATE
+ 	jar -cvf $@ BUILDDATE COPYRIGHT \
+ 		META-INF/services/javax.imageio.spi.ImageReaderSpi \
+ 		com/pixelmed/codec/jpeg/*.class \



View it on GitLab: https://salsa.debian.org/med-team/pixelmed-codec/-/commit/f55ac0c4c4694b8e320ce6cc5604659ca4dfb145

-- 
View it on GitLab: https://salsa.debian.org/med-team/pixelmed-codec/-/commit/f55ac0c4c4694b8e320ce6cc5604659ca4dfb145
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200818/fc04423d/attachment-0001.html>