r52171 - in /desktop/experimental/glib2.0/debian: changelog patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sat Mar  4 15:39:06 2017
New Revision: 52171

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52171
Log:
Add patch to make glib-mkenums output more reproducible (Closes: #809152)

Added:
    desktop/experimental/glib2.0/debian/patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=52171&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Sat Mar  4 15:39:06 2017
@@ -40,6 +40,7 @@
       libraries to be imported by the gdb hooks, not scripts.
     - Don't generate a ldconfig trigger for libglib2.0-tests, which does
       not contain any public shared libraries
+  * Add patch to make glib-mkenums output more reproducible (Closes: #809152)
 
  -- Simon McVittie <smcv at debian.org>  Thu, 02 Mar 2017 09:15:48 +0000
 

Added: desktop/experimental/glib2.0/debian/patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch?rev=52171&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/glib-mkenums-Sort-input-files-for-more-deterministic.patch	[utf-8] Sat Mar  4 15:39:06 2017
@@ -0,0 +1,32 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sat, 4 Mar 2017 15:15:50 +0000
+Subject: glib-mkenums: Sort input files for more deterministic output
+
+This should be helpful for reproducible builds
+<https://reproducible-builds.org/>.
+
+Perl's sorting is not locale-sensitive unless the lexical scope has
+'use locale', which this one does not, so we do not need to force
+locale-agnostic sorting.
+
+Signed-off-by: Simon McVittie <smcv at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=769983
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809152
+Forwarded: yes
+---
+ gobject/glib-mkenums.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
+index f7da97506..219a16615 100755
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -290,6 +290,8 @@ if (length($fhead)) {
+     print "$prod\n";
+ }
+ 
++ at ARGV = sort @ARGV;
++
+ while (<>) {
+     if (eof) {
+ 	close (ARGV);		# reset line numbering

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=52171&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Sat Mar  4 15:39:06 2017
@@ -13,3 +13,4 @@
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
 Install-gdb-Python-helpers-as-data-not-as-executable.patch
+glib-mkenums-Sort-input-files-for-more-deterministic.patch