From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD169138330 for ; Sun, 7 Jan 2018 19:16:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B33BE077A; Sun, 7 Jan 2018 19:16:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEAC6E077A for ; Sun, 7 Jan 2018 19:16:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89B2833FD24 for ; Sun, 7 Jan 2018 19:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E55E147 for ; Sun, 7 Jan 2018 19:15:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515352538.49e87796953844e226f0037ede5baad8d767879b.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch X-VCS-Directories: kde-frameworks/extra-cmake-modules/ kde-frameworks/extra-cmake-modules/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 49e87796953844e226f0037ede5baad8d767879b X-VCS-Branch: master Date: Sun, 7 Jan 2018 19:15:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 061f1091-7d63-4fbc-956c-21e971d27eb8 X-Archives-Hash: 9d03e3b0125dfa2edcb03d565aea2dae commit: 49e87796953844e226f0037ede5baad8d767879b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 19:15:38 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 19:15:38 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=49e87796 kde-frameworks/extra-cmake-modules: Re-add qmlplugindump patch Still pending upstream. Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../extra-cmake-modules-5.42.0.ebuild | 2 ++ ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild index 8b14f01dc7..fb96d84501 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } 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 0000000000..d1bcf791fd --- /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 +