Hello community, here is the log from the commit of package libqt4 checked in at Tue Mar 11 18:56:38 CET 2008. -------- --- libqt4/libqt4.changes 2008-03-06 14:46:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-03-11 18:47:12.684011000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 11 18:47:01 CET 2008 - dmueller@suse.de + +- update to 20080310 + * fixes s390(x) compile + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change Old: ---- qt-x11-opensource-src-4.4.0-snapshot-20080306.tar.bz2 New: ---- qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 s390-pedantic-compile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.F22936/_old 2008-03-11 18:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.F22936/_new 2008-03-11 18:56:24.000000000 +0100 @@ -27,10 +27,10 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.93 -Release: 7 +Release: 8 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080306 +%define rversion 4.4.0-snapshot-20080310 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -55,6 +55,7 @@ Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff +Patch57: s390-pedantic-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_docdir/%{base_name}/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -91,6 +92,7 @@ %patch53 %patch54 %patch55 +%patch57 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -152,6 +154,9 @@ /usr/share/doc/packages/%base_name/examples %changelog +* Tue Mar 11 2008 dmueller@suse.de +- update to 20080310 + * fixes s390(x) compile * Thu Mar 06 2008 dmueller@suse.de - update to 20080306 * fixes kdebindings4 build regression ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.F22936/_old 2008-03-11 18:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.F22936/_new 2008-03-11 18:56:24.000000000 +0100 @@ -37,10 +37,10 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN Version: 4.3.93 -Release: 7 +Release: 8 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080306 +%define rversion 4.4.0-snapshot-20080310 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -65,6 +65,7 @@ Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff +Patch57: s390-pedantic-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_docdir/%{base_name}/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -102,6 +103,7 @@ %patch53 %patch54 %patch55 +%patch57 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -389,6 +391,9 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Mar 11 2008 dmueller@suse.de +- update to 20080310 + * fixes s390(x) compile * Thu Mar 06 2008 dmueller@suse.de - update to 20080306 * fixes kdebindings4 build regression ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.F22936/_old 2008-03-11 18:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.F22936/_new 2008-03-11 18:56:24.000000000 +0100 @@ -33,10 +33,10 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.93 -Release: 3 +Release: 4 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080306 +%define rversion 4.4.0-snapshot-20080310 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -61,6 +61,7 @@ Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff +Patch57: s390-pedantic-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_docdir/%{base_name}/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -96,6 +97,7 @@ %patch53 %patch54 %patch55 +%patch57 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -211,6 +213,9 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Mar 11 2008 dmueller@suse.de +- update to 20080310 + * fixes s390(x) compile * Thu Mar 06 2008 dmueller@suse.de - update to 20080306 * fixes kdebindings4 build regression ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.F22936/_old 2008-03-11 18:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.F22936/_new 2008-03-11 18:56:24.000000000 +0100 @@ -31,10 +31,10 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.93 -Release: 7 +Release: 8 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.0-snapshot-20080306 +%define rversion 4.4.0-snapshot-20080310 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -59,6 +59,7 @@ Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff Patch56: compile-qsslsocket.diff +Patch57: s390-pedantic-compile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_docdir/%{base_name}/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -96,6 +97,7 @@ %patch53 %patch54 %patch55 +%patch57 #%patch56 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} @@ -235,6 +237,9 @@ %_docdir/%base_name/demos %changelog +* Tue Mar 11 2008 dmueller@suse.de +- update to 20080310 + * fixes s390(x) compile * Thu Mar 06 2008 dmueller@suse.de - update to 20080306 * fixes kdebindings4 build regression ++++++ qt-x11-opensource-src-4.4.0-snapshot-20080306.tar.bz2 -> qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.4.0-snapshot-20080306.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-x11-opensource-src-4.4.0-snapshot-20080310.tar.bz2 differ: byte 11, line 1 ++++++ s390-pedantic-compile.diff ++++++ --- src/corelib/arch/qatomic_s390.h +++ src/corelib/arch/qatomic_s390.h @@ -103,7 +103,13 @@ template <typename T> Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() { return false; } -#define __CS_LOOP(ptr, op_val, op_string, pre, post) ({ \ +#ifdef __GNUC__ +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif + +#define __CS_LOOP(ptr, op_val, op_string, pre, post) __GNU_EXTENSION ({ \ volatile int old_val, new_val; \ __asm__ __volatile__(pre \ " l %0,0(%3)\n" \ @@ -120,7 +126,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() new_val; \ }) -#define __CS_OLD_LOOP(ptr, op_val, op_string, pre, post ) ({ \ +#define __CS_OLD_LOOP(ptr, op_val, op_string, pre, post ) __GNU_EXTENSION ({ \ volatile int old_val, new_val; \ __asm__ __volatile__(pre \ " l %0,0(%3)\n" \ @@ -138,7 +144,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() }) #ifdef __s390x__ -#define __CSG_OLD_LOOP(ptr, op_val, op_string, pre, post) ({ \ +#define __CSG_OLD_LOOP(ptr, op_val, op_string, pre, post) __GNU_EXTENSION ({ \ long old_val, new_val; \ __asm__ __volatile__(pre \ " lg %0,0(%3)\n" \ @@ -417,8 +423,11 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo return fetchAndAddOrdered(valueToAdd); } +#undef __GNU_EXTENSION + QT_END_NAMESPACE QT_END_HEADER + #endif // QATOMIC_S390_H ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org