Revert "backport the qatomic/ppc patch"
This reverts commit c18de56126
.
This commit is contained in:
parent
6d3bf7eb69
commit
780dd8bbb9
@ -15,7 +15,7 @@
|
|||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Version: 5.1.1
|
Version: 5.1.1
|
||||||
Release: 6%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -31,9 +31,6 @@ Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
|
|||||||
# support multilib optflags
|
# support multilib optflags
|
||||||
Patch2: qtbase-multilib_optflags.patch
|
Patch2: qtbase-multilib_optflags.patch
|
||||||
|
|
||||||
# qatomic on ppc/ppc64, http://bugzilla.redhat.com/1005482
|
|
||||||
Patch3: qtbase-qatomic-ppc.patch
|
|
||||||
|
|
||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
# support poll
|
# support poll
|
||||||
# https://bugreports.qt-project.org/browse/QTBUG-27195
|
# https://bugreports.qt-project.org/browse/QTBUG-27195
|
||||||
@ -169,8 +166,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||||||
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
|
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
|
||||||
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
||||||
|
|
||||||
%patch3 -p1 -b .qatomic-ppc
|
|
||||||
|
|
||||||
#patch50 -p1 -b .poll
|
#patch50 -p1 -b .poll
|
||||||
%patch51 -p1 -b .bigendian
|
%patch51 -p1 -b .bigendian
|
||||||
|
|
||||||
@ -544,9 +539,6 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Oct 17 2013 Lukáš Tinkl <ltinkl@redhat.com> - 5.1.1-6
|
|
||||||
- Fixes #1005482 - qtbase FTBFS on ppc/ppc64
|
|
||||||
|
|
||||||
* Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5
|
* Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5
|
||||||
- fix big endian builds
|
- fix big endian builds
|
||||||
|
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
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; }
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user