summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Ensure-static-plugins-are-exported.patch4
-rw-r--r--0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch4
-rw-r--r--0003-Disable-d3d12-requiring-fxc.exe.patch4
-rw-r--r--PKGBUILD12
-rw-r--r--PKGBUILD.sh.ep2
6 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16cfb8b13b9d..6dbdda3c59d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-declarative
pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
- pkgver = 5.15.10+kde+r26
+ pkgver = 5.15.11+kde+r30
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -19,13 +19,13 @@ pkgbase = mingw-w64-qt5-declarative
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=5352f113b3c7a5af2ad2741d593c6e6a758eb93e
+ source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=1b0e366092bcfae0392592c3b7891f0e47af1018
source = 0001-Ensure-static-plugins-are-exported.patch
source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
source = 0003-Disable-d3d12-requiring-fxc.exe.patch
sha256sums = SKIP
- sha256sums = 3070fe24d2e8a236749e22fad1acb3b0a6309bac8ab1096030d2a9865f4ef76f
- sha256sums = 2229bf17dceb44f391705167e48289e5ca7d56d4fa38841a74221ece140f663e
- sha256sums = f3ac1da6686021fc0d7569b27ec581c0ca5b3f0e9ec12c34ab74c704239f8367
+ sha256sums = aecbf4f84e446ef4ddf5a62d80833386c1a8b9fc6b33bb3e8a186715e011d0f4
+ sha256sums = 0e2286bb59695d397dd4a47eefaca8b4efb6574ae069e9e5f6a0284900a180c4
+ sha256sums = 73d3ba393b933ebb16730b1bdc3a3cd89a8b56e002eda918fbba2da7630a2e2e
pkgname = mingw-w64-qt5-declarative
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index 22bdc2cf229b..1478b280d67e 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From aa4d09933eb239f8c07b304c26e78fd51a068f3b Mon Sep 17 00:00:00 2001
+From dcb544e21e528b609344d1da455d25abf3289a9f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 23 Oct 2016 01:18:13 +0200
Subject: [PATCH 1/3] Ensure static plugins are exported
@@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644
foreach(_other_plugin ${_qt5qml_other_plugins})
include(${_other_plugin} OPTIONAL)
--
-2.41.0
+2.42.0
diff --git a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index 32611b270c5c..cd8186a875a7 100644
--- a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From 59acb9131f87b707a5d17281ed3bb726ace69674 Mon Sep 17 00:00:00 2001
+From 4aed049e0102d174771829ffeb5002ecbf02f426 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 4 Feb 2017 01:59:59 +0100
Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build
@@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644
# define QML_PARSER_EXPORT
# elif defined(QT_BUILD_QML_LIB)
--
-2.41.0
+2.42.0
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index bf2794e1e30d..820d1b0e149d 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From ccf2e873c68b58101463948edbe750b42d57e33e Mon Sep 17 00:00:00 2001
+From 4ca432c2f9999d1defc328b92866a83eccf0236c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 20 Nov 2020 18:32:31 +0100
Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe
@@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644
qtConfig(openvg): SUBDIRS += openvg
--
-2.41.0
+2.42.0
diff --git a/PKGBUILD b/PKGBUILD
index 568684607f46..c30fa9047d6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,16 +14,16 @@
_qt_module=qtdeclarative
pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.10
+pkgver=5.15.11
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
depends=('mingw-w64-qt5-base')
makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=5352f113b3c7a5af2ad2741d593c6e6a758eb93e
+_commit=1b0e366092bcfae0392592c3b7891f0e47af1018
_basever=$pkgver
-pkgver+=+kde+r26
+pkgver+=+kde+r30
makedepends+=('git')
options=('!strip' '!buildflags' 'staticlibs')
groups=('mingw-w64-qt5')
@@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
'0003-Disable-d3d12-requiring-fxc.exe.patch')
sha256sums=('SKIP'
- '3070fe24d2e8a236749e22fad1acb3b0a6309bac8ab1096030d2a9865f4ef76f'
- '2229bf17dceb44f391705167e48289e5ca7d56d4fa38841a74221ece140f663e'
- 'f3ac1da6686021fc0d7569b27ec581c0ca5b3f0e9ec12c34ab74c704239f8367')
+ 'aecbf4f84e446ef4ddf5a62d80833386c1a8b9fc6b33bb3e8a186715e011d0f4'
+ '0e2286bb59695d397dd4a47eefaca8b4efb6574ae069e9e5f6a0284900a180c4'
+ '73d3ba393b933ebb16730b1bdc3a3cd89a8b56e002eda918fbba2da7630a2e2e')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 17ddeec81105..f932995aa7bb 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -6,7 +6,7 @@
# Contributor: ohmyarch
% end
\
-pkgver=5.15.10
+pkgver=5.15.11
pkgrel=1
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'