[arch-commits] Commit in (41 files)

Antonio Rojas arojas at gemini.archlinux.org
Fri Mar 4 11:12:40 UTC 2022 

    Date: Friday, March 4, 2022 @ 11:12:39
  Author: arojas
Revision: 438839

Rebase on 5.15.3

Modified:
  qt5-3d/trunk/PKGBUILD
  qt5-base/trunk/PKGBUILD
  qt5-charts/trunk/PKGBUILD
  qt5-connectivity/trunk/PKGBUILD
  qt5-datavis3d/trunk/PKGBUILD
  qt5-declarative/trunk/PKGBUILD
  qt5-doc/trunk/PKGBUILD
  qt5-doc/trunk/qt5-webengine-python3.patch
  qt5-gamepad/trunk/PKGBUILD
  qt5-graphicaleffects/trunk/PKGBUILD
  qt5-imageformats/trunk/PKGBUILD
  qt5-location/trunk/PKGBUILD
  qt5-lottie/trunk/PKGBUILD
  qt5-mqtt/trunk/PKGBUILD
  qt5-multimedia/trunk/PKGBUILD
  qt5-networkauth/trunk/PKGBUILD
  qt5-purchasing/trunk/PKGBUILD
  qt5-quick3d/trunk/PKGBUILD
  qt5-quickcontrols/trunk/PKGBUILD
  qt5-quickcontrols2/trunk/PKGBUILD
  qt5-quicktimeline/trunk/PKGBUILD
  qt5-remoteobjects/trunk/PKGBUILD
  qt5-script/trunk/PKGBUILD
  qt5-scxml/trunk/PKGBUILD
  qt5-sensors/trunk/PKGBUILD
  qt5-serialbus/trunk/PKGBUILD
  qt5-serialport/trunk/PKGBUILD
  qt5-speech/trunk/PKGBUILD
  qt5-svg/trunk/PKGBUILD
  qt5-tools/trunk/PKGBUILD
  qt5-translations/trunk/PKGBUILD
  qt5-virtualkeyboard/trunk/PKGBUILD
  qt5-wayland/trunk/PKGBUILD
  qt5-webchannel/trunk/PKGBUILD
  qt5-webengine/trunk/PKGBUILD
  qt5-webglplugin/trunk/PKGBUILD
  qt5-webkit/trunk/PKGBUILD
  qt5-websockets/trunk/PKGBUILD
  qt5-webview/trunk/PKGBUILD
  qt5-x11extras/trunk/PKGBUILD
  qt5-xmlpatterns/trunk/PKGBUILD

