diff --git a/qt-x11-opensource-src-4.4.0-qgtkstyle.patch b/qt-x11-opensource-src-4.4.0-qgtkstyle.patch new file mode 100644 index 0000000..fb7e69d --- /dev/null +++ b/qt-x11-opensource-src-4.4.0-qgtkstyle.patch @@ -0,0 +1,18 @@ +diff -ur qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp +--- qt-x11-opensource-src-4.4.0/src/gui/kernel/qapplication_x11.cpp 2008-04-28 15:11:18.000000000 +0200 ++++ qt-x11-opensource-src-4.4.0-qgtkstyle/src/gui/kernel/qapplication_x11.cpp 2008-05-27 05:43:57.000000000 +0200 +@@ -2262,9 +2262,11 @@ + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); + break; + case DE_GNOME: +- if (X11->use_xrender) +- QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); +- else ++ if (X11->use_xrender) { ++ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("gtk")); ++ if (!QApplicationPrivate::app_style) ++ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("cleanlooks")); ++ } else + QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("windows")); + break; + case DE_CDE: diff --git a/qt.spec b/qt.spec index 1f6912d..55fea79 100644 --- a/qt.spec +++ b/qt.spec @@ -11,7 +11,7 @@ Name: qt Name: qt4 %endif Version: 4.4.0 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -37,6 +37,9 @@ Patch2: qt-x11-opensource-src-4.2.2-multilib.patch Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # kill hardcoded font substitutions (#447298) Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch +# under GNOME, default to QGtkStyle if available +# (otherwise fall back to QCleanlooksStyle) +Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch ## qt-copy patches %define qt_copy 20080516 @@ -312,6 +315,7 @@ test -x apply_patches && ./apply_patches %patch2 -p1 %patch5 -p1 -b .bz#437440-as_IN-437440 %patch8 -p1 -b .font-aliases +%patch9 -p1 -b .qgtkstyle # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -787,6 +791,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Tue May 27 2008 Kevin Kofler 4.4.0-5 +- under GNOME, default to QGtkStyle if available + * Mon May 19 2008 Kevin Kofler 4.4.0-4 - don't hardcode incorrect font substitutions (#447298)