From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- kde-frameworks/extra-cmake-modules/Manifest | 3 +- .../extra-cmake-modules-5.49.0-r1.ebuild | 63 ++++++++++++++++++++++ .../extra-cmake-modules-5.49.0.ebuild | 61 --------------------- ...ra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 +++++++ 4 files changed, 84 insertions(+), 62 deletions(-) create mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch (limited to 'kde-frameworks/extra-cmake-modules') diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 9b56d6046379..63468e2f8a3e 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,5 +1,6 @@ +AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697 DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a DIST extra-cmake-modules-5.49.0.tar.xz 323488 BLAKE2B a15972adbc6a810aa3c2cb8a1919a9ec61117691e7eb232bc79e392850348d1ab6071ec9a320974fcf6f35f61bf1d8b0b8ea00ab9164acc2107b8e1b297b7251 SHA512 ed9925d4096f79241bc915b065a48b3a5cda78e53f6f2514d453232aabbfbe83e0b700040ef811bb9043567d5304e9681ba218b9a948685114c12b6dc6108279 EBUILD extra-cmake-modules-5.46.0.ebuild 1275 BLAKE2B 26d0cbbedbb94bdd3a120927ddc53fecade47a421da8a4d0a44e59a35931a577ea20c5eb41da2fc4c2cfbb215b124bc9d7494b6e14941b57b3b77671819ac678 SHA512 617e537fb35c8d79db273839da20dc16bc94aa245a9cc9e292f6a651cc2bd7ba75a9a399e01211613040d785e68720c0a83af80988384898f76d39a13ba2a999 -EBUILD extra-cmake-modules-5.49.0.ebuild 1279 BLAKE2B ebde1e71c55192ad5cf4647cf14059dcd04d0463d0215b4f4f72ff9afbed908b9a385cfc1a229d6ee721743f06f2c02235b15d9f4067f8a872a8223ac49cce59 SHA512 bc872ce6523cb5d5391113eab1526ed6dbf7755ea0f93ce0701e114ac43d378f5153f1114d18494a24d644b00dcd19d2b5f0f63f1c7267a3b371f2f9e7d4bc93 +EBUILD extra-cmake-modules-5.49.0-r1.ebuild 1343 BLAKE2B 6734190613d2bf2b4d981206b7cba91be7366b227a82b1237681789343df7e688eef25d2b1b8da0a7f1a455968e09815d7e41df9f9d78fd812503cd0c2c50e44 SHA512 3949b9b497d6be87617bda80444dea100bc2e3d005c22000ed548b135c26ab702952b5ac981e07f7c19ca469da19af50749f22ac777bff06c83ceb69c64599a3 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild new file mode 100644 index 000000000000..7003678df8f5 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_QTHELP="false" +KDE_TEST="false" +inherit kde5 python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="doc test" + +DEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_HTML_DOCS="$(usex doc)" + -DBUILD_MAN_DOCS="$(usex doc)" + -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" + ) + use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) + + cmake-utils_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + local myctestargs=( + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + kde5_src_test +} diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild deleted file mode 100644 index 376fd4315892..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HTML_DOCS="$(usex doc)" - -DBUILD_MAN_DOCS="$(usex doc)" - -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" - ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - - cmake-utils_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - local myctestargs=( - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - kde5_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch new file mode 100644 index 000000000000..f71d19d5fc86 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch @@ -0,0 +1,19 @@ +Avoid triggering a build failure with GCC8 and ld.gold producing warnings. + +Bug: https://bugs.gentoo.org/663512 + +diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +index 44358fb..0270aa5 100644 +--- a/kde-modules/KDECompilerSettings.cmake ++++ b/kde-modules/KDECompilerSettings.cmake +@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)) + # Linker warnings should be treated as errors +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") +- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") ++# set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") ++# set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") + + # Do not allow undefined symbols, even in non-symbolic shared libraries + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") -- cgit v1.2.3