gentoo resync : 19.07.2019

4 files changed, 152 insertions, 4 deletions

diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 6c33f9144aa3..156b0bda8a93 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,7 +1,9 @@
 AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
 AUX qtcurve-1.9.0-gcc9.patch 1057 BLAKE2B 4071dde6768793e0bfc443816508b445fd713a0df46ae2bcfe6932f0792f1c092d67bd2797e47c88b3b0fdc2cb7e1aafdfdc21f5eb720cab0bcf2539cf832d13 SHA512 8926c432704b15c30bf56011e38349907fc3020f0576bf9f0ab8797324bdc3e7e424210ad95bc3c437ee09a92c21b769845009088a7a1ff1c09237e7324f207c
+AUX qtcurve-1.9.0-libreoffice-crashfix.patch 2509 BLAKE2B f5aa8b5355da28eedde976460c9c29d5ed90a8858c1cabd061495ff1d91dff015473d7488997e8849a91dbfd0238c253bfe96805a925e1f1ae1015cb8752f2ec SHA512 f58f568df682a2a809123203f4cb88c95965810968dbd30fdaaa63918d9669641cfa1cb659a4a3cb30f3267d39b0c98d29e0c7e300fb7bcf34017617d65a8c8c
 AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
+EBUILD qtcurve-1.9.0-r1.ebuild 2038 BLAKE2B c6ed4cf8663ef22f2b72311b6df40fd330895c27fb652be23333dc9aa72144591a09595c5b31827a0ed71dbc75448110152ed2415878c4045e283e6fd1d6708f SHA512 a021aa635dccfa3ab8b805b98ee5cac55732f9e30b0014a136164b635dedca54028f9305ac9055c1677326076a4ff6c0b3ac5127a03b9ed3236b8fd07f49f99e
 EBUILD qtcurve-1.9.0.ebuild 2043 BLAKE2B c4184122dd2b6eb529d230f54fe04cc73450c4b085bbd0c533f559a0532d0d21e8565938756c4f6eb1d6a9a4528911c4ea3bf19f5e274e2eff4c500216d8b112 SHA512 7eb621404eb818b9d814359c41f8462483e81788338e4c4c78a0f4a105afbf22be9c5b836638753e97aff39624e7749823f2a79f79bba75a47381f4374150f21
