commit: b11ab4611f22b0e5454cadfcb3969adbf2248a85 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 4 22:09:50 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 4 22:19:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11ab461
media-sound/rosegarden: Fix build w/ cmake-3.9.1 Closes: https://bugs.gentoo.org/625880 Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-sound/rosegarden/Manifest | 2 +- .../files/rosegarden-17.04-cmake-3.9.1.patch | 18 ++++++++++++++++++ media-sound/rosegarden/rosegarden-17.04.ebuild | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest index 4fb3032d2b5..cbae0ae11ff 100644 --- a/media-sound/rosegarden/Manifest +++ b/media-sound/rosegarden/Manifest @@ -3,4 +3,4 @@ DIST rosegarden-13.10.tar.bz2 6355164 SHA256 6c3a1961b75ded3ded634e9c24f194fd483 DIST rosegarden-14.02.tar.bz2 6402898 SHA256 f5d1d78424582326dcde4bb46b521eb25c2b3fd05b98ce3aaf7f2ffd2e9f7cd6 SHA512 ed11482dbb65823186cae4b1532b9e38c75a29e209a97a965521091cc7b6d4fdc32571b30a2be38dee06fd2f516fc924ab1a8e72acaa7212b12dd28d61e224f3 WHIRLPOOL 780edec4c442788e85563d9dc10d36dd2eceadf31b7a865d1e03c3f92623506b354795318e28518dab9335e287d4da3e9a085be80923641588ea4f0c2ab940ee DIST rosegarden-14.12.tar.bz2 6235233 SHA256 f876fbb818326da7f012a01a4d6baf45022dcbb98626e0ce40c67b6943ee147e SHA512 7820197d97025365c781f95811a9725058b86375654df9915599957f743f5ea335eb468d0b52100e7be5096e9d10bc6fdad4252db48dc5c49d9ed6d8e7db6660 WHIRLPOOL 9d34eaa60707b3b18007a939c4b5da282e459699a898cc0a1c8016c35c4052f565ff0f7f8bcade4ba986ba501a4d28b3d2fb48c4caba769a270dedb5f124e52e DIST rosegarden-16.06.tar.bz2 6362923 SHA256 1044334f2c1a2ac7560d80910e0721c8913bd924f8185a393f630c89020340db SHA512 b95c1c9c49967b15cd100fe45c06db9f389adc17161c16c46f1b4c989d6e93373c90f9f2e622b960f83d2fb9fec9f12458b19840b22cb8c233e66d6e25f2d0de WHIRLPOOL 5b6304a12f3cabbfbaba6a15a7a358f1adbb840cf1dfb9c7edacb64df63fd2b5bf9bb0cfc3f16944e694df364c77a8c3de3df091e003698d96f5646f44645a5c -DIST rosegarden-17.04.tar.bz2 6454603 SHA256 988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b WHIRLPOOL 91b7d8d74578e8666de607f55cecdfc57dde9b9b4e2367d7b5a2f1d3ae76eaf3d0ef6b62d78ae4f9f080448019caf8e0580d5c1e30f56708c9b2dcc2c3113aa9 +DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b diff --git a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch new file mode 100644 index 00000000000..bc587a72977 --- /dev/null +++ b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.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 <[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) + diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild index 6bb3fccf30c..a87cb129209 100644 --- a/media-sound/rosegarden/rosegarden-17.04.ebuild +++ b/media-sound/rosegarden/rosegarden-17.04.ebuild @@ -36,6 +36,8 @@ DEPEND="${RDEPEND} dev-qt/qttest:5 virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-cmake-3.9.1.patch" ) + src_configure() { local mycmakeargs=( "-DDISABLE_LIRC=$(usex lirc OFF ON)"
