From 7ec79fff0409bc16d85a149b424efe2937f481b2 Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Mon, 18 Nov 2019 11:36:26 -0800 Subject: libraries/qwt-qt5: Updated for version 6.1.4. --- libraries/qwt-qt5/patch-6.1.3-pkgconfig.diff | 22 ---------- libraries/qwt-qt5/patch-6.1.3-qwtconfig.diff | 54 ------------------------- libraries/qwt-qt5/patch-6.1.3-qwtfunctions.diff | 27 ------------- libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff | 22 ++++++++++ libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff | 54 +++++++++++++++++++++++++ libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff | 27 +++++++++++++ 6 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 libraries/qwt-qt5/patch-6.1.3-pkgconfig.diff delete mode 100644 libraries/qwt-qt5/patch-6.1.3-qwtconfig.diff delete mode 100644 libraries/qwt-qt5/patch-6.1.3-qwtfunctions.diff create mode 100644 libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff create mode 100644 libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff create mode 100644 libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff diff --git a/libraries/qwt-qt5/patch-6.1.3-pkgconfig.diff b/libraries/qwt-qt5/patch-6.1.3-pkgconfig.diff deleted file mode 100644 index 91c5ed4c78..0000000000 --- a/libraries/qwt-qt5/patch-6.1.3-pkgconfig.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- src/src.pro.orig 2014-12-12 00:13:13.461186493 +1000 -+++ src/src.pro 2015-10-05 08:55:43.504194164 +1000 -@@ -21,6 +21,19 @@ - - DESTDIR = $${QWT_OUT_ROOT}/lib - -+# Add pkgconfig support -+unix { -+ CONFIG += create_pc create_prl no_install_prl -+ QMAKE_PKGCONFIG_NAME = qwt-qt5 -+ QMAKE_PKGCONFIG_DESCRIPTION = GUI components -+ QMAKE_PKGCONFIG_PREFIX = $${QWT_INSTALL_PREFIX} -+ QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS} -+ QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS} -+ QMAKE_PKGCONFIG_REQUIRES = QtCore -+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig -+} -+ -+ - contains(QWT_CONFIG, QwtDll) { - - CONFIG += dll diff --git a/libraries/qwt-qt5/patch-6.1.3-qwtconfig.diff b/libraries/qwt-qt5/patch-6.1.3-qwtconfig.diff deleted file mode 100644 index 815013bd06..0000000000 --- a/libraries/qwt-qt5/patch-6.1.3-qwtconfig.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- qwtconfig.pri.orig 2014-12-11 14:13:13.513186492 +0000 -+++ qwtconfig.pri 2015-09-27 08:33:01.948490369 +0000 -@@ -16,11 +16,8 @@ - # Install paths - ###################################################################### - --QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] -- - unix { -- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION -- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION -+ QWT_INSTALL_PREFIX = /usr - } - - win32 { -@@ -29,8 +26,10 @@ - } - - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc --QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include --QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib -+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qt5/qwt -+QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib$${LIBDIRSUFFIX} -+ -+ - - ###################################################################### - # Designer plugin -@@ -42,14 +41,12 @@ - # runtime environment of designer/creator. - ###################################################################### - --QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer -- - # linux distributors often organize the Qt installation - # their way and QT_INSTALL_PREFIX doesn't offer a good - # path. Also QT_INSTALL_PREFIX is only one of the default - # search paths of the designer - not the Qt creator - --#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer -+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer - - ###################################################################### - # Features -@@ -63,8 +60,7 @@ - # with every Qt upgrade. - ###################################################################### - --QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features --# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features -+QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features - - ###################################################################### - # Build the static/shared libraries. diff --git a/libraries/qwt-qt5/patch-6.1.3-qwtfunctions.diff b/libraries/qwt-qt5/patch-6.1.3-qwtfunctions.diff deleted file mode 100644 index b31dc22de6..0000000000 --- a/libraries/qwt-qt5/patch-6.1.3-qwtfunctions.diff +++ /dev/null @@ -1,27 +0,0 @@ -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) { - - unset(LIBRARY_NAME) -+ -+ greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION} -+ } else { - LIBRARY_NAME = $$1 -+ } - - mac:contains(QWT_CONFIG, QwtFramework) { - -@@ -36,7 +41,11 @@ defineReplace(qwtLibraryTarget) { - defineTest(qwtAddLibrary) { - - LIB_PATH = $$1 -+ greaterThan(QT_MAJOR_VERSION, 4) { -+ LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION} -+ } else { - LIB_NAME = $$2 -+ } - - mac:contains(QWT_CONFIG, QwtFramework) { diff --git a/libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff b/libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff new file mode 100644 index 0000000000..91c5ed4c78 --- /dev/null +++ b/libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff @@ -0,0 +1,22 @@ +--- src/src.pro.orig 2014-12-12 00:13:13.461186493 +1000 ++++ src/src.pro 2015-10-05 08:55:43.504194164 +1000 +@@ -21,6 +21,19 @@ + + DESTDIR = $${QWT_OUT_ROOT}/lib + ++# Add pkgconfig support ++unix { ++ CONFIG += create_pc create_prl no_install_prl ++ QMAKE_PKGCONFIG_NAME = qwt-qt5 ++ QMAKE_PKGCONFIG_DESCRIPTION = GUI components ++ QMAKE_PKGCONFIG_PREFIX = $${QWT_INSTALL_PREFIX} ++ QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS} ++ QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS} ++ QMAKE_PKGCONFIG_REQUIRES = QtCore ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig ++} ++ ++ + contains(QWT_CONFIG, QwtDll) { + + CONFIG += dll diff --git a/libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff b/libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff new file mode 100644 index 0000000000..815013bd06 --- /dev/null +++ b/libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff @@ -0,0 +1,54 @@ +--- qwtconfig.pri.orig 2014-12-11 14:13:13.513186492 +0000 ++++ qwtconfig.pri 2015-09-27 08:33:01.948490369 +0000 +@@ -16,11 +16,8 @@ + # Install paths + ###################################################################### + +-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] +- + unix { +- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION +- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION ++ QWT_INSTALL_PREFIX = /usr + } + + win32 { +@@ -29,8 +26,10 @@ + } + + QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc +-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include +-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib ++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qt5/qwt ++QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib$${LIBDIRSUFFIX} ++ ++ + + ###################################################################### + # Designer plugin +@@ -42,14 +41,12 @@ + # runtime environment of designer/creator. + ###################################################################### + +-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer +- + # linux distributors often organize the Qt installation + # their way and QT_INSTALL_PREFIX doesn't offer a good + # path. Also QT_INSTALL_PREFIX is only one of the default + # search paths of the designer - not the Qt creator + +-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer ++QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer + + ###################################################################### + # Features +@@ -63,8 +60,7 @@ + # with every Qt upgrade. + ###################################################################### + +-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features +-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features ++QWT_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features + + ###################################################################### + # Build the static/shared libraries. diff --git a/libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff b/libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff new file mode 100644 index 0000000000..b31dc22de6 --- /dev/null +++ b/libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff @@ -0,0 +1,27 @@ +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) { + + unset(LIBRARY_NAME) ++ ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION} ++ } else { + LIBRARY_NAME = $$1 ++ } + + mac:contains(QWT_CONFIG, QwtFramework) { + +@@ -36,7 +41,11 @@ defineReplace(qwtLibraryTarget) { + defineTest(qwtAddLibrary) { + + LIB_PATH = $$1 ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION} ++ } else { + LIB_NAME = $$2 ++ } + + mac:contains(QWT_CONFIG, QwtFramework) { -- cgit v1.2.3