rpms
/
qt5-qtbase
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #1005482 - qtbase FTBFS on ppc/ppc64

This commit is contained in:
Lukáš Tinkl 2013-10-16 18:35:52 +02:00
parent 3bc8a77c43
commit be3d96a708
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt5-qtbase.spec
View File

@ -21,7 +21,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.2.0
Release: 0.1.%{pre}%{?dist}
Release: 0.2.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -33,7 +33,7 @@ Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/subm
%endif
# http://bugzilla.redhat.com/1005482
ExcludeArch: ppc64 ppc
#ExcludeArch: ppc64 ppc
# help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files
Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
@ -41,6 +41,9 @@ Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
# support multilib optflags
Patch2: qtbase-multilib_optflags.patch
# qatomic on ppc/ppc64
Patch3: qtbase-qatomic-ppc.patch
# upstreamable patches
# support poll
# https://bugreports.qt-project.org/browse/QTBUG-27195
@ -195,6 +198,8 @@ Qt5 libraries used for drawing widgets and OpenGL items.
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch3 -p1 -b .qatomic-ppc
#patch50 -p1 -b .poll
%patch51 -p1 -b .bigendian
%patch52 -p1 -b .harfbuzz
@ -593,6 +598,9 @@ popd
%changelog
* Wed Oct 16 2013 Lukáš Tinkl <ltinkl@redhat.com> - 5.2.0-0.2.alpha
- Fixes #1005482 - qtbase FTBFS on ppc/ppc64
* Tue Oct 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-0.1.alpha
- 5.2.0-alpha
- -system-harfbuzz

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