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 02246138239 for ; Sun, 17 Feb 2019 22:59:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03499E08C0; Sun, 17 Feb 2019 22:59:44 +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 BD26BE08C0 for ; Sun, 17 Feb 2019 22:59:43 +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 96742335CB7 for ; Sun, 17 Feb 2019 22:59:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7498A545 for ; Sun, 17 Feb 2019 22:59:39 +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: <1550444368.f0e4482c6d36030e7cc3146d4de54b78ba047453.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-6.0.0.ebuild media-gfx/digikam/files/digikam-6.0.0-cmake.patch X-VCS-Directories: media-gfx/digikam/files/ media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f0e4482c6d36030e7cc3146d4de54b78ba047453 X-VCS-Branch: master Date: Sun, 17 Feb 2019 22:59:39 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3061aad-3fcf-4e08-85d0-c5b6d90244fa X-Archives-Hash: db27f2210f38e278643adbbcda4e425e commit: f0e4482c6d36030e7cc3146d4de54b78ba047453 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 22:54:19 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 22:59:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e4482c media-gfx/digikam: Un-break optional Qt5 detection Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-6.0.0.ebuild | 2 + media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 +++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild index 4288c82dc56..0c70439cb3f 100644 --- a/media-gfx/digikam/digikam-6.0.0.ebuild +++ b/media-gfx/digikam/digikam-6.0.0.ebuild @@ -105,6 +105,8 @@ RDEPEND="${COMMON_DEPEND} RESTRICT+=" test" # bug 366505 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp kde5_pkg_pretend diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch new file mode 100644 index 00000000000..f90067f4812 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch @@ -0,0 +1,62 @@ +From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt5 detection + +--- + core/CMakeLists.txt | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 27d3819323..17c8aa0320 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION} + ) + + if(ENABLE_QWEBENGINE) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) ++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) + else() +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) ++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) + endif() + +-find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt5DBus ${QT_MIN_VERSION}) ++ ++find_package(Qt5OpenGL ${QT_MIN_VERSION}) + + if(ENABLE_DBUS) + if(NOT Qt5DBus_FOUND) +@@ -154,10 +152,10 @@ endif() + # Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS +- Test +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) ++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) ++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) + endif() + + find_package(KF5 ${KF5_MIN_VERSION} +@@ -323,7 +321,7 @@ find_package(OpenGL) # For Presentation tool. + find_package(X11) + + if(X11_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + set(HAVE_X11 TRUE) + else() + set(HAVE_X11 FALSE) +-- +2.20.1 +