[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Fatih Aşıcı]

Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
 package/qt5/qt5.mk                                 |    4 +--
 package/qt5/qt5base/Config.in                      |    2 ++
 ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch |   32 -------------------
 package/qt5/qt5base/qt5base-mkspecs-files.patch    |    5 +--
 ...-Add-egl-cflags-when-opengles2-is-enabled.patch |   29 +++++++++++++++++
 package/qt5/qt5base/qt5base.mk                     |   10 ++++--
 package/qt5/qt5declarative/qt5declarative.mk       |    1 +
 .../qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch |   33 --------------------
 package/qt5/qt5quick1/qt5quick1.mk                 |    4 +--
 9 files changed, 45 insertions(+), 75 deletions(-)
 delete mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
 create mode 100644 package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
 delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index fce0ca3..671a217 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,5 +1,5 @@
-QT5_VERSION = 5.0.2
-QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
+QT5_VERSION = 5.1.1
+QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/
 include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 9c7fd15..e433373 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI
 
 config BR2_PACKAGE_QT5BASE_WIDGETS
 	bool "widgets module"
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
 	help
 	  This option enables the Qt5Widgets library.
 
@@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XCB_UTIL_IMAGE
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	select BR2_PACKAGE_XCB_UTIL_WM
+	select BR2_PACKAGE_LIBXKBCOMMON
 
 comment "X.org XCB backend available if X.org is enabled"
 	depends on !BR2_PACKAGE_XORG7
diff --git a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
deleted file mode 100644
index a85a5aa..0000000
--- a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 13 Jan 2013 14:36:48 +0100
-Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include
- paths
-
-The eglconvenience code includes <EGL/egl.h>. Therefore, it should get
-the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL,
-otherwise the build might if the EGL library has its headers in
-special locations. In order to achieve this, we simply add the "egl"
-feature to the list of features imported by eglconvenience.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- .../eglconvenience/eglconvenience.pri              |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
-index 188eb1c..8996cea 100644
---- a/src/platformsupport/eglconvenience/eglconvenience.pri
-+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
-@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
-     SOURCES += \
-         $$PWD/qeglconvenience.cpp \
-         $$PWD/qeglplatformcontext.cpp
-+    CONFIG += egl
- 
-     contains(QT_CONFIG,xlib) {
-         HEADERS += \
--- 
-1.7.9.5
-
diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch
index bfa9c15..e406cfc 100644
--- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
+++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
@@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 ===================================================================
 --- /dev/null
 +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,44 @@
 +MAKEFILE_GENERATOR      = UNIX
-+CONFIG                  += incremental gdb_dwarf_index
++CONFIG                 += incremental gdb_dwarf_index
 +QMAKE_INCREMENTAL_STYLE = sublib
 +
 +include(../../common/linux.conf)
@@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 +# modifications to linux.conf
 +QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs
 +QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy
++QMAKE_NM                = $${BUILDROOT_CROSS_COMPILE}nm -P
 +QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip
 +
 +#modifications to gcc-base.conf
diff --git a/package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch b/package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
new file mode 100644
index 0000000..fee66e9
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
@@ -0,0 +1,29 @@
+From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Sun, 15 Sep 2013 11:15:33 +0300
+Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
+---
+ src/plugins/platforms/xcb/xcb-plugin.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
+index 8299528..bc21afe 100644
+--- a/src/plugins/platforms/xcb/xcb-plugin.pro
++++ b/src/plugins/platforms/xcb/xcb-plugin.pro
+@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) {
+ contains(QT_CONFIG, opengl) {
+     contains(QT_CONFIG, opengles2) {
+         DEFINES += XCB_USE_EGL
+-        LIBS += -lEGL
++        CONFIG += egl
+         HEADERS += qxcbeglsurface.h
+ 
+         # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
+-- 
+1.7.10.4
+
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index ddc5574..0106c2c 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5BASE_CONFIGURE_OPTS += -xcb
+QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \
 	xcb-util-image \
 	xcb-util-keysyms \
-	xlib_libX11
+	xlib_libX11 \
+	libxkbcommon
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+QT5BASE_DEPENDENCIES   += xlib_libXext
+endif
 else
 QT5BASE_CONFIGURE_OPTS += -no-xcb
 endif
@@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS
 		-sysroot $(STAGING_DIR) \
 		-plugindir /usr/lib/qt/plugins \
 		-no-rpath \
-		-nomake examples -nomake demos -nomake tests \
+		-nomake examples -nomake tests \
 		-device buildroot \
 		-no-c++11 \
 		$(QT5BASE_CONFIGURE_OPTS) \
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 603c0e7..943f33d 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
 define QT5DECLARATIVE_INSTALL_TARGET_LIBS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
 endef
 endif
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
deleted file mode 100644
index 50a6dbc..0000000
--- a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix build on uClibc
-
-Patch taken from https://code.google.com/p/v8/source/detail?r=12094.
-
-Review URL: https://chromiumcodereview.appspot.com/10784012
-Patch from Remi Duraffort <remi.duraffort@st.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc
-===================================================================
---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc	2012-12-18 20:04:01.000000000 +0100
-+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc	2013-03-03 20:31:46.000000000 +0100
-@@ -1030,7 +1030,8 @@
-   sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]);
- #elif V8_HOST_ARCH_ARM
- // An undefined macro evaluates to 0, so this applies to Android's Bionic also.
--#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \
-+     !defined(__UCLIBC__))
-   sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]);
-   sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]);
-   sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]);
-@@ -1038,7 +1039,8 @@
-   sample->pc = reinterpret_cast<Address>(mcontext.arm_pc);
-   sample->sp = reinterpret_cast<Address>(mcontext.arm_sp);
-   sample->fp = reinterpret_cast<Address>(mcontext.arm_fp);
--#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) &&
-+        // !defined(__UCLIBC__))
- #elif V8_HOST_ARCH_MIPS
-   sample->pc = reinterpret_cast<Address>(mcontext.pc);
-   sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 9bd36db..f9bb3e8 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -12,7 +12,6 @@ QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsba
 QT5QUICK1_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
 QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0
 QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
