summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-11-01 13:38:32 +0100
committerMartchus2022-11-01 13:38:32 +0100
commitbd819359736e9dba828d8af03ce4453140535274 (patch)
treeb6b47b91fc178e38ec3239ed8df07ff13ed3f489
parent6689b56e6359841f2be962cafa0a765a5bc71580 (diff)
downloadaur-bd819359736e9dba828d8af03ce4453140535274.tar.gz
Update/rebase to 5.15.7
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-linguist-macro.patch6
-rw-r--r--[-rwxr-xr-x]PKGBUILD6
-rw-r--r--PKGBUILD.sh.ep2
4 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 176ab180332a..5de2a23b18fd 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.6+kde+r1
+ pkgver = 5.15.7+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=32912a06aadfc3dcbc34e0a668ce2c78351eee6e
+ source = git+https://invent.kde.org/qt/qt/qttools#commit=c4750dd02070ce246ff98cc5d137193825043912
source = 0001-Fix-linguist-macro.patch
sha256sums = SKIP
- sha256sums = 7561ccb8cc99cce440bd668b347f632da677ee85e9609cae9ba6accf6b76c4d5
+ sha256sums = e0fa09d5a866b7eb0dae3d97bc390aa095e3e2381327964b38ba29c42096c8a7
pkgname = mingw-w64-qt5-tools
diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch
index 385e9b4f8aea..76f854fc0af4 100644
--- a/0001-Fix-linguist-macro.patch
+++ b/0001-Fix-linguist-macro.patch
@@ -1,4 +1,4 @@
-From 8654e5629a27aacba18c76c6eefdf8f302be7118 Mon Sep 17 00:00:00 2001
+From 91b278a3d9d073c6d474be142e88ee75bbec5bdd 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix linguist macro
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
-index 20fb14935..406d3d3a3 100644
+index ab1534144..1106633d0 100644
--- a/src/linguist/Qt5LinguistToolsMacros.cmake
+++ b/src/linguist/Qt5LinguistToolsMacros.cmake
@@ -90,8 +90,10 @@ function(QT5_CREATE_TRANSLATION _qm_files)
@@ -38,5 +38,5 @@ index 20fb14935..406d3d3a3 100644
DEPENDS ${_abs_FILE} VERBATIM
)
--
-2.37.3
+2.38.1
diff --git a/PKGBUILD b/PKGBUILD
index 704c5b3f0ef5..c7f54076cf46 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,14 +23,14 @@
_qt_module=qttools
pkgname=mingw-w64-qt5-tools
-pkgver=5.15.6
+pkgver=5.15.7
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=32912a06aadfc3dcbc34e0a668ce2c78351eee6e
+_commit=c4750dd02070ce246ff98cc5d137193825043912
_basever=$pkgver
pkgver+=+kde+r1
makedepends+=('git')
@@ -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'
- '7561ccb8cc99cce440bd668b347f632da677ee85e9609cae9ba6accf6b76c4d5')
+ 'e0fa09d5a866b7eb0dae3d97bc390aa095e3e2381327964b38ba29c42096c8a7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 488c10e3d309..cd35b5ad65e0 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -18,7 +18,7 @@
% end
\
-pkgver=5.15.6
+pkgver=5.15.7
pkgrel=1
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"