summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-08-28 16:48:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-08-28 17:18:48 +0200
commitc47d87a94f1612305a38388399f62e49dbf14599 (patch)
tree82da8606db69d5c3ecd01ecac81cbb3c604685f5
parent0fd119fcd1618f10a9dd6f0fd14b8ca4e5edafd8 (diff)
downloadptxdist-c47d87a94f1612305a38388399f62e49dbf14599.tar.gz
ptxdist-c47d87a94f1612305a38388399f62e49dbf14599.tar.xz
qwt: add patch to disable textengines
... needs QtXml and is currently not installed anyway. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/qwt-6.0.1/0001-fix-prefix.patch2
-rw-r--r--patches/qwt-6.0.1/0002-disable-designer-plugins.patch2
-rw-r--r--patches/qwt-6.0.1/0003-disable-svg-by-default.patch2
-rw-r--r--patches/qwt-6.0.1/0004-Disable-the-textengines-to-be-less-depended-on-the-Q.patch35
-rw-r--r--patches/qwt-6.0.1/series3
5 files changed, 40 insertions, 4 deletions
diff --git a/patches/qwt-6.0.1/0001-fix-prefix.patch b/patches/qwt-6.0.1/0001-fix-prefix.patch
index 81174bb1d..970114863 100644
--- a/patches/qwt-6.0.1/0001-fix-prefix.patch
+++ b/patches/qwt-6.0.1/0001-fix-prefix.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qwtconfig.pri b/qwtconfig.pri
-index da52a53..21cf28b 100644
+index b0d2110..86265e1 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
diff --git a/patches/qwt-6.0.1/0002-disable-designer-plugins.patch b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch
index a68bd521e..a919b9473 100644
--- a/patches/qwt-6.0.1/0002-disable-designer-plugins.patch
+++ b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 21cf28b..b54abeb 100644
+index 86265e1..54f8059 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -98,7 +98,7 @@ QWT_CONFIG += QwtMathML
diff --git a/patches/qwt-6.0.1/0003-disable-svg-by-default.patch b/patches/qwt-6.0.1/0003-disable-svg-by-default.patch
index fc560799f..74d42fafb 100644
--- a/patches/qwt-6.0.1/0003-disable-svg-by-default.patch
+++ b/patches/qwt-6.0.1/0003-disable-svg-by-default.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qwtconfig.pri b/qwtconfig.pri
-index b54abeb..89ea0ef 100644
+index 54f8059..32117ee 100644
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -79,7 +79,7 @@ QWT_CONFIG += QwtWidgets
diff --git a/patches/qwt-6.0.1/0004-Disable-the-textengines-to-be-less-depended-on-the-Q.patch b/patches/qwt-6.0.1/0004-Disable-the-textengines-to-be-less-depended-on-the-Q.patch
new file mode 100644
index 000000000..f14d312e7
--- /dev/null
+++ b/patches/qwt-6.0.1/0004-Disable-the-textengines-to-be-less-depended-on-the-Q.patch
@@ -0,0 +1,35 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Date: Fri, 26 Aug 2011 12:19:33 +0200
+Subject: [PATCH] Disable the textengines to be less depended on the Qt
+ config.
+
+If the textengines are built, it ends with an error message:
+
+make[3]: Entering directory `[...]/platform/build-target/qwt-6.0.1/textengines/mathml'
+compiling qwt_mml_document.cpp
+qwt_mml_document.cpp:5:20: fatal error: QDomNode: No such file or directory
+compilation terminated.
+make[3]: *** [obj/qwt_mml_document.o] Error 1
+
+As the PTXdist rule file only installs the library and not the tools, they can
+be disabled.
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ qwt.pro | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/qwt.pro b/qwt.pro
+index 4ab4c08..950c182 100644
+--- a/qwt.pro
++++ b/qwt.pro
+@@ -13,8 +13,7 @@ TEMPLATE = subdirs
+ CONFIG += ordered
+
+ SUBDIRS = \
+- src \
+- textengines
++ src
+
+ contains(QWT_CONFIG, QwtDesigner ) {
+ SUBDIRS += designer
diff --git a/patches/qwt-6.0.1/series b/patches/qwt-6.0.1/series
index 07253abd5..cf545f65a 100644
--- a/patches/qwt-6.0.1/series
+++ b/patches/qwt-6.0.1/series
@@ -3,4 +3,5 @@
0001-fix-prefix.patch
0002-disable-designer-plugins.patch
0003-disable-svg-by-default.patch
-# a74c74195506b5a6708b7527b8bbfa72 - git-ptx-patches magic
+0004-Disable-the-textengines-to-be-less-depended-on-the-Q.patch
+# 8284e163940123ec689fea7298eb4cb1 - git-ptx-patches magic