@@ -35,8 +34,7 @@ endef
 
 define QT5QUICK1_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib
-	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
-	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/
 	cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr
 endef
 
-- 
1.7.10.4

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Thomas Petazzoni]

Dear Fatih A??c?,

Nice!

However, I believe this bump is far from being trivial, and the commit
log should therefore give a lot more details about the changes being
made. A few questions below to show the kind of details that I believe
are missing.

On Wed, 18 Sep 2013 09:28:09 +0300, Fatih A??c? wrote:
> diff --git a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
> deleted file mode 100644
> index a85a5aa..0000000
> --- a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001
> -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -Date: Sun, 13 Jan 2013 14:36:48 +0100
> -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include
> - paths
> -
> -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get
> -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL,
> -otherwise the build might if the EGL library has its headers in
> -special locations. In order to achieve this, we simply add the "egl"
> -feature to the list of features imported by eglconvenience.
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ----
> - .../eglconvenience/eglconvenience.pri              |    1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
> -index 188eb1c..8996cea 100644
> ---- a/src/platformsupport/eglconvenience/eglconvenience.pri
> -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
> -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
> -     SOURCES += \
> -         $$PWD/qeglconvenience.cpp \
> -         $$PWD/qeglplatformcontext.cpp
> -+    CONFIG += egl
> - 
> -     contains(QT_CONFIG,xlib) {
> -         HEADERS += \
> --- 
> -1.7.9.5
> -

Why is this patch removed? Was this fixed in Qt upstream? I see you're
adding a CONFIG += egl in another patch, but only for the X.org case.

> diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch
> index bfa9c15..e406cfc 100644
> --- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
> +++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
> @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
>  ===================================================================
>  --- /dev/null
>  +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> -@@ -0,0 +1,43 @@
> +@@ -0,0 +1,44 @@
>  +MAKEFILE_GENERATOR      = UNIX
> -+CONFIG                  += incremental gdb_dwarf_index
> ++CONFIG                 += incremental gdb_dwarf_index

Is this change needed? Seems like white space change only, no?

> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index ddc5574..0106c2c 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
>  QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
>  
>  ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
> -QT5BASE_CONFIGURE_OPTS += -xcb
> +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
>  QT5BASE_DEPENDENCIES   += \
>  	libxcb \
>  	xcb-util-wm \
>  	xcb-util-image \
>  	xcb-util-keysyms \
> -	xlib_libX11
> +	xlib_libX11 \
> +	libxkbcommon
> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
> +QT5BASE_DEPENDENCIES   += xlib_libXext
> +endif
>  else
>  QT5BASE_CONFIGURE_OPTS += -no-xcb
>  endif
> @@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS
>  		-sysroot $(STAGING_DIR) \
>  		-plugindir /usr/lib/qt/plugins \
>  		-no-rpath \
> -		-nomake examples -nomake demos -nomake tests \
> +		-nomake examples -nomake tests \

No more demos to disable?

>  		-device buildroot \
>  		-no-c++11 \
>  		$(QT5BASE_CONFIGURE_OPTS) \
> diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
> index 603c0e7..943f33d 100644
> --- a/package/qt5/qt5declarative/qt5declarative.mk
> +++ b/package/qt5/qt5declarative/qt5declarative.mk
> @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
>  define QT5DECLARATIVE_INSTALL_TARGET_LIBS
>  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
>  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
> +	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
>  	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
>  endef
>  endif
> diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> deleted file mode 100644
> index 50a6dbc..0000000
> --- a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> +++ /dev/null

So this patch was merged upstream? Or is no longer needed?

>  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> -QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license

Hum why does this gets removed from qt5quick1 but not the other
packages? Maybe it's only needed in qt5base, but in this case, it
should be removed from all other packages, and as a separate patch,
since it's unrelated to the version bump, no?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Fatih Aşıcı]

Sorry. I forgot to add mail list to cc.

On Wednesday 18 September 2013 20:04:37 you wrote:
> > -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri
> > b/src/platformsupport/eglconvenience/eglconvenience.pri -index
> > 188eb1c..8996cea 100644
> > ---- a/src/platformsupport/eglconvenience/eglconvenience.pri
> > -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
> > -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
> > -     SOURCES += \
> > -         $$PWD/qeglconvenience.cpp \
> > -         $$PWD/qeglplatformcontext.cpp
> > -+    CONFIG += egl
> > -
> > -     contains(QT_CONFIG,xlib) {
> > -         HEADERS += \
> > ---
> > -1.7.9.5
> > -
> 
> Why is this patch removed? Was this fixed in Qt upstream? I see you're
> adding a CONFIG += egl in another patch, but only for the X.org case.

It is fixed in upstream. The new patch is also sent to upstream and it is
applied, too:

https://bugdiffs.qt-project.org/fisheye/changelog/Qt5-
qtbase?cs=ff7b57bbb936bc86a64aa2a947fa8984adf400c8

> 
> > diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > b/package/qt5/qt5base/qt5base-mkspecs-files.patch index bfa9c15..e406cfc
> > 100644
> > --- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > +++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > 
> >  ===================================================================
> >  --- /dev/null
> >  +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > 
> > -@@ -0,0 +1,43 @@
> > +@@ -0,0 +1,44 @@
> > 
> >  +MAKEFILE_GENERATOR      = UNIX
> > 
> > -+CONFIG                  += incremental gdb_dwarf_index
> > ++CONFIG                 += incremental gdb_dwarf_index
> 
> Is this change needed? Seems like white space change only, no?

I checked the mkspec files in old and new versions of upstream. Upstream's
files have this change. So I changed our mkspec file to reduce diff output.
I think, this will help checking again in new versions. Yes, it is only
a white space change and not needed.

> 
> > diff --git a/package/qt5/qt5base/qt5base.mk
> > b/package/qt5/qt5base/qt5base.mk index ddc5574..0106c2c 100644
> > --- a/package/qt5/qt5base/qt5base.mk
> > +++ b/package/qt5/qt5base/qt5base.mk
> > @@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if
> > $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
> > 
> >  QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
> >  
> >  ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
> > 
> > -QT5BASE_CONFIGURE_OPTS += -xcb
> > +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
> > 
> >  QT5BASE_DEPENDENCIES   += \
> >  
> >  	libxcb \
> >  	xcb-util-wm \
> >  	xcb-util-image \
> >  	xcb-util-keysyms \
> > 
> > -	xlib_libX11
> > +	xlib_libX11 \
> > +	libxkbcommon
> > +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
> > +QT5BASE_DEPENDENCIES   += xlib_libXext
> > +endif
> > 
> >  else
> >  QT5BASE_CONFIGURE_OPTS += -no-xcb
> >  endif
> > 
> > @@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS
> > 
> >  		-sysroot $(STAGING_DIR) \
> >  		-plugindir /usr/lib/qt/plugins \
> >  		-no-rpath \
> > 
> > -		-nomake examples -nomake demos -nomake tests \
> > +		-nomake examples -nomake tests \
> 
> No more demos to disable?

"examples" and "demos" directories are merged in this new version.
configure script fails with "-nomake demos".
 
> >  		-device buildroot \
> >  		-no-c++11 \
> >  		$(QT5BASE_CONFIGURE_OPTS) \
> > 
> > diff --git a/package/qt5/qt5declarative/qt5declarative.mk
> > b/package/qt5/qt5declarative/qt5declarative.mk index 603c0e7..943f33d
> > 100644
> > --- a/package/qt5/qt5declarative/qt5declarative.mk
> > +++ b/package/qt5/qt5declarative/qt5declarative.mk
> > @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
> > 
> >  define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> >  
> >  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> >  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* 
$(TARGET_DIR)/usr/lib
> > 
> > +	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible
> > $(TARGET_DIR)/usr/lib/qt/plugins
> > 
> >  	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml*
> >  	$(TARGET_DIR)/usr/lib/qt/plugins
> >  
> >  endef
> >  endif
> > 
> > diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> > b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch deleted file
> > mode 100644
> > index 50a6dbc..0000000
> > --- a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> > +++ /dev/null
> 
> So this patch was merged upstream? Or is no longer needed?

It is upstreamed, too.

> 
> >  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> > 
> > -QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
> 
> Hum why does this gets removed from qt5quick1 but not the other
> packages? Maybe it's only needed in qt5base, but in this case, it
> should be removed from all other packages, and as a separate patch,
> since it's unrelated to the version bump, no?

OK. I will remove all of them with a separate patch.

> 
> Thanks a lot!
> 
> Thomas

Thanks,
Fatih

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Thomas Petazzoni]

Dear Fatih A??c?,

On Wed, 18 Sep 2013 21:18:23 +0300, Fatih A??c? wrote:
> Sorry. I forgot to add mail list to cc.
> 
> On Wednesday 18 September 2013 20:04:37 you wrote:
> > > -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri
> > > b/src/platformsupport/eglconvenience/eglconvenience.pri -index
> > > 188eb1c..8996cea 100644
> > > ---- a/src/platformsupport/eglconvenience/eglconvenience.pri
> > > -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
> > > -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
> > > -     SOURCES += \
> > > -         $$PWD/qeglconvenience.cpp \
> > > -         $$PWD/qeglplatformcontext.cpp
> > > -+    CONFIG += egl
> > > -
> > > -     contains(QT_CONFIG,xlib) {
> > > -         HEADERS += \
> > > ---
> > > -1.7.9.5
> > > -
> > 
> > Why is this patch removed? Was this fixed in Qt upstream? I see you're
> > adding a CONFIG += egl in another patch, but only for the X.org case.
> 
> It is fixed in upstream. The new patch is also sent to upstream and it is
> applied, too:
> 
> https://bugdiffs.qt-project.org/fisheye/changelog/Qt5-
> qtbase?cs=ff7b57bbb936bc86a64aa2a947fa8984adf400c8

Ok, thanks. This should have been part of the commit log :)

> > > diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > > b/package/qt5/qt5base/qt5base-mkspecs-files.patch index bfa9c15..e406cfc
> > > 100644
> > > --- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > > +++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
> > > @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > > 
> > >  ===================================================================
> > >  --- /dev/null
> > >  +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
> > > 
> > > -@@ -0,0 +1,43 @@
> > > +@@ -0,0 +1,44 @@
> > > 
> > >  +MAKEFILE_GENERATOR      = UNIX
> > > 
> > > -+CONFIG                  += incremental gdb_dwarf_index
> > > ++CONFIG                 += incremental gdb_dwarf_index
> > 
> > Is this change needed? Seems like white space change only, no?
> 
> I checked the mkspec files in old and new versions of upstream. Upstream's
> files have this change. So I changed our mkspec file to reduce diff output.
> I think, this will help checking again in new versions. Yes, it is only
> a white space change and not needed.

It's a bit early, so maybe my brain is not yet up and running, but if
the upstream has changed this, and we don't care about whether there's
a space or not, why does our patch contains something to change this?

> > > -		-nomake examples -nomake demos -nomake tests \
> > > +		-nomake examples -nomake tests \
> > 
> > No more demos to disable?
> 
> "examples" and "demos" directories are merged in this new version.
> configure script fails with "-nomake demos".

Ok. I was of course suspecting that, merely pointing out that a more
detailed commit log would have been nice.

>  
> > >  		-device buildroot \
> > >  		-no-c++11 \
> > >  		$(QT5BASE_CONFIGURE_OPTS) \
> > > 
> > > diff --git a/package/qt5/qt5declarative/qt5declarative.mk
> > > b/package/qt5/qt5declarative/qt5declarative.mk index 603c0e7..943f33d
> > > 100644
> > > --- a/package/qt5/qt5declarative/qt5declarative.mk
> > > +++ b/package/qt5/qt5declarative/qt5declarative.mk
> > > @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
> > > 
> > >  define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> > >  
> > >  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> > >  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* 
> $(TARGET_DIR)/usr/lib
> > > 
> > > +	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible
> > > $(TARGET_DIR)/usr/lib/qt/plugins
> > > 
> > >  	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml*
> > >  	$(TARGET_DIR)/usr/lib/qt/plugins
> > >  
> > >  endef
> > >  endif
> > > 
> > > diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> > > b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch deleted file
> > > mode 100644
> > > index 50a6dbc..0000000
> > > --- a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
> > > +++ /dev/null
> > 
> > So this patch was merged upstream? Or is no longer needed?
> 
> It is upstreamed, too.

Ditto: to be mentioned in the commit log.

> > >  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> > > 
> > > -QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
> > 
> > Hum why does this gets removed from qt5quick1 but not the other
> > packages? Maybe it's only needed in qt5base, but in this case, it
> > should be removed from all other packages, and as a separate patch,
> > since it's unrelated to the version bump, no?
> 
> OK. I will remove all of them with a separate patch.

Thanks a lot! Definitely nice to see Qt5 moving.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Fatih Aşıcı]

