qt5: bump to 5.3.0

QT5_VERSION_MAJOR = 5.2

QT5_VERSION = $(QT5_VERSION_MAJOR).1

QT5_VERSION_MAJOR = 5.3

QT5_VERSION = $(QT5_VERSION_MAJOR).0

QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules/

include $(sort $(wildcard package/qt5/*/*.mk))

From af2241c678bcd9af58d38f98f5caec96a498733e Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>

Date: Fri, 23 May 2014 17:02:01 +0300

Subject: [PATCH] QDnsLookup: Fix build with uClibc

uClibc doesn't have a nsmap member in __res_state. Since it also doesn't have

res_nquery() which is mandatory for QDnsLookup, we can simply disable the code

to fix the build.

Sent-Upstream: https://codereview.qt-project.org/86159

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

Change-Id: Ia872f535519aca3a2de763548c6dd0e3e0ee20d4

---

 src/network/kernel/qdnslookup_unix.cpp | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp

index 26834df..2a482a6 100644

--- a/src/network/kernel/qdnslookup_unix.cpp

+++ b/src/network/kernel/qdnslookup_unix.cpp

@@ -160,9 +160,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN

                 Q_CHECK_PTR(ns);

                 state._u._ext.nsaddrs[0] = ns;

             }

+#ifndef __UCLIBC__

             // Set nsmap[] to indicate that nsaddrs[0] is an IPv6 address

             // See: https://sourceware.org/ml/libc-hacker/2002-05/msg00035.html

             state._u._ext.nsmap[0] = MAXNS + 1;

+#endif

             state._u._ext.nscount6 = 1;

             ns->sin6_family = AF_INET6;

             ns->sin6_port = htons(53);

-- 

1.9.1

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

[PATCH]: fix build on uClibc

Reported upstream: https://bugreports.qt-project.org/browse/QTBUG-35742

uClibc defines __GNU_LIBRARY__ like glibc, but doesn't provide

gnu/lib-names.h, so the build breaks with:

kernel/qdnslookup_unix.cpp:56:29: fatal error: gnu/lib-names.h:

No such file or directory

Fix it by explicitly checking for !uClibc.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

---

 src/network/kernel/qdnslookup_unix.cpp |    2 +-

 src/network/kernel/qhostinfo_unix.cpp  |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

Index: qt5base-5.2.0/src/network/kernel/qdnslookup_unix.cpp

===================================================================

--- qt5base-5.2.0.orig/src/network/kernel/qdnslookup_unix.cpp

+++ qt5base-5.2.0/src/network/kernel/qdnslookup_unix.cpp

@@ -52,7 +52,7 @@

 #include <arpa/nameser_compat.h>

 #include <resolv.h>

-#ifdef __GNU_LIBRARY__

+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)

 #  include <gnu/lib-names.h>

 #endif

Index: qt5base-5.2.0/src/network/kernel/qhostinfo_unix.cpp

===================================================================

--- qt5base-5.2.0.orig/src/network/kernel/qhostinfo_unix.cpp

+++ qt5base-5.2.0/src/network/kernel/qhostinfo_unix.cpp

@@ -63,7 +63,7 @@

 #  include <resolv.h>

 #endif

-#ifdef __GNU_LIBRARY__

+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)

 #  include <gnu/lib-names.h>

 #endif

From 18eee84e9458bdcb244df4c5ad968c8d5ea1860a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>

Date: Fri, 18 Apr 2014 10:19:03 +0300

Subject: [PATCH] sqlite3: Do not check feature macros for posix_fallocate()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Build system already checks for this function and defines

HAVE_POSIX_FALLOCATE if it is available.

Next releases of Qt will come with an updated sqlite3 which removes this

check.

Change-Id: I55e403aa01a7f054f9fe4773ce96dad399afce80

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

---

 src/3rdparty/sqlite/sqlite3.c | 7 -------

 1 file changed, 7 deletions(-)

diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c

index 03fa649..1ae9be2 100644

--- a/src/3rdparty/sqlite/sqlite3.c

+++ b/src/3rdparty/sqlite/sqlite3.c

@@ -22935,13 +22935,6 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){

 */

 #if SQLITE_OS_UNIX              /* This file is used on unix only */

-/* Use posix_fallocate() if it is available

-*/

-#if !defined(HAVE_POSIX_FALLOCATE) \

-      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)

-# define HAVE_POSIX_FALLOCATE 1

-#endif

-

 /*

 ** There are various methods for file locking used for concurrency

 ** control:

-- 

1.9.1