Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-09-17 13:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-06-25 14:21:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-09-17 13:58:21.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 5 12:41:12 UTC 2012 - [email protected] + +- Add rpm macros file with commonly-needed folders and other macros + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2012-06-25 14:21:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2012-09-17 13:58:21.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 22 00:20:20 UTC 2012 - [email protected] + +- Omit qdbusconnection warnings in release/no-debug mode + +------------------------------------------------------------------- +Sun Aug 5 12:41:12 UTC 2012 - [email protected] + +- Add rpm macros file with commonly-needed folders and other macros + +------------------------------------------------------------------- New: ---- macros.qt4 qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.FPtE2P/_old 2012-09-17 13:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FPtE2P/_new 2012-09-17 13:58:27.000000000 +0200 @@ -59,6 +59,7 @@ # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf +Source3: macros.qt4 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.FPtE2P/_old 2012-09-17 13:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FPtE2P/_new 2012-09-17 13:58:27.000000000 +0200 @@ -75,6 +75,7 @@ # to get mtime of file: Source1: libqt4.changes Source2: baselibs.conf +Source3: macros.qt4 Source10: qt4config.desktop Source11: designer4.desktop Source12: linguist4.desktop @@ -109,6 +110,7 @@ Patch131: disable-im-for-password.diff Patch132: CVE-2011-3922.diff Patch136: handle-tga-files-properly.diff +Patch137: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -164,6 +166,7 @@ %patch131 -p1 %patch132 %patch136 +%patch137 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -455,6 +458,9 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +# install macros and replace version placeholder with current version +install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.qt4 +sed -i 's/QTVER/%{version}/g' %{buildroot}%{_sysconfdir}/rpm/macros.qt4 %if %with_qtwebkit cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ @@ -615,6 +621,7 @@ %if !%with_qtwebkit %plugindir/designer/libqdeclarativeview.so %endif +%{_sysconfdir}/rpm/macros.qt4 %if %with_qt3support ++++++ macros.qt4 ++++++ %_libqt4_pluginsdir %{_libdir}/qt4/plugins %_libqt4_accessibledir %{_libqt4_pluginsdir}/accessible %_libqt4_bearerdir %{_libqt4_pluginsdir}/bearer %_libqt4_codecsdir %{_libqt4_pluginsdir}/codecs %_libqt4_designerdir %{_libqt4_pluginsdir}/designer %_libqt4_iconenginesdir %{_libqt4_pluginsdir}/iconengines %_libqt4_imageformatsdir %{_libqt4_pluginsdir}/imageformats %_libqt4_importsdir %{_libqt4_pluginsdir}/imports %_libqt4_inputmethodsdir %{_libqt4_pluginsdir}/inputmethods %_libqt4_graphicssystemsdir %{_libqt4_pluginsdir}/graphicssystems %_libqt4_phonon_backenddir %{_libqt4_pluginsdir}/phonon_backend %_libqt4_qmltoolingdir %{_libqt4_pluginsdir}/qmltooling %_libqt4_scriptdir %{_libqt4_pluginsdir}/script %_libqt4_sqldriversdir %{_libqt4_pluginsdir}/sqldrivers %_libqt4_version QTVER %libqt4_requires(d) Requires: libqt4 >= %_libqt4_version %{-d:, libqt4-devel >= %_libqt4_version} ++++++ qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch ++++++ diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp --- qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug 2012-04-17 07:18:51.536629078 -0500 +++ qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp 2012-04-17 07:18:56.910561895 -0500 @@ -1109,8 +1109,10 @@ public: // make sure this connection is running on the main thread QCoreApplication *instance = QCoreApplication::instance(); if (!instance) { +#ifndef QT_NO_DEBUG qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); +#endif } else { QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
