[debian-edu-commits] debian-edu/pkg-team/ 01/01: Sort lists generated from globbing expressions

Javier Serrano Polo jasp00-guest at moszumanska.debian.org
Tue Jun 7 23:36:29 UTC 2016


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

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

commit 0be6c45c2094d6d2bbd0d4b74d3f587f1b83d247
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Wed Jun 8 01:31:07 2016 +0200

    Sort lists generated from globbing expressions
---
 debian/changelog                     |   7 ++
 debian/patches/series                |   1 +
 debian/patches/sort-glob.patch       | 164 +++++++++++++++++++++++++++++++++++
 debian/patches/sync-socket.patch     |   1 +
 debian/patches/wine-buildflags.patch |   1 +
 debian/patches/wine-runpath.patch    |   1 +
 6 files changed, 175 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 66a6dfa..bd4aa8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lmms (1.1.3-4) unstable; urgency=medium
+
+  [ Javier Serrano Polo ]
+  * Sort lists generated from globbing expressions (reproducibility).
+
+ -- Javier Serrano Polo <javier at jasp.net>  Wed, 08 Jun 2016 01:25:37 +0200
+
 lmms (1.1.3-3) unstable; urgency=medium
 
   [ Javier Serrano Polo ]
diff --git a/debian/patches/series b/debian/patches/series
index 0effbec..dedcee2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ useless-deps.patch
 switch-pulse.patch
 license-gpl3.patch
 copyright-fixes.patch
