Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Wed Oct 12 23:59:53 CEST 2011.
-------- --- openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-10-07 16:08:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-10-11 23:17:53.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Oct 11 23:11:43 CEST 2011 - [email protected] + +- require the right QtWebKit version again + +------------------------------------------------------------------- +Fri Oct 7 15:57:50 UTC 2011 - [email protected] + +- fix arm assembler when using thumb2 +- disable neon support, seems we lack header definitions atm + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: ---- fix-arm-assembler-for-thumb2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.000000000 +0200 @@ -36,7 +36,7 @@ %define tar_version everywhere-opensource-src-%{version} # COMMON-VERSION-END # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel libqt4-devel >= %version +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML @@ -87,6 +87,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.diff 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 @@ -140,6 +141,7 @@ %patch126 %patch128 %patch129 -p1 +%patch130 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.000000000 +0200 @@ -79,6 +79,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.diff 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 @@ -132,6 +133,7 @@ %patch126 %patch128 %patch129 -p1 +%patch130 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.000000000 +0200 @@ -97,6 +97,7 @@ Patch126: qsslsocket-QTBUG-14985.patch Patch128: build-qvfb-tool.diff Patch129: blacklist-diginotar-certs.diff +Patch130: fix-arm-assembler-for-thumb2.diff 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 @@ -150,6 +151,7 @@ %patch126 %patch128 %patch129 -p1 +%patch130 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -418,6 +420,9 @@ echo yes | ./configure %common_options $platform \ -plugin-sql-sqlite -nomake examples -nomake demos -nomake docs \ +%ifarch %arm + -no-neon \ +%endif %if %with_qtwebkit -webkit \ %endif ++++++ fix-arm-assembler-for-thumb2.diff ++++++ Index: src/corelib/arch/qatomic_armv6.h =================================================================== --- src/corelib/arch/qatomic_armv6.h.orig +++ src/corelib/arch/qatomic_armv6.h @@ -144,6 +144,9 @@ inline bool QBasicAtomicInt::testAndSetO asm volatile("0:\n" "ldrex %[result], [%[_q_value]]\n" "eors %[result], %[result], %[expectedValue]\n" + + "itt eq\n" + "strexeq %[result], %[newValue], [%[_q_value]]\n" "teqeq %[result], #1\n" "beq 0b\n" @@ -202,6 +205,9 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint asm volatile("0:\n" "ldrex %[result], [%[_q_value]]\n" "eors %[result], %[result], %[expectedValue]\n" + + "itt eq\n" + "strexeq %[result], %[newValue], [%[_q_value]]\n" "teqeq %[result], #1\n" "beq 0b\n" Index: src/corelib/arch/qatomic_arm.h =================================================================== --- src/corelib/arch/qatomic_arm.h.orig +++ src/corelib/arch/qatomic_arm.h @@ -355,10 +355,7 @@ template <typename T> Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) { T *originalValue; - asm volatile("swp %0,%2,[%3]" - : "=&r"(originalValue), "=m" (_q_value) - : "r"(newValue), "r"(&_q_value) - : "cc", "memory"); + originalValue = __sync_lock_test_and_set(&_q_value, newValue); return originalValue; } ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.ZgvUco/_old 2011-10-12 23:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgvUco/_new 2011-10-12 23:59:44.000000000 +0200 @@ -29,7 +29,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END -BuildRequires: libQtWebKit-devel libqt4-devel >= %version +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
