Control: tags 828876 pending On 2022-10-06, Vagrant Cascadian wrote: > On 2016-06-28, Reiner Herrmann wrote: >> While working on the "reproducible builds" effort [1], we have noticed >> that ario could not be built reproducibly. >> It embeds the current year into the binary. >> >> The attached patch replaces it with a static value. > > I can confirm this patch is still needed, but when I tried applying this > patch, it fails to build asking for automake-1.15 (which is no longer in > debian, but automake-1.16 is): > > Making all in src > make[3]: Entering directory '/<<PKGBUILDDIR>>/src' > cd .. && /bin/bash /<<PKGBUILDDIR>>/missing automake-1.15 --foreign > src/Makefile > /<<PKGBUILDDIR>>/missing: line 81: automake-1.15: command not found > WARNING: 'automake-1.15' is missing on your system. > You should only need it if you modified 'Makefile.am' or > 'configure.ac' or m4 files included by 'configure.ac'. > > Struggling to figure out how to get cdbs to actually regenerate the > files with a newer automake...
Fixed this by adding support for dh-autoreconf. Uploaded an NMU fixing this to DELAYED/10: diff -Nru ario-1.6/debian/changelog ario-1.6/debian/changelog --- ario-1.6/debian/changelog 2021-01-02 09:54:20.000000000 -0800 +++ ario-1.6/debian/changelog 2022-12-22 10:45:30.000000000 -0800 @@ -1,3 +1,16 @@ +ario (1.6-1.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Reiner Herrmann ] + * Replace current year with static value to get reproducible build + (Closes: #828876) + + [ Vagrant Cascadian ] + * Use dh-autoreconf. + + -- Vagrant Cascadian <vagr...@debian.org> Thu, 22 Dec 2022 10:45:30 -0800 + ario (1.6-1.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -Nru ario-1.6/debian/control ario-1.6/debian/control --- ario-1.6/debian/control 2018-01-14 14:06:03.000000000 -0800 +++ ario-1.6/debian/control 2022-12-22 10:45:30.000000000 -0800 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Marc Pavot <marc.pa...@gmail.com> -Build-Depends: debhelper (>=9), cdbs, autotools-dev, libgtk-3-dev, libglib2.0-dev, libxml2-dev, libcurl4-gnutls-dev, intltool, libavahi-client-dev, libavahi-glib-dev, libdbus-glib-1-dev, libtagc0-dev, libmpdclient-dev, +Build-Depends: debhelper (>=9), dh-autoreconf, cdbs, autotools-dev, libgtk-3-dev, libglib2.0-dev, libxml2-dev, libcurl4-gnutls-dev, intltool, libavahi-client-dev, libavahi-glib-dev, libdbus-glib-1-dev, libtagc0-dev, libmpdclient-dev, Standards-Version: 4.1.3 Homepage: http://ario-player.sourceforge.net/ diff -Nru ario-1.6/debian/patches/replace-current-year-with-static-value-t.patch ario-1.6/debian/patches/replace-current-year-with-static-value-t.patch --- ario-1.6/debian/patches/replace-current-year-with-static-value-t.patch 1969-12-31 16:00:00.000000000 -0800 +++ ario-1.6/debian/patches/replace-current-year-with-static-value-t.patch 2022-12-22 10:45:30.000000000 -0800 @@ -0,0 +1,36 @@ +From: Reiner Herrmann <rei...@reiner-h.de> +Date: Tue, 28 Jun 2016 20:57:58 +0200 +X-Dgit-Generated: 1.6-1.2 ee49d4c2ad945b1ccb14656dba223bd01cc15557 +Subject: Replace current year with static value to get reproducible build + +(Closes: #828876) + +--- + +diff --git a/src/Makefile.am b/src/Makefile.am +index 64f2fef..c6a855e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -206,8 +206,7 @@ AM_CPPFLAGS = \ + -DDATA_PATH=\""$(pkgdatadir)/data/"\"\ + -DUI_PATH=\""$(pkgdatadir)/ui/"\"\ + -DARIO_PLUGIN_DIR=\"$(PLUGINDIR)\"\ +- -DARIO_PLUGIN_DATA_DIR=\"$(PLUGIN_DATA_DIR)\"\ +- -DCURRENT_DATE="\"`date +%G`\"" ++ -DARIO_PLUGIN_DATA_DIR=\"$(PLUGIN_DATA_DIR)\" + + if MPD_GLIB + AM_CPPFLAGS += -DMPD_GLIB +diff --git a/src/shell/ario-shell.c b/src/shell/ario-shell.c +index a9cb4fa..b6422e7 100644 +--- a/src/shell/ario-shell.c ++++ b/src/shell/ario-shell.c +@@ -665,7 +665,7 @@ ario_shell_cmd_about (GSimpleAction *action, + "name", "Ario", + "program-name", "Ario", + "version", PACKAGE_VERSION, +- "copyright", "Copyright \xc2\xa9 2005-" CURRENT_DATE " Marc Pavot", ++ "copyright", "Copyright \xc2\xa9 2005-2011 Marc Pavot", + "comments", _("GTK client for MPD"), + "translator-credits", _("translator-credits"), + "authors", (const char **) authors, diff -Nru ario-1.6/debian/patches/series ario-1.6/debian/patches/series --- ario-1.6/debian/patches/series 2018-01-14 14:06:03.000000000 -0800 +++ ario-1.6/debian/patches/series 2022-12-22 10:45:30.000000000 -0800 @@ -0,0 +1 @@ +replace-current-year-with-static-value-t.patch diff -Nru ario-1.6/debian/rules ario-1.6/debian/rules --- ario-1.6/debian/rules 2013-05-18 10:26:19.000000000 -0700 +++ ario-1.6/debian/rules 2022-12-22 10:45:30.000000000 -0800 @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/gnome.mk # exclude plugins from shlibs generation
signature.asc
Description: PGP signature
