summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-07-27 17:51:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-05 11:09:41 +0200
commitc110de233f0fd56e60b2be996dece64147c332e0 (patch)
tree394f63daf8c21542c650d3c4bf5c3db85349f430 /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
parent4cea8f8c4a6ff2d869b0244c279def2e5adb9e8a (diff)
downloadmeta-qt5-c110de233f0fd56e60b2be996dece64147c332e0.tar.gz
qt5: upgrade to latest revisions in 5.6 branch
* LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index ca271e6c..f7066371 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
1From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 1From 7421a689c695a09fff2d5ffbdbe56e34d73f771d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option 4Subject: [PATCH] Add -external-hostbindir option
@@ -37,10 +37,10 @@ Conflicts:
37 7 files changed, 38 insertions(+), 12 deletions(-) 37 7 files changed, 38 insertions(+), 12 deletions(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 88a308d..f2611ed 100755 40index 9ab6a9d..225b9f3 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -810,6 +810,7 @@ QT_HOST_BINS= 43@@ -826,6 +826,7 @@ QT_HOST_BINS=
44 QT_HOST_LIBS= 44 QT_HOST_LIBS=
45 QT_HOST_DATA= 45 QT_HOST_DATA=
46 QT_EXT_PREFIX= 46 QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index 88a308d..f2611ed 100755
48 48
49 #flags for SQL drivers 49 #flags for SQL drivers
50 QT_CFLAGS_PSQL= 50 QT_CFLAGS_PSQL=
51@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do 51@@ -945,6 +946,7 @@ while [ "$#" -gt 0 ]; do
52 -testsdir| \ 52 -testsdir| \
53 -hostdatadir| \ 53 -hostdatadir| \
54 -hostbindir| \ 54 -hostbindir| \
@@ -56,7 +56,7 @@ index 88a308d..f2611ed 100755
56 -hostlibdir| \ 56 -hostlibdir| \
57 -extprefix| \ 57 -extprefix| \
58 -sysroot| \ 58 -sysroot| \
59@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do 59@@ -1175,6 +1177,9 @@ while [ "$#" -gt 0 ]; do
60 extprefix) 60 extprefix)
61 QT_EXT_PREFIX="$VAL" 61 QT_EXT_PREFIX="$VAL"
62 ;; 62 ;;
@@ -66,7 +66,7 @@ index 88a308d..f2611ed 100755
66 pkg-config) 66 pkg-config)
67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 67 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
68 CFG_PKGCONFIG="$VAL" 68 CFG_PKGCONFIG="$VAL"
69@@ -2428,6 +2433,10 @@ Installation options: 69@@ -2444,6 +2449,10 @@ Installation options:
70 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 70 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
71 (default HOSTPREFIX) 71 (default HOSTPREFIX)
72 72
@@ -77,7 +77,7 @@ index 88a308d..f2611ed 100755
77 Configure options: 77 Configure options:
78 78
79 The defaults (*) are usually acceptable. A plus (+) denotes a default value 79 The defaults (*) are usually acceptable. A plus (+) denotes a default value
80@@ -3172,6 +3181,11 @@ fi 80@@ -3195,6 +3204,11 @@ fi
81 # command line and environment validation 81 # command line and environment validation
82 #------------------------------------------------------------------------------- 82 #-------------------------------------------------------------------------------
83 83
@@ -90,7 +90,7 @@ index 88a308d..f2611ed 100755
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in 91 case "$CFG_QCONFIG" in
92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
93index 8639695..d89d948 100644 93index 4a1d265..a2bdd29 100644
94--- a/mkspecs/features/qt_functions.prf 94--- a/mkspecs/features/qt_functions.prf
95+++ b/mkspecs/features/qt_functions.prf 95+++ b/mkspecs/features/qt_functions.prf
96@@ -70,7 +70,11 @@ defineTest(qtHaveModule) { 96@@ -70,7 +70,11 @@ defineTest(qtHaveModule) {