[SCM] rosegarden/master: Fix deps for svnversion.h to keep cmake happy

stuart at users.alioth.debian.org stuart at users.alioth.debian.org
Sun Aug 27 23:25:58 UTC 2017


The following commit has been merged in the master branch:
commit 864c7a16fa2869e6ac5f4644832f1facfe5cf190
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Aug 28 00:35:27 2017 +1000

    Fix deps for svnversion.h to keep cmake happy
    
    incorrect dep causes race condition in parallel builds and so the package
    FTBFS.
    
    (Closes: #871213)

diff --git a/debian/patches/series b/debian/patches/series
index 722dd0e..77d5caa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+svnheader.patch
 fix-mime-types.patch
diff --git a/debian/patches/svnheader.patch b/debian/patches/svnheader.patch
new file mode 100644
index 0000000..bc587a7
--- /dev/null
+++ b/debian/patches/svnheader.patch
@@ -0,0 +1,18 @@
+Description: fix svnversion.h dependency to permit parallel building
+ With CMake 3.9.1 and parallel building enabled, the incorrect specification
+ of the output filename when creating svnversion.h can lead to a race condition
+ such that the package fails to build.
+Author: Stuart Prescott <stuart at debian.org>
+Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
+Bug-Debian: https://bugs.debian.org/871213
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -810,7 +810,7 @@
+ add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
+ 
+ # creates svnheader.h using cmake script
+-add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
++add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+     COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+                          -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
+ 

-- 
rosegarden packaging



More information about the pkg-multimedia-commits mailing list