Hello community,

here is the log from the commit of package libqt5-qtbase for openSUSE:13.1 
checked in at 2013-10-29 10:16:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/libqt5-qtbase (Old)
 and      /work/SRC/openSUSE:13.1/.libqt5-qtbase.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtbase"

Changes:
--------
--- /work/SRC/openSUSE:13.1/libqt5-qtbase/libqt5-qtbase.changes 2013-10-19 
16:49:26.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.libqt5-qtbase.new/libqt5-qtbase.changes    
2013-10-29 10:16:22.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Oct 18 17:48:59 UTC 2013 - [email protected]
+
+- Added qtbase-opensource-src-5.1.1-bigendian.patch, also needed
+  for building on PowerPC, otherwise fromWordToBytes is
+  left undeclared
+
+-------------------------------------------------------------------
+Fri Oct 18 12:38:19 UTC 2013 - [email protected]
+
+- Added qtbase-qatomic-ppc.patch, fixes PowerPC build
+
+-------------------------------------------------------------------

New:
----
  qtbase-opensource-src-5.1.1-bigendian.patch
  qtbase-qatomic-ppc.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.yxUXNs/_old  2013-10-29 10:16:22.000000000 +0100
+++ /var/tmp/diff_new_pack.yxUXNs/_new  2013-10-29 10:16:22.000000000 +0100
@@ -61,6 +61,11 @@
 Source3:        baselibs.conf
 # PATCH-FIX-UPSTREAM qt-never-strip.diff -- for creating debug packages
 Patch2:         qt-never-strip.diff
+# PATCH-FIX-UPSTREAM qtbase-qatomic-ppc.patch -- fixes build on PPC
+Patch3:         qtbase-qatomic-ppc.patch
+# PATCH-FIX-UPSTREAM qtbase-opensource-src-5.1.1-bigendian.patch -- fixes 
build on big endian arches/PPC
+Patch4:         qtbase-opensource-src-5.1.1-bigendian.patch
+# PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on 
build
 # PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on 
build
 Patch109:       libqt5-libtool-nodate.diff
 # PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include 
/usr/include path
@@ -98,6 +103,8 @@
 %prep
 %setup -q -n qtbase-opensource-src-%{real_version}
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 %patch109 -p1
 %patch131 -p1
 


++++++ qtbase-opensource-src-5.1.1-bigendian.patch ++++++
diff -up 
qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian 
qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c
--- 
qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian    
    2013-09-23 11:10:42.000000000 +0200
+++ qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c  
2013-09-23 11:16:02.000000000 +0200
@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c
     KeccakPermutationOnWords((UINT64*)state);
 }
 
-#if 0 // Unused in the Qt configuration
+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
 static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
 {
     unsigned int i;
@@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char *
 #endif
 }
 
-#if 0 // Unused in the Qt configuration
+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
 static void fromWordToBytes(UINT8 *bytes, const UINT64 word)
 {
     unsigned int i;
++++++ qtbase-qatomic-ppc.patch ++++++
Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
===================================================================
--- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h
+++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
@@ -63,7 +63,7 @@ public:
     // Atomic API, implemented in qatomic_XXX.h
 
     int load() const { return _q_value; }
-    int loadAcquire() { return _q_value; }
+    int loadAcquire() const { return _q_value; }
     void store(int newValue) { _q_value = newValue; }
     void storeRelease(int newValue) { _q_value = newValue; }
 
@@ -107,7 +107,7 @@ public:
     // Atomic API, implemented in qatomic_XXX.h
 
     T *load() const { return _q_value; }
-    T *loadAcquire() { return _q_value; }
+    T *loadAcquire() const { return _q_value; }
     void store(T *newValue) { _q_value = newValue; }
     void storeRelease(T *newValue) { _q_value = newValue; }
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to