Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Oct 6 17:23:21 CEST 2011.
-------- --- openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-09-23 02:09:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-10-06 13:33:03.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Oct 6 11:24:29 UTC 2011 - [email protected] + +- reenable fix for bnc#656144 - I reviewed the patch one more time + +------------------------------------------------------------------- +Sun Sep 25 10:54:07 UTC 2011 - [email protected] + +- libQtWebKit4 is now delivered through its separate package, + therefore libqt4 should not build it from the qt4 sources anymore + +------------------------------------------------------------------- +Sat Sep 17 14:27:00 UTC 2011 - [email protected] + +- Add qt_lt.ts - Lithuanian translation (bnc#713143) + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- openSUSE:Factory/libqt4/libqt4.changes 2011-09-23 02:09:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-10-06 13:33:04.000000000 +0200 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 6 11:24:29 UTC 2011 - [email protected] + +- reenable fix for bnc#656144 - I reviewed the patch one more time + +------------------------------------------------------------------- +Sun Sep 25 10:54:07 UTC 2011 - [email protected] + +- libQtWebKit4 is now delivered through its separate package, + therefore libqt4 should not build it from the qt4 sources anymore + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:16.000000000 +0200 @@ -61,6 +61,7 @@ Source14: assistant.png Source15: designer.png Source16: linguist.png +Source17: qt_lt.ts Patch2: qt-never-strip.diff Patch3: plastik-default.diff Patch6: use-freetype-default.diff @@ -135,6 +136,7 @@ %patch120 %endif %patch123 +cp %{SOURCE17} translations/ %patch126 %patch128 %patch129 -p1 libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:16.000000000 +0200 @@ -30,6 +30,7 @@ %define with_qt3support 1 %define with_phonon 0 %define with_phonon_backend 0 +%define with_qtwebkit 0 %if %with_phonon %if %with_phonon_backend BuildRequires: gstreamer-0_10-plugins-base-devel libxine-devel @@ -265,6 +266,7 @@ Qt 4 libraries which are used for connection with an SQL server. You will need also a plugin package for a supported SQL server. +%if %with_qtwebkit %package -n libQtWebKit4 License: GPLv2 ; GPLv3 @@ -296,6 +298,7 @@ engineers made WebKit toolkit independent. WebKit Qt is a project aiming at porting this fabulous engine back to Qt. +%endif %package private-headers-devel License: GPLv2 ; GPLv3 @@ -313,7 +316,6 @@ %package -n phonon - License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -329,7 +331,6 @@ %package -n phonon-devel - License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -346,7 +347,6 @@ %package -n libphonon4 - License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -364,7 +364,6 @@ %package -n phonon-backend-gstreamer-0_10 - License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -380,7 +379,6 @@ %package -n phonon-backend-xine - License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -419,7 +417,12 @@ sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure echo yes | ./configure %common_options $platform \ - -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs -webkit -xmlpatterns + -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs \ +%if %with_qtwebkit +-webkit \ +%endif +-xmlpatterns + %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} @@ -429,9 +432,11 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +%if %with_qtwebkit cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ $RPM_BUILD_ROOT/%_libdir +%endif # argggh, qmake is such a piece of <censored> find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; @@ -503,9 +508,13 @@ %postun sql -p /sbin/ldconfig +%if %with_qtwebkit + %post -n libQtWebKit4 -p /sbin/ldconfig %postun -n libQtWebKit4 -p /sbin/ldconfig +%endif + %if %with_phonon %post -n libphonon4 -p /sbin/ldconfig @@ -578,6 +587,10 @@ /usr/share/qt4/phrasebooks /usr/share/qt4/translations/qtconfig_*.qm %plugindir/script/libqtscriptdbus.so +%if !%with_qtwebkit +%plugindir/designer/libqdeclarativeview.so +%endif + %if %with_qt3support %files qt3support @@ -587,6 +600,8 @@ %plugindir/designer/libqt3supportwidgets.so %endif +%if %with_qtwebkit + %files -n libQtWebKit4 %defattr(-,root,root,755) %dir %plugindir/imports/QtWebKit @@ -604,13 +619,16 @@ %_libdir/libjscore.a %_libdir/libjscore.prl %_libdir/pkgconfig/QtWebKit.pc +%endif %files devel %defattr(-,root,root,755) +%if %with_qtwebkit %exclude %_libdir/libQtWebKit.la %exclude %_libdir/libQtWebKit.prl %exclude %_libdir/libQtWebKit.so %exclude %_libdir/pkgconfig/QtWebKit.pc +%endif /usr/bin/rcc /usr/bin/uic %if %with_qt3support ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:16.000000000 +0200 @@ -19,4 +19,3 @@ libqt4-sql-mysql supplements "packageand(libqt4-sql-mysql:libqt4-sql-<targettype>)" -libQtWebKit4 ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.ZE6Dab/_old 2011-10-06 17:23:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ZE6Dab/_new 2011-10-06 17:23:17.000000000 +0200 @@ -1,15 +1,71 @@ ---- src/gui/kernel/qguiplatformplugin.cpp +Index: src/gui/kernel/qguiplatformplugin.cpp +=================================================================== +--- src/gui/kernel/qguiplatformplugin.cpp.orig +++ src/gui/kernel/qguiplatformplugin.cpp -@@ -180,7 +180,10 @@ +@@ -92,6 +92,7 @@ QGuiPlatformPlugin *qt_guiPlatformPlugin + break; + default: + key = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION")); ++ key.replace(QLatin1String("kde-plasma"), QLatin1String("kde")); + break; + } + } +@@ -180,7 +181,15 @@ QString QGuiPlatformPlugin::styleName() stylename = QLatin1String("cde"); break; default: - // Don't do anything -+ if (X11->use_xrender) -+ stylename = QLatin1String("plastique"); -+ else ++ if (X11->use_xrender) { ++ QStringList availableStyles = QStyleFactory::keys(); ++ QString kdeStyleKey = QLatin1String("Oxygen"); ++ if (availableStyles.contains(kdeStyleKey)) ++ stylename = kdeStyleKey; ++ else ++ stylename = QLatin1String("Plastique"); ++ } else + stylename = QLatin1String("windows"); break; } return stylename; - +Index: src/gui/kernel/qapplication_x11.cpp +=================================================================== +--- src/gui/kernel/qapplication_x11.cpp.orig ++++ src/gui/kernel/qapplication_x11.cpp +@@ -2285,12 +2285,23 @@ void qt_init(QApplicationPrivate *priv, + int rc; + + do { +- if (!qgetenv("KDE_FULL_SESSION").isEmpty()) { ++ if (!qgetenv("KDE_SESSION_VERSION").isEmpty()) { + X11->desktopEnvironment = DE_KDE; + X11->desktopVersion = qgetenv("KDE_SESSION_VERSION").toInt(); + break; + } + ++ rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(KDE_FULL_SESSION), ++ 0, 2, False, XA_STRING, &type, &format, &length, ++ &after, &data); ++ if (rc == Success && length) { ++ X11->desktopEnvironment = DE_KDE; ++ // We got the property but it wasn't xfce4. Free data before it gets overwritten. ++ XFree(data); ++ data = 0; ++ break; ++ } ++ + if (qgetenv("DESKTOP_SESSION") == "gnome") { + X11->desktopEnvironment = DE_GNOME; + break; +Index: src/gui/kernel/qt_x11_p.h +=================================================================== +--- src/gui/kernel/qt_x11_p.h.orig ++++ src/gui/kernel/qt_x11_p.h +@@ -684,6 +684,8 @@ struct QX11Data + XTabletStylus, + XTabletEraser, + ++ KDE_FULL_SESSION, ++ + NPredefinedAtoms, + + _QT_SETTINGS_TIMESTAMP = NPredefinedAtoms, continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
