summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-05-18 11:22:13 +0200
committerMartchus2022-05-18 11:22:13 +0200
commitf869ac7318b3bf077adc2ed62a2e1840957295c5 (patch)
tree43e98194987e1f4cf1d9c2ed95aaebf634b0271d
parent690932abb770a2afa33f053f417e78aec133db0b (diff)
downloadaur-f869ac7318b3bf077adc2ed62a2e1840957295c5.tar.gz
Rebase against 5.15.4
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-linguist-macro.patch4
-rwxr-xr-xPKGBUILD8
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56b9b54c879f..3d052cee3949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-tools-static
pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)
- pkgver = 5.15.3+kde+r1
+ pkgver = 5.15.4+kde+r0
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -20,9 +20,9 @@ pkgbase = mingw-w64-qt5-tools-static
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qttools#commit=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4
+ source = git+https://invent.kde.org/qt/qt/qttools#commit=53ee43a51b5a3de2877dafffc78e71ff55926708
source = 0001-Fix-linguist-macro.patch
sha256sums = SKIP
- sha256sums = 4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082
+ sha256sums = b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b
pkgname = mingw-w64-qt5-tools-static
diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch
index 7f5504f186c2..4ad04e8c882a 100644
--- a/0001-Fix-linguist-macro.patch
+++ b/0001-Fix-linguist-macro.patch
@@ -1,4 +1,4 @@
-From 91a31449aefc95da17c08fb11cd3d77939ff942e Mon Sep 17 00:00:00 2001
+From 0cfa1827d85c15346128940f2480ac844e97e609 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.35.1
+2.36.1
diff --git a/PKGBUILD b/PKGBUILD
index 43494780e88f..fef8da74a59a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,16 +23,16 @@
_qt_module=qttools
pkgname=mingw-w64-qt5-tools-static
-pkgver=5.15.3
+pkgver=5.15.4
pkgrel=1
arch=('any')
pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
depends=('mingw-w64-qt5-declarative-static')
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=a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4
+_commit=53ee43a51b5a3de2877dafffc78e71ff55926708
_basever=$pkgver
-pkgver+=+kde+r1
+pkgver+=+kde+r0
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'
- '4808f9bc8db99b2d719a0aecc4a296580f9a92b95c03ddbbd78470c1a903d082')
+ 'b535f1f31263e791514e784dd5d9bd93e34e6cf5da06d1a4aa2b06809421f36b')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'