Hello community,
here is the log from the commit of package libqt4
checked in at Fri Apr 13 16:36:19 CEST 2007.
--------
--- libqt4/libqt4.changes 2007-03-27 21:53:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-04-13 09:46:01.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 13 09:45:50 CEST 2007 - dmueller@suse.de
+
+- add QAtomic primitives for s390(x)
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
New:
----
FIXME.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.N22760/_old 2007-04-13 16:35:22.000000000 +0200
+++ /var/tmp/diff_new_pack.N22760/_new 2007-04-13 16:35:22.000000000 +0200
@@ -25,7 +25,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.2.90
-Release: 1
+Release: 3
%define x11_free -x11-opensource-src-
%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
@@ -37,6 +37,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: FIXME.diff
Patch18: fix-string-literal-comparison.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
@@ -65,6 +66,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch18
%patch20
%patch21
@@ -107,6 +109,8 @@
/usr/share/doc/packages/libqt4/examples
%changelog
+* Fri Apr 13 2007 - dmueller@suse.de
+- add QAtomic primitives for s390(x)
* Tue Mar 27 2007 - dmueller@suse.de
- update to 4.3.0 beta
* no upstream ChangeLog available yet
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.N22760/_old 2007-04-13 16:35:22.000000000 +0200
+++ /var/tmp/diff_new_pack.N22760/_new 2007-04-13 16:35:22.000000000 +0200
@@ -31,7 +31,7 @@
Provides: qt
# COMMON-BEGIN
Version: 4.2.90
-Release: 1
+Release: 3
%define x11_free -x11-opensource-src-
%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
@@ -43,6 +43,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: FIXME.diff
Patch18: fix-string-literal-comparison.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
@@ -72,6 +73,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch18
%patch20
%patch21
@@ -382,6 +384,8 @@
%_libdir/libQtSql*.so.*
%changelog
+* Fri Apr 13 2007 - dmueller@suse.de
+- add QAtomic primitives for s390(x)
* Tue Mar 27 2007 - dmueller@suse.de
- update to 4.3.0 beta
* no upstream ChangeLog available yet
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.N22760/_old 2007-04-13 16:35:22.000000000 +0200
+++ /var/tmp/diff_new_pack.N22760/_new 2007-04-13 16:35:22.000000000 +0200
@@ -24,7 +24,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.2.90
-Release: 1
+Release: 2
%define x11_free -x11-opensource-src-
%define rversion 4.3.0beta
Source: qt%x11_free%rversion.tar.bz2
@@ -36,6 +36,7 @@
Patch3: plastik-default.diff
Patch5: lib64.patch
Patch6: use-freetype-default.diff
+Patch7: FIXME.diff
Patch18: fix-string-literal-comparison.diff
Patch20: qt-font-choose.diff
Patch21: 0142-uic3-wordWrapAttribute.diff
@@ -63,6 +64,7 @@
%patch3
%patch5
%patch6
+%patch7
%patch18
%patch20
%patch21
@@ -205,6 +207,8 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
+* Fri Apr 13 2007 - dmueller@suse.de
+- add QAtomic primitives for s390(x)
* Tue Mar 27 2007 - dmueller@suse.de
- update to 4.3.0 beta
* no upstream ChangeLog available yet
++++++ FIXME.diff ++++++
Index: src/corelib/arch/qatomic_arch.h
===================================================================
--- src/corelib/arch/qatomic_arch.h (revision 652925)
+++ src/corelib/arch/qatomic_arch.h (working copy)
@@ -28,7 +28,80 @@
QT_BEGIN_HEADER
-#if defined(QT_ARCH_ALPHA)
+#if !defined(QT_ARCH_I386)
+#define QT_NATIVE_ATOMIC_BUILTINS 1
+#endif
+
+#ifdef QT_NATIVE_ATOMIC_BUILTINS
+
+inline int q_atomic_test_and_set_int(volatile int *ptr, int expected, int newval)
+{
+ return __sync_bool_compare_and_swap(ptr, expected, newval);
+}
+
+inline int q_atomic_test_and_set_acquire_int(volatile int *ptr, int expected, int newval)
+{
+ // there is __sync_lock_test_and_set, but it only allows mutex·
+ // semantics (writing 1 and 0). Qt API wants more.
+ return q_atomic_test_and_set_int(ptr, expected, newval);
+}
+
+inline int q_atomic_test_and_set_release_int(volatile int *ptr, int expected, int newval)
+{
+ // there is __sync_lock_test_and_set, but it only allows mutex·
+ // semantics (writing 1 and 0). Qt API wants more.
+ return q_atomic_test_and_set_int(ptr, expected, newval);
+}
+
+inline int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval)
+{
+ return __sync_bool_compare_and_swap(reinterpret_cast