Provides and conflicts with qt4, not qt(5), Thanks MarsSeed.

2 files changed, 38 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1af027dbe176..363d1283cfa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,24 @@
 # Generated by mksrcinfo v8
-# Wed Mar 30 07:08:22 UTC 2016
+# Tue May  3 08:07:23 UTC 2022
 pkgbase = qt4-revert80e3108
 	pkgdesc = A cross-platform application and UI framework
 	pkgver = 4.8.7
-	pkgrel = 8
-	url = http://www.qt.io
-	install = qt4.install
-	arch = i686
+	pkgrel = 30
+	url = https://www.qt.io
 	arch = x86_64
 	license = GPL3
 	license = LGPL
 	license = FDL
 	license = custom
 	makedepends = postgresql-libs
-	makedepends = mariadb
+	makedepends = mariadb-libs
 	makedepends = unixodbc
 	makedepends = cups
 	makedepends = gtk2
 	makedepends = libfbclient
 	makedepends = mesa
-	depends = libtiff
-	depends = libpng
 	depends = sqlite
 	depends = ca-certificates
-	depends = dbus
 	depends = fontconfig
 	depends = libgl
 	depends = libxrandr
@@ -34,9 +29,9 @@ pkgbase = qt4-revert80e3108
 	depends = hicolor-icon-theme
 	depends = desktop-file-utils
 	depends = libmng
-	optdepends = qtchooser: set the default Qt toolkit
+	depends = dbus
 	optdepends = postgresql-libs: PostgreSQL driver
-	optdepends = libmariadbclient: MariaDB driver
+	optdepends = mariadb-libs: MariaDB driver
 	optdepends = unixodbc: ODBC driver
 	optdepends = libfbclient: Firebird/iBase driver
 	optdepends = libxinerama: Xinerama support
@@ -44,10 +39,10 @@ pkgbase = qt4-revert80e3108
 	optdepends = libxfixes: Xfixes support
 	optdepends = icu: Unicode support
 	optdepends = sni-qt: StatusNotifierItem (AppIndicators) support
-	provides = qt4=4.8.7
+	provides = qt4
 	conflicts = qt4
-	replaces = qt4
-	source = http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
+	replaces = qt<=4.8.4
+	source = https://ftp.desolve.ru/ftp/viktor/qt4/qt-everywhere-opensource-src-4.8.7.tar.gz
 	source = qtconfig-qt4.desktop
 	source = assistant-qt4.desktop
 	source = designer-qt4.desktop
@@ -62,21 +57,31 @@ pkgbase = qt4-revert80e3108
 	source = l-qclipboard_fix_recursive.patch
 	source = l-qclipboard_delay.patch
 	source = revert_80e3108.patch
-	md5sums = d990ee66bf7ab0c785589776f35ba6ad
-	md5sums = a16638f4781e56e7887ff8212a322ecc
-	md5sums = 8a28b3f52dbeb685d4b69440b520a3e1
-	md5sums = 9727c406c240990870c905696a8c5bd1
-	md5sums = 0e384663d3dd32abe35f5331c4147569
-	md5sums = b859c5673e5098c39f72b2252947049e
-	md5sums = c439c7731c25387352d8453ca7574971
-	md5sums = da387bde22ae1c446f12525d2a31f070
-	md5sums = a523644faa8f98a73f55c4aa23c114a6
-	md5sums = 66dfea63916c8dbf47b23cb012ffdccc
-	md5sums = 85679531c8a7310317adfb7002d9f99a
-	md5sums = 1803ab6313df762d807678e58fc85f53
-	md5sums = 009de09b4e589a7770fba74405656c99
-	md5sums = addc5e88d538ee55e17bd49ba337ca67
-	md5sums = 81d3526edfd0be9aa21f56cff7cfc10f
+	source = qt4-gcc6.patch
+	source = qt4-gcc8.patch
+	source = qt4-glibc-2.25.patch
+	source = qt4-icu59.patch
+	source = qt4-openssl-1.1.patch
+	sha256sums = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+	sha256sums = 157eb47865f0b43e4717819783823c569127a2e9fc48309982ca0f2b753517a1
+	sha256sums = d63f22858174489068c30a12b9115d1b4e23ade00c31c117513212e9a225c1ce
+	sha256sums = c154de65da1b81564fa68f29c773b5f1751e0ee821e858ee8f0684b8d027da58
+	sha256sums = 22bd69ee3ba986448a63e41f529a7d28d0f2e6d83d6114e763eba761db302e01
+	sha256sums = 915a1cb0f7328840cac742c03f5121dc6e19498952c082b46c0bf7263bf6676d
+	sha256sums = 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33
+	sha256sums = 876c681ef8fbcc25f28cd4ad6c697abf8a4165d540bae37433bc40256dbf9d62
+	sha256sums = 9fad22674c5eec835613a7f16c11b865aa793b448e90974c0f804105284a548b
+	sha256sums = ce97da195445f145d9f82df8f8e5d8716128e869ec6632db66c7125be663d813
+	sha256sums = e7f8d1c906640b836454e8202a48602352609d8e44a33a3de05dc1d20f5b1a8a
+	sha256sums = 829b02ba10f208c2beba8e8a0110b6d10c63932612dabc08d536f099b9f66101
+	sha256sums = 5db36cbb0686b8a503941779c821febc4a0330dc260e51d603f7aa1e4d8860ad
+	sha256sums = af3648ddb2372333b0e428788fd2ffbcfe571653fb46f898a55ae5a202f7e242
+	sha256sums = d87808d4ea2f2e3445070960999dbce4893099e851c671e50d23c3b6b8a80313
+	sha256sums = 51da49e41edac66559d3ec8dd0a152995a51a53e5d1f63f09fa089a8af7e3112
+	sha256sums = 0497411e54a0461f76ffa204236f5146a2ed0d272ae66afcfabd74090459208b
+	sha256sums = e6555f4a681227447e94e9f14e11626d50b7e5108aad06088311e87063bc0347
+	sha256sums = 61d6bf45649c728dec5f8d22be5b496ed9d40f52c2c70102696d07133cd1750d
+	sha256sums = ff3ddb5428cd2ff243558dc0c75b35f470077e9204bbc989ddcba04c866c1b68
 
 pkgname = qt4-revert80e3108
 
diff --git a/PKGBUILD b/PKGBUILD
index 430936381a6b..50c44a4ddfff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Antonio Orefice <kokokork@gmail.com>
 
-pkgname=qt4
+pkgname=qt4-revert80e3108
 pkgver=4.8.7
-pkgrel=29
+pkgrel=30
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -25,7 +25,8 @@ optdepends=('postgresql-libs: PostgreSQL driver'
             'icu: Unicode support'
             'sni-qt: StatusNotifierItem (AppIndicators) support')
 replaces=('qt<=4.8.4')
-conflicts=('qt')
+conflicts=('qt4')
+provides=('qt4')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("https://ftp.desolve.ru/ftp/viktor/qt4/${_pkgfqn}.tar.gz"
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'