-EBUILD qtcurve-9999.ebuild 1873 BLAKE2B 209f0082f3c70b21f1e81f91192ccb331e71c44478c23abf2559300a2cd5a230d3a14b65404b32b81c7a8453e0cd303c74d0d88d63761429a16564944ee59fc0 SHA512 eaedd06716beadc259dd4021e805d04c7810e6bfe8d52c700cb0f5324a6a3aedb864ecbe996384a29a42e34e703e719a4d85a716c5ed93d9acbe4ccf1c953144
+EBUILD qtcurve-9999.ebuild 1839 BLAKE2B a82f14b59a6aa08250aad17cdfb146fce67feb134d98f1e77fccfa4654068eada366045f46de976c9de1f54efcd5b8622a1165b7c2bd3912f4f7d28a2cc7fda6 SHA512 9fc95e7187df48cf78c816e3823177006e452d0e23de9dbfff19d350bab0edb7d6212ba2eff184e9e73848beea108f57fd8861dff773fcda31496aee084a49e4
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch
new file mode 100644
index 000000000000..c431ab743d09
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch
@@ -0,0 +1,58 @@
+From 293a822b2fc0572f826a819d9ad8df858c4ed1ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@gmail.com>
+Date: Sun, 3 Feb 2019 11:14:47 +0100
+Subject: Fix the LibreOffice fix
+
+My previous commit was a bit overzealous and didn't take into account
+the fact that there are legitimate reasons for the widget argument to
+Style::drawPrimitive() to be NULL.
+---
+ qt5/style/qtcurve_api.cpp | 16 +++-------------
+ 2 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp
+index 155d159..f26c438 100644
+--- a/qt5/style/qtcurve_api.cpp
++++ b/qt5/style/qtcurve_api.cpp
+@@ -2036,6 +2036,7 @@ QPalette Style::standardPalette() const
+ 
+ static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0)
+ {
++    Q_UNUSED(widget);
+     if (opts.onlyTicksInMenu && opts.fontTickWidth <= 0) {
+         opts.tickFont = font;
+ #ifndef Q_OS_MACOS
+@@ -2047,8 +2048,6 @@ static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0)
+         // adjust the size so the tickmark looks just about right
+         opts.tickFont.setPointSizeF(opts.tickFont.pointSizeF() * 1.3);
+         opts.fontTickWidth = QFontMetrics(opts.tickFont).width(opts.menuTick);
+-        // qDebug() << widget << "font->tickFont:" << font.toString() << opts.tickFont.toString() << "tickMark:" << opts.menuTick
+-        //    << "width=" << opts.fontTickWidth << "/" << QFontMetrics(opts.tickFont).boundingRect(opts.menuTick).width();
+         return true;
+     }
+     return false;
+@@ -2123,9 +2117,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+         break;
+     case PE_FrameStatusBar:
+     case PE_FrameMenu:
+-        if (widget) {
+-            initFontTickData(opts, widget->font(), widget);
+-        }
++        initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget);
+         drawFunc = &Style::drawPrimitiveFrameStatusBarOrMenu;
+         break;
+     case PE_FrameDockWidget:
+@@ -2182,9 +2174,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
+         drawFunc = &Style::drawPrimitivePanelTipLabel;
+         break;
+     case PE_PanelMenu:
+-        if (widget) {
+-            initFontTickData(opts, widget->font(), widget);
+-        }
++        initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget);
+         drawFunc = &Style::drawPrimitivePanelMenu;
+         break;
+     default:
+-- 
+cgit v1.1
+
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..418fc5a6d0f9
--- /dev/null
+++ b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_KDEINSTALLDIRS="false"
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Widget styles for Qt and GTK2"
+HOMEPAGE="https://cgit.kde.org/qtcurve.git"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+X gtk nls plasma +qt5 test"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+REQUIRED_USE="gtk? ( X )
+	|| ( gtk qt5 )
+	plasma? ( qt5 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	plasma? (
+		$(add_frameworks_dep frameworkintegration)
+		$(add_frameworks_dep karchive)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kdelibs4support)
+		$(add_frameworks_dep kguiaddons)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kwindowsystem)
+		$(add_frameworks_dep kxmlgui)
+		$(add_qt_dep qtprintsupport)
+	)
+	qt5? (
+		$(add_qt_dep qtdbus)
+		$(add_qt_dep qtgui)
+		$(add_qt_dep qtsvg)
+		$(add_qt_dep qtwidgets)
+		X? ( $(add_qt_dep qtx11extras) )
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+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"
+	"${FILESDIR}/${PN}-1.9.0-gcc9.patch"
+	"${FILESDIR}/${PN}-1.9.0-libreoffice-crashfix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-DENABLE_QT4=OFF
+		-DQTC_QT4_ENABLE_KDE=OFF
+		-DQTC_KDE4_DEFAULT_HOME=ON
+		-DENABLE_GTK2="$(usex gtk)"
+		-DENABLE_QT5="$(usex qt5)"
+		-DQTC_ENABLE_X11="$(usex X)"
+		-DQTC_INSTALL_PO="$(usex nls)"
+		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
+	)
+
+	kde5_src_configure
+}
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 3952cdf7d04d..98dfb742e0d0 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -60,9 +60,7 @@ DEPEND="
 		x11-libs/libxcb
 	)
 "
-RDEPEND="${DEPEND}
-	!x11-themes/gtk-engines-qtcurve
-"
+RDEPEND="${DEPEND}"
 
 RESTRICT+=" test"