-------------------------------------------+
 qt5-3d/trunk/PKGBUILD                     |   15 ++++-------
 qt5-base/trunk/PKGBUILD                   |   12 +++-----
 qt5-charts/trunk/PKGBUILD                 |   20 +++++++++-----
 qt5-connectivity/trunk/PKGBUILD           |   13 +++------
 qt5-datavis3d/trunk/PKGBUILD              |   20 +++++++++-----
 qt5-declarative/trunk/PKGBUILD            |   12 +++-----
 qt5-doc/trunk/PKGBUILD                    |   38 ++++++++--------------------
 qt5-doc/trunk/qt5-webengine-python3.patch |   25 +++++-------------
 qt5-gamepad/trunk/PKGBUILD                |   19 +++++++++-----
 qt5-graphicaleffects/trunk/PKGBUILD       |   20 +++++++++-----
 qt5-imageformats/trunk/PKGBUILD           |   20 +++++++++-----
 qt5-location/trunk/PKGBUILD               |   19 +++++++++-----
 qt5-lottie/trunk/PKGBUILD                 |   20 +++++++++-----
 qt5-mqtt/trunk/PKGBUILD                   |    3 +-
 qt5-multimedia/trunk/PKGBUILD             |   20 +++++++++-----
 qt5-networkauth/trunk/PKGBUILD            |   19 +++++++++-----
 qt5-purchasing/trunk/PKGBUILD             |   20 +++++++++-----
 qt5-quick3d/trunk/PKGBUILD                |   18 +++++--------
 qt5-quickcontrols/trunk/PKGBUILD          |   20 +++++++++-----
 qt5-quickcontrols2/trunk/PKGBUILD         |   14 ++++------
 qt5-quicktimeline/trunk/PKGBUILD          |   19 +++++++++-----
 qt5-remoteobjects/trunk/PKGBUILD          |   20 +++++++++-----
 qt5-script/trunk/PKGBUILD                 |    8 ++---
 qt5-scxml/trunk/PKGBUILD                  |   20 +++++++++-----
 qt5-sensors/trunk/PKGBUILD                |   20 +++++++++-----
 qt5-serialbus/trunk/PKGBUILD              |   20 +++++++++-----
 qt5-serialport/trunk/PKGBUILD             |   20 +++++++++-----
 qt5-speech/trunk/PKGBUILD                 |   13 +++------
 qt5-svg/trunk/PKGBUILD                    |   14 ++++------
 qt5-tools/trunk/PKGBUILD                  |   14 ++++------
 qt5-translations/trunk/PKGBUILD           |    9 +++---
 qt5-virtualkeyboard/trunk/PKGBUILD        |   15 ++++-------
 qt5-wayland/trunk/PKGBUILD                |   12 +++-----
 qt5-webchannel/trunk/PKGBUILD             |   15 ++++-------
 qt5-webengine/trunk/PKGBUILD              |   10 +++----
 qt5-webglplugin/trunk/PKGBUILD            |   19 +++++++++-----
 qt5-webkit/trunk/PKGBUILD                 |    1 
 qt5-websockets/trunk/PKGBUILD             |   15 ++++-------
 qt5-webview/trunk/PKGBUILD                |   20 +++++++++-----
 qt5-x11extras/trunk/PKGBUILD              |   20 +++++++++-----
 qt5-xmlpatterns/trunk/PKGBUILD            |   20 +++++++++-----
 41 files changed, 384 insertions(+), 307 deletions(-)

Modified: qt5-3d/trunk/PKGBUILD
===================================================================
--- qt5-3d/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-3d/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-3d
-_qtver=5.15.2
-pkgver=5.15.2+kde+r39
-pkgrel=3
-_commit=dba14d48611b9e9d59576172658779ab4a39b416
+_basever=5.15.3
+pkgver=5.15.3+kde+r18
+pkgrel=1
+_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,7 +13,7 @@
 depends=('qt5-declarative' 'assimp')
 makedepends=('git' 'vulkan-headers')
 groups=('qt' 'qt5')
-_pkgfqn=qt3d
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +20,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 997ff3ad21b9303aa3321a86e5c5b9cfcfc2f807 # Revert version bump
 }
 
 build() {

Modified: qt5-base/trunk/PKGBUILD
===================================================================
--- qt5-base/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-base/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -3,9 +3,10 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-pkgver=5.15.2+kde+r305
+_basever=5.15.3
+pkgver=5.15.3+kde+r120
 pkgrel=1
-_commit=77c620f0a1f8a5e8e126fd00a7beba6ac8005ad0
+_commit=6c11375ecad82026c029d6118ee84cf75e1d833c
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,7 +28,7 @@
             'perl: for fixqt4headers and syncqt')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
-_pkgfqn=qtbase
+_pkgfqn=${pkgbase/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         qmake-cflags.patch
         qmake-config.patch)
@@ -38,14 +39,11 @@
 
 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 ${_pkgfqn}
-
-  git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-
   patch -p1 < ../qmake-cflags.patch # Use system CFLAGS in qmake
   patch -p1 < ../qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834
 }

Modified: qt5-charts/trunk/PKGBUILD
===================================================================
--- qt5-charts/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-charts/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-charts
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=f13988aa1ad9de5d92e7b0ba4d0d947dd019d759
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3')
 pkgdesc='Provides a set of easy to use chart components'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-connectivity/trunk/PKGBUILD
===================================================================
--- qt5-connectivity/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-connectivity/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-connectivity
-_qtver=5.15.2
-pkgver=5.15.2+kde+r7
+_basever=5.15.3
+pkgver=5.15.3+kde+r5
 pkgrel=1
