diff options
| author | Florian Franzmann | 2018-07-14 20:53:32 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2018-07-14 20:53:32 +0200 |
| commit | 139c1b1b67d0d9b590e85e738fc058d6ac13157d (patch) | |
| tree | 1f4a9bdb4624bb96c3fd636369262a84bf2d0b29 /x11-toolkits | |
| parent | 517b0d5633aa538e8d742dfc7425a9f66ae1bad7 (diff) | |
x11-toolkits/qwt5: version 6.1.3
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch | 25 | ||||
| -rwxr-xr-x | x11-toolkits/qwt5/BUILD | 2 | ||||
| -rwxr-xr-x | x11-toolkits/qwt5/DEPENDS | 2 | ||||
| -rwxr-xr-x | x11-toolkits/qwt5/DETAILS | 4 | ||||
| -rw-r--r-- | x11-toolkits/qwt5/HISTORY | 6 | ||||
| -rwxr-xr-x | x11-toolkits/qwt5/PRE_BUILD | 4 |
6 files changed, 38 insertions, 5 deletions
diff --git a/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch b/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch new file mode 100644 index 0000000000..d0b249d132 --- /dev/null +++ b/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch @@ -0,0 +1,25 @@ +From 83de529d6d22b2e8a890b3d88d7abcad74d7f301 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Sat, 14 Jul 2018 20:50:08 +0200 +Subject: [PATCH] do not build designer plugin + +--- + qwtconfig.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 2dc3715..4aae30f 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 +-- +2.18.0 + diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD index eec3de4651..0694f5668d 100755 --- a/x11-toolkits/qwt5/BUILD +++ b/x11-toolkits/qwt5/BUILD @@ -1 +1 @@ -qt4_build +qt5_build diff --git a/x11-toolkits/qwt5/DEPENDS b/x11-toolkits/qwt5/DEPENDS index 06a9804b98..bec1ddc7a2 100755 --- a/x11-toolkits/qwt5/DEPENDS +++ b/x11-toolkits/qwt5/DEPENDS @@ -1,2 +1,2 @@ depends -sub CXX gcc && -depends qt4 +depends qtbase diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS index 4cb3aaba78..937f1896a8 100755 --- a/x11-toolkits/qwt5/DETAILS +++ b/x11-toolkits/qwt5/DETAILS @@ -1,6 +1,6 @@ SPELL=qwt5 - VERSION=6.1.0 - SOURCE_HASH=sha512:5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc + VERSION=6.1.3 + SOURCE_HASH=sha512:d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a SOURCE=qwt-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/qwt/qwt/${VERSION}/${SOURCE} diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY index 8f85fe6556..e5d1a779dc 100644 --- a/x11-toolkits/qwt5/HISTORY +++ b/x11-toolkits/qwt5/HISTORY @@ -1,3 +1,9 @@ +2018-07-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 6.1.3 + * DEPENDS, BUILD: use qt5 + * PRE_BUILD, 0001-do-not-build-designer-plugin.patch: do not build designer + plugin + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD index 31656b1dfa..1a6b953d9b 100755 --- a/x11-toolkits/qwt5/PRE_BUILD +++ b/x11-toolkits/qwt5/PRE_BUILD @@ -5,5 +5,7 @@ default_pre_build && cd $SOURCE_DIRECTORY && sed -i -e "/local/D;/QWT_INSTALL_PREFIX *=/s|=.*$|= $INSTALL_ROOT/usr|" \ -e "s|/doc|/share/doc|;/features/s|/|/share/qt4/mkspecs/|" \ - qwtconfig.pri + qwtconfig.pri && + +patch -p1 < "$SPELL_DIRECTORY/0001-do-not-build-designer-plugin.patch" |