qwt-6.1.2

10 years ago · b3ded0a6a4
parent 573b35a48b
commit b3ded0a6a4
6 changed files with 34 additions and 104 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/qwt-6.1.1.tar.bz2
+/qwt-6.1.2.tar.bz2
--- a/qwt-6.1.2-qt_install_paths.patch
+++ b/qwt-6.1.2-qt_install_paths.patch
@ -1,18 +1,7 @@
-diff -up qwt-6.1.0/designer/designer.pro.qt_install_paths qwt-6.1.0/designer/designer.pro
--- qwt-6.1.0/designer/designer.pro.qt_install_paths	2013-05-30 10:18:27.753341938 -0500
-+++ qwt-6.1.0/designer/designer.pro	2013-10-29 10:19:50.587458161 -0500
-@@ -84,7 +84,7 @@ contains(QWT_CONFIG, QwtDesigner) {
-         # compile the path for finding the Qwt library
-         # into the plugin. Not supported on Windows !
- 
-        QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-+        #QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
- 
-         contains(QWT_CONFIG, QwtFramework) {
- 
-diff -up qwt-6.1.0/qwtbuild.pri.qt_install_paths qwt-6.1.0/qwtbuild.pri
--- qwt-6.1.0/qwtbuild.pri.qt_install_paths	2013-05-30 10:18:27.762341938 -0500
-+++ qwt-6.1.0/qwtbuild.pri	2013-10-29 10:19:50.588458143 -0500
+diff -up qwt-6.1.2/designer/designer.pro.qt_install_paths qwt-6.1.2/designer/designer.pro
+diff -up qwt-6.1.2/qwtbuild.pri.qt_install_paths qwt-6.1.2/qwtbuild.pri
+--- qwt-6.1.2/qwtbuild.pri.qt_install_paths	2014-12-11 08:13:13.509186492 -0600
+++ qwt-6.1.2/qwtbuild.pri	2014-12-12 20:41:50.128472485 -0600
@@ -14,8 +14,7 @@
 CONFIG           += qt     
 CONFIG           += warn_on
@ -23,31 +12,20 @@ diff -up qwt-6.1.0/qwtbuild.pri.qt_install_paths qwt-6.1.0/qwtbuild.pri
 ######################################################################
 # release/debug mode
 ######################################################################
-@@ -73,7 +72,7 @@ RCC_DIR      = resources
- 
- unix {
- 
-    exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
-+    exists( $${QMAKE_LIBDIR_QT}/libqwt.so ) {
- 
-         # On some Linux distributions the Qwt libraries are installed 
-         # in the same directory as the Qt libraries. Unfortunately
-diff -up qwt-6.1.0/qwtconfig.pri.qt_install_paths qwt-6.1.0/qwtconfig.pri
--- qwt-6.1.0/qwtconfig.pri.qt_install_paths	2013-05-30 10:18:27.767341938 -0500
-+++ qwt-6.1.0/qwtconfig.pri	2013-10-29 10:20:30.618729032 -0500
-@@ -18,17 +18,17 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
- 
+diff -up qwt-6.1.2/qwtconfig.pri.qt_install_paths qwt-6.1.2/qwtconfig.pri
+--- qwt-6.1.2/qwtconfig.pri.qt_install_paths	2014-12-11 08:13:13.513186492 -0600
+++ qwt-6.1.2/qwtconfig.pri	2014-12-12 20:43:02.394738555 -0600
+@@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
 
-unix {
+ unix {
 -    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
-}
-+#unix {
-+#    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
-+#}
+    # QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
+     # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ }
 
- win32 {
-     QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION
+@@ -28,9 +28,9 @@ win32 {
+     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
 }
 
 -QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
@ -59,7 +37,7 @@ diff -up qwt-6.1.0/qwtconfig.pri.qt_install_paths qwt-6.1.0/qwtconfig.pri
 
 ######################################################################
 # Designer plugin
-@@ -40,7 +40,8 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
+@@ -42,7 +42,8 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
 # runtime environment of designer/creator.
 ######################################################################
 
@ -69,7 +47,7 @@ diff -up qwt-6.1.0/qwtconfig.pri.qt_install_paths qwt-6.1.0/qwtconfig.pri
 
 # linux distributors often organize the Qt installation
 # their way and QT_INSTALL_PREFIX doesn't offer a good
-@@ -61,8 +62,8 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
+@@ -63,8 +64,8 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
 # with every Qt upgrade. 
 ######################################################################
 
@ -80,7 +58,7 @@ diff -up qwt-6.1.0/qwtconfig.pri.qt_install_paths qwt-6.1.0/qwtconfig.pri
 
 ######################################################################
 # Build the static/shared libraries.
-@@ -108,7 +109,7 @@ QWT_CONFIG     += QwtOpenGL
+@@ -110,7 +111,7 @@ QWT_CONFIG     += QwtOpenGL
 # to your qmake project file.
 ######################################################################
 
--- a/qwt-qt5.patch
+++ b/qwt-qt5.patch
@ -1,6 +1,6 @@
-diff -up qwt-6.1.1/qwtfunctions.pri.qt5 qwt-6.1.1/qwtfunctions.pri
--- qwt-6.1.1/qwtfunctions.pri.qt5	2014-09-18 09:59:46.659028741 -0500
-+++ qwt-6.1.1/qwtfunctions.pri	2014-12-01 07:23:30.215055279 -0600
+diff -up qwt-6.1.2/qwtfunctions.pri.qt5 qwt-6.1.2/qwtfunctions.pri
+--- qwt-6.1.2/qwtfunctions.pri.qt5	2014-12-11 08:13:13.511186492 -0600
+++ qwt-6.1.2/qwtfunctions.pri	2014-12-12 20:45:24.556261966 -0600
@@ -12,7 +12,12 @@
 defineReplace(qwtLibraryTarget) {
 
@ -14,15 +14,15 @@ diff -up qwt-6.1.1/qwtfunctions.pri.qt5 qwt-6.1.1/qwtfunctions.pri
 
     mac:contains(QWT_CONFIG, QwtFramework) {
 
-@@ -35,7 +40,11 @@ defineReplace(qwtLibraryTarget) {
- 
+@@ -36,7 +41,11 @@ defineReplace(qwtLibraryTarget) {
 defineTest(qwtAddLibrary) {
 
+     LIB_PATH = $$1
 +    greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIB_NAME = $${1}-qt$${QT_MAJOR_VERSION} 
+    LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION}
 +    } else {
-     LIB_NAME = $$1
+     LIB_NAME = $$2
 +    }
 
-     unset(LINKAGE)
+     mac:contains(QWT_CONFIG, QwtFramework) {
 
--- a/qwt-qt54.patch
+++ b/qwt-qt54.patch
@ -1,47 +0,0 @@
-Index: src/qwt_transform.cpp
-===================================================================
--- src/qwt_transform.cpp	(revision 2064)
-+++ src/qwt_transform.cpp	(revision 2066)
-@@ -14,12 +14,24 @@
- #define qExp(x) ::exp(x)
- #endif
- 
-+#if QT_VERSION >= 0x050400
-+
- //! Smallest allowed value for logarithmic scales: 1.0e-150
-+const double QwtLogTransform::LogMin = 1.0e-150;
-+    
-+//! Largest allowed value for logarithmic scales: 1.0e150
-+const double QwtLogTransform::LogMax = 1.0e150;
-+
-+#else
-+
-+//! Smallest allowed value for logarithmic scales: 1.0e-150
- QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150;
- 
- //! Largest allowed value for logarithmic scales: 1.0e150
- QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150;
- 
-+#endif
-+
- //! Constructor
- QwtTransform::QwtTransform()
- {
-Index: src/qwt_transform.h
-===================================================================
--- src/qwt_transform.h	(revision 2064)
-+++ src/qwt_transform.h	(revision 2066)
-@@ -107,8 +107,13 @@
- 
-     virtual QwtTransform *copy() const;
- 
-+#if QT_VERSION >= 0x050400
-+    static const double LogMin;
-+    static const double LogMax;
-+#else
-     QT_STATIC_CONST double LogMin;
-     QT_STATIC_CONST double LogMax;
-+#endif
- };
- 
- /*!
--- a/qwt.spec
+++ b/qwt.spec
@ -7,22 +7,20 @@

 Name:    qwt
 Summary: Qt Widgets for Technical Applications
-Version: 6.1.1
-Release: 3%{?dist}
+Version: 6.1.2
+Release: 1%{?dist}

 License: LGPLv2 with exceptions
 URL:     http://qwt.sourceforge.net
 Source:  http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2

 ## upstream patches
-# fix build with qt-5.4
-Patch1: qwt-qt54.patch

 ## upstreamable patches
 # fix pkgconfig support
 Patch50: qwt-6.1.1-pkgconfig.patch
 # use QT_INSTALL_ paths instead of custom prefix
-Patch51: qwt-6.1.0-qt_install_paths.patch
+Patch51: qwt-6.1.2-qt_install_paths.patch
 # parallel-installable qt5 version
 Patch52: qwt-qt5.patch

@ -80,16 +78,14 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 %endif


-
 %prep
 %setup -q

-%patch1 -p0 -b .qt54
-
 %patch50 -p1 -b .pkgconfig
 %patch51 -p1 -b .qt_install_paths
 %patch52 -p1 -b .qt5

+
 %build
 %if 0%{?qt5}
 mkdir %{_target_platform}-qt5
@ -185,6 +181,9 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \


 %changelog
+* Fri Dec 12 2014 Rex Dieter <rdieter@fedoraproject.org> 6.1.2-1
+- qwt-6.1.2
+
 * Mon Dec 01 2014 Rex Dieter <rdieter@fedoraproject.org> - 6.1.1-3
 - %%build: use %%qmake-qt? macro variant
 - RFE: Qwt build for Qt5 (#1164515)
--- a/2
+++ b/2
@ -1 +1 @@
-fe4bdd561ef5584924e72e15bcf46b9e  qwt-6.1.1.tar.bz2
+9c88db1774fa7e3045af063bbde44d7d  qwt-6.1.2.tar.bz2