From f0027c41c1543d516223cdc86157ce36b6838181 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 8 Apr 2021 14:15:18 +0200 Subject: community/qt5-qtxmlpatterns: apply latest KDE patches --- community/qt5-qttranslations/APKBUILD | 2 +- community/qt5-qtxmlpatterns/APKBUILD | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/community/qt5-qttranslations/APKBUILD b/community/qt5-qttranslations/APKBUILD index ec03bda876f..8476abd618c 100644 --- a/community/qt5-qttranslations/APKBUILD +++ b/community/qt5-qttranslations/APKBUILD @@ -7,7 +7,7 @@ url="https://www.qt.io/developers/" arch="noarch" license="GPL-3.0-only AND Qt-GPL-exception-1.0" makedepends="qt5-qttools-dev" -builddir="$srcdir/qttranslations-everywhere-src-$pkgver" +builddir="$srcdir/qttranslations-$_commit" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; diff --git a/community/qt5-qtxmlpatterns/APKBUILD b/community/qt5-qtxmlpatterns/APKBUILD index 29d6ba3ec72..a64e8edbd8a 100644 --- a/community/qt5-qtxmlpatterns/APKBUILD +++ b/community/qt5-qtxmlpatterns/APKBUILD @@ -1,21 +1,30 @@ # Maintainer: Bart Ribbers pkgname=qt5-qtxmlpatterns -pkgver=5.15.2 -pkgrel=1 +pkgver=5.15.3_git20201028 +pkgrel=0 +_commit="189e28d0aff1f3d7960228ba318b83e3cadac98c" pkgdesc="Qt5 - QtXmlPatterns component" url="https://www.qt.io/developers/" arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-dev" -builddir="$srcdir/qtxmlpatterns-everywhere-src-$pkgver" +builddir="$srcdir/qtxmlpatterns-$_commit" case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtxmlpatterns-everywhere-src-$pkgver.tar.xz" +source="https://invent.kde.org/qt/qt/qtxmlpatterns/-/archive/$_commit/qtxmlpatterns-$_commit.tar.gz" + +prepare() { + default_prepare + + # We need to make the build system think we're running in a git repository + # so it correctly symlinks during the build + mkdir .git +} build() { qmake-qt5 @@ -37,4 +46,4 @@ package() { ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348 qtxmlpatterns-everywhere-src-5.15.2.tar.xz" +sha512sums="5a35408aa271beb4b787595fc40d8162f10dbae6fb80bb779664e8aa3c9c8c8a659c1d10e459854bda6f6f7a4ab2d5c748501f94cc8927ff8389e9998fa5d0f6 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.gz" -- cgit v1.2.3