-_commit=19ae816330924f595be812a36dc3ed2a1e2aa29a
+_commit=8a377440b37f5633156a8e40c9f0dce5f4d5a665
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,7 +14,7 @@
 makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn=qtconnectivity
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -21,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 69a87a9b831e36a578594a0a13130c384ad03121 # Revert version bump
 }
 
 build() {

Modified: qt5-datavis3d/trunk/PKGBUILD
===================================================================
--- qt5-datavis3d/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-datavis3d/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-datavis3d
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=19af9584f7b80928ee49950c573c770af68c9519
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3')
 pkgdesc='Qt Data Visualization module'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-declarative/trunk/PKGBUILD
===================================================================
--- qt5-declarative/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-declarative/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-declarative
-pkgver=5.15.2+kde+r46
+_basever=5.15.3
+pkgver=5.15.3+kde+r20
 pkgrel=1
-_commit=29ee9a0e9f02ec74153a2cf09dc63722bc273544
+_commit=02105099301450c890e1caba977ef44efdc43da7
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,7 +14,7 @@
 makedepends=('python' 'vulkan-headers' 'git')
 groups=('qt' 'qt5')
 conflicts=('qtchooser')
-_pkgfqn=qtdeclarative
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 568763928a78b52373932b01be17e040f7c3fa50 # Revert version bump
 }
 
 build() {

Modified: qt5-doc/trunk/PKGBUILD
===================================================================
--- qt5-doc/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-doc/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -4,9 +4,8 @@
 
 pkgbase=qt5-doc
 pkgname=(qt5-doc qt5-examples)
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+pkgver=5.15.3
+pkgrel=1
 arch=('any')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,38 +12,25 @@
 makedepends=('qt5-tools' 'python' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite'
              'gperf' 'nss' 'clang')
 groups=('qt' 'qt5')
-_pkgfqn="qt-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz"
-         https://invent.kde.org/qt/qt/qtbase/-/commit/8252ef5f.patch
-         https://invent.kde.org/qt/qt/qtbase/-/commit/cb2da673.patch
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz"
          qt5-webengine-python3.patch)
-sha256sums=('3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240'
-            '8ab742b991ed5c43e8da4b1ce1982fd38fe611aaac3d57ee37728b59932b518a'
-            '33304570431c0dd3becc22f3f0911ccfc781a1ce6c7926c3acb08278cd2e60c3'
-            '54de45621463a7c07f87482fbcbb9eacbc60d840bb69b34bc6c776d1df720453')
+sha256sums=('b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb'
+            '5ad3f81a32f612872f48098354120459c7650c398cd653c3ff5e6641dfc5c615')
 
 prepare() {
-  cd ${_pkgfqn}
+  cd ${_pkgfqn/opensource-/}
 
   ln -s /usr/bin qttools/
   ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/
 
-  patch -d qtbase -p1 < "$srcdir"/8252ef5f.patch # Fix build with GCC 11
-  patch -d qtbase -p1 < "$srcdir"/cb2da673.patch
   patch -d qtwebengine -p1 < "$srcdir"/qt5-webengine-python3.patch # Fix build with Python 3
 }
 
 build() {
-  cd ${_pkgfqn}
+  cd ${_pkgfqn/opensource-/}
 
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -headerdir /usr/include/qt \
-    -archdatadir /usr/lib/qt \
-    -datadir /usr/share/qt \
-    -sysconfdir /etc/xdg \
-    -nomake examples
+  qmake CONFIG+="confirm-license opensource"
   make docs
 }
 
@@ -52,7 +38,7 @@
   pkgdesc='A cross-platform application and UI framework (Documentation)'
   depends=('qt5-base')
 
-  cd ${_pkgfqn}
+  cd ${_pkgfqn/opensource-/}
   make INSTALL_ROOT="$pkgdir" install_docs
 
   install -d "$pkgdir"/usr/share/licenses
@@ -69,9 +55,9 @@
   # QtCreator requires them to be in the same top-level directory.
   # Matching the Qt5 installer, only the qtbase project is kept.
   mkdir -p $_base
-  cp ${_pkgfqn}/qtbase/examples/examples.pro $_base
+  cp ${_pkgfqn/opensource-/}/qtbase/examples/examples.pro $_base
 
