diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2017-11-30 09:10:26 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-12-20 08:17:35 +0000 |
commit | 1be652e5075bf3c65b521093556e9611c4a57541 (patch) | |
tree | 5b8d28c2312638b008da9f53921cfa9364e3ad96 /recipes-qt/qwt/qwt-qt5 | |
parent | 1421787254c26d3fd4269630786b1fb1f1d078e7 (diff) | |
download | meta-qt5-1be652e5075bf3c65b521093556e9611c4a57541.tar.gz |
qwt-qt5: rewrite completely
* install pkgconfig
* fix examples
* DESCRIPTION -> SUMMARY
* overall cleanup
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qwt/qwt-qt5')
-rw-r--r-- | recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch | 69 | ||||
-rw-r--r-- | recipes-qt/qwt/qwt-qt5/remove_rpath.patch | 17 |
2 files changed, 69 insertions, 17 deletions
diff --git a/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch new file mode 100644 index 00000000..fa63c347 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5/0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From ff950c71bf841a4d62952aac72f3c5a830cf9cff Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Wed, 29 Nov 2017 22:31:07 +0100 | ||
4 | Subject: [PATCH] Remove rpath from binaries - they point to buuild area | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This is a rework of the patch submitted by Khem Raj. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE specific] | ||
12 | |||
13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
14 | --- | ||
15 | designer/designer.pro | 1 - | ||
16 | examples/examples.pri | 1 - | ||
17 | playground/playground.pri | 1 - | ||
18 | qwt.prf | 1 - | ||
19 | 4 files changed, 4 deletions(-) | ||
20 | |||
21 | diff --git a/designer/designer.pro b/designer/designer.pro | ||
22 | index 7d44a44..a11847d 100644 | ||
23 | --- a/designer/designer.pro | ||
24 | +++ b/designer/designer.pro | ||
25 | @@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) { | ||
26 | # compile the path for finding the Qwt library | ||
27 | # into the plugin. Not supported on Windows ! | ||
28 | |||
29 | - QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
30 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
31 | |||
32 | contains(QWT_CONFIG, QwtDll) { | ||
33 | diff --git a/examples/examples.pri b/examples/examples.pri | ||
34 | index 200b188..b7776a8 100644 | ||
35 | --- a/examples/examples.pri | ||
36 | +++ b/examples/examples.pri | ||
37 | @@ -34,7 +34,6 @@ else { | ||
38 | } | ||
39 | } | ||
40 | |||
41 | -QMAKE_RPATHDIR *= $${QWT_OUT_ROOT}/lib | ||
42 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
43 | |||
44 | greaterThan(QT_MAJOR_VERSION, 4) { | ||
45 | diff --git a/playground/playground.pri b/playground/playground.pri | ||
46 | index c544360..fd0275f 100644 | ||
47 | --- a/playground/playground.pri | ||
48 | +++ b/playground/playground.pri | ||
49 | @@ -35,7 +35,6 @@ else { | ||
50 | } | ||
51 | |||
52 | |||
53 | -QMAKE_RPATHDIR *= $${QWT_ROOT}/lib | ||
54 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
55 | |||
56 | greaterThan(QT_MAJOR_VERSION, 4) { | ||
57 | diff --git a/qwt.prf b/qwt.prf | ||
58 | index 2625b31..7860153 100644 | ||
59 | --- a/qwt.prf | ||
60 | +++ b/qwt.prf | ||
61 | @@ -33,5 +33,4 @@ else { | ||
62 | INCLUDEPATH *= $${QWT_INSTALL_HEADERS} | ||
63 | } | ||
64 | |||
65 | -# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
66 | qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) | ||
67 | -- | ||
68 | 2.9.5 | ||
69 | |||
diff --git a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch b/recipes-qt/qwt/qwt-qt5/remove_rpath.patch deleted file mode 100644 index 14b65d6a..00000000 --- a/recipes-qt/qwt/qwt-qt5/remove_rpath.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Remove rpath from library, it points to build area which is not | ||
2 | ok | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: qwt-6.1.3/designer/designer.pro | ||
7 | =================================================================== | ||
8 | --- qwt-6.1.3.orig/designer/designer.pro | ||
9 | +++ qwt-6.1.3/designer/designer.pro | ||
10 | @@ -83,7 +83,6 @@ contains(QWT_CONFIG, QwtDesigner) { | ||
11 | # compile the path for finding the Qwt library | ||
12 | # into the plugin. Not supported on Windows ! | ||
13 | |||
14 | - QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} | ||
15 | qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) | ||
16 | |||
17 | contains(QWT_CONFIG, QwtDll) { | ||