diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 0b1bc5f..28dc201 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 18 12:38:19 UTC 2013 - hrvoje.senjan@gmail.com + +- Added qtbase-qatomic-ppc.patch, fixes PowerPC build + ------------------------------------------------------------------- Wed Oct 16 17:24:48 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index b234938..a7df178 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -66,6 +66,8 @@ Source2: macros.qt5 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 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 @@ -103,6 +105,7 @@ handling. %prep %setup -q -n qtbase-opensource-src-%{real_version} %patch2 -p1 +%patch3 -p1 %patch109 -p1 %patch131 -p1 diff --git a/qtbase-qatomic-ppc.patch b/qtbase-qatomic-ppc.patch new file mode 100644 index 0000000..826036e --- /dev/null +++ b/qtbase-qatomic-ppc.patch @@ -0,0 +1,22 @@ +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; } +