From 4cd2370bed609c118b6edfde5d3f116e5c35b897 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Dec 2017 16:17:22 +0000 Subject: gentoo resync : 03.12.2017 --- kde-frameworks/extra-cmake-modules/Manifest | 5 +- .../extra-cmake-modules-5.40.0-r1.ebuild | 63 ++++++++++++++++++++++ .../extra-cmake-modules-5.40.0.ebuild | 61 --------------------- ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 +++++++++++++ 4 files changed, 104 insertions(+), 63 deletions(-) create mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.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 c043b1ed9b62..4977df59c594 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,5 +1,6 @@ +AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 1270 BLAKE2B f07e75e7558f85f2b1bf0ec49258c489ac64dc8efb0b9d897fec790a91d36e6e44d75cdad5aa34c9f45f269b49531cb82bcdffe7a0627b6f092317ac5ffb01aa SHA512 cbfd90b802f9629573c6bf1b51b2bb46d2d5991ffe41381f8867fe094c43a8f2d80175f70d7372a1df05a835df34faad5049ae87971b581f3fe0ba12e41724db DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d -DIST extra-cmake-modules-5.40.0.tar.xz 312532 SHA256 83e48889c84474e4f560e10e4eea0cc529f8511b3bd0415fcb898ac0496e630a SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c WHIRLPOOL 8b41b776a90c4126c9291a0bd7cde6a417240e0976b6d3325fbe7d534a90bf51e9f36871b76ebe9a11e06510367620fe63351e625b4b4665b896ed7f17ecd201 +DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c EBUILD extra-cmake-modules-5.37.0-r1.ebuild 1282 BLAKE2B 626c42faf13e2dc17b768eed847996ca283f2d030b29b8b51099e5b9342a18b33c1f6d503be375672e6405f87c859b9564575bc226980ddb0186d4934cbc89b2 SHA512 c52d5b2899eb2dfb2479c8df74af05fc19a64870dda36d42de03cae98cfc61a669600de8c9b22379652759774518a327172057558345108dd1095cdc3bc4ffa7 -EBUILD extra-cmake-modules-5.40.0.ebuild 1267 BLAKE2B f4f7dd512a4324d1a6e0105e2d6c95eaa7099e7bbffbeb5c1be52264b62bc2996c5359c92f43856f9d94755dbf5920b62da10b854f9aeda021275f55cdcb1b7e SHA512 d0f1df995c74a6fd9ba779369f3378c559f63fee5ea0d8482d9d3c0991d72d978e7d786d90370536d350771e53565da5b3aa5a7d873856fb5e2926d52cf51115 +EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1324 BLAKE2B 751a000e97ea546d7195f7d6624960a126d4eb12f4255e113984e7c68ffb3d464260528a0a786f354dc1d70eab0d25c30921ad9e817c5eb90e5900e2f0c63ebc SHA512 0411ef52b469ce4c4787ef8a3aab32467da3018a442e4398b514961b8821e648eff2100cc54ef40b519c88cc816df9584581f013135f9de449154d8086a02f08 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild new file mode 100644 index 000000000000..76f08e6ba7c6 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 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" +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}/${P}-qmlplugindump-path.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.40.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild deleted file mode 100644 index f565f9c0be76..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 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" -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.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch new file mode 100644 index 000000000000..d1bcf791fd4c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -0,0 +1,38 @@ +From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 2 Dec 2017 19:04:10 +0100 +Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump + +Summary: +Without any hint, qmlplugindump version is whatever default is set by qtchooser. +Fix uses the same approach as FindQtWaylandScanner.cmake. + +Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. + +Reviewers: apol + +Subscribers: #frameworks, #build_system + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D9116 +--- + modules/ECMFindQMLModule.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +index 428d60a..d72c52b 100644 +--- a/modules/ECMFindQMLModule.cmake.in ++++ b/modules/ECMFindQMLModule.cmake.in +@@ -27,7 +27,7 @@ + + include(FindPackageHandleStandardArgs) + +-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) + if(NOT QMLPLUGINDUMP_PROGRAM) + message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") + endif() +-- +2.15.1 + -- cgit v1.2.3