From 40c5f3bf30945581b57b6f5a621784aca74ce524 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 12 Mar 2022 12:06:24 +0800 Subject: [PATCH] switch to SIP 5.x following upstream See: https://github.com/lxqt/qtermwidget/pull/465 --- .SRCINFO | 11 ++++++----- PKGBUILD | 15 ++++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2f1c4e1b5426..42b460be4dea 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = qtermwidget-git pkgdesc = A terminal widget for Qt, used by QTerminal - pkgver = 1.0.0.2.g56ed3a7 - pkgrel = 2 + pkgver = 1.0.0.14.g76b4e9f + pkgrel = 1 url = https://github.com/lxqt/qtermwidget arch = x86_64 license = LGPL @@ -12,11 +12,12 @@ pkgbase = qtermwidget-git makedepends = lxqt-build-tools-git makedepends = qt5-tools makedepends = python-pyqt5 - makedepends = python-sip4 - makedepends = sip4 + makedepends = pyqt-builder + makedepends = sip + makedepends = python-installer depends = qt5-base optdepends = python: PyQt5 bindings - provides = qtermwidget=1.0.0.2.g56ed3a7 + provides = qtermwidget=1.0.0.14.g76b4e9f conflicts = qtermwidget source = git+https://github.com/lxqt/qtermwidget.git sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index f81b6ed92c68..5af7f1c0b49b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ _pkgname=qtermwidget pkgname=$_pkgname-git -pkgver=1.0.0.2.g56ed3a7 -pkgrel=2 +pkgver=1.0.0.14.g76b4e9f +pkgrel=1 pkgdesc="A terminal widget for Qt, used by QTerminal" arch=("x86_64") url="https://github.com/lxqt/qtermwidget" @@ -12,7 +12,7 @@ url="https://github.com/lxqt/qtermwidget" license=("LGPL" "custom:BSD" "custom:Public Domain") depends=("qt5-base") makedepends=("git" "cmake" "lxqt-build-tools-git" "qt5-tools" - "python-pyqt5" "python-sip4" "sip4") + "python-pyqt5" "pyqt-builder" "sip" "python-installer") provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") optdepends=( @@ -30,13 +30,18 @@ build() { mkdir -p build cd build cmake "$srcdir/$_pkgname" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DQTERMWIDGET_BUILD_PYTHON_BINDING=OFF + -DCMAKE_INSTALL_PREFIX=/usr make + + cd "$srcdir/$_pkgname"/pyqt + CXXFLAGS="-I$PWD/../lib -I$PWD/../../build/lib" LDFLAGS="-L$PWD/../../build" sip-wheel --verbose } package() { cd build make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/$_pkgname/README.md" -t "$pkgdir"/usr/share/licenses/$pkgname + + cd "$srcdir/$_pkgname"/pyqt + python -m installer --destdir="$pkgdir" *.whl }