From c908fe4ebd5a04813be0b83c173fae182bb22728 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 2 Nov 2013 19:06:14 +0100 Subject: qt5: upgrade to 5.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- ...-the-mkv8snapshot-tool-to-the-native-side.patch | 32 ---------------------- ...pro-respect-external-host-bindir-when-set.patch | 31 --------------------- 2 files changed, 63 deletions(-) delete mode 100644 recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch (limited to 'recipes-qt/qt5/qtjsbackend-git') diff --git a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch deleted file mode 100644 index e823b761..00000000 --- a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 11:20:13 -0800 -Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro -index 16beb02..5e327f7 100644 ---- a/src/tools/mkv8snapshot/mkv8snapshot.pro -+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro -@@ -24,5 +24,10 @@ unix:LIBS += -lpthread - - # We don't need to install this tool, it's only used for building v8. - # However we do have to make sure that 'make install' builds it. --dummytarget.CONFIG = dummy_install --INSTALLS += dummytarget -+#dummytarget.CONFIG = dummy_install -+#INSTALLS += dummytarget -+ -+# Install the tool so that during target cross compilation we have access to the native side binary -+target.path = $$[QT_HOST_BINS] -+INSTALLS += target -+ --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch deleted file mode 100644 index b0ac27d1..00000000 --- a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 02:45:01 +0200 -Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - src/v8/v8.pro | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/v8/v8.pro b/src/v8/v8.pro -index 2be6a19..d3da4e1 100644 ---- a/src/v8/v8.pro -+++ b/src/v8/v8.pro -@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. - include(v8.pri) - - contains(QT_CONFIG, v8snapshot) { -- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() -+ !exists($$mkv8snapshot.tool): \ -+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() -+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} - DUMMY_FILE = v8.pro - mkv8snapshot.input = DUMMY_FILE - mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp --- -1.8.3.2 - -- cgit v1.2.3-54-g00ecf