From b5336f76da7f561eb4f03db2afd69f4bef8d087e Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 5 Nov 2019 17:38:38 +0300 Subject: [PATCH] qscintilla: Update to 2.11.3 --- mingw-w64-qscintilla/PKGBUILD | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mingw-w64-qscintilla/PKGBUILD b/mingw-w64-qscintilla/PKGBUILD index d3d9de1719..797bf5c8b0 100644 --- a/mingw-w64-qscintilla/PKGBUILD +++ b/mingw-w64-qscintilla/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}-common") -pkgver=2.11.2 -pkgrel=2 +pkgver=2.11.3 +pkgrel=1 pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class (mingw-w64)" arch=('any') license=("GPL") @@ -17,18 +17,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python2-pyqt5" "${MINGW_PACKAGE_PREFIX}-python3-pyqt5") options=(!strip staticlibs !buildflags) -source=(#"https://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz" - https://www.riverbankcomputing.com/static/Downloads/QScintilla/${pkgver}/QScintilla_gpl-${pkgver}.tar.gz +source=(https://www.riverbankcomputing.com/static/Downloads/QScintilla/${pkgver}/QScintilla-${pkgver}.tar.gz 'run-command-via-sh.patch' 'qmake-install-paths.patch' 'designed-plugin-config-build.patch') -sha256sums=('029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1' +sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6' 'a517b6427006c18db816dfcd087eee36e2f08c48c5147c48971f25118ea0c149' '517df6924d9d10104ee57372530692457cc3d4687d98ee6222f9764f0b31024b' 'b9de93dc99426bebcb9516942b70b0cd8b17cba62de79becceb04737a1b0a2e7') prepare() { - cd QScintilla_gpl-${pkgver} + cd QScintilla-${pkgver} patch -p1 -i "${srcdir}"/run-command-via-sh.patch patch -p1 -i "${srcdir}"/qmake-install-paths.patch patch -p1 -i "${srcdir}"/designed-plugin-config-build.patch @@ -40,7 +39,7 @@ package_qscintilla() { pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" depends=("${MINGW_PACKAGE_PREFIX}-qt5") - cd ${srcdir}/QScintilla_gpl-${pkgver} + cd ${srcdir}/QScintilla-${pkgver} sed -e "s|%INSTALL_PREFIX%|$(cygpath -wm ${pkgdir})|g" \ -i Qt4Qt5/qscintilla.pro \ -i designer-Qt4Qt5/designer.pro @@ -62,7 +61,7 @@ package_python-qscintilla-common() { pkgdesc="Common python qscintilla bindings files shared between python3-qscintilla and python2-qscintilla" depends=("${MINGW_PACKAGE_PREFIX}-qscintilla") - cd QScintilla_gpl-${pkgver}/Python + cd QScintilla-${pkgver}/Python MSYS2_ARG_CONV_EXCL="${MINGW_PREFIX}" \ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1 @@ -74,7 +73,7 @@ package_python3-qscintilla() { pkgdesc="Python 3.x bindings for QScintilla2" depends=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common" "${MINGW_PACKAGE_PREFIX}-python3-pyqt5") - cd QScintilla_gpl-${pkgver}/Python + cd QScintilla-${pkgver}/Python ${MINGW_PREFIX}/bin/python3 configure.py \ --pyqt=PyQt5 \ --qsci-featuresdir=../Qt4Qt5/features \ @@ -92,7 +91,7 @@ package_python2-qscintilla() { pkgdesc="Python 2.x bindings for QScintilla2" depends=("${MINGW_PACKAGE_PREFIX}-python-qscintilla-common" "${MINGW_PACKAGE_PREFIX}-python2-pyqt5") - cd QScintilla_gpl-${pkgver}/Python2 + cd QScintilla-${pkgver}/Python2 ${MINGW_PREFIX}/bin/python2 configure.py \ --pyqt=PyQt5 \ --qsci-featuresdir=../Qt4Qt5/features \