summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-03-08 23:35:16 +0100
committerMartchus2022-03-08 23:35:16 +0100
commit86777d70492227675006544a73023ab500ee91cc (patch)
tree54b2ee174050f246b4f85171b065ad958e4674c8
parente6477c6c2e8031340afa9d92e17375f5dd163995 (diff)
downloadaur-86777d70492227675006544a73023ab500ee91cc.tar.gz
Rebase against 5.15.3
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--PKGBUILD.sh.ep2
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2afafc05c5a6..cc5c95829e97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-svg
pkgdesc = Classes for displaying the contents of SVG files (mingw-w64)
- pkgver = 5.15.2+kde+r14
+ pkgver = 5.15.3+kde+r12
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -16,7 +16,7 @@ pkgbase = mingw-w64-qt5-svg
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qtsvg#commit=5b9285c34731e67f9f1d61ec804740991f2a0380
+ source = git+https://invent.kde.org/qt/qt/qtsvg#commit=2f42157cabbd1db6249ccb1d14e6eede80451e0c
sha256sums = SKIP
pkgname = mingw-w64-qt5-svg
diff --git a/PKGBUILD b/PKGBUILD
index 9b1d4dd8d6b4..9dac83cc2a52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,15 +10,16 @@
_qt_module=qtsvg
pkgname=mingw-w64-qt5-svg
-pkgver=5.15.2
+pkgver=5.15.3
pkgrel=1
arch=('any')
pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"
depends=('mingw-w64-qt5-base')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=5b9285c34731e67f9f1d61ec804740991f2a0380
-pkgver+=+kde+r14
+_commit=2f42157cabbd1db6249ccb1d14e6eede80451e0c
+_basever=$pkgver
+pkgver+=+kde+r12
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
@@ -33,13 +34,11 @@ _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
pkgver() {
cd $_pkgfqn
- echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+ echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
}
prepare() {
cd "${srcdir}/${_pkgfqn}"
-
- git revert -n 9aac88424a1b76e0198b52437af58a6d94aff8e9 # Revert version bump
}
build() {
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 09406c99cf92..fa9a126dd7fe 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -4,7 +4,7 @@
# Contributor: ant32 <antreimer@gmail.com>
% end
\
-pkgver=5.15.2
+pkgver=5.15.3
pkgrel=1
arch=('any')
pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"