[ptxdist] [PATCH] qwt5: add qwt library based on Qt5

[ptxdist] [PATCH] qwt5: add qwt library based on Qt5

[Juergen Borleis]

The already existing qwt implementation in PTXdist is based on Qt4. Since
Qt4 and Qt5 can co-exist, the same is valid for qwt and qwt5.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 patches/qwt-6.1.3/0001-fix-prefix.patch            | 22 ++++++++
 .../qwt-6.1.3/0002-disable-designer-plugins.patch  | 22 ++++++++
 .../qwt-6.1.3/0003-disable-svg-by-default.patch    | 24 +++++++++
 patches/qwt-6.1.3/series                           |  6 +++
 rules/qwt5.in                                      | 24 +++++++++
 rules/qwt5.make                                    | 60 ++++++++++++++++++++++
 6 files changed, 158 insertions(+)
 create mode 100644 patches/qwt-6.1.3/0001-fix-prefix.patch
 create mode 100644 patches/qwt-6.1.3/0002-disable-designer-plugins.patch
 create mode 100644 patches/qwt-6.1.3/0003-disable-svg-by-default.patch
 create mode 100644 patches/qwt-6.1.3/series
 create mode 100644 rules/qwt5.in
 create mode 100644 rules/qwt5.make

diff --git a/patches/qwt-6.1.3/0001-fix-prefix.patch b/patches/qwt-6.1.3/0001-fix-prefix.patch
new file mode 100644
index 0000000..bd81abc
--- /dev/null
+++ b/patches/qwt-6.1.3/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 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 2dc3715523b3..c1645fd935ca 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
+     # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ }
+ 
diff --git a/patches/qwt-6.1.3/0002-disable-designer-plugins.patch b/patches/qwt-6.1.3/0002-disable-designer-plugins.patch
new file mode 100644
index 0000000..cf9c586
--- /dev/null
+++ b/patches/qwt-6.1.3/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 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index c1645fd935ca..d2f902cb70c5 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -118,7 +118,7 @@ QWT_CONFIG     += QwtOpenGL
+ # Otherwise you have to build it from the designer directory.
+ ######################################################################
+ 
+-QWT_CONFIG     += QwtDesigner
++# QWT_CONFIG     += QwtDesigner
+ 
+ ######################################################################
+ # Compile all Qwt classes into the designer plugin instead
diff --git a/patches/qwt-6.1.3/0003-disable-svg-by-default.patch b/patches/qwt-6.1.3/0003-disable-svg-by-default.patch
new file mode 100644
index 0000000..ebb4d58
--- /dev/null
+++ b/patches/qwt-6.1.3/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 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index d2f902cb70c5..e6198186240d 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -93,7 +93,7 @@ QWT_CONFIG     += QwtWidgets
+ # export a plot to a SVG document
+ ######################################################################
+ 
+-QWT_CONFIG     += QwtSvg
++# QWT_CONFIG     += QwtSvg
+ 
+ ######################################################################
+ # If you want to use a OpenGL plot canvas
diff --git a/patches/qwt-6.1.3/series b/patches/qwt-6.1.3/series
new file mode 100644
index 0000000..07253ab
--- /dev/null
+++ b/patches/qwt-6.1.3/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/qwt5.in b/rules/qwt5.in
new file mode 100644
index 0000000..9e394fa
--- /dev/null
+++ b/rules/qwt5.in
@@ -0,0 +1,24 @@
+## SECTION=qt
+
+menuconfig QWT5
+	tristate
+	prompt "qwt5                          "
+	select QT5
+	select QT5_GUI
+	select QT5_MODULE_QTBASE_WIDGETS
+	select QT5_MODULE_QTSVG 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 QWT5
+
+config QWT5_SVG
+	bool
+	prompt "SVG support"
+
+endif
+
diff --git a/rules/qwt5.make b/rules/qwt5.make
new file mode 100644
index 0000000..e678fdf
--- /dev/null
+++ b/rules/qwt5.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2009,2011 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_QWT5) += qwt5
+
+#
+# Paths and names
+#
+QWT5_VERSION	:= 6.1.3
+QWT5_MD5	:= 19d1f5fa5e22054d22ee3accc37c54ba
+QWT5		:= qwt-$(QWT5_VERSION)
+QWT5_SUFFIX	:= tar.bz2
+QWT5_URL	:= $(call ptx/mirror, SF, qwt/$(QWT5).$(QWT5_SUFFIX))
+QWT5_SOURCE	:= $(SRCDIR)/$(QWT5).$(QWT5_SUFFIX)
+QWT5_DIR	:= $(BUILDDIR)/$(QWT5)
+QWT5_BUILD_OOT	:= YES
+QWT5_LICENSE	:= LGPL-2.1, QWT-1.0
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+QWT5_PATH	:= PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH)
+
+QWT5_CONF_OPT	:= $(CROSS_QMAKE_OPT) TARGET_TEMPLATE=lib
+
+ifdef PTXCONF_QWT5_SVG
+QWT5_CONF_OPT += QWT5_CONFIG+=QwtSvg
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/qwt5.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, qwt5)
+	@$(call install_fixup, qwt5,PRIORITY,optional)
+	@$(call install_fixup, qwt5,SECTION,base)
+	@$(call install_fixup, qwt5,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup, qwt5,DESCRIPTION,"widget set for technical apps")
+
+	@$(call install_lib, qwt5, 0, 0, 0644, libqwt)
+
+	@$(call install_finish, qwt5)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de