extra/qt5-base to 5.15.2+kde+r171-1

extra/qt5-base/PKGBUILD

@@ -8,9 +8,9 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=5
+pkgver=5.15.2+kde+r171
+pkgrel=1
+_commit=cb2da673f53815a5cfe15f50df49b98032429f9e
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -18,8 +18,8 @@ pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
          'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'mesa'
          'tslib' 'libinput' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion' 'md4c')
-makedepends=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
-             'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
+makedepends=('libfbclient' 'mariadb-libs' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+             'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'git')
 optdepends=('qt5-svg: to use SVG icon themes'
             'qt5-wayland: to run Qt applications in a Wayland session'
             'qt5-translations: for some native UI translations'
@@ -32,22 +32,25 @@ optdepends=('qt5-svg: to use SVG icon themes'
             'perl: for fixqt4headers and syncqt')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn=qtbase
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
          qt5-base-cflags.patch
-         qt5-base-nostrip.patch
-         kdebug-428095.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch?id=c5336057")
-sha256sums=('909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8'
+         qt5-base-nostrip.patch)
+sha256sums=('SKIP'
             'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
-            '25b1059e92ae135b1b5031c5b1dde32d03906f17c9245ac1c2f9e1248917e7b0')
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+
+pkgver() {
+  cd $_pkgfqn
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
 
 prepare() {
   cd ${_pkgfqn}
 
+  git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS in qmake
   patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
-  patch -p1 -i ../kdebug-428095.patch # Fix black border on some menus with Breeze
 }
 
 build() {