diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-03 16:06:48 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-04 00:01:56 +0200 |
| commit | 2e3dc3f26fccd427061531ab36f03343c54dc06c (patch) | |
| tree | 1a6c27de44ea46f1af78f4700ecb7a5ae2d7b89e /patches/qwt-6.0.1 | |
| parent | 6d66311b740deefd629ead7a8264c0983331b3b8 (diff) | |
| download | ptxdist-2e3dc3f26fccd427061531ab36f03343c54dc06c.tar.gz ptxdist-2e3dc3f26fccd427061531ab36f03343c54dc06c.tar.xz | |
qwt: version bump 6.0.0 -> 6.0.1
and add option for SVG
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/qwt-6.0.1')
| -rw-r--r-- | patches/qwt-6.0.1/0001-fix-prefix.patch | 22 | ||||
| -rw-r--r-- | patches/qwt-6.0.1/0002-disable-designer-plugins.patch | 22 | ||||
| -rw-r--r-- | patches/qwt-6.0.1/0003-disable-svg-by-default.patch | 24 | ||||
| -rw-r--r-- | patches/qwt-6.0.1/series | 6 |
4 files changed, 74 insertions, 0 deletions
diff --git a/patches/qwt-6.0.1/0001-fix-prefix.patch b/patches/qwt-6.0.1/0001-fix-prefix.patch new file mode 100644 index 000000000..81174bb1d --- /dev/null +++ b/patches/qwt-6.0.1/0001-fix-prefix.patch @@ -0,0 +1,22 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 3 Aug 2011 16:09:23 +0200 +Subject: [PATCH] fix prefix + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qwtconfig.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index da52a53..21cf28b 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT} + QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + + unix { +- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION ++ QWT_INSTALL_PREFIX = /usr + } + + win32 { diff --git a/patches/qwt-6.0.1/0002-disable-designer-plugins.patch b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch new file mode 100644 index 000000000..a68bd521e --- /dev/null +++ b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch @@ -0,0 +1,22 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 3 Aug 2011 16:09:42 +0200 +Subject: [PATCH] disable designer plugins + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qwtconfig.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 21cf28b..b54abeb 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -98,7 +98,7 @@ QWT_CONFIG += QwtMathML + # Otherwise you have to build it from the designer directory. + ###################################################################### + +-QWT_CONFIG += QwtDesigner ++# QWT_CONFIG += QwtDesigner + + ###################################################################### + # If you want to auto build the examples, enable the line below 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 new file mode 100644 index 000000000..fc560799f --- /dev/null +++ b/patches/qwt-6.0.1/0003-disable-svg-by-default.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 3 Aug 2011 15:08:05 +0200 +Subject: [PATCH] disable svg by default + +it can be enabled with QWT_CONFIG+=QwtSvg as qmake option. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qwtconfig.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index b54abeb..89ea0ef 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -79,7 +79,7 @@ QWT_CONFIG += QwtWidgets + # export a plot to a SVG document + ###################################################################### + +-QWT_CONFIG += QwtSvg ++# QWT_CONFIG += QwtSvg + + ###################################################################### + # You can use the MathML renderer of the Qt solutions package to diff --git a/patches/qwt-6.0.1/series b/patches/qwt-6.0.1/series new file mode 100644 index 000000000..07253abd5 --- /dev/null +++ b/patches/qwt-6.0.1/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-prefix.patch +0002-disable-designer-plugins.patch +0003-disable-svg-by-default.patch +# a74c74195506b5a6708b7527b8bbfa72 - git-ptx-patches magic |