diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-02 19:06:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-12 15:01:37 +0100 |
commit | c908fe4ebd5a04813be0b83c173fae182bb22728 (patch) | |
tree | ac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch | |
parent | 775d77e482f1ea203c78003cccd2547075fd720f (diff) | |
download | meta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz |
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.patch | 70 |
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 @@ | |||
1 | From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | ||
4 | Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement | ||
5 | |||
6 | * in situation like this: | ||
7 | QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm | ||
8 | QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib | ||
9 | QT_INSTALL_LIBS/raw:/usr/lib | ||
10 | QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib | ||
11 | |||
12 | I don't want the replacement like this: | ||
13 | sed | ||
14 | -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" | ||
15 | -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" | ||
16 | "../../lib/pkgconfig/Qt5Core.pc" | ||
17 | >"/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" | ||
18 | because that way I'll end with -L/usr/lib in .pc file which is | ||
19 | cross-compile unfriendly, keeping ${libdir}/${includedir} works better | ||
20 | in my case | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
25 | --- | ||
26 | mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- | ||
27 | 1 file changed, 16 insertions(+), 4 deletions(-) | ||
28 | |||
29 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | ||
30 | index 7f7de85..7741b96 100644 | ||
31 | --- a/mkspecs/features/qt_module.prf | ||
32 | +++ b/mkspecs/features/qt_module.prf | ||
33 | @@ -140,18 +140,30 @@ unix|win32-g++* { | ||
34 | rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* | ||
35 | else: \ | ||
36 | rplbase = $$MODULE_BASE_OUTDIR | ||
37 | + pkgconfig_include_replace.match = $$rplbase/include | ||
38 | + pkgconfig_include_replace.replace = "\$$\\{includedir}" | ||
39 | + pkgconfig_lib_replace.match = $$rplbase/lib | ||
40 | + pkgconfig_lib_replace.replace = "\$$\\{libdir}" | ||
41 | include_replace.match = $$rplbase/include | ||
42 | include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
43 | lib_replace.match = $$rplbase/lib | ||
44 | - lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR | ||
45 | - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace | ||
46 | + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
47 | + lafile_replace.match = $$rplbase | ||
48 | + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
49 | + | ||
50 | + !isEmpty(SYSROOT): \ | ||
51 | + rplbase = $$[SYSROOT] \ | ||
52 | + lafile_replace.match = $$rplbase \ | ||
53 | + lafile_replace.replace = "=" \ | ||
54 | + | ||
55 | + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | ||
56 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | ||
57 | } | ||
58 | |||
59 | unix { | ||
60 | CONFIG += create_libtool explicitlib | ||
61 | - QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR | ||
62 | - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace | ||
63 | + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] | ||
64 | + QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace | ||
65 | } | ||
66 | |||
67 | unix|win32-g++* { | ||
68 | -- | ||
69 | 1.8.3.2 | ||
70 | |||