summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-12-20 01:05:55 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-21 21:01:40 +0000
commitc8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch)
tree821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
parentc6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff)
downloadmeta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz
qt5: upgrade to latest revision in 5.12
* WIP * zlib temporarily disabled in qtbase-native, the configure fails too find it even when it is in RSS: docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\* /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939 /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed. * fixes #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
deleted file mode 100644
index a734f8a2..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 2 Jul 2018 13:32:44 +0300
4Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH
5
6git describe can produce different strings for the same sha1, depending
7on the version of git (length of short hash) and whether release tag was
8in place when build was done (v5.11.1-0- vs. v5.11.0-66-).
9
10Instead use rev-parse to get the unambiguous commit sha1 which is also
11what is used from the .tag file.
12
13Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559
14Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
15---
16 src/qml/qml.pro | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/qml/qml.pro b/src/qml/qml.pro
20index 940ebb325..a76a87b15 100644
21--- a/src/qml/qml.pro
22+++ b/src/qml/qml.pro
23@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH
24 !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") {
25 QML_COMPILE_HASH = $$tag
26 } else:exists($$PWD/../../.git) {
27- commit = $$system(git describe --tags --always --long --dirty)
28+ commit = $$system(git rev-parse HEAD)
29 QML_COMPILE_HASH = $$commit
30 }
31 compile_hash_contents = \