Skip to contentSkip to conversation

qt5: bump to 5.3.0

PATCH Superseded Fatih Aşıcı 2 participants 8 messages May 20, 2014 – May 23, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Fatih Aşıcı

author
#0 lore raw

PATCH 1/3 qt5: bump to 5.3.0

Remove upstreamed patches.

See http://qt-project.org/qt5/qt53 for the release information.

Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/qt5.mk                                 |  4 +-
 package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch | 29 ----------
 .../qt5base-0005-uclibc-no-gnu-lib-names.patch     | 44 --------------
 ...not-check-feature-macros-for-posix_falloc.patch | 41 -------------
 ...qt5base-0007-Fix-no-opengl-build-with-egl.patch | 65 ---------------------
 ...on-t-require-GL-when-build-with-no-opengl.patch | 28 ---------
 ...5base-Fix-linuxfb-argument-mmsize-parsing.patch | 38 ------------
 ...n_t-build-scanner-example-without-qtquick.patch | 30 ----------
 ...ample-needs-no-widgets-but-it-needs-quick.patch | 67 ----------------------
 9 files changed, 2 insertions(+), 344 deletions(-)
 delete mode 100644 package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0006-sqlite3-Do-not-check-feature-macros-for-posix_falloc.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch
 delete mode 100644 package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch
 delete mode 100644 package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch
 delete mode 100644 package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch
 delete mode 100644 package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch
package/qt5/qt5.mk +2 -2
index 0ce6cf5..c897496 100644
@@ -1,5 +1,5 @@
-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))
package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch deleted +0 -29
deleted file mode 100644
index 906b56a..0000000
@@ -1,29 +0,0 @@
-Set loadAcquire() as const
-
-Fixes powerpc build.
-
-Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643
-Signed-off-by: Fatih A??c? <[email protected]>
-
-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; }
-
package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch deleted +0 -44

44 lines not on this page · raw message

package/qt5/qt5base/qt5base-0006-sqlite3-Do-not-check-feature-macros-for-posix_falloc.patch deleted +0 -41

41 lines not on this page · raw message

package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch deleted +0 -65

65 lines not on this page · raw message

