incorporate changes in extra/qt5-base

4 files changed, 43 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b606302203f..89244de7eaf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = qt5-base-headless
 	pkgdesc = A cross-platform application and UI framework - headless build, no QtGui or QtWidgets
-	pkgver = 5.15.2
-	pkgrel = 2
+	pkgver = 5.15.2+kde+r171
+	pkgrel = 1
 	url = https://www.qt.io/
 	arch = x86_64
+	groups = qt
+	groups = qt5
 	license = GPL3
 	license = LGPL3
 	license = FDL
 	license = custom
 	makedepends = mariadb-libs
-	makedepends = sqlite
 	makedepends = unixodbc
 	makedepends = postgresql-libs
 	makedepends = dbus
 	makedepends = systemd
 	makedepends = md4c
+	makedepends = git
 	depends = sqlite
 	depends = libproxy
 	depends = double-conversion
@@ -26,10 +28,12 @@ pkgbase = qt5-base-headless
 	provides = qt5-base
 	conflicts = qtchooser
 	conflicts = qt5-base
-	source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz
+	source = git+https://invent.kde.org/qt/qt/qtbase#commit=cb2da673f53815a5cfe15f50df49b98032429f9e
 	source = qt5-base-cflags.patch
-	sha256sums = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
+	source = qt5-base-nostrip.patch
+	sha256sums = SKIP
 	sha256sums = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
+	sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094
 
 pkgname = qt5-base-headless
 
diff --git a/.gitignore b/.gitignore
index 73526e93a120..95bc6611d850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 pkg/
 src/
+qtbase/
 *.tar.xz
 *.pkg.tar*
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 34b9f0d7f41c..96e26e17e0c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,16 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-base-headless
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+pkgver=5.15.2+kde+r171
+pkgrel=1
+_commit=cb2da673f53815a5cfe15f50df49b98032429f9e
 arch=('x86_64')
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework - headless build, no QtGui or QtWidgets'
+groups=('qt' 'qt5')
 depends=('sqlite' 'libproxy' 'double-conversion')
-makedepends=('mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'dbus' 'systemd' 'md4c')
+makedepends=('mariadb-libs' 'unixodbc' 'postgresql-libs' 'dbus' 'systemd' 'md4c' 'git')
 optdepends=('postgresql-libs: PostgreSQL driver'
             'mariadb-libs: MariaDB driver'
             'unixodbc: ODBC driver'
@@ -20,16 +21,25 @@ optdepends=('postgresql-libs: PostgreSQL driver'
             'shared-mime-info: Freedesktop.org Shared MIME Info')
 conflicts=('qtchooser' 'qt5-base')
 provides=('qt5-base')
-_pkgfqn="qtbase-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qt5-base-cflags.patch)
-sha256sums=('909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8'
-	    'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
+_pkgfqn=qtbase
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
+        qt5-base-cflags.patch
+        qt5-base-nostrip.patch)
+sha256sums=('SKIP'
+            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+
+pkgver() {
+  cd $_pkgfqn
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
 
 prepare() {
   cd ${_pkgfqn}
 
-  patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+  git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
+  patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
+  patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
 }
 
 build() {
diff --git a/qt5-base-nostrip.patch b/qt5-base-nostrip.patch
new file mode 100644
index 000000000000..17d24b4b6551
--- /dev/null
+++ b/qt5-base-nostrip.patch
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 99d77156fd..fc840fe9f6 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -31,6 +31,8 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+ 
++CONFIG += nostrip
++
+ QMAKE_CFLAGS_OPTIMIZE      = -O2
+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og