qwt: version bump 6.0.0 -> 6.0.1

and add option for SVG

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 81 insertions, 38 deletions

diff --git a/patches/qwt-6.0.0/fix-prefix.diff b/patches/qwt-6.0.0/fix-prefix.diff
deleted file mode 100644
index 95b1983e3..000000000
--- a/patches/qwt-6.0.0/fix-prefix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- qwtconfig.pri |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/qwtconfig.pri
-===================================================================
---- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -19,7 +19,7 @@
- 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.0/series b/patches/qwt-6.0.0/series
deleted file mode 100644
index 140a3dc52..000000000
--- a/patches/qwt-6.0.0/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-prefix.diff
-disable-designer-plugins.diff
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.0/disable-designer-plugins.diff b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch
index abcddc0c9..a68bd521e 100644
--- a/patches/qwt-6.0.0/disable-designer-plugins.diff
+++ b/patches/qwt-6.0.1/0002-disable-designer-plugins.patch
@@ -1,12 +1,17 @@
+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 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: b/qwtconfig.pri
-===================================================================
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 21cf28b..b54abeb 100644
 --- a/qwtconfig.pri
 +++ b/qwtconfig.pri
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ QWT_CONFIG     += QwtMathML
  # Otherwise you have to build it from the designer directory.
  ######################################################################
  
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
diff --git a/rules/qwt.in b/rules/qwt.in
index 9384ba8a3..eee339d07 100644
--- a/rules/qwt.in
+++ b/rules/qwt.in
@@ -1,13 +1,23 @@
 ## SECTION=qt
 
-config QWT
+menuconfig QWT
 	tristate
-	prompt "qwt"
+	prompt "qwt                           "
 	select QT4
 	select QT4_BUILD_GUI
+	select QT4_BUILD_SVG if QWT_SVG
 	help
 	  The Qwt library contains GUI Components and utility classes
 	  which are primarily useful for programs with a technical
 	  background. Beside a 2D plot widget it provides scales, sliders,
 	  dials, compasses, thermometers, wheels and knobs to control or
 	  display values, arrays, or ranges of type double.
+
+if QWT
+
+config QWT_SVG
+	bool
+	prompt "SVG support"
+
+endif
+
diff --git a/rules/qwt.make b/rules/qwt.make
index 9f11047d7..ae4828fe1 100644
--- a/rules/qwt.make
+++ b/rules/qwt.make
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 #
-# Copyright (C) 2009 by 
+# Copyright (C) 2009,2011 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QWT) += qwt
 #
 # Paths and names
 #
-QWT_VERSION	:= 6.0.0
-QWT_MD5		:= 1795cf075ebce3ae048255d2060cbac0
+QWT_VERSION	:= 6.0.1
+QWT_MD5		:= ace68558eab873e2da7e641179c4ef0c
 QWT		:= qwt-$(QWT_VERSION)
 QWT_SUFFIX	:= tar.bz2
 QWT_URL		:= $(PTXCONF_SETUP_SFMIRROR)/qwt/$(QWT).$(QWT_SUFFIX)
@@ -26,19 +26,14 @@ QWT_DIR		:= $(BUILDDIR)/$(QWT)
 QWT_MAKE_PAR	:= NO
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(QWT_SOURCE):
-	@$(call targetinfo)
-	@$(call get, QWT)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-QWT_PATH	:= PATH=$(CROSS_PATH)
-QWT_CONF_ENV	:= $(CROSS_ENV)
+QWT_CONF_OPT	:= $(CROSS_QMAKE_OPT)
+
+ifdef PTXCONF_QWT_SVG
+QWT_CONF_OPT += QWT_CONFIG+=QwtSvg
+endif
 
 # ----------------------------------------------------------------------------
 # Target-Install