package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch deleted +0 -28
deleted file mode 100644
index e04bcc4..0000000
@@ -1,28 +0,0 @@
-From 02edc30764935d64f0994a9c592ca729f1c37410 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <[email protected]>
-Date: Fri, 31 Jan 2014 22:28:19 +0100
-Subject: [PATCH] CMake: don't require GL when build with -no-opengl
-
-Task-number: QTBUG-36509
-Change-Id: I03451527ab91754d87ff2a43985952c7c7641826
-Reviewed-by: Stephen Kelly <[email protected]>
----
- src/gui/gui.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 3203b41..f4c35a3 100644
---- a/src/gui/gui.pro
-+++ b/src/gui/gui.pro
-@@ -81,7 +81,7 @@ contains(QT_CONFIG, angle) {
-         !isEmpty(QMAKE_LIBDIR_OPENGL_ES2): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)
-         CMAKE_GL_HEADER_NAME = GLES2/gl2.h
-         CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
--    } else {
-+    } else:contains(QT_CONFIG, opengl) {
-         !isEmpty(QMAKE_INCDIR_OPENGL): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)
-         CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)
-         CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)
--- 
-1.8.3.2
-
package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch deleted +0 -38
deleted file mode 100644
index 3b9811b..0000000
@@ -1,38 +0,0 @@
-From b1fb89055d4d1bc88b7b0b788ad8eca4f3641f9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <[email protected]>
-Date: Fri, 7 Feb 2014 13:12:37 +0100
-Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing
-
-Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'.
-
-Task-number: QTBUG-29133
-Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1
----
- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-index 735a43d..33a9523 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize()
-     foreach (const QString &arg, mArgs) {
-         if (arg == QLatin1String("nographicsmodeswitch"))
-             doSwitchToGraphicsMode = false;
-+        else if (mmSizeRx.indexIn(arg) != -1)
-+            userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
-         else if (sizeRx.indexIn(arg) != -1)
-             userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt()));
-         else if (offsetRx.indexIn(arg) != -1)
-@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize()
-             ttyDevice = ttyRx.cap(1);
-         else if (fbRx.indexIn(arg) != -1)
-             fbDevice = fbRx.cap(1);
--        else if (mmSizeRx.indexIn(arg) != -1)
--            userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
-     }
- 
-     if (fbDevice.isEmpty()) {
--- 
-1.8.3.2
-
package/qt5/qt5connectivity/qt5connectivity-0001-don_t-build-scanner-example-without-qtquick.patch deleted +0 -30
deleted file mode 100644
index 0751ba7..0000000
@@ -1,30 +0,0 @@
-qt5connectivity: Don't build scanner example without QtQuick
-Signed-off-by: Vicente Olivert Riera <[email protected]>
-
-From 1454664752505f5870e4173d15362bfdfe4148e7 Mon Sep 17 00:00:00 2001
-From: Alex Blasche <[email protected]>
-Date: Wed, 15 Jan 2014 12:11:31 +0100
-Subject: [PATCH] Don't build scanner example without QtQuick
-
-Task-number: QTBUG-35711
-Change-Id: I0406fb5edd8fb2a90046308853485eaaa4311a26
-Reviewed-by: Friedemann Kleint <[email protected]>
-Reviewed-by: Fabian Bumberger <[email protected]>
-Reviewed-by: Alex Blasche <[email protected]>
----
- examples/bluetooth/bluetooth.pro |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro
-index e3ef769..549bb7c 100644
---- a/examples/bluetooth/bluetooth.pro
-+++ b/examples/bluetooth/bluetooth.pro
-@@ -6,4 +6,4 @@ qtHaveModule(widgets) {
-                bttennis
- }
- 
--SUBDIRS += scanner
-+qtHaveModule(quick): SUBDIRS += scanner
--- 
-1.7.1
-
package/qt5/qt5connectivity/qt5connectivity-0002-the-poster-example-needs-no-widgets-but-it-needs-quick.patch deleted +0 -67

67 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/3 qt5enginio: new package

Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/Config.in                |  1 +
 package/qt5/qt5enginio/Config.in     | 13 +++++++++
 package/qt5/qt5enginio/qt5enginio.mk | 56 ++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 package/qt5/qt5enginio/Config.in
 create mode 100644 package/qt5/qt5enginio/qt5enginio.mk
package/qt5/Config.in +1 -0
index d36852e..e810ecb 100644
@@ -29,6 +29,7 @@ if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
+source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
package/qt5/qt5enginio/Config.in new file +13 -0
new file mode 100644
index 0000000..c06e6da
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT5ENGINIO
+	bool "qt5enginio"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5enginio module.
+
+	  http://qt-project.org
package/qt5/qt5enginio/qt5enginio.mk new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 qt5enginio: new package

Quoted 35 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fatih" == Fatih A??c? <[email protected]> writes:

Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/Config.in                |  1 +
 package/qt5/qt5enginio/Config.in     | 13 +++++++++
 package/qt5/qt5enginio/qt5enginio.mk | 56 ++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 package/qt5/qt5enginio/Config.in
 create mode 100644 package/qt5/qt5enginio/qt5enginio.mk
package/qt5/Config.in +1 -0
index d36852e..e810ecb 100644
@@ -29,6 +29,7 @@ if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
+source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
package/qt5/qt5enginio/Config.in new file +6 -0
new file mode 100644
index 0000000..c06e6da
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT5ENGINIO
+	bool "qt5enginio"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_NETWORK

<snip>

Quoted 1 line

+QT5ENGINIO_DEPENDENCIES = qt5base

You forgot to add openssl to _DEPENDENCIES.

Otherwise it looks good.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 2/3 qt5enginio: new package

Quoted 42 lines · On Thursday 22 May 2014 16:42:09 Peter Korsgaard wrote:
Quoted 39 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fatih" == Fatih A??c? <[email protected]> writes:

Signed-off-by Fatih A??c? <[email protected]>

---

 package/qt5/Config.in                |  1 +
 package/qt5/qt5enginio/Config.in     | 13 +++++++++
 package/qt5/qt5enginio/qt5enginio.mk | 56
 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+)
 create mode 100644 package/qt5/qt5enginio/Config.in
 create mode 100644 package/qt5/qt5enginio/qt5enginio.mk
package/qt5/Config.in +1 -0
index d36852e..e810ecb 100644
@@ -29,6 +29,7 @@ if BR2_PACKAGE_QT5
 
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
 
+source "package/qt5/qt5enginio/Config.in"

source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5multimedia/Config.in"

(quoted diff) +0 -0

b/package/qt5/qt5enginio/Config.in new file mode 100644 index 0000000..c06e6da

package/qt5/qt5enginio/Config.in new file +6 -0
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT5ENGINIO
+	bool "qt5enginio"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_NETWORK

<snip>

Quoted 3 lines
Quoted 1 line

+QT5ENGINIO_DEPENDENCIES = qt5base

You forgot to add openssl to _DEPENDENCIES.

openssl is not a direct dependency of this package. It needs an openssl- enabled qt5base. qt5base has openssl in its _DEPENDENCIES variable.

