fixed qgtkstyle, it actually works now

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

7 files changed, 278 insertions, 14 deletions

diff --git a/x11-themes/qgtkstyle/ChangeLog b/x11-themes/qgtkstyle/ChangeLog
index ededc7681ef2..8b95ad673a1d 100644
--- a/x11-themes/qgtkstyle/ChangeLog
+++ b/x11-themes/qgtkstyle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/qgtkstyle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.3 2010/11/10 21:29:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.4 2010/11/13 20:36:00 wired Exp $
+
+*qgtkstyle-4.7.1-r1 (13 Nov 2010)
+*qgtkstyle-4.6.3-r1 (13 Nov 2010)
+
+  13 Nov 2010; Alex Alexander <wired@gentoo.org> +qgtkstyle-4.6.3-r1.ebuild,
+  +qgtkstyle-4.7.1-r1.ebuild, +files/main.cpp, files/qgtkstyle.pro,
+  +files/qgtkstyle-gentoo.patch:
+  fixed qgtkstyle, it actually works now.
 
   10 Nov 2010; Markos Chandras <hwoarang@gentoo.org> qgtkstyle-4.6.3.ebuild:
   Stable on amd64 wrt bug #341703
diff --git a/x11-themes/qgtkstyle/Manifest b/x11-themes/qgtkstyle/Manifest
index d9cb56552f73..41c0444e434c 100644
--- a/x11-themes/qgtkstyle/Manifest
+++ b/x11-themes/qgtkstyle/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX qgtkstyle.pro 391 RMD160 43405afd2bac00bb59c4da7764abaedd112f22b7 SHA1 49ac4ce42bdf0c1fed1ebc4e35c2a89b9c0bb39b SHA256 732e965ad22f1789e1b41f6fb1d4e7bf5e399a81b7c3bf4e2ea8f147643f5da3
+AUX main.cpp 1547 RMD160 c17d69b82b893bfe7ed29fa9ebd741f4b7a05487 SHA1 21473b110befeac127d7a1a803409161887db2f2 SHA256 36353cfb2cd99417473aa64ba4b8183d92312a063859733b52c211631e863ada
+AUX qgtkstyle-gentoo.patch 703 RMD160 41d706c22e4bd3844b46fb8b912eb0277ff157fd SHA1 a9298e178c662e1e8662d5a4a3372549bf77590e SHA256 8ec08c184b3d4d695ced13a43b16afbe006dc191be1768b7dd18f27f2ed9b9d9
+AUX qgtkstyle.pro 1481 RMD160 8edd6c0f5fb8444145820a038c09da3d3a6097c1 SHA1 8af534fdf3a2df2088b77eee86925c38db21e068 SHA256 e1c396f5a6567f4fda9a2a52919a521df769d8fddc5cbcab189f8b543a20edc9
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
+EBUILD qgtkstyle-4.6.3-r1.ebuild 1828 RMD160 9b09bb39ef2b1e3f5608df89dfd9033cc932105c SHA1 de6dd95943eacbebbcc29771aaaa14d78ae9e2e1 SHA256 523918a70acc3c73199e21ab77794379289e028c6bda91162b40a08d1c00ed64
 EBUILD qgtkstyle-4.6.3.ebuild 1025 RMD160 a66116259b6211d56a791ba07f9440093a3f0fc6 SHA1 756905c6d6d22f5437f9e376823b16e7d6459557 SHA256 707c15dd643e8dbe45890f3934ce4fb56a0db92805139ea49ef984a4981aee3f
+EBUILD qgtkstyle-4.7.1-r1.ebuild 1829 RMD160 b6d8df1a08f2a77e16026e9328139096bb7c25c5 SHA1 cf73cd4c869c2df58a7f9dae105f5e03d4d315b1 SHA256 5d8c81c917db9bf3facc80e715fb3c9005d2bdb095f8da116acb487c2abc9b16
 EBUILD qgtkstyle-4.7.1.ebuild 1017 RMD160 10fd053fb1be6b2779503fa3d564617c2c94acd0 SHA1 46028f4cf9c8a6bb6cdcabe41d4579ca7ff0391d SHA256 b452a9b1de9820121513c86a9ae08112f3ae5e672bb057f4e69db056e6c2bc92
-MISC ChangeLog 669 RMD160 fd2d00d319c2f86322cc729a159e5999efb5461a SHA1 42782e8a11d7da6e4266b9b1e294875fdfac702e SHA256 e5d576e3bd9d0e8cdcbbfa3582ac7824b0353d3748815e7e290b9b034aae92ec
+MISC ChangeLog 956 RMD160 f062bcc461290a42391c12b5d33b3e5ffd9a0224 SHA1 06fe279a94bce28969b653eaaa3760212d2eb886 SHA256 ae5425f7d47334aed3902403263af3a62ae93d66e118807181fa3feaecc16442
 MISC metadata.xml 156 RMD160 2c307fe3d7f514f10f158344b51114121632f411 SHA1 1b61305bd125f03b40ed85c17989140608e1efee SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkzbDsUACgkQ9/cejkQaxBD6BQCeMZ6tcS+qBggO1KXO7wzHDiRo
