[gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/files/, x11-themes/qtcurve/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3d6e675d90c69b51c03b9fac7b9caa806852028c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 20:15:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 20:27:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6e675d

x11-themes/qtcurve: Fix build w/ USE-X and dev-qt/qtwebengine present

Closes: https://bugs.gentoo.org/670466
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtcurve-1.9.0-no-X-buildfix.patch        | 54 ++++++++++++++++++++++
 x11-themes/qtcurve/qtcurve-1.9.0.ebuild            |  3 +-
 x11-themes/qtcurve/qtcurve-9999.ebuild             |  4 +-
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch
new file mode 100644
index 00000000000..883a8af2435
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch
@@ -0,0 +1,54 @@
+From 9aae21bb68308d9017977a53059dd75b347d7bbd Mon Sep 17 00:00:00 2001
+From: "R.J.V. Bertin" <rjvbertin@gmail.com>
+Date: Tue, 3 Apr 2018 18:18:37 +0200
+Subject: Minor X11-related build fixes:
+
+- don't override QTC_ENABLE_X11 with platform conditionals
+- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere
+
+Committed from host : Portia.local
+---
+ qt5/CMakeLists.txt           | 2 +-
+ qt5/config/qtcurveconfig.cpp | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 930c919..8cff198 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -36,7 +36,7 @@ if(ENABLE_QT5)
+     set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS})
+     set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS})
+   endforeach()
+-  if(NOT APPLE)
++  if(QTC_ENABLE_X11)
+     set(QTC_QT5_OPT_MODULES Qt5X11Extras)
+   endif()
+   foreach(QtModule ${QTC_QT5_OPT_MODULES})
+diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp
+index b320c25..a34f9bd 100644
+--- a/qt5/config/qtcurveconfig.cpp
++++ b/qt5/config/qtcurveconfig.cpp
+@@ -42,6 +42,7 @@
+ #include <qtcurve-utils/dirs.h>
+ #include <qtcurve-utils/process.h>
+ #include <qtcurve-utils/qtutils.h>
++#include <qtcurve-utils/x11base.h>
+ 
+ // Qt
+ #include <QCheckBox>
+@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent)
+     dropShadowSize->setRange(0, 100);
+     dropShadowSize->setSingleStep(1);
+     dropShadowSize->setValue(qtcX11ShadowSize());
+-#ifndef QTC_ENABLE_X11
+-    dropShadowSize->setEnabled(false);
+-#endif
++    if (!qtcX11Enabled()) {
++        dropShadowSize->setEnabled(false);
++    }
+ 
+ 
+     sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH);
+-- 
+cgit v0.11.2

diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
index cb783404aa5..6047b67909d 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtgui)
 		$(add_qt_dep qtsvg)
 		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
+		X? ( $(add_qt_dep qtx11extras) )
 	)
 	X? (
 		x11-libs/libX11
@@ -68,6 +68,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.0-build_testing.patch"
+	"${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch"
 )
 
 src_configure() {

diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 9a99d8eec62..0d7ef602fb6 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtgui)
 		$(add_qt_dep qtsvg)
 		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
+		X? ( $(add_qt_dep qtx11extras) )
 	)
 	X? (
 		x11-libs/libX11