+sort-glob.patch
diff --git a/debian/patches/sort-glob.patch b/debian/patches/sort-glob.patch
new file mode 100644
index 0000000..af96e1e
--- /dev/null
+++ b/debian/patches/sort-glob.patch
@@ -0,0 +1,164 @@
+Description: Sort lists generated from globbing expressions
+ LMMS does not build reproducibly
+ (https://reproducible.debian.net/rb-pkg/lmms.html). One identified issue is
+ that lists from FILE(GLOB ...) are not deterministic. This patch sorts those
+ lists. This issue does not affect CMake after version 3.5.2.
+Author: Javier Serrano Polo <javier at jasp.net>
+Forwarded: https://github.com/LMMS/lmms/pull/2829
+
+Index: lmms-1.1.3/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/CMakeLists.txt	2016-06-07 18:45:19.000000000 +0200
++++ lmms-1.1.3/CMakeLists.txt	2016-06-07 18:49:57.000000000 +0200
+@@ -359,8 +359,11 @@
+ FILE(REMOVE include/lmmsconfig.h)
+ 
+ FILE(GLOB lmms_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
++LIST(SORT lmms_INCLUDES)
+ FILE(GLOB lmms_UI "${CMAKE_SOURCE_DIR}/src/gui/dialogs/*.ui" "${CMAKE_SOURCE_DIR}/src/gui/Forms/*.ui")
++LIST(SORT lmms_UI)
+ FILE(GLOB_RECURSE lmms_SOURCES "${CMAKE_SOURCE_DIR}/src/*.cpp")
++LIST(SORT lmms_SOURCES)
+ 
+ SET(lmms_MOC ${lmms_INCLUDES})
+ 
+@@ -518,6 +521,7 @@
+ # rules for building localizations
+ #
+ FILE(GLOB lmms_LOCALES data/locale/*.ts)
++LIST(SORT lmms_LOCALES)
+ SET(ts_targets "")
+ SET(qm_targets "")
+ FOREACH(_ts_file ${lmms_LOCALES})
+@@ -558,6 +562,7 @@
+ 		FILE(GLOB ZASF_BINARIES
+ 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll"
+ 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe")
++		LIST(SORT ZASF_BINARIES)
+ 		INSTALL(FILES "${ZASF_BINARIES}" DESTINATION "${PLUGIN_DIR}")
+ 	ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/extras")
+ ENDIF(LMMS_BUILD_WIN32)
+Index: lmms-1.1.3/cmake/modules/InstallHelpers.cmake
+===================================================================
+--- lmms-1.1.3.orig/cmake/modules/InstallHelpers.cmake	2016-06-07 18:51:31.000000000 +0200
++++ lmms-1.1.3/cmake/modules/InstallHelpers.cmake	2016-06-07 18:53:15.000000000 +0200
+@@ -23,6 +23,7 @@
+ MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
+ 	FOREACH(_wildcard ${_wildcards})
+ 		FILE(GLOB_RECURSE files ${_wildcard})
++		LIST(SORT files)
+ 		SET(SUBDIRS)
+ 
+ 		FOREACH(_item ${files})
+@@ -36,6 +37,7 @@
+ 
+ 		FOREACH(_item ${SUBDIRS})
+ 			FILE(GLOB files "${_item}/${_wildcard}")
++			LIST(SORT files)
+ 			FOREACH(_file ${files})
+ 				INSTALL(FILES "${_file}" DESTINATION "${LMMS_DATA_DIR}/${_subdir}/${_item}/")
+ 			ENDFOREACH(_file ${files})
+Index: lmms-1.1.3/data/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/data/CMakeLists.txt	2016-06-07 18:59:02.000000000 +0200
++++ lmms-1.1.3/data/CMakeLists.txt	2016-06-07 18:59:31.000000000 +0200
+@@ -16,6 +16,7 @@
+ 
+ IF(LMMS_BUILD_WIN32)
+    FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw")
++   LIST(SORT RAWWAVES)
+    INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+Index: lmms-1.1.3/data/backgrounds/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/data/backgrounds/CMakeLists.txt	2016-06-07 18:55:45.000000000 +0200
++++ lmms-1.1.3/data/backgrounds/CMakeLists.txt	2016-06-07 18:58:39.000000000 +0200
+@@ -1,2 +1,3 @@
+ FILE(GLOB PNG_FILES *.png)
++LIST(SORT PNG_FILES)
+ INSTALL(FILES ${PNG_FILES} DESTINATION "${LMMS_DATA_DIR}/backgrounds")
+Index: lmms-1.1.3/data/locale/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/data/locale/CMakeLists.txt	2016-06-07 19:01:38.000000000 +0200
++++ lmms-1.1.3/data/locale/CMakeLists.txt	2016-06-07 19:02:22.000000000 +0200
+@@ -1,6 +1,8 @@
+ FILE(GLOB QM_FILES *.qm)
++LIST(SORT QM_FILES)
+ IF(LMMS_BUILD_WIN32)
+ 	FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm")
++	LIST(SORT QT_QM_FILES)
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+ INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION "${LMMS_DATA_DIR}/locale")
+Index: lmms-1.1.3/data/wavetables/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/data/wavetables/CMakeLists.txt	2016-06-07 18:59:45.000000000 +0200
++++ lmms-1.1.3/data/wavetables/CMakeLists.txt	2016-06-07 19:00:01.000000000 +0200
+@@ -1,2 +1,3 @@
+ FILE(GLOB WAVETABLES *.bin)
++LIST(SORT WAVETABLES)
+ INSTALL(FILES ${WAVETABLES} DESTINATION "${LMMS_DATA_DIR}/wavetables")
+Index: lmms-1.1.3/plugins/LadspaEffect/calf/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/calf/CMakeLists.txt	2016-06-07 19:08:55.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/calf/CMakeLists.txt	2016-06-07 19:09:19.000000000 +0200
+@@ -1,4 +1,5 @@
+ FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
++LIST(SORT SOURCES)
+ ADD_LIBRARY(calf MODULE ${SOURCES})
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include"
+                     "${CMAKE_BINARY_DIR}"
+Index: lmms-1.1.3/plugins/LadspaEffect/caps/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/caps/CMakeLists.txt	2016-06-07 19:09:49.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/caps/CMakeLists.txt	2016-06-07 19:10:10.000000000 +0200
+@@ -1,5 +1,6 @@
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
+ FILE(GLOB SOURCES *.cc)
++LIST(SORT SOURCES)
+ ADD_LIBRARY(caps MODULE ${SOURCES})
+ INSTALL(TARGETS caps LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
+ IF(LMMS_BUILD_WIN64)
+Index: lmms-1.1.3/plugins/LadspaEffect/cmt/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/cmt/CMakeLists.txt	2016-06-07 19:05:03.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/cmt/CMakeLists.txt	2016-06-07 19:06:01.000000000 +0200
+@@ -1,5 +1,6 @@
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
+ FILE(GLOB_RECURSE SOURCES src/*.cpp)
++LIST(SORT SOURCES)
+ ADD_LIBRARY(cmt MODULE ${SOURCES})
+ INSTALL(TARGETS cmt LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
+ 
+Index: lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/CMakeLists.txt	2016-06-07 19:08:00.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt	2016-06-07 19:08:32.000000000 +0200
+@@ -5,6 +5,7 @@
+                     "${CMAKE_BINARY_DIR}")
+ LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
+ FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c")
++LIST(SORT PLUGIN_SOURCES)
+ 
+ FOREACH(_item ${PLUGIN_SOURCES})
+ 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
+@@ -49,6 +50,7 @@
+ TARGET_LINK_LIBRARIES(notch_iir_1894 iir)
+ 
+ FILE(GLOB GSM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/gsm/*.c")
++LIST(SORT GSM_SOURCES)
+ ADD_LIBRARY(gsm STATIC ${GSM_SOURCES})
+ SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
+ TARGET_LINK_LIBRARIES(gsm_1215 gsm)
+Index: lmms-1.1.3/plugins/LadspaEffect/tap/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/LadspaEffect/tap/CMakeLists.txt	2016-06-07 19:06:27.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/tap/CMakeLists.txt	2016-06-07 19:06:51.000000000 +0200
+@@ -1,5 +1,6 @@
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
+ FILE(GLOB PLUGIN_SOURCES *.c)
++LIST(SORT PLUGIN_SOURCES)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math")
+ FOREACH(_item ${PLUGIN_SOURCES})
+ 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
diff --git a/debian/patches/sync-socket.patch b/debian/patches/sync-socket.patch
index 35b05dc..eb34591 100644
--- a/debian/patches/sync-socket.patch
+++ b/debian/patches/sync-socket.patch
@@ -4,6 +4,7 @@ Description: Synchronize with remote plugins using local sockets
 Author: Javier Serrano Polo <javier at jasp.net>
 Bug-Debian: https://bugs.debian.org/763720
 Forwarded: https://github.com/LMMS/lmms/pull/2739
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/include/RemotePlugin.h
 ===================================================================
diff --git a/debian/patches/wine-buildflags.patch b/debian/patches/wine-buildflags.patch
index 76a0368..68c34e0 100644
--- a/debian/patches/wine-buildflags.patch
+++ b/debian/patches/wine-buildflags.patch
@@ -4,6 +4,7 @@ Description: Pass build flags to wineg++
  optimization does not work.
 Author: Javier Serrano Polo <javier at jasp.net>
 Forwarded: https://github.com/LMMS/lmms/pull/2746
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/CMakeLists.txt
 ===================================================================
diff --git a/debian/patches/wine-runpath.patch b/debian/patches/wine-runpath.patch
index 7b98cdf..5460982 100644
--- a/debian/patches/wine-runpath.patch
+++ b/debian/patches/wine-runpath.patch
@@ -4,6 +4,7 @@ Description: Define RUNPATH to find wine library
 Author: Javier Serrano Polo <javier at jasp.net>
 Bug-Debian: https://bugs.debian.org/763720
 Forwarded: https://github.com/LMMS/lmms/pull/2746
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/plugins/vst_base/CMakeLists.txt
 ===================================================================

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



More information about the debian-edu-commits mailing list