-8eQAn20rSH8ONFXMOHG9+Fics4fhWTVk
-=lInB
+iQIcBAEBCAAGBQJM3vcKAAoJEDZF8K7rm0r6IxAP/il6M1Kwzvb8o4/51HUmInyB
+Ps+915FoEvZtSdlj5e5PeNerKplYU69Efa6rGnzidQ6PvZvqAZBK5P7dYQB5lpI/
+VA07/2NZFx3ZcuJqhQooznL8cO5Kntsko+T0bWIB96+YioyGwwRnLrJwXWcWG9t6
+wKQV7UKI/3b2AFdxsVN8Kq9ogHJWkJ8TLoGC6mI9QGnSJFP/4p3BLviZi79G9W6R
+KGP13xAhXDWmyT+X+t7qzSOg1h3V2qlvCmcpbz43rNbFpNcMZkBjaokVLQ5Cavpn
+UpvwJ+kMO6ZE14yUMxb5bfSrJBW63+4zEfvDgXia7qhF/VgZFTV6Udb+yhTAFmEr
+x84LqGebYzhmc0izPCIYlVEDjZt0tAbDVFUmgafCCha8Ws5EekFqtIcthjvTpc1X
+evJRcFFiRomcy1R3DQKbtBoHRfR0J5gmFldMZaEMMLov5QOlem1TwHfPZ/TBBz29
+TXgxMinoXBaJ9srL8Pf0XXHiBgtl8saGHCXdhSjhewPnGHHWYSjdDHIdyxGlTuJc
+oSlkJwWwabMr7XBjDVBHRbZSPXrGoMpM+/Cf2Bpa1DOzIyNEfDV4RH34cNp4dh+u
+hR3NGEF0dBFFAKoXrLtvV+TP4Al+10PAAb1J9KYiQu24r/mxZBzdQ1eeyqWpgj1G
+pu1D3NA55X3D1SGA6CC6
+=rKXd
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qgtkstyle/files/main.cpp b/x11-themes/qgtkstyle/files/main.cpp
new file mode 100644
index 000000000000..51f2ad7cbfee
--- /dev/null
+++ b/x11-themes/qgtkstyle/files/main.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QGtkStyle project on Trolltech Labs.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.trolltech.com/products/qt/opensource.html
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://www.trolltech.com/products/qt/licensing.html or contact the
+** sales department at sales@trolltech.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#include "qgtkstyle.h"
+#include <QtGui/QStylePlugin>
+
+class QGtkStylePlugin : public QStylePlugin
+{
+public :
+    QGtkStylePlugin();
+    QStyle *create(const QString &key);
+    QStringList keys() const;
+};
+
+QGtkStylePlugin::QGtkStylePlugin()
+{}
+
+QStyle *QGtkStylePlugin::create(const QString &key)
+{
+    return (key.toLower() == "gtk") ? new QGtkStyle : 0;
+}
+
+QStringList QGtkStylePlugin::keys() const
+{
+    return QStringList() << "GTK";
+}
+
+Q_EXPORT_PLUGIN2(qgtkstyle, QGtkStylePlugin)
diff --git a/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch b/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch
new file mode 100644
index 000000000000..e17867b682bc
--- /dev/null
+++ b/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch
@@ -0,0 +1,19 @@
+--- src/gui/styles/qgtkstyle_p.cpp	2010-11-06 03:55:14.000000000 +0200
++++ src/gui/styles/qgtkstyle_p.cpp	2010-11-13 21:53:51.507000001 +0200
+@@ -252,14 +252,14 @@
+     return QHashableLatin1Literal::fromData(copy);
+ }
+ 
+-
++Q_GLOBAL_STATIC(FontHash, app_fonts)
+ 
+ bool QGtkStyleFilter::eventFilter(QObject *obj, QEvent *e)
+ {
+     if (e->type() == QEvent::ApplicationPaletteChange) {
+         // Only do this the first time since this will also
+         // generate applicationPaletteChange events
+-        if (!qt_app_palettes_hash() ||  qt_app_palettes_hash()->isEmpty()) {
++        if (!app_fonts() ||  app_fonts()->isEmpty()) {
+             stylePrivate->applyCustomPaletteHash();
+         }
+     }
diff --git a/x11-themes/qgtkstyle/files/qgtkstyle.pro b/x11-themes/qgtkstyle/files/qgtkstyle.pro
index 45fa57fdc1ad..2c40ba655f40 100644
--- a/x11-themes/qgtkstyle/files/qgtkstyle.pro
+++ b/x11-themes/qgtkstyle/files/qgtkstyle.pro
@@ -1,18 +1,61 @@
 TEMPLATE = lib
 CONFIG += qt plugin link_pkgconfig
 
+QT = core gui
+
 LIBS += $$QMAKE_LIBS_X11
+LIBS += -L/usr/lib64/qt4
+QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
+LIBS_PRIVATE += $$QT_LIBS_QGTKSTYLE
+
+unix:QMAKE_PKGCONFIG_REQUIRES = QtGui
+
 PKGCONFIG += gdk-x11-2.0
 PKGCONFIG += atk
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 TARGET   = $$qtLibraryTarget(gtkstyle)
-HEADERS  = qgtkstyle.h \
-           qgtkpainter_p.h
-SOURCES  = qgtkstyle.cpp \
-           qgtkpainter.cpp \
 
-target.path = $$[QT_INSTALL_PLUGINS]/styles
-INSTALLS += target
+INCLUDEPATH += $$PWD/dialogs
+
+FORMS += dialogs/qfiledialog.ui
+HEADERS  = styles/qgtkstyle.h \
+           styles/qgtkpainter_p.h \
+	   styles/qgtkstyle_p.h \
+	   styles/qstylehelper_p.h \
+	   styles/qwindowsstyle.h \
+	   image/qiconloader_p.h \
+	   kernel/qguiplatformplugin_p.h \
+	   kernel/qkde_p.h \
+	   dialogs/qfiledialog_p.h \
+	   dialogs/qfiledialog.h \
+	   dialogs/qsidebar_p.h \
+	   dialogs/qfilesystemmodel.h \
+	   dialogs/qfileinfogatherer_p.h
+SOURCES  = styles/main.cpp \
+	   styles/qgtkstyle.cpp \
+           styles/qgtkpainter.cpp \
+	   styles/qgtkstyle_p.cpp \
+	   styles/qstylehelper.cpp \
+	   styles/qwindowsstyle.cpp \
+	   image/qiconloader.cpp \
+	   kernel/qguiplatformplugin.cpp \
+	   kernel/qkde.cpp \
+	   dialogs/qsidebar.cpp \
+	   dialogs/qfiledialog.cpp \
+	   dialogs/qfilesystemmodel.cpp \
+	   dialogs/qfileinfogatherer.cpp
+# RESOURCES = qstyle.qrc
+
+include(../qbase.pri)
+
+contains(QT_CONFIG, x11sm):CONFIG += x11sm
+
+#platforms
+x11:include(kernel/x11.pri)
+mac:include(kernel/mac.pri)
+win32:include(kernel/win.pri)
 
+# target.path = $$[QT_INSTALL_PLUGINS]/styles
+# INSTALLS += target
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..039ea2cf565e
--- /dev/null
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild,v 1.1 2010/11/13 20:36:00 wired Exp $
+
+EAPI="3"
+inherit confutils qt4-build
+
+DESCRIPTION="Qt style that uses the active GTK theme."
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	x11-libs/gtk+:2
+	>=x11-libs/qt-gui-${PV}-r1
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo
+"
+RDEPEND="${COMMON_DEPEND}
+	!>x11-libs/qt-gui-${PV}-r9999
+"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+	"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/qgtkstyle.pro "${S}"/src/gui/gui.pro || die
+	cp "${FILESDIR}"/main.cpp "${S}"/src/gui/styles/ || die
+	sed "/QT_NO_STYLE_/d" -i "${S}"/src/gui/styles/qgtk* || die
+	epatch "${FILESDIR}"/"${PN}"-gentoo.patch
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
+		-no-sql-odbc -no-xrender -no-xrandr -no-xkb -no-xshape -no-sm -no-svg -no-webkit
+		-no-cups -no-glib -no-libmng -no-nis -no-libtiff -no-dbus -no-qdbus
+		-no-qt3support -no-xinerama -no-phonon -no-opengl -no-accessibility
+		-gtkstyle"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/qt4/plugins/styles/ || die
+	doins lib/libgtkstyle.so || die
+}
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..311b8d669d3e
--- /dev/null
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild,v 1.1 2010/11/13 20:36:00 wired Exp $
+
+EAPI="3"
+inherit confutils qt4-build
+
+DESCRIPTION="Qt style that uses the active GTK theme."
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	x11-libs/gtk+:2
+	>=x11-libs/qt-gui-${PV}-r1
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo
+"
+RDEPEND="${COMMON_DEPEND}
+	!>x11-libs/qt-gui-${PV}-r9999
+"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/gui
+	"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools/linguist/phrasebooks
+		tools/linguist/shared
+		tools/shared"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/qgtkstyle.pro "${S}"/src/gui/gui.pro || die
+	cp "${FILESDIR}"/main.cpp "${S}"/src/gui/styles/ || die
+	sed "/QT_NO_STYLE_/d" -i "${S}"/src/gui/styles/qgtk* || die
+	epatch "${FILESDIR}"/"${PN}"-gentoo.patch
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
+		-no-sql-odbc -no-xrender -no-xrandr -no-xkb -no-xshape -no-sm -no-svg -no-webkit
+		-no-cups -no-glib -no-libmng -no-nis -no-libtiff -no-dbus -no-qdbus -no-egl
+		-no-qt3support -no-xinerama -no-phonon -no-opengl -no-accessibility
+		-gtkstyle"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/qt4/plugins/styles/ || die
+	doins lib/libgtkstyle.so || die
+}