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 85EBF1396D9 for ; Fri, 20 Oct 2017 22:56:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B25C2E0D12; Fri, 20 Oct 2017 22:56:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7CC50E0D12 for ; Fri, 20 Oct 2017 22:56:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5610133BF3C for ; Fri, 20 Oct 2017 22:56:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4855331F for ; Fri, 20 Oct 2017 22:56:37 +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: <1508540185.40344977cca595b82e3fd69d98f810a0df612643.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/files/, kde-plasma/drkonqi/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch X-VCS-Directories: kde-plasma/drkonqi/ kde-plasma/drkonqi/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 40344977cca595b82e3fd69d98f810a0df612643 X-VCS-Branch: master Date: Fri, 20 Oct 2017 22:56:37 +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: 250bd1d2-457b-41a2-9cd0-3e368afa33ca X-Archives-Hash: 9cf8354cfb90d161b0d1b9487362f316 commit: 40344977cca595b82e3fd69d98f810a0df612643 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 20 22:55:27 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 20 22:56:25 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=40344977 kde-plasma/drkonqi: Fix build with USE=-X Gentoo-bug: 634510 Package-Manager: Portage-2.3.12, Repoman-2.3.3 kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild | 2 + kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch | 46 +++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild index cac8570632..a21d1fd143 100644 --- a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild @@ -39,6 +39,8 @@ RDEPEND="${COMMON_DEPEND} ! +Date: Sun, 15 Oct 2017 18:52:53 +0200 +Subject: Make Qt5::X11Extras really optional + +Summary: +Otherwise may fail. + +Reviewers: rjvbb, sitter, davidedmundson + +Reviewed By: sitter, davidedmundson + +Subscribers: apol, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D8307 +--- + CMakeLists.txt | 2 +- + config-X11.h.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43eeea5..8c8f9b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service ConfigWidgets JobWidgets KIO Crash Completion XmlRpcClient WidgetsAddons Wallet Notifications IdleTime) + +-find_package(Qt5 ${QT_MIN_VERSION} CONFIG COMPONENTS X11Extras) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG) + + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +diff --git a/config-X11.h.cmake b/config-X11.h.cmake +index 26064aa..2f779a2 100644 +--- a/config-X11.h.cmake ++++ b/config-X11.h.cmake +@@ -1,2 +1,2 @@ +-#cmakedefine Qt5X11Extras_FOUND 1 ++#cmakedefine01 Qt5X11Extras_FOUND + #define HAVE_X11 Qt5X11Extras_FOUND +-- +cgit v0.11.2 +