On Thu, 2013-09-19 at 06:24 +0200, Thomas Petazzoni wrote:
> > > > -@@ -0,0 +1,43 @@
> > > > +@@ -0,0 +1,44 @@
> > > > 
> > > >  +MAKEFILE_GENERATOR      = UNIX
> > > > 
> > > > -+CONFIG                  += incremental gdb_dwarf_index
> > > > ++CONFIG                 += incremental gdb_dwarf_index
> > > 
> > > Is this change needed? Seems like white space change only, no?
> > 
> > I checked the mkspec files in old and new versions of upstream.
> Upstream's
> > files have this change. So I changed our mkspec file to reduce diff
> output.
> > I think, this will help checking again in new versions. Yes, it is
> only
> > a white space change and not needed.
> 
> It's a bit early, so maybe my brain is not yet up and running, but if
> the upstream has changed this, and we don't care about whether there's
> a space or not, why does our patch contains something to change this?

It is just a cosmetic change not to see the difference when comparing
files :)

If the rule is not to touch anywhere unrelated to the version change, I
can revert that part.

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Arnout Vandecappelle]

On 19/09/13 07:31, Fatih A??c? wrote:
> On Thu, 2013-09-19 at 06:24 +0200, Thomas Petazzoni wrote:
>>>>> -@@ -0,0 +1,43 @@
>>>>> +@@ -0,0 +1,44 @@
>>>>>
>>>>>   +MAKEFILE_GENERATOR      = UNIX
>>>>>
>>>>> -+CONFIG                  += incremental gdb_dwarf_index
>>>>> ++CONFIG                 += incremental gdb_dwarf_index
>>>>
>>>> Is this change needed? Seems like white space change only, no?
>>>
>>> I checked the mkspec files in old and new versions of upstream.
>> Upstream's
>>> files have this change. So I changed our mkspec file to reduce diff
>> output.
>>> I think, this will help checking again in new versions. Yes, it is
>> only
>>> a white space change and not needed.
>>
>> It's a bit early, so maybe my brain is not yet up and running, but if
>> the upstream has changed this, and we don't care about whether there's
>> a space or not, why does our patch contains something to change this?
>
> It is just a cosmetic change not to see the difference when comparing
> files :)
>
> If the rule is not to touch anywhere unrelated to the version change, I
> can revert that part.

  I think it's a good idea to keep it. The closer that our mkspecs stays 
