Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-12-02 13:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-10-24 13:41:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2011-12-02 13:21:46.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Nov 28 14:08:59 UTC 2011 - [email protected] + +- Fix duplicate files + +------------------------------------------------------------------- +Mon Nov 21 19:17:33 CET 2011 - [email protected] + +- update to 4.8.0 rc1: + * too many changes to list here, see http://qt.nokia.com/doc/4.8 + and included changes-4.8.0 +- remove patches that went upstream +- rediff patches and adjust filelist + +------------------------------------------------------------------- +Mon Nov 21 00:21:24 CET 2011 - [email protected] + +- rediffed webkit-ia64_s390x.patch and reactivated patch + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2011-11-21 15:47:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2011-12-02 13:21:46.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 28 14:08:59 UTC 2011 - [email protected] + +- Fix duplicate files + +------------------------------------------------------------------- +Mon Nov 21 19:17:33 CET 2011 - [email protected] + +- update to 4.8.0 rc1: + * too many changes to list here, see http://qt.nokia.com/doc/4.8 + and included changes-4.8.0 +- remove patches that went upstream +- rediff patches and adjust filelist + +------------------------------------------------------------------- Old: ---- blacklist-diginotar-certs.diff fix-arm-assembler-for-thumb2.diff qsslsocket-QTBUG-14985.patch qt-everywhere-opensource-src-4.7.4.tar.bz2 New: ---- qt-everywhere-opensource-src-4.8.0-rc1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -30,10 +30,10 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.7.4 +Version: 4.7.90 Release: 1 %define base_name libqt4 -%define tar_version everywhere-opensource-src-%{version} +%define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version @@ -50,7 +50,7 @@ Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%tar_version.tar.bz2 +Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -84,10 +84,7 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff -Patch129: blacklist-diginotar-certs.diff -Patch130: fix-arm-assembler-for-thumb2.diff Patch131: disable-im-for-password.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -128,10 +125,11 @@ %patch75 %patch87 %patch101 -# ### 47 rediff -%patch107 +# ### 48 rediff +# %patch107 %patch109 -%patch113 +# ### 48 rediff +# %patch113 %patch118 -p1 %ifarch hppa %patch119 @@ -139,10 +137,7 @@ %endif %patch123 cp %{SOURCE17} translations/ -%patch126 %patch128 -%patch129 -p1 -%patch130 %patch131 -p1 # ### 47 rediff #%patch121 -p1 ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -28,10 +28,10 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.7.4 +Version: 4.7.90 Release: 1 %define base_name libqt4 -%define tar_version everywhere-opensource-src-%{version} +%define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-VERSION-END BuildRequires: libqt4-devel >= %version @@ -42,7 +42,7 @@ Summary: Qt 4 SQL related libraries # COMMON-BEGIN # COMMON-BEGIN -Source: qt-%tar_version.tar.bz2 +Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -76,10 +76,7 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff -Patch129: blacklist-diginotar-certs.diff -Patch130: fix-arm-assembler-for-thumb2.diff Patch131: disable-im-for-password.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -120,10 +117,11 @@ %patch75 %patch87 %patch101 -# ### 47 rediff -%patch107 +# ### 48 rediff +# %patch107 %patch109 -%patch113 +# ### 48 rediff +# %patch113 %patch118 -p1 %ifarch hppa %patch119 @@ -131,10 +129,7 @@ %endif %patch123 cp %{SOURCE17} translations/ -%patch126 %patch128 -%patch129 -p1 -%patch130 %patch131 -p1 # ### 47 rediff #%patch121 -p1 ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -54,13 +54,13 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.7.4 +Version: 4.7.90 Release: 1 %define base_name libqt4 -%define tar_version everywhere-opensource-src-%{version} +%define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END # COMMON-BEGIN -Source: qt-%tar_version.tar.bz2 +Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf @@ -94,10 +94,7 @@ Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff -Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff -Patch129: blacklist-diginotar-certs.diff -Patch130: fix-arm-assembler-for-thumb2.diff Patch131: disable-im-for-password.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -138,10 +135,11 @@ %patch75 %patch87 %patch101 -# ### 47 rediff -%patch107 +# ### 48 rediff +# %patch107 %patch109 -%patch113 +# ### 48 rediff +# %patch113 %patch118 -p1 %ifarch hppa %patch119 @@ -149,10 +147,7 @@ %endif %patch123 cp %{SOURCE17} translations/ -%patch126 %patch128 -%patch129 -p1 -%patch130 %patch131 -p1 # ### 47 rediff #%patch121 -p1 @@ -562,6 +557,7 @@ %endif /usr/bin/qdbusviewer /usr/bin/qmlviewer +/usr/bin/qmlplugindump /usr/share/applications/qt4config.desktop # designer.png is referenced by qt4config.desktop /usr/share/pixmaps/designer.png @@ -591,6 +587,7 @@ %plugindir/bearer/* %plugindir/imports/Qt/* %plugindir/qmltooling/libqmldbg_tcp.so +%plugindir/qmltooling/libqmldbg_inspector.so /usr/share/qt4/phrasebooks /usr/share/qt4/translations/qtconfig_*.qm %plugindir/script/libqtscriptdbus.so @@ -636,6 +633,10 @@ %exclude %_libdir/libQtWebKit.so %exclude %_libdir/pkgconfig/QtWebKit.pc %endif +%exclude /usr/include/QtDeclarative/private +%exclude /usr/include/QtCore/private +%exclude /usr/include/QtScript/private +%exclude /usr/include/QtGui/private /usr/bin/rcc /usr/bin/uic %if %with_qt3support ++++++ 0180-window-role.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/corelib/kernel/qobject.cpp +Index: src/corelib/kernel/qobject.cpp +=================================================================== +--- src/corelib/kernel/qobject.cpp.orig +++ src/corelib/kernel/qobject.cpp -@@ -1099,10 +1099,19 @@ void QObject::setObjectName(const QStrin +@@ -1074,10 +1074,19 @@ void QObject::setObjectName(const QStrin d->objectName = name; @@ -20,11 +22,13 @@ #ifdef QT3_SUPPORT /*! \internal ---- src/corelib/kernel/qobject_p.h +Index: src/corelib/kernel/qobject_p.h +=================================================================== +--- src/corelib/kernel/qobject_p.h.orig +++ src/corelib/kernel/qobject_p.h -@@ -156,6 +156,9 @@ public: +@@ -160,6 +160,9 @@ public: + #ifdef QT3_SUPPORT void sendPendingChildInsertedEvents(); - void removePendingChildInsertedEvents(QObject *child); #endif +#if defined(Q_WS_X11) + virtual void checkWindowRole(); @@ -32,9 +36,11 @@ static inline Sender *setCurrentSender(QObject *receiver, Sender *sender); ---- src/gui/kernel/qwidget_p.h +Index: src/gui/kernel/qwidget_p.h +=================================================================== +--- src/gui/kernel/qwidget_p.h.orig +++ src/gui/kernel/qwidget_p.h -@@ -762,6 +762,7 @@ public: +@@ -781,6 +781,7 @@ public: static QWidget *keyboardGrabber; void setWindowRole(); @@ -42,9 +48,11 @@ void sendStartupMessage(const char *message) const; void setNetWmWindowTypes(); void x11UpdateIsOpaque(); ---- src/gui/kernel/qwidget_x11.cpp +Index: src/gui/kernel/qwidget_x11.cpp +=================================================================== +--- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -837,13 +837,17 @@ void QWidgetPrivate::create_sys(WId wind +@@ -843,13 +843,17 @@ void QWidgetPrivate::create_sys(WId wind // declare the widget's window role @@ -68,7 +76,7 @@ } // set client leader property -@@ -2957,6 +2961,17 @@ void QWidgetPrivate::setWindowRole() +@@ -3027,6 +3031,17 @@ void QWidgetPrivate::setWindowRole() XChangeProperty(X11->display, q->internalWinId(), ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, (unsigned char *)windowRole.constData(), windowRole.length()); ++++++ 0191-listview-alternate-row-colors.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -13,7 +13,7 @@ =================================================================== --- src/gui/itemviews/qlistview.cpp.orig +++ src/gui/itemviews/qlistview.cpp -@@ -989,7 +989,7 @@ void QListView::paintEvent(QPaintEvent * +@@ -992,7 +992,7 @@ void QListView::paintEvent(QPaintEvent * option.state &= ~QStyle::State_Enabled; cg = QPalette::Disabled; } else { ++++++ 0195-compositing-properties.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -11,7 +11,7 @@ =================================================================== --- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -762,6 +762,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -768,6 +768,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -23,7 +23,7 @@ } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -815,13 +820,21 @@ void QWidgetPrivate::create_sys(WId wind +@@ -821,13 +826,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -47,7 +47,7 @@ // declare the widget's window role if (QTLWExtra *topData = maybeTopData()) { -@@ -837,10 +850,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -843,10 +856,6 @@ void QWidgetPrivate::create_sys(WId wind XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&X11->wm_client_leader, 1); ++++++ build-qvfb-tool.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -9,3 +9,14 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus # We don't need these command line utilities on embedded platforms. !wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator +--- tools/qvfb/qvfb.pro ++++ tools/qvfb/qvfb.pro +@@ -38,8 +38,6 @@ + + !embedded { + DEFINES += QT_NO_QWS_SIGNALHANDLER +- HEADERS += ../../src/gui/embedded/qlock_p.h +- SOURCES += ../../src/gui/embedded/qlock.cpp + } + + include(../shared/deviceskin/deviceskin.pri) ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -31,7 +31,7 @@ =================================================================== --- src/gui/kernel/qapplication_x11.cpp.orig +++ src/gui/kernel/qapplication_x11.cpp -@@ -2285,12 +2285,23 @@ void qt_init(QApplicationPrivate *priv, +@@ -2297,12 +2297,23 @@ void qt_init(QApplicationPrivate *priv, int rc; do { ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -1,4 +1,6 @@ ---- configure +Index: configure +=================================================================== +--- configure.orig +++ configure @@ -65,7 +65,6 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s, @@ -8,7 +10,7 @@ QMAKE_CONFIG= QTCONFIG_CONFIG= QT_CONFIG= -@@ -1417,7 +1416,7 @@ while [ "$#" -gt 0 ]; do +@@ -1521,7 +1520,7 @@ while [ "$#" -gt 0 ]; do QMakeVar add QMAKE_CFLAGS -pg QMakeVar add QMAKE_CXXFLAGS -pg QMakeVar add QMAKE_LFLAGS -pg @@ -17,7 +19,7 @@ else UNKNOWN_OPT=yes fi -@@ -3080,6 +3079,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then +@@ -3225,6 +3224,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then fi fi ++++++ use-freetype-default.diff ++++++ --- /var/tmp/diff_new_pack.qT92sB/_old 2011-12-02 13:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.qT92sB/_new 2011-12-02 13:22:07.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/gui/text/qfontengine_x11.cpp.orig +++ src/gui/text/qfontengine_x11.cpp -@@ -978,6 +978,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte +@@ -967,6 +967,26 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte *antialias = b; } @@ -29,8 +29,8 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) : QFontEngineFT(fd) -@@ -995,7 +1015,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat - canUploadGlyphsToServer = qApp->thread() == QThread::currentThread(); +@@ -984,7 +1004,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat + canUploadGlyphsToServer = QApplication::testAttribute(Qt::AA_X11InitThreads) || (qApp->thread() == QThread::currentThread()); subpixelType = Subpixel_None; - if (antialias) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