-  _fdirs=$(find "${_pkgfqn}" -maxdepth 2 -type d -name examples)
+  _fdirs=$(find "${_pkgfqn/opensource-/}" -maxdepth 2 -type d -name examples)
   for _dir in $_fdirs; do
       _mod=$(basename ${_dir%/examples})
 

Modified: qt5-doc/trunk/qt5-webengine-python3.patch
===================================================================
--- qt5-doc/trunk/qt5-webengine-python3.patch	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-doc/trunk/qt5-webengine-python3.patch	2022-03-04 11:12:39 UTC (rev 438839)
@@ -68,12 +68,12 @@
      !qtwebengine_checkForGperf(QtWebEngine):return(false)
      !qtwebengine_checkForBison(QtWebEngine):return(false)
      !qtwebengine_checkForFlex(QtWebEngine):return(false)
--    !qtwebengine_checkForPython2(QtWebengine):return(false)
-+    !qtwebengine_checkForPython(QtWebengine):return(false)
+-    !qtwebengine_checkForPython2(QtWebEngine):return(false)
++    !qtwebengine_checkForPython(QtWebEngine):return(false)
+     !qtwebengine_checkForNodejs(QtWebEngine):return(false)
      !qtwebengine_checkForSanitizer(QtWebEngine):return(false)
      linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
-     linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false)
-@@ -50,7 +50,7 @@ defineReplace(qtwebengine_checkPdfError) {
+@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) {
      !qtwebengine_checkForGperf(QtPdf):return(false)
      !qtwebengine_checkForBison(QtPdf):return(false)
      !qtwebengine_checkForFlex(QtPdf):return(false)
@@ -82,7 +82,7 @@
      !qtwebengine_checkForSanitizer(QtPdf):return(false)
      linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
      linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
-@@ -142,10 +142,10 @@ defineTest(qtwebengine_checkForFlex) {
+@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) {
      return(true)
  }
  
@@ -100,7 +100,7 @@
 index 88d1790c..032aa665 100644
 --- a/src/buildtools/configure.json
 +++ b/src/buildtools/configure.json
-@@ -294,9 +294,9 @@
+@@ -289,9 +289,9 @@
              "label": "system ninja",
              "type": "detectNinja"
          },
@@ -113,7 +113,7 @@
              "log": "location"
          },
          "webengine-winversion": {
-@@ -372,7 +372,7 @@
+@@ -394,7 +394,7 @@
                           && features.webengine-gperf
                           && features.webengine-bison
                           && features.webengine-flex
@@ -122,16 +122,7 @@
                           && (!config.sanitizer || features.webengine-sanitizer)
                           && (!config.linux || features.pkg-config)
                           && (!config.linux || features.webengine-host-pkg-config)
-@@ -397,7 +397,7 @@
-                          && features.webengine-gperf
-                          && features.webengine-bison
-                          && features.webengine-flex
--                         && features.webengine-python2
-+                         && features.webengine-python
-                          && (!config.sanitizer || features.webengine-sanitizer)
-                          && (!config.linux || features.pkg-config)
-                          && (!config.linux || features.webengine-host-pkg-config)
-@@ -420,12 +420,12 @@
+@@ -417,12 +417,12 @@
              "autoDetect": "features.private_tests",
              "output": [ "privateFeature" ]
          },

Modified: qt5-gamepad/trunk/PKGBUILD
===================================================================
--- qt5-gamepad/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-gamepad/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -3,21 +3,28 @@
 
 pkgname=qt5-gamepad
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=6b7a6303439f83147680723f4d8142d676cdb928
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Adds support for getting events from gamepad devices'
 depends=('qt5-base' 'sdl2')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-graphicaleffects/trunk/PKGBUILD
===================================================================
--- qt5-graphicaleffects/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-graphicaleffects/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-graphicaleffects
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=379577925766385991f413a2b0d0d46831381ffa
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Graphical effects for use with Qt Quick 2'
 depends=('qt5-declarative')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-imageformats/trunk/PKGBUILD
