diff options
Diffstat (limited to 'package/qt5/qt5base')
| -rw-r--r-- | package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch | 3 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch | 29 |
2 files changed, 30 insertions, 2 deletions
diff --git a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch index b0011f6c35..51cea04763 100644 --- a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch +++ b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch @@ -136,12 +136,11 @@ diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 58d4ddd..072502c 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri -@@ -1,6 +1,7 @@ +@@ -1,5 +1,6 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS +contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1 - winrt: DEFINES += SQLITE_OS_WINRT INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c diff --git a/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch new file mode 100644 index 0000000000..906b56a0d4 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch @@ -0,0 +1,29 @@ +Set loadAcquire() as const + +Fixes powerpc build. + +Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643 +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> + +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; } + |
