aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
qt5: upgrade to 5.2.0
* 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 <jan.petersen@kdab.com> 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 <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
deleted file mode 100644
index f855292c..00000000
--- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement
-
-* in situation like this:
- QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
- QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
- QT_INSTALL_LIBS/raw:/usr/lib
- QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
-
- I don't want the replacement like this:
- sed
- -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
- -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
- "../../lib/pkgconfig/Qt5Core.pc"
- >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
- because that way I'll end with -L/usr/lib in .pc file which is
- cross-compile unfriendly, keeping ${libdir}/${includedir} works better
- in my case
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 7f7de85..7741b96 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -140,18 +140,30 @@ unix|win32-g++* {
- rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
- else: \
- rplbase = $$MODULE_BASE_OUTDIR
-+ pkgconfig_include_replace.match = $$rplbase/include
-+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
-+ pkgconfig_lib_replace.match = $$rplbase/lib
-+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
- include_replace.match = $$rplbase/include
- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
- lib_replace.match = $$rplbase/lib
-- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
-- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
-+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
-+ lafile_replace.match = $$rplbase
-+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
-+
-+ !isEmpty(SYSROOT): \
-+ rplbase = $$[SYSROOT] \
-+ lafile_replace.match = $$rplbase \
-+ lafile_replace.replace = "=" \
-+
-+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
- QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
- }
-
- unix {
- CONFIG += create_libtool explicitlib
-- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
-- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
-+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
-+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
- }
-
- unix|win32-g++* {
---
-1.8.3.2
-