===================================================================
--- qt5-imageformats/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-imageformats/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-imageformats
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=90038c936763645610fe1e5f05cfc025e4d98631
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
 depends=('qt5-base' 'jasper' 'libmng' 'libwebp')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-location/trunk/PKGBUILD
===================================================================
--- qt5-location/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-location/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,20 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-location
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=5
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Provides access to position, satellite and area monitoring classes'
 depends=('qt5-declarative')
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-lottie/trunk/PKGBUILD
===================================================================
--- qt5-lottie/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-lottie/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=qt5-lottie
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=fca3f80f0ce389271e5bd9af864ce56a313d359a
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')  
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-mqtt/trunk/PKGBUILD
===================================================================
--- qt5-mqtt/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-mqtt/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -4,7 +4,8 @@
 
 pkgname=qt5-mqtt
 _qtver=5.15.2
-pkgver=${_qtver/-/}
+_basever=5.15.3
+pkgver=0
 pkgrel=2
 pkgdesc="Module to implement MQTT protocol v3.1/3.1.1/5.0"
 arch=(x86_64)

Modified: qt5-multimedia/trunk/PKGBUILD
===================================================================
--- qt5-multimedia/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-multimedia/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,24 +2,30 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-multimedia
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Classes for audio, video, radio and camera functionality'
 depends=('qt5-base' 'gst-plugins-base' 'libpulse' 'openal')
-makedepends=('qt5-declarative' 'gst-plugins-bad')
+makedepends=('qt5-declarative' 'gst-plugins-bad' 'git')
 optdepends=('qt5-declarative: QML bindings' 'gst-plugins-good: camera support, additional plugins'
             'gst-plugins-bad: camera support, additional plugins' 'gst-plugins-ugly: additional plugins'
             'gst-libav: ffmpeg plugin')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-networkauth/trunk/PKGBUILD
===================================================================
--- qt5-networkauth/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-networkauth/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,20 +2,27 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=qt5-networkauth
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=958db00a2064f77b354b573102ca2c2b2e07529c
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Network authentication module'
 depends=(qt5-base)
+makedepends=(git)
 groups=(qt qt5)
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-purchasing/trunk/PKGBUILD
===================================================================
--- qt5-purchasing/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-purchasing/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-purchasing
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=255b9e16f286003bbfaff9d48e4548fb0cb3b398
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Qt In-App Purchasing API'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-quick3d/trunk/PKGBUILD
===================================================================
--- qt5-quick3d/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-quick3d/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-quick3d
-_qtver=5.15.2
-pkgver=5.15.2+kde+r19
-pkgrel=5
-_commit=3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
+_basever=5.15.3
+pkgver=5.15.3+kde+r2
+pkgrel=1
+_commit=1ede2ac20170357b3e8d7d9810e5474e08170827
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3')
@@ -14,7 +14,7 @@
 makedepends=('git' 'assimp')
 optdepends=('assimp: assimp import plugin')
 groups=('qt' 'qt5')
