Signed-off-by: Ladislav Michl <[email protected]>
---
.../disable-designer-plugins.diff | 6 +++---
.../fix-prefix.diff} | 8 ++++----
patches/{qwt-5.2.0 => qwt-6.0.0}/series | 2 +-
rules/qwt.make | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
rename patches/{qwt-5.2.0 => qwt-6.0.0}/disable-designer-plugins.diff (82%)
rename patches/{qwt-5.2.0/qwt-5.1.1-fix-prefix.diff =>
qwt-6.0.0/fix-prefix.diff} (59%)
rename patches/{qwt-5.2.0 => qwt-6.0.0}/series (53%)
diff --git a/patches/qwt-5.2.0/disable-designer-plugins.diff
b/patches/qwt-6.0.0/disable-designer-plugins.diff
similarity index 82%
rename from patches/qwt-5.2.0/disable-designer-plugins.diff
rename to patches/qwt-6.0.0/disable-designer-plugins.diff
index e7d9f19..abcddc0 100644
--- a/patches/qwt-5.2.0/disable-designer-plugins.diff
+++ b/patches/qwt-6.0.0/disable-designer-plugins.diff
@@ -6,12 +6,12 @@ Index: b/qwtconfig.pri
===================================================================
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
-@@ -114,7 +114,7 @@ CONFIG += QwtWidgets
+@@ -98,7 +98,7 @@
# Otherwise you have to build it from the designer directory.
######################################################################
--CONFIG += QwtDesigner
-+#CONFIG += QwtDesigner
+-QWT_CONFIG += QwtDesigner
++# QWT_CONFIG += QwtDesigner
######################################################################
# If you want to auto build the examples, enable the line below
diff --git a/patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff
b/patches/qwt-6.0.0/fix-prefix.diff
similarity index 59%
rename from patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff
rename to patches/qwt-6.0.0/fix-prefix.diff
index 622fc74..95b1983 100644
--- a/patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff
+++ b/patches/qwt-6.0.0/fix-prefix.diff
@@ -6,12 +6,12 @@ Index: b/qwtconfig.pri
===================================================================
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
-@@ -8,7 +8,7 @@ VER_PAT = 0
- VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+@@ -19,7 +19,7 @@
+ QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
unix {
-- INSTALLBASE = /usr/local/qwt-5.2.0
-+ INSTALLBASE = /usr
+- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
++ QWT_INSTALL_PREFIX = /usr
}
win32 {
diff --git a/patches/qwt-5.2.0/series b/patches/qwt-6.0.0/series
similarity index 53%
rename from patches/qwt-5.2.0/series
rename to patches/qwt-6.0.0/series
index 0391ba9..140a3dc 100644
--- a/patches/qwt-5.2.0/series
+++ b/patches/qwt-6.0.0/series
@@ -1,2 +1,2 @@
-qwt-5.1.1-fix-prefix.diff
+fix-prefix.diff
disable-designer-plugins.diff
diff --git a/rules/qwt.make b/rules/qwt.make
index 4ac29b7..9f11047 100644
--- a/rules/qwt.make
+++ b/rules/qwt.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QWT) += qwt
#
# Paths and names
#
-QWT_VERSION := 5.2.0
-QWT_MD5 := c60b4cfac271a41524402b3ae5197890
+QWT_VERSION := 6.0.0
+QWT_MD5 := 1795cf075ebce3ae048255d2060cbac0
QWT := qwt-$(QWT_VERSION)
QWT_SUFFIX := tar.bz2
QWT_URL := $(PTXCONF_SETUP_SFMIRROR)/qwt/$(QWT).$(QWT_SUFFIX)
--
1.5.3.8
--
ptxdist mailing list
[email protected]
