[debian-edu-commits] debian-edu/pkg-team/ 01/01: Build with install RUNPATH

[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 64d12fcde0101caaaef9ea0329fd3ee42ff6da75
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Tue Sep 6 23:18:15 2016 +0200

    Build with install RUNPATH
---
 debian/changelog                     |  7 +++++++
 debian/patches/install-runpath.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/patches/sort-resources.patch  |  1 +
 4 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e986f0..bab2be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lmms (1.1.3-6) unstable; urgency=medium
+
+  [ Javier Serrano Polo ]
+  * Build with install RUNPATH (reproducibility).
+
+ -- Javier Serrano Polo <javier at jasp.net>  Tue, 06 Sep 2016 22:44:55 +0200
+
 lmms (1.1.3-5) unstable; urgency=medium
 
   [ Javier Serrano Polo ]
diff --git a/debian/patches/install-runpath.patch b/debian/patches/install-runpath.patch
new file mode 100644
index 0000000..b3be927
--- /dev/null
+++ b/debian/patches/install-runpath.patch
@@ -0,0 +1,32 @@
+Description: Build with install RUNPATH
+ CMake builds setting RUNPATH to the build path by default; on install, RUNPATH
+ is changed without rebuilding. This behavior is not suitable for reproducible
+ builds, because the BuildID and RUNPATH size depend on the build path.
+ .
+ This patch will not be necessary since version 1.1.91.
+Author: Javier Serrano Polo <javier at jasp.net>
+
+Index: lmms-1.1.3/plugins/VstEffect/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/VstEffect/CMakeLists.txt	2016-09-06 22:49:42.000000000 +0200
++++ lmms-1.1.3/plugins/VstEffect/CMakeLists.txt	2016-09-06 22:52:22.000000000 +0200
+@@ -3,6 +3,7 @@
+ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
+ LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
+ LINK_LIBRARIES(-lvstbase -Wl,--enable-new-dtags)
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+ BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+ SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
+Index: lmms-1.1.3/plugins/vestige/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/vestige/CMakeLists.txt	2016-09-06 22:49:42.000000000 +0200
++++ lmms-1.1.3/plugins/vestige/CMakeLists.txt	2016-09-06 22:52:03.000000000 +0200
+@@ -3,6 +3,7 @@
+    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
+    LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
+    LINK_LIBRARIES(-lvstbase -Wl,--enable-new-dtags)
++   SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+    SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+    BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+    ADD_DEPENDENCIES(vestige vstbase)
diff --git a/debian/patches/series b/debian/patches/series
index 400fc8e..1c3c50a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ contributors.patch
 honor-contributors.patch
 no-file.patch
 sort-resources.patch
+install-runpath.patch
diff --git a/debian/patches/sort-resources.patch b/debian/patches/sort-resources.patch
index ff2eac7..a505892 100644
--- a/debian/patches/sort-resources.patch
+++ b/debian/patches/sort-resources.patch
@@ -3,6 +3,7 @@ Description: Sort plug-in embedded resources
  shell expansion; with Bash, it depends on locale, hindering reproducible
  builds.
 Author: Javier Serrano Polo <javier at jasp.net>
+Bug: https://github.com/LMMS/lmms/pull/3014
 
 Index: lmms-1.1.3/cmake/modules/BuildPlugin.cmake
 ===================================================================

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