-_pkgfqn=qtquick3d
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         qt5-quick3d-assimp-5.1.patch)
 sha256sums=('SKIP'
@@ -23,16 +23,12 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 80196af36528e66826549a8b54d6cc5988db1622 # Revert version bump
-
-  patch -p1 < ../qt5-quick3d-assimp-5.1.patch # Fix build with assimp 5.1
+  patch -d $_pkgfqn -p1 < qt5-quick3d-assimp-5.1.patch # Fix build with assimp 5.1
 }
 
 build() {

Modified: qt5-quickcontrols/trunk/PKGBUILD
===================================================================
--- qt5-quickcontrols/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-quickcontrols/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-quickcontrols
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces'
 depends=('qt5-declarative')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-quickcontrols2/trunk/PKGBUILD
===================================================================
--- qt5-quickcontrols2/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-quickcontrols2/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-quickcontrols2
-pkgver=5.15.2+kde+r11
-pkgrel=2
-_commit=d8d6b14b9907adbc6ce307d52be34aaa761a58fa
+_basever=5.15.3
+pkgver=5.15.3+kde+r4
+pkgrel=1
+_commit=26bd7f5414dc592ab5277e2bb4ad0199faa889de
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,7 +14,7 @@
 makedepends=('git')
 optdepends=('qt5-graphicaleffects: for the Material style')
 groups=('qt' 'qt5')
-_pkgfqn=qtquickcontrols2
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 2e32d0975eb058c2076597c03b07c67b7ce9027f # Revert version bump
 }
 
 build() {

Modified: qt5-quicktimeline/trunk/PKGBUILD
===================================================================
--- qt5-quicktimeline/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-quicktimeline/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -1,20 +1,27 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-quicktimeline
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=98b1ff53458887061b4bcc183efcce899f432394
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Qt module for keyframe-based timeline construction'
 depends=('qt5-declarative')
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-remoteobjects/trunk/PKGBUILD
===================================================================
--- qt5-remoteobjects/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-remoteobjects/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-remoteobjects
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=581475dfeb44c8b51c0be86e0f2f57df7d117a80
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Inter-process communication (IPC) module developed for Qt'
 depends=(qt5-base)
-makedepends=(qt5-declarative)
+makedepends=(qt5-declarative git)
 optdepends=('qt5-declarative: QML bindings')
 groups=(qt qt5)
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-script/trunk/PKGBUILD
===================================================================
--- qt5-script/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-script/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,9 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-script
-_qtver=5.15.8
-pkgver=${_qtver/-/}
-pkgrel=3
+_basever=5.15.3
+pkgver=5.15.8
+pkgrel=4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -41,5 +41,5 @@
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
 
   # Fix cmake dependency versions
-  sed -e "s|$pkgver\ |5.15.2 |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
+  sed -e "s|$pkgver\ |$_basever |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
 }

Modified: qt5-scxml/trunk/PKGBUILD
===================================================================
--- qt5-scxml/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-scxml/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-scxml
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=50d2da3965ed8e85f3f5f5760393c42b12d34a9f
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Static and runtime integration of SCXML models into Qt code'
 depends=('qt5-declarative')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-sensors/trunk/PKGBUILD
===================================================================
--- qt5-sensors/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-sensors/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,22 +2,28 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-sensors
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=975ba788d3d0ee87aa08bb5301cd33dcbf00521b
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Provides access to sensor hardware and motion gesture recognition'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-serialbus/trunk/PKGBUILD
===================================================================
--- qt5-serialbus/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-serialbus/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-serialbus
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=22b3cad193232ab379a0c9e16989a7db1fdc9234
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Qt module for general purpose serial bus access'
 depends=('qt5-serialport')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-serialport/trunk/PKGBUILD
===================================================================
--- qt5-serialport/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-serialport/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-serialport
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=f95e2411d7c978def87846ea7cedf3dc5fd7c8b8
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Provides access to hardware and virtual serial ports'
 depends=('qt5-base')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-speech/trunk/PKGBUILD
===================================================================
--- qt5-speech/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-speech/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=qt5-speech
-_qtver=5.15.2
-pkgver=5.15.2+kde+r3
+_basever=5.15.3
+pkgver=5.15.3+kde+r1
 pkgrel=1
-_commit=16c625528f5e34e698983fc66a7c9cfb96da8052
+_commit=08b27c29aadc0cc0303cca97c9a3baa2a690dfe4
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -14,7 +14,7 @@
 makedepends=(git flite speech-dispatcher)
 optdepends=('flite: flite TTS backend' 'speech-dispatcher: speech-dispatcher TTS backend')
 groups=(qt qt5)
