| 1 |
commit: 19427e1b8a1f3dbe17adf54f4f555a98554816cf |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 27 23:52:29 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 27 23:52:29 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=19427e1b |
| 7 |
|
| 8 |
[dev-qt/qtgui:4] Apply patch from Fedora to fix bug 491226. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
.../qtgui-4.8.6-disable-gtk-theme-check.patch | 22 ++++++++++++++++++++++ |
| 14 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 18 ++++-------------- |
| 15 |
2 files changed, 26 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..9a9f773 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+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 |
| 24 |
+--- 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 |
| 25 |
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 |
| 26 |
+@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() |
| 27 |
+ return; |
| 28 |
+ } |
| 29 |
+ |
| 30 |
+- static QString themeName; |
| 31 |
+- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { |
| 32 |
+- themeName = getThemeName(); |
| 33 |
+- |
| 34 |
+- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { |
| 35 |
+- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, |
| 36 |
+- // we cannot support the GTK_Qt Gtk engine |
| 37 |
+- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); |
| 38 |
+- return; |
| 39 |
+- } |
| 40 |
+- } |
| 41 |
+- |
| 42 |
+ if (QGtkStylePrivate::gtk_init) { |
| 43 |
+ // Gtk will set the Qt error handler so we have to reset it afterwards |
| 44 |
+ x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); |
| 45 |
|
| 46 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 47 |
index 044dc03..5dadd5d 100644 |
| 48 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 49 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 50 |
@@ -67,6 +67,7 @@ PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}/${PN}-4.7.3-cups.patch" |
| 54 |
+ "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226 |
| 55 |
) |
| 56 |
|
| 57 |
QT4_TARGET_DIRECTORIES=" |
| 58 |
@@ -128,7 +129,8 @@ src_prepare() { |
| 59 |
} |
| 60 |
|
| 61 |
src_configure() { |
| 62 |
- myconf="$(qt_use accessibility) |
| 63 |
+ myconf+=" |
| 64 |
+ $(qt_use accessibility) |
| 65 |
$(qt_use cups) |
| 66 |
$(qt_use glib) |
| 67 |
$(qt_use mng libmng system) |
| 68 |
@@ -139,9 +141,7 @@ src_configure() { |
| 69 |
$(qt_use qt3support) |
| 70 |
$(qt_use gtkstyle) |
| 71 |
$(qt_use xinerama) |
| 72 |
- $(qt_use xv xvideo)" |
| 73 |
- |
| 74 |
- myconf+=" |
| 75 |
+ $(qt_use xv xvideo) |
| 76 |
-system-libpng -system-libjpeg -system-zlib |
| 77 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 78 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 79 |
@@ -171,16 +171,6 @@ src_install() { |
| 80 |
newicon tools/qtconfig/images/appicon.png qtconfig.png |
| 81 |
make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' |
| 82 |
fi |
| 83 |
- |
| 84 |
- # bug 388551 |
| 85 |
- if use gtkstyle; then |
| 86 |
- local tempfile=${T}/${PN}4.sh |
| 87 |
- cat <<-EOF > "${tempfile}" |
| 88 |
- export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0 |
| 89 |
- EOF |
| 90 |
- insinto /etc/profile.d |
| 91 |
- doins "${tempfile}" |
| 92 |
- fi |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
Archives