commit: 19427e1b8a1f3dbe17adf54f4f555a98554816cf
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 23:52:29 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 23:52:29 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=19427e1b
[dev-qt/qtgui:4] Apply patch from Fedora to fix bug 491226.
Package-Manager: portage-2.2.10
---
.../qtgui-4.8.6-disable-gtk-theme-check.patch | 22 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 18 ++++--------------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
b/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
new file mode 100644
index 0000000..9a9f773
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
@@ -0,0 +1,22 @@
+diff -up
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
+---
qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check
2013-06-09 16:28:22.938840346 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
2013-06-09 17:03:01.781125479 -0500
+@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
+ return;
+ }
+
+- static QString themeName;
+- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+- themeName = getThemeName();
+-
+- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+- // Due to namespace conflicts with Qt3 and obvious recursion with
Qt4,
+- // we cannot support the GTK_Qt Gtk engine
+- qWarning("QGtkStyle cannot be used together with the GTK_Qt
engine.");
+- return;
+- }
+- }
+-
+ if (QGtkStylePrivate::gtk_init) {
+ // Gtk will set the Qt error handler so we have to reset it afterwards
+ x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 044dc03..5dadd5d 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -67,6 +67,7 @@ PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=]
)"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
+ "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
)
QT4_TARGET_DIRECTORIES="
@@ -128,7 +129,8 @@ src_prepare() {
}
src_configure() {
- myconf="$(qt_use accessibility)
+ myconf+="
+ $(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
$(qt_use mng libmng system)
@@ -139,9 +141,7 @@ src_configure() {
$(qt_use qt3support)
$(qt_use gtkstyle)
$(qt_use xinerama)
- $(qt_use xv xvideo)"
-
- myconf+="
+ $(qt_use xv xvideo)
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm
-xinput -xkb
@@ -171,16 +171,6 @@ src_install() {
newicon tools/qtconfig/images/appicon.png qtconfig.png
make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig
'Qt;Settings;DesktopSettings'
fi
-
- # bug 388551
- if use gtkstyle; then
- local tempfile=${T}/${PN}4.sh
- cat <<-EOF > "${tempfile}"
- export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
- EOF
- insinto /etc/profile.d
- doins "${tempfile}"
- fi
}
pkg_postinst() {