-_pkgfqn=qtspeech
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -21,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n dedf2d21e8c0893e039edb7bf87646e205685240 # Revert version bump
 }
 
 build() {

Modified: qt5-svg/trunk/PKGBUILD
===================================================================
--- qt5-svg/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-svg/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -3,9 +3,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-svg
-pkgver=5.15.2+kde+r16
-pkgrel=2
-_commit=728012f7762ecd5762d493f8796907c6456f31e7
+_basever=5.15.3
+pkgver=5.15.3+kde+r12
+pkgrel=1
+_commit=2f42157cabbd1db6249ccb1d14e6eede80451e0c
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,7 +14,7 @@
 depends=('qt5-base')
 makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn=qtsvg
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 9aac88424a1b76e0198b52437af58a6d94aff8e9 # Revert version bump
 }
 
 build() {

Modified: qt5-tools/trunk/PKGBUILD
===================================================================
--- qt5-tools/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-tools/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-tools
-pkgver=5.15.2+kde+r17
-pkgrel=6
-_commit=33693a928986006d79c1ee743733cde5966ac402
+_basever=5.15.3
+pkgver=5.15.3+kde+r1
+pkgrel=1
+_commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,7 +15,7 @@
 optdepends=('clang: for qdoc' 'qt5-webkit: for Qt Assistant')
 groups=('qt' 'qt5')
 conflicts=('qtchooser')
-_pkgfqn=qttools
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         {assistant,designer,linguist,qdbusviewer}.desktop)
 sha256sums=('SKIP'
@@ -26,14 +27,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n dbe0567470db2b369a9fdb28d9fbac38be3e2d60 # Revert version bump
 }
 
 build() {

Modified: qt5-translations/trunk/PKGBUILD
===================================================================
--- qt5-translations/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-translations/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-translations
-pkgver=5.15.2+kde+r22
+_basever=5.15.3
+pkgver=5.15.3+kde+r2
 pkgrel=1
-_commit=8fbbdf21f127197f97b58c7d80d2fa2a59135638
+_commit=a6d5e7f84a57394db4c8b069f81c56cfeb802e19
 arch=('any')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,13 +13,13 @@
 depends=()
 makedepends=('git' 'qt5-tools')
 groups=('qt' 'qt5')
-_pkgfqn=qttranslations
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 
 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() {

Modified: qt5-virtualkeyboard/trunk/PKGBUILD
===================================================================
--- qt5-virtualkeyboard/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-virtualkeyboard/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-virtualkeyboard
-_qtver=5.15.2
-pkgver=5.15.2+kde+r6
-pkgrel=2
-_commit=98d1fd864cbb6c7c012c4139118808af110fb8f0
+_basever=5.15.3
+pkgver=5.15.3+kde+r3
+pkgrel=1
+_commit=bb40dee811333929dd467a480dce24ab7af84ef9
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3')
@@ -13,7 +13,7 @@
 depends=('qt5-declarative' 'qt5-svg' 'hunspell')
 makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn=qtvirtualkeyboard
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +20,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 94fa973de0ec77d27e144f73bc4b788241644090 # Revert version bump
 }
 
 build() {

Modified: qt5-wayland/trunk/PKGBUILD
===================================================================
--- qt5-wayland/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-wayland/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-wayland
-pkgver=5.15.2+kde+r54
+_basever=5.15.3
+pkgver=5.15.3+kde+r40
 pkgrel=1
-_commit=8f0c9169310344c8f179311bae446239cdb61f68
+_commit=118674630cdb5933e66a8b4415afe7c716ad4662
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +13,7 @@
 depends=('qt5-declarative' 'libxcomposite')
 makedepends=('vulkan-headers' 'git')
 groups=('qt' 'qt5')
-_pkgfqn=qtwayland
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -19,14 +20,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 30cb2a87fcc6265232cb5a3ffce9836da6e531d6 # Revert version bump
 }
 
 build() {

Modified: qt5-webchannel/trunk/PKGBUILD
===================================================================
--- qt5-webchannel/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-webchannel/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-webchannel
-_qtver=5.15.2
-pkgver=5.15.2+kde+r5
-pkgrel=2
-_commit=fa8b07105b5e274daaa8adcc129fa4aa0447f9f7
+_basever=5.15.3
+pkgver=5.15.3+kde+r3
+pkgrel=1
+_commit=611016a49f3a9ba7b58bef29bc295323e06373ae
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,7 +13,7 @@
 depends=('qt5-declarative')
 makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn=qtwebchannel
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -20,14 +20,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 0159fb80446f2fc472a2391de9fc83f55ca2d50e # Revert version bump
 }
 
 build() {

Modified: qt5-webengine/trunk/PKGBUILD
===================================================================
--- qt5-webengine/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-webengine/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,9 +2,9 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-webengine
-_qtver=5.15.8
-pkgver=${_qtver/-/}
-pkgrel=9
+_basever=5.15.3
+pkgver=5.15.8
+pkgrel=10
 arch=('x86_64')
 url='https://www.qt.io'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -14,7 +14,7 @@
 makedepends=('git' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'pipewire' 'nodejs')
 optdepends=('pipewire: WebRTC desktop sharing under Wayland')
 groups=('qt' 'qt5')
-_pkgfqn=qtwebengine
+_pkgfqn=${pkgname/5-/}
 source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-lts
         git+https://code.qt.io/qt/qtwebengine-chromium.git
         git+https://chromium.googlesource.com/catapult#commit=5eedfe23148a234211ba477f76fc2ea2e8529189
@@ -75,5 +75,5 @@
   install -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
 
   # Fix cmake dependency versions
-  sed -e "s|$pkgver\ |5.15.2 |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
+  sed -e "s|$pkgver\ |$_basever |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
 }

Modified: qt5-webglplugin/trunk/PKGBUILD
===================================================================
--- qt5-webglplugin/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-webglplugin/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,20 +2,27 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-webglplugin
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='QPA plugin for running an application via a browser using streamed WebGL commands'
 depends=(qt5-websockets qt5-declarative)
+makedepends=(git)
 groups=(qt qt5)
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-webkit/trunk/PKGBUILD
===================================================================
--- qt5-webkit/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-webkit/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -4,6 +4,7 @@
 
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
+_basever=5.15.3
 pkgver=${_pkgver/-/}
 pkgrel=11
 arch=(x86_64)

Modified: qt5-websockets/trunk/PKGBUILD
===================================================================
--- qt5-websockets/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-websockets/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,10 +2,10 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-websockets
-_qtver=5.15.2
-pkgver=5.15.2+kde+r7
-pkgrel=2
-_commit=b13b56904b76e96ea52d0efe56395acc94b17d96
+_basever=5.15.3
+pkgver=5.15.3+kde+r3
+pkgrel=1
+_commit=7196d2cc34adf9f45b50a9488f4ff95b36092993
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,7 +14,7 @@
 makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 groups=('qt' 'qt5')
-_pkgfqn=qtwebsockets
+_pkgfqn=${pkgname/5-/}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
 sha256sums=('SKIP')
 options=(debug)
@@ -21,14 +21,11 @@
 
 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() {
   mkdir -p build
-
-  cd $_pkgfqn
-  git revert -n 767afe93c3f104716a68ff563d4a4e4ee0a62d3d # Revert version bump
 }
 
 build() {

Modified: qt5-webview/trunk/PKGBUILD
===================================================================
--- qt5-webview/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-webview/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=qt5-webview
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=ec4de0cec2299f4ae0228ea2c71011e0520ca40e
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Provides a way to display web content in a QML application'
 depends=('qt5-webengine')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-x11extras/trunk/PKGBUILD
===================================================================
--- qt5-x11extras/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-x11extras/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,21 +2,27 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-x11extras
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=f628d7a60e45d90a439cb0a393a6229ac6892be5
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Provides platform-specific APIs for X11'
 depends=('qt5-base')
-makedepends=()
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

Modified: qt5-xmlpatterns/trunk/PKGBUILD
===================================================================
--- qt5-xmlpatterns/trunk/PKGBUILD	2022-03-04 10:48:46 UTC (rev 438838)
+++ qt5-xmlpatterns/trunk/PKGBUILD	2022-03-04 11:12:39 UTC (rev 438839)
@@ -2,23 +2,29 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-xmlpatterns
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+_basever=5.15.3
+pkgver=5.15.3+kde+r0
+pkgrel=1
+_commit=af4958af9d628d6124e64abd9743abce42f15a6f
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Support for XPath, XQuery, XSLT and XML schema validation'
 depends=('qt5-base')
-makedepends=('qt5-declarative')
+makedepends=('qt5-declarative' 'git')
 optdepends=('qt5-declarative: QML bindings')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 options=(debug)
 
+pkgver() {
+  cd $_pkgfqn
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit`
+}
+
 prepare() {
   mkdir -p build
 }

More information about the arch-commits mailing list