Rebase against 5.15.3

2 files changed, 17 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 866295d75e96..56a6d09ea3f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-serialport-static
 	pkgdesc = Provides access to hardware and virtual serial ports (mingw-w64)
-	pkgver = 5.15.2
+	pkgver = 5.15.3+kde+r0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -11,13 +11,13 @@ pkgbase = mingw-w64-qt5-serialport-static
 	license = custom
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
+	makedepends = git
 	depends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-serialport
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz
-	sha256sums = 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d
+	source = git+https://invent.kde.org/qt/qt/qtserialport#commit=f95e2411d7c978def87846ea7cedf3dc5fd7c8b8
+	sha256sums = SKIP
 
 pkgname = mingw-w64-qt5-serialport-static
-
diff --git a/PKGBUILD b/PKGBUILD
index 96531bb9b91c..e00f9446cf0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,25 +10,34 @@
 
 _qt_module=qtserialport
 pkgname=mingw-w64-qt5-serialport-static
-pkgver=5.15.2
+pkgver=5.15.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
+_commit=f95e2411d7c978def87846ea7cedf3dc5fd7c8b8
+_basever=$pkgver
+pkgver+=+kde+r0
+makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d')
+_pkgfqn=${_qt_module}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers
 _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   cd "${srcdir}/${_pkgfqn}"