qwt: update to 6.2.0

This commit is contained in:
Mehdi Chinoune
2021-07-19 08:29:44 +01:00
parent 257399ba23
commit b616f2192f
3 changed files with 80 additions and 187 deletions

View File

@@ -0,0 +1,63 @@
--- qwt-6.2.0/qwtconfig.pri.orig 2021-07-18 12:19:33.000000000 +0100
+++ qwt-6.2.0/qwtconfig.pri 2021-07-19 08:10:23.644576700 +0100
@@ -24,12 +24,11 @@
}
win32 {
- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
- # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ QWT_INSTALL_PREFIX = %VALUE_QWT_INSTALL_PREFIX%
}
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt
+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
######################################################################
@@ -42,7 +41,7 @@
# runtime environment of designer/creator.
######################################################################
-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
+QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/share/qt5/plugins/designer
# linux distributors often organize the Qt installation
# their way and QT_INSTALL_PREFIX doesn't offer a good
@@ -63,8 +62,7 @@
# with every Qt upgrade.
######################################################################
-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
+QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt5/mkspecs/features
######################################################################
# Build the static/shared libraries.
@@ -137,7 +135,7 @@
# Otherwise you have to build them from the examples directory.
######################################################################
-QWT_CONFIG += QwtExamples
+#QWT_CONFIG += QwtExamples
######################################################################
# The playground is primarily intended for the Qwt development
@@ -148,14 +146,14 @@
# Otherwise you have to build them from the playground directory.
######################################################################
-QWT_CONFIG += QwtPlayground
+#QWT_CONFIG += QwtPlayground
######################################################################
# If you want to auto build the tests, enable the line below
# Otherwise you have to build them from the tests directory.
######################################################################
-QWT_CONFIG += QwtTests
+#QWT_CONFIG += QwtTests
######################################################################
# When Qt has been built as framework qmake wants

View File