to one of the upstream examples, the better.

  Perhaps we could try upstreaming our mkspecs? Does that make sense?

  Regards,
  Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Thomas Petazzoni]

Dear Arnout Vandecappelle,

On Thu, 19 Sep 2013 19:41:45 +0200, Arnout Vandecappelle wrote:

>   Perhaps we could try upstreaming our mkspecs? Does that make sense?

Our mkspecs is really meant to be a template that has to be tuned by
the qt5base.mk makefile, and therefore outside Buildroot itself I
believe its meaning is not so important. We could even carry it within
package/qt5/qt5base/ rather than as a patch, for example.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Dear Arnout Vandecappelle,
 Thomas> On Thu, 19 Sep 2013 19:41:45 +0200, Arnout Vandecappelle wrote:

 >> Perhaps we could try upstreaming our mkspecs? Does that make sense?

 Thomas> Our mkspecs is really meant to be a template that has to be tuned by
 Thomas> the qt5base.mk makefile, and therefore outside Buildroot itself I
 Thomas> believe its meaning is not so important. We could even carry it within
 Thomas> package/qt5/qt5base/ rather than as a patch, for example.

That might indeed be a good idea.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Fatih Aşıcı]

Dear Thomas,

On Thursday 19 September 2013 21:55:14 Thomas Petazzoni wrote:
> On Thu, 19 Sep 2013 19:41:45 +0200, Arnout Vandecappelle wrote:
> >   Perhaps we could try upstreaming our mkspecs? Does that make sense?
> 
> Our mkspecs is really meant to be a template that has to be tuned by
> the qt5base.mk makefile, and therefore outside Buildroot itself I
> believe its meaning is not so important. We could even carry it within
> package/qt5/qt5base/ rather than as a patch, for example.

