[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/, x11-misc/qt5ct/files/

[Michael Palimaka]

commit:     515573c7fc6890224549dfdc3788c23f5ecb6ab6
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 19:31:53 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:52:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515573c7

x11-misc/qt5ct: correctly apply KDE styles

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch | 20 ++++++++++++++++++++
 .../{qt5ct-0.29.ebuild => qt5ct-0.29-r1.ebuild}      |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch b/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch
new file mode 100644
index 00000000..d15609d
--- /dev/null
+++ b/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch
@@ -0,0 +1,20 @@
+Correctly apply selected theme to KDE apps.
+
+https://sourceforge.net/p/qt5ct/tickets/32/
+
+Index: src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
+===================================================================
+--- a/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp	(revision 368)
++++ b/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp	(revision 369)
+@@ -101,9 +101,8 @@
+
+ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
+ {
+-    if(m_customPalette && m_usePalette)
+-        return m_customPalette;
+-    return QPlatformTheme::palette(type);
++    Q_UNUSED(type);
++    return (m_usePalette ? m_customPalette : 0);
+ }
+
+ const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const

diff --git a/x11-misc/qt5ct/qt5ct-0.29.ebuild b/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild
similarity index 95%
rename from x11-misc/qt5ct/qt5ct-0.29.ebuild
rename to x11-misc/qt5ct/qt5ct-0.29-r1.ebuild
index c449014..2563ebe 100644
--- a/x11-misc/qt5ct/qt5ct-0.29.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-kde-styles.patch" )
+
 src_configure() {
 	eqmake5 DEFINES="$(usex systray '' QT_NO_SYSTEMTRAYICON)" ${PN}.pro
 }