summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-09-10 20:51:52 +0200
committerMartchus2022-09-10 20:51:52 +0200
commit6689b56e6359841f2be962cafa0a765a5bc71580 (patch)
treed2b8e1184a3a98f7455b5a5b172c1b5faf958956
parent14a4dce3add6b06605bbdafd53d2f302732c9cef (diff)
downloadaur-6689b56e6359841f2be962cafa0a765a5bc71580.tar.gz
Rebase against Qt 5.15.6
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-linguist-macro.patch4
-rwxr-xr-xPKGBUILD8
-rw-r--r--PKGBUILD.sh.ep2
4 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c61740cde91c..176ab180332a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-tools
pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)
- pkgver = 5.15.4+kde+r0
+ pkgver = 5.15.6+kde+r1
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -20,9 +20,9 @@ pkgbase = mingw-w64-qt5-tools
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qttools#commit=53ee43a51b5a3de2877dafffc78e71ff55926708
+ source = git+https://invent.kde.org/qt/qt/qttools#commit=32912a06aadfc3dcbc34e0a668ce2c78351eee6e
source = 0001-Fix-linguist-macro.patch
sha256sums = SKIP
- sha256sums = b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b
+ sha256sums = 7561ccb8cc99cce440bd668b347f632da677ee85e9609cae9ba6accf6b76c4d5
pkgname = mingw-w64-qt5-tools
diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch
index 4ad04e8c882a..385e9b4f8aea 100644
--- a/0001-Fix-linguist-macro.patch
+++ b/0001-Fix-linguist-macro.patch
@@ -1,4 +1,4 @@
-From 0cfa1827d85c15346128940f2480ac844e97e609 Mon Sep 17 00:00:00 2001
+From 8654e5629a27aacba18c76c6eefdf8f302be7118 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 21:44:42 +0200
Subject: [PATCH] Fix linguist macro
@@ -38,5 +38,5 @@ index 20fb14935..406d3d3a3 100644
DEPENDS ${_abs_FILE} VERBATIM
)
--
-2.36.1
+2.37.3
diff --git a/PKGBUILD b/PKGBUILD
index 4ae7639ef6c8..704c5b3f0ef5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,16 +23,16 @@
_qt_module=qttools
pkgname=mingw-w64-qt5-tools
-pkgver=5.15.4
+pkgver=5.15.6
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
depends=('mingw-w64-qt5-declarative')
makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=53ee43a51b5a3de2877dafffc78e71ff55926708
+_commit=32912a06aadfc3dcbc34e0a668ce2c78351eee6e
_basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r1
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
@@ -41,7 +41,7 @@ _pkgfqn=${_qt_module}
source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0001-Fix-linguist-macro.patch')
sha256sums=('SKIP'
- 'b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b')
+ '7561ccb8cc99cce440bd668b347f632da677ee85e9609cae9ba6accf6b76c4d5')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index ccb4b1b667ef..488c10e3d309 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -18,7 +18,7 @@
% end
\
-pkgver=5.15.4
+pkgver=5.15.6
pkgrel=1
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"