[debian-edu-commits] debian-edu/pkg-team/ 02/03: Sort plug-in embedded resources

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 1f58e311f234eccd8cfb3db7b0b3c5def9f372ba
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Sat Sep 3 21:07:12 2016 +0200

    Sort plug-in embedded resources
---
 debian/changelog                    |  1 +
 debian/patches/series               |  1 +
 debian/patches/sort-resources.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2e4b77e..82784b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lmms (1.1.3-5) unstable; urgency=medium
 
   [ Javier Serrano Polo ]
   * Add Wine stable path to PATH, otherwise wine package would be required.
+  * Sort plug-in embedded resources (reproducibility).
 
  -- Javier Serrano Polo <javier at jasp.net>  Sat, 03 Sep 2016 17:31:05 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f49af34..400fc8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ sort-glob.patch
 contributors.patch
 honor-contributors.patch
 no-file.patch
+sort-resources.patch
diff --git a/debian/patches/sort-resources.patch b/debian/patches/sort-resources.patch
new file mode 100644
index 0000000..ff2eac7
--- /dev/null
+++ b/debian/patches/sort-resources.patch
@@ -0,0 +1,29 @@
+Description: Sort plug-in embedded resources
+ Plug-ins declare embedded resources by using wildcards. The generation uses
+ shell expansion; with Bash, it depends on locale, hindering reproducible
+ builds.
+Author: Javier Serrano Polo <javier at jasp.net>
+
+Index: lmms-1.1.3/cmake/modules/BuildPlugin.cmake
+===================================================================
+--- lmms-1.1.3.orig/cmake/modules/BuildPlugin.cmake	2016-09-03 18:37:36.000000000 +0200
++++ lmms-1.1.3/cmake/modules/BuildPlugin.cmake	2016-09-03 20:38:29.000000000 +0200
+@@ -60,6 +60,18 @@
+ 
+ 	LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN)
+ 	IF(ER_LEN)
++		# Expand and sort arguments to avoid locale dependent sorting in
++		# shell
++		SET(NEW_ARGS)
++		FOREACH(ARG ${PLUGIN_EMBEDDED_RESOURCES})
++			FILE(GLOB EXPANDED "${ARG}")
++			LIST(SORT EXPANDED)
++			FOREACH(ITEM ${EXPANDED})
++				LIST(APPEND NEW_ARGS ${ITEM})
++			ENDFOREACH()
++		ENDFOREACH()
++		SET(PLUGIN_EMBEDDED_RESOURCES ${NEW_ARGS})
++
+ 		SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
+ 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
+ 			COMMAND ${BIN2RES}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git