Hello community, here is the log from the commit of package rosegarden for openSUSE:Factory checked in at 2017-08-28 15:18:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rosegarden (Old) and /work/SRC/openSUSE:Factory/.rosegarden.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rosegarden" Mon Aug 28 15:18:27 2017 rev:29 rq:518991 version:17.04 Changes: -------- --- /work/SRC/openSUSE:Factory/rosegarden/rosegarden.changes 2017-05-27 13:13:51.993663764 +0200 +++ /work/SRC/openSUSE:Factory/.rosegarden.new/rosegarden.changes 2017-08-28 15:19:36.628109383 +0200 @@ -1,0 +2,7 @@ +Sat Aug 26 15:31:47 UTC 2017 - [email protected] + +- Work around cmake-3.9.0 bug with upstream patch svnheader.patch +- See https://sourceforge.net/p/rosegarden/bugs/1552/ and + https://gitlab.kitware.com/cmake/cmake/issues/17222. + +------------------------------------------------------------------- New: ---- svnheader.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rosegarden.spec ++++++ --- /var/tmp/diff_new_pack.LbQZWy/_old 2017-08-28 15:19:38.199888501 +0200 +++ /var/tmp/diff_new_pack.LbQZWy/_new 2017-08-28 15:19:38.211886815 +0200 @@ -29,6 +29,8 @@ Patch1: rosegarden-10.10-filepaths.patch # PATCH-FIX-OPENSUSE [email protected] fix bashisms in scripts Patch2: rosegarden-14.02-fix-bashisms.patch +# PATCH-FIX-UPSTREAM see header - Fix cmake-3.9.0 build failure +Patch3: svnheader.patch BuildRequires: alsa-devel BuildRequires: cmake >= 2.8.12 BuildRequires: dssi-devel @@ -40,7 +42,6 @@ BuildRequires: libjack-devel BuildRequires: liblo-devel BuildRequires: liblrdf-devel -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) @@ -49,9 +50,6 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Test) BuildRequires: cmake(Qt5LinguistTools) -%else -BuildRequires: libqt4-devel >= 4.6.3 -%endif BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: lilypond @@ -88,6 +86,7 @@ %setup -q %patch1 %patch2 +%patch3 -p1 # When we build svn we need to execute bootstrap.sh #sh bootstrap.sh @@ -100,11 +99,10 @@ # Now uses cmake #%%configure --enable-debug --localedir=%%{_datadir}/%%{name}/locale/ %cmake \ -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 -DUSE_QT5:BOOL=ON \ -%endif -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/locale/ +#make svnheader make %{?_smp_mflags} %install ++++++ svnheader.patch ++++++ 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 <[email protected]> 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)
