diff options
author | Benjamin Trigona-Harany <slackbuilds@jaxartes.net> | 2020-06-22 21:06:35 -0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-06-28 08:16:41 +0700 |
commit | 65b52a1665dfe6e853d847a3bcd7d38d44e11a8a (patch) | |
tree | 06eac1951ffb142ecc55d9c2e27a197e6ea45136 /libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff | |
parent | 814742a14cbde9ccb7f09edec7d41438aa776738 (diff) |
libraries/qwt-qt5: Updated for version 6.1.5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff')
-rw-r--r-- | libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff b/libraries/qwt-qt5/patch-6.1.5-qwtconfig.diff new file mode 100644 index 0000000000000..815013bd06595 --- /dev/null +++ b/libraries/qwt-qt5/patch-6.1.5-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. |