rpm/rosegarden
SHA256
1
0
Fork 0
forked from pool/rosegarden
Code Pull Requests Activity

Accepting request 518991 from multimedia:apps

Browse Source 
fix build against cmake-3.9.0

OBS-URL: https://build.opensuse.org/request/show/518991
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rosegarden?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2017-08-28 13:18:27 +00:00 committed by Git OBS Bridge
commit 4269e617e6
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rosegarden.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Aug 26 15:31:47 UTC 2017 - davejplater@gmail.com
- 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.
-------------------------------------------------------------------
Fri Apr 21 16:32:14 UTC 2017 - davejplater@gmail.com

10
rosegarden.spec
View File

@ -29,6 +29,8 @@ Source2: %{name}.1
Patch1: rosegarden-10.10-filepaths.patch
# PATCH-FIX-OPENSUSE ledest@gmail.com 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: ladspa-devel
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(Qt5Widgets)
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 @@ See the changelog for details.
%setup -q
%patch1
%patch2
%patch3 -p1
# When we build svn we need to execute bootstrap.sh
#sh bootstrap.sh
@ -100,11 +99,10 @@ export CXXFLAGS="$CFLAGS"
# 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

18
svnheader.patch Normal file
View File

@ -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@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)