@@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
pkgver=6.1.6
pkgver=6.2.0
pkgrel=1
pkgdesc="Qt Widgets for Technical Applications (mingw-w64)"
arch=('any')
@@ -19,38 +19,41 @@ depends=("${MINGW_PACKAGE_PREFIX}-qt5")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
options=(!strip staticlibs !buildflags)
source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.bz2"
"qwtconfig-msys2.pri"
001-separate-debug-info-build.patch
002-link-to-release.patch)
sha256sums=('99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6'
'5b85185c42bde551f406ab30fd3ea664bf6574e44caef65cad49cb9916597796'
002-link-to-release.patch
003-qwtconfig-msys2.patch)
sha256sums=('9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530'
'0e103a7ae290bb706c87135b9f0fffc9f2fb83eea57922973817b220c0f45e9d'
'6e0101d2c2897c94da6284ba0b929a7a39d82120313e6cd6353fd5e3aaf4b059')
'6e0101d2c2897c94da6284ba0b929a7a39d82120313e6cd6353fd5e3aaf4b059'
'403d56bfce0a22220af409a3bc51bd20d9039696ec947869e8028625e50f1062')
prepare() {
# copy our config file to the right place
cp ${srcdir}/qwtconfig-msys2.pri ${srcdir}/${_realname}-${pkgver}/qwtconfig.pri
cd ${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-separate-debug-info-build.patch
patch -p1 -i ${srcdir}/002-link-to-release.patch
patch -p1 -i ${srcdir}/003-qwtconfig-msys2.patch
}
package() {
local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX})
[[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/build-${MSYSTEM}
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/build-${MINGW_CHOST}
cd ${srcdir}/build-${MINGW_CHOST}
cd ${srcdir}/build-${MSYSTEM}
local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX})
sed -s "s|%VALUE_QWT_INSTALL_PREFIX%|${PREFIX_WIN}|g" -i qwtconfig.pri
${MINGW_PREFIX}/bin/qmake CONFIG-=debug_and_release CONFIG+=release qwt.pro
make # VERBOSE=1
make -j1 install
install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING \
${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
mkdir -p ${pkgdir}${MINGW_PREFIX}/bin/
mv "${pkgdir}${MINGW_PREFIX}"/lib/*.{debug,dll} "${pkgdir}${MINGW_PREFIX}"/bin/
# install debug info
#install -Dm644 lib/*.debug -t "${pkgdir}${MINGW_PREFIX}"/bin/

View File

@@ -1,173 +0,0 @@
################################################################
# Qwt Widget Library
# Copyright (C) 1997 Josef Wilgen
# Copyright (C) 2002 Uwe Rathmann
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the Qwt License, Version 1.0
################################################################
QWT_VER_MAJ = 6
QWT_VER_MIN = 1
QWT_VER_PAT = 6
QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
######################################################################
# 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
}
win32 {
QWT_INSTALL_PREFIX = %VALUE_QWT_INSTALL_PREFIX%
}
QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt
QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
######################################################################
# Designer plugin
# creator/designer load designer plugins from certain default
# directories ( f.e the path below QT_INSTALL_PREFIX ) and the
# directories listed in the QT_PLUGIN_PATH environment variable.
# When using the path below QWT_INSTALL_PREFIX you need to
# add $${QWT_INSTALL_PREFIX}/plugins to QT_PLUGIN_PATH in the
# runtime environment of designer/creator.
######################################################################
QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/share/qt5/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
######################################################################
# Features
# When building a Qwt application with qmake you might want to load
# the compiler/linker flags, that are required to build a Qwt application
# from qwt.prf. Therefore all you need to do is to add "CONFIG += qwt"
# to your project file and take care, that qwt.prf can be found by qmake.
# ( see http://doc.trolltech.com/4.7/qmake-advanced-usage.html#adding-new-configuration-features )
# I recommend not to install the Qwt features together with the
# Qt features, because you will have to reinstall the Qwt features,
# with every Qt upgrade.
######################################################################
QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/share/qt5/mkspecs/features
######################################################################
# Build the static/shared libraries.
# If QwtDll is enabled, a shared library is built, otherwise
# it will be a static library.
######################################################################
QWT_CONFIG += QwtDll
######################################################################
# QwtPlot enables all classes, that are needed to use the QwtPlot
# widget.
######################################################################
QWT_CONFIG += QwtPlot
######################################################################
# QwtWidgets enables all classes, that are needed to use the all other
# widgets (sliders, dials, ...), beside QwtPlot.
######################################################################
QWT_CONFIG += QwtWidgets
######################################################################
# If you want to display svg images on the plot canvas, or
# export a plot to a SVG document
######################################################################
QWT_CONFIG += QwtSvg
######################################################################
# If you want to use a OpenGL plot canvas
######################################################################
QWT_CONFIG += QwtOpenGL
######################################################################
# You can use the MathML renderer of the Qt solutions package to
# enable MathML support in Qwt. Because of license implications
# the ( modified ) code of the MML Widget solution is included and
# linked together with the QwtMathMLTextEngine into an own library.
# To use it you will have to add "CONFIG += qwtmathml"
# to your qmake project file.
######################################################################
#QWT_CONFIG += QwtMathML
######################################################################
# If you want to build the Qwt designer plugin,
# enable the line below.
# Otherwise you have to build it from the designer directory.
######################################################################
QWT_CONFIG += QwtDesigner
######################################################################
# Compile all Qwt classes into the designer plugin instead
# of linking it against the shared Qwt library. Has no effect
# when QwtDesigner or QwtDll are not both enabled.
#
# On systems where rpath is supported ( all Unixoids ) the
# location of the installed Qwt library is compiled into the plugin,
# but on Windows it might be easier to have a self contained
# plugin to avoid any hassle with configuring the runtime
# environment of the designer/creator.
######################################################################
win32 {
QWT_CONFIG += QwtDesignerSelfContained
}
######################################################################
# If you want to auto build the examples, enable the line below
# Otherwise you have to build them from the examples directory.
######################################################################
#QWT_CONFIG += QwtExamples
######################################################################
# The playground is primarily intended for the Qwt development
# to explore and test new features. Nevertheless you might find
# ideas or code snippets that help for application development
# If you want to auto build the applications in playground, enable
# the line below.
# Otherwise you have to build them from the playground directory.
######################################################################
#QWT_CONFIG += QwtPlayground
######################################################################
# When Qt has been built as framework qmake wants
# to link frameworks instead of regular libs
######################################################################
macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) {
QWT_CONFIG += QwtFramework
}
######################################################################
# Create and install pc files for pkg-config
# See https://www.freedesktop.org/wiki/Software/pkg-config/
######################################################################
unix {
#QWT_CONFIG += QwtPkgConfig
}