From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
Date: Sat, 2 Dec 2017 18:33:48 +0000 (UTC) [thread overview]
Message-ID: <1512239612.13dec085bcd84e7c7c67ae53cd5152c08bc9213e.asturm@gentoo> (raw)
commit: 13dec085bcd84e7c7c67ae53cd5152c08bc9213e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 18:29:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 18:33:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dec085
kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in
See also: https://phabricator.kde.org/D9116
Bug: https://bugs.gentoo.org/639460
Package-Manager: Portage-2.3.16, Repoman-2.3.6
| 2 +-
| 63 ++++++++++++++++++++++
...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 +++++++++++++
3 files changed, 102 insertions(+), 1 deletion(-)
--git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index a5966730bab..f466f82d096 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,2 @@
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
--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 00000000000..76f08e6ba7c
--- /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/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 00000000000..d1bcf791fd4
--- /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 <andreas.sturmlechner@gmail.com>
+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
+
next reply other threads:[~2017-12-02 18:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 18:33 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 17:48 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/ Andreas Sturmlechner
2024-08-31 10:47 Andreas Sturmlechner
2025-05-17 22:36 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1512239612.13dec085bcd84e7c7c67ae53cd5152c08bc9213e.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox