rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 203743 from KDE:Qt5

Browse Source 
Added qtbase-qatomic-ppc.patch, fixes PowerPC build

Depending how important is to get this package built on PPC, checkin to 13.1 also

OBS-URL: https://build.opensuse.org/request/show/203743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=5
This commit is contained in:
Tomáš Chvátal 2013-10-18 17:21:28 +00:00 committed by Git OBS Bridge
parent 26038cf417
commit 901ce1940a
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libqt5-qtbase.changes
View File

@ -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

3
libqt5-qtbase.spec
View File

@ -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

22
qtbase-qatomic-ppc.patch Normal file
View File

@ -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; }