Hi Philipp Am Mittwoch, 5. August 2015, 17:43:51 schrieb Philipp Zabel: > > - select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE > > + select DBUS if QT5_DBUS > Why? The qtwebengine build fails when dbus is not yet installed. Probably a typing accident. I overlooked this.
> > -QT5_VERSION := 5.4.2 > > -QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0 > > +QT5_VERSION := 5.5.0 > > +QT5_MD5 := 24d387fbb0e3042cc48aeaff5627bbb6 > > Sure? I have downloaded a qt-everywhere-opensource-src-5.5.0.tar.xz with > md5sum 65d5282f3dee0336da9ed1f77148952f. See > http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-op > ensource-src-5.5.0.tar.xz.mirrorlist Also patch 0005 doesn't apply. Strange mine has the above but as this might be the newer version i just updated the md5 hash. > > + $(call ptx/qt5-module, QT3D, qt3d) \ > > + -skip qtactiveqt \ > > + -skip qtandroidextras \ > > These two are already set directly above. Oops. Below is a patchset done with -M: Signed-off-by: Tim Sander <t...@krieglstein.org> --- ...1-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch | 14 +++++++++----- ...eclarative-is-an-optional-dependency-for-qtwebkit.patch | 10 +++++++--- ...ultimedia-videonode-plugins-require-qtmultimediaq.patch | 6 +++++- .../0004-HACK-put-wayland-scanner-outout-in-srcdir.patch | 6 +++++- ...turesfeatures-don-t-use-gold-linker-for-host-tool.patch | 6 +++++- .../series | 3 --- rules/qt5.in | 8 ++++++++ rules/qt5.make | 12 ++++++++++-- 8 files changed, 49 insertions(+), 16 deletions(-) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch (75%) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch (74%) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch (80%) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch (86%) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch (84%) rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/series (72%) diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch similarity index 75% rename from patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch rename to patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch index c18bbbf..f7d86ad 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch +++ b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch @@ -1,6 +1,7 @@ +From 18d8d3381e3caca32b2c253f34917280cca47972 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbr...@pengutronix.de> Date: Tue, 12 May 2015 11:38:35 +0200 -Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit +Subject: [PATCH 1/8] ptxdist: qtwebengine: allow building with ptxdsit Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> --- @@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf -index 4c2547d571db..6b5d34b527a5 100644 +index ef0320da1af0..460f9a91c49f 100644 --- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf +++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf -@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) { +@@ -16,6 +16,7 @@ defineTest(isPlatformSupported) { !isPythonVersionSupported(): return(false) linux-g++*|win32-msvc2013|macx-clang: return(true) boot2qt: return(true) @@ -19,12 +20,15 @@ index 4c2547d571db..6b5d34b527a5 100644 skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") return(false) -@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) { +@@ -72,7 +73,7 @@ defineReplace(getChromiumSrcDir) { } defineReplace(extractCFlag) { - CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS + CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS - !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS OPTION = $$find(CFLAGS, $$1) OPTION = $$split(OPTION, =) + return ($$member(OPTION, 1)) +-- +1.9.1 + diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch similarity index 74% rename from patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch rename to patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch index 2145c91..60a4a57 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch +++ b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch @@ -1,6 +1,7 @@ +From fc0ba7fc2fc39ff76c7fd507cc93be775bca02d2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbr...@pengutronix.de> Date: Tue, 29 Apr 2014 18:35:43 +0200 -Subject: [PATCH] qtdeclarative is an optional dependency for qtwebkit +Subject: [PATCH 2/8] qtdeclarative is an optional dependency for qtwebkit Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> --- @@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro -index 15fd48ec71f3..a1d87b9a9d24 100644 +index 6876dfba1853..5eaf64caa111 100644 --- a/qt.pro +++ b/qt.pro -@@ -77,7 +77,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) +@@ -76,7 +76,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative) addModule(qtwebsockets, qtbase, qtdeclarative) addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets) @@ -20,3 +21,6 @@ index 15fd48ec71f3..a1d87b9a9d24 100644 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) +-- +1.9.1 + diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch similarity index 80% rename from patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch rename to patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch index 10d99a4..dda536a 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch +++ b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch @@ -1,6 +1,7 @@ +From d571d941407e5951475dec60e28474d924e2a3a3 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbr...@pengutronix.de> Date: Tue, 12 May 2015 11:29:53 +0200 -Subject: [PATCH] qtmultimedia: videonode plugins require +Subject: [PATCH 3/8] qtmultimedia: videonode plugins require qtmultimediaquicktools Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> @@ -21,3 +22,6 @@ index 26f99bc29fe3..6cbe4f0347ad 100644 } # Optional bits +-- +1.9.1 + diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch similarity index 86% rename from patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch rename to patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch index 2ea4c75..6e62a8a 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch +++ b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch @@ -1,6 +1,7 @@ +From 7d644980fd38e6d7cba0378d8e19b2602beba4ba Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbr...@pengutronix.de> Date: Mon, 10 Nov 2014 17:44:10 +0100 -Subject: [PATCH] HACK: put wayland-scanner outout in srcdir +Subject: [PATCH 4/8] HACK: put wayland-scanner outout in srcdir The include paths are currently broken when building OOT @@ -22,3 +23,6 @@ index 5a97d98373fa..a5477e8f9b42 100644 header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest) !isEmpty(header_files_client) { +-- +1.9.1 + diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch similarity index 84% rename from patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch rename to patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch index df02743..d6e94c6 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch +++ b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch @@ -1,6 +1,7 @@ +From 590cbb399b51dcbc280442c8188cea5841a5fed9 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbr...@pengutronix.de> Date: Tue, 2 Jun 2015 17:35:01 +0200 -Subject: [PATCH] featuresfeatures: don't use gold linker for host tools +Subject: [PATCH 5/8] featuresfeatures: don't use gold linker for host tools The check it it is supported was only done for the target. @@ -22,3 +23,6 @@ index e967399258ad..7f08ba31c308 100644 dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +1.9.1 + diff --git a/patches/qt-everywhere-opensource-src-5.4.2/series b/patches/qt-everywhere-opensource-src-5.5.0/series similarity index 72% rename from patches/qt-everywhere-opensource-src-5.4.2/series rename to patches/qt-everywhere-opensource-src-5.5.0/series index d689a39..327dd1e 100644 --- a/patches/qt-everywhere-opensource-src-5.4.2/series +++ b/patches/qt-everywhere-opensource-src-5.5.0/series @@ -1,8 +1,5 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch 0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch 0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch 0004-HACK-put-wayland-scanner-outout-in-srcdir.patch 0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch -# 487e45ed5135b1e39410672e7ce9351c - git-ptx-patches magic diff --git a/rules/qt5.in b/rules/qt5.in index 2670ac4..0f696ac 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -255,6 +255,14 @@ config QT5_MODULE_QTBASE if QT5_MODULE_QTBASE +config QT5_MODULE_QT3D + bool + prompt "Qt3D" + +config QT5_MODULE_QTCANVAS3D + bool + prompt "QtCanvas3D" + config QT5_MODULE_QTBASE_ACCESSIBILITY bool default QT5_ACCESSIBILITY && QT5_MODULE_QTBASE_WIDGETS diff --git a/rules/qt5.make b/rules/qt5.make index 330ad55..83c24bc 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5 # # Paths and names # -QT5_VERSION := 5.4.2 -QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0 +QT5_VERSION := 5.5.0 +QT5_MD5 := 65d5282f3dee0336da9ed1f77148952f QT5 := qt-everywhere-opensource-src-$(QT5_VERSION) QT5_SUFFIX := tar.xz QT5_URL := \ @@ -136,7 +136,9 @@ QT5_CONF_OPT := \ $(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \ -skip qtactiveqt \ -skip qtandroidextras \ + $(call ptx/qt5-module, QT3D, qt3d) \ $(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \ + $(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \ $(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \ $(call ptx/qt5-module, QTENGINIO, qtenginio) \ -skip qtdoc \ @@ -297,12 +299,18 @@ QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_LINUXFB) += platforms/libqlinuxfb QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_GUI) += platforms/libqminimal QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_EGLFS) += platforms/libqminimalegl +### Qt3d ### +QT5_LIBS_$(PTXCONF_QT5_MODULE_QT3D) += Qt3d + ### QtConnectivity ### QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Bluetooth QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Nfc QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtBluetooth QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtNfc +### QtCanvas3d ### +QT5_LIBS_$(PTXCONF_QT5_MODULE_CANVAS3D) += QtCanvas3d + ### QtDeclarative ### QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE) += Qt5Qml QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick -- 1.9.1 -- ptxdist mailing list ptxdist@pengutronix.de