I think, this part could be simplified by using a mkspec file for "Generic 
Linux" device which could be accepted by upstream. In order to customize 
variables we can use -device-option argument. As you mention in a comment in 
qt5base.mk, this option has some problems. I sent[1] a patch to upstream which 
fixes a problem when the value contains an equal sign.

I am also waiting[2] for a reply from upstream about the linux-generic-g++ 
device suggestion.

I have tried this method on my local machine and it seems working.

[1] https://bugreports.qt-project.org/browse/QTBUG-33584
[2] https://bugreports.qt-project.org/browse/QTBUG-33586

---
Fatih

[Buildroot] [PATCH 1/5] qt5: bump to 5.1.1

[Thomas Petazzoni]

Dear Fatih A??c?,

On Sat, 21 Sep 2013 21:38:02 +0300, Fatih A??c? wrote:

> I think, this part could be simplified by using a mkspec file for "Generic 
> Linux" device which could be accepted by upstream. In order to customize 
> variables we can use -device-option argument. As you mention in a comment in 
> qt5base.mk, this option has some problems. I sent[1] a patch to upstream which 
> fixes a problem when the value contains an equal sign.
> 
> I am also waiting[2] for a reply from upstream about the linux-generic-g++ 
> device suggestion.
> 
> I have tried this method on my local machine and it seems working.
> 
> [1] https://bugreports.qt-project.org/browse/QTBUG-33584
> [2] https://bugreports.qt-project.org/browse/QTBUG-33586

Great, this definitely looks like a nice solution! I'm happy to see
that you have taken the time to dive into Qt5 to polish all these
little problems, this is really cool. Looking forward to seeing more
progress on these things.

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com