In this case, do I really need to add this dependency to this package?

Regards,
Fatih

#4 lore raw

PATCH 2/3 qt5enginio: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fatih" == Fatih A??c? <[email protected]> writes:

Hi,

Quoted 9 lines
Quoted 9 lines
Quoted 6 lines
package/qt5/qt5enginio/Config.in new file +6 -0
+config BR2_PACKAGE_QT5ENGINIO
+	bool "qt5enginio"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_NETWORK

<snip>

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+QT5ENGINIO_DEPENDENCIES = qt5base

You forgot to add openssl to _DEPENDENCIES.

openssl is not a direct dependency of this package. It needs an openssl- enabled qt5base. qt5base has openssl in its _DEPENDENCIES variable.

Ahh, ok - That wasn't clear to me.

Quoted 1 line

In this case, do I really need to add this dependency to this package?

It cannot hurt. I would say you should either:

- Add openssl to _DEPENDENCIES
- Add a comment after the 'select BR2_PACKAGE_OPENSSL' to explain why (similar to how we do for runtime dependencies)

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 3/3 qt5websockets: new package

In reply to Fatih Aşıcı
Signed-off-by Fatih A??c? <[email protected]>
---
 package/qt5/Config.in                      |  1 +
 package/qt5/qt5websockets/Config.in        | 12 +++++++
 package/qt5/qt5websockets/qt5websockets.mk | 55 ++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 package/qt5/qt5websockets/Config.in
 create mode 100644 package/qt5/qt5websockets/qt5websockets.mk
package/qt5/Config.in +1 -0
index e810ecb..efdd9d4 100644
@@ -40,6 +40,7 @@ source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 endif
package/qt5/qt5websockets/Config.in new file +12 -0
new file mode 100644
index 0000000..26a248d
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_QT5WEBSOCKETS
+	bool "qt5websockets"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5BASE_SQL
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5websockets module.
+
+	  http://qt-project.org
package/qt5/qt5websockets/qt5websockets.mk new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
1.9.1
#6 lore raw

PATCH 1/3 qt5: bump to 5.3.0

In reply to Fatih Aşıcı
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fatih" == Fatih A??c? <[email protected]> writes:

Remove upstreamed patches.
See http://qt-project.org/qt5/qt53 for the release information.

Thanks. It unfortunately doesn't build for me with the default uClibc/gcc versions:

kernel/qdnslookup_unix.cpp: In static member function ?static void QDnsLookupRunnable::query(int, const QByteArray&, const QHostAddress&, QDnsLookupReply*)?:
kernel/qdnslookup_unix.cpp:165:27: error: ?struct __res_state::<anonymous union>::<anonymous>? has no member named ?nsmap? Makefile:16244: recipe for target '.obj/qdnslookup_unix.o' failed
make[3]: *** [.obj/qdnslookup_unix.o] Error 1

Seems to have been introduced here:

https://qt.gitorious.org/qt/qtbase/commit/62f01d581bdda6f67cd96af179ae1953e30fa218

uClibc doesn't have a nsmap member in __res_state:

http://git.uclibc.org/uClibc/tree/include/resolv.h

So I guess this need to go in an #ifndef __UCLIBC__ conditional.

Care to create a patch (and send upstream!)?

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 1/3 qt5: bump to 5.3.0

Quoted 19 lines · On Thursday 22 May 2014 16:41:36 Peter Korsgaard wrote:
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fatih" == Fatih A??c? <[email protected]> writes:

Remove upstreamed patches.
See http://qt-project.org/qt5/qt53 for the release information.

Thanks. It unfortunately doesn't build for me with the default uClibc/gcc versions:

kernel/qdnslookup_unix.cpp: In static member function ?static void QDnsLookupRunnable::query(int, const QByteArray&, const QHostAddress&, QDnsLookupReply*)?: kernel/qdnslookup_unix.cpp:165:27: error: ?struct __res_state::<anonymous union>::<anonymous>? has no member named ?nsmap? Makefile:16244: recipe for target '.obj/qdnslookup_unix.o' failed make[3]: *** [.obj/qdnslookup_unix.o] Error 1

Seems to have been introduced here:

https://qt.gitorious.org/qt/qtbase/commit/62f01d581bdda6f67cd96af179ae1953e
30fa218

Quoted 7 lines

uClibc doesn't have a nsmap member in __res_state:

http://git.uclibc.org/uClibc/tree/include/resolv.h

So I guess this need to go in an #ifndef __UCLIBC__ conditional.

Care to create a patch (and send upstream!)?

This time I didn't test it with a uclibc toolchain. Will look at it.

Regards,
Fatih