Update to 5.14.1

6 files changed, 52 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f361e5be809..8e5bbeeeb33d 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.14.0
+	pkgver = 5.14.1
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -20,12 +20,12 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtdeclarative-everywhere-src-5.14.1.tar.xz
 	source = 0001-Ensure-static-plugins-are-exported.patch
 	source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
-	sha256sums = bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e
-	sha256sums = 23ef13e6155bdc06429f6dff97b37f26cab389594eea62a40365c1304ef57629
-	sha256sums = 71dc45ee6a81cf3b612f83942283f5514c19d66a76736cb6bd84db58e6f82322
+	sha256sums = 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a
+	sha256sums = 81b34580fd40feab6596051674d37fcaafb4cbbe47db8792ae261d8f8ee8ed8f
+	sha256sums = 8b6d62ccd68bc955908983162c24ef4688c6f3c44c4678b41e8b0b7e58467935
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index e906511d13a4..c3f9a849333f 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From 7ac9c6ee8129947658d5dc059cb388fb9c76898f Mon Sep 17 00:00:00 2001
+From 725198b92bd02b7933c941ad4d660a0e6db1257b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 1/2] Ensure static plugins are exported
@@ -18,5 +18,5 @@ index 9ddb9885cd..9775d85e08 100644
  foreach(_other_plugin ${_qt5qml_other_plugins})
      include(${_other_plugin} OPTIONAL)
 -- 
-2.24.1
+2.25.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 067d374bcddf..116f1f2598c6 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 7d79006abc40f6ff48e50b20351942b53bf6c198 Mon Sep 17 00:00:00 2001
+From b051932d087b108a65d94f04d78dff41676b4ff9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 2/2] 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.24.1
+2.25.0
 
diff --git a/PKGBUILD b/PKGBUILD
index a40623511a65..96cb553ee1cd 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,42 @@
 # Maintainer: Martchus <martchus@gmx.net>
+# Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
 # Contributor: ohmyarch
 
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# Includes dynamic and static versions; if only one version is requried, just
-# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+# This file is created from PKGBUILD.sh.in contained by the mentioned repository.
+# Do not edit it manually! See README.md in the repository's root directory
+# for more information.
 
 # All patches are managed at https://github.com/Martchus/qtdeclarative
 
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.14.0
+pkgver=5.14.1
 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')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Ensure-static-plugins-are-exported.patch'
         '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e'
-            '23ef13e6155bdc06429f6dff97b37f26cab389594eea62a40365c1304ef57629'
-            '71dc45ee6a81cf3b612f83942283f5514c19d66a76736cb6bd84db58e6f82322')
+sha256sums=('762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a'
+            '81b34580fd40feab6596051674d37fcaafb4cbbe47db8792ae261d8f8ee8ed8f'
+            '8b6d62ccd68bc955908983162c24ef4688c6f3c44c4678b41e8b0b7e58467935')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
 [[ $NO_STATIC_LIBS ]] || \
   makedepends+=('mingw-w64-qt5-base-static') \
   optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
@@ -49,12 +55,12 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_pkgfqn}"
+
   for _arch in ${_architectures}; do
     for _config in "${_configurations[@]}"; do
       msg2 "Building ${_config##*=} version for ${_arch}"
       mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
-      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
-
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args}
       make
       popd
     done
@@ -63,6 +69,7 @@ build() {
 
 package() {
   cd "${srcdir}/${_pkgfqn}"
+
   for _arch in ${_architectures}; do
     for _config in "${_configurations[@]}"; do
       pushd build-${_arch}-${_config##*=}
@@ -114,8 +121,6 @@ package() {
   done
 
   # make sure the executables don't conflict with their mingw-qt4 counterpart
-  # (Actually only qmlplugindump.exe conflicts, but for consistency all executables
-  #  will be suffixed.)
   for _arch in ${_architectures}; do
     for exe_file in "${pkgdir}/usr/${_arch}/bin/"*.exe; do
       [[ -f $exe_file ]] && mv "${exe_file}" "${exe_file%.exe}-qt5.exe"
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
new file mode 100644
index 000000000000..6376996fd4a6
--- /dev/null
+++ b/PKGBUILD.sh.ep
@@ -0,0 +1,26 @@
+% layout 'mingw-w64-qt5-module';
+\
+% content_for additional_contributors => begin
+# Contributor: ant32 <antreimer@gmail.com>
+# Contributor: Filip Brcic <brcha@gna.org>
+# Contributor: ohmyarch
+% end
+\
+pkgver=5.14.1
+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')
+\
+% content_for package => begin
+
+<%== include 'fragments/mingw-w64-qt5-executable_suffix' %>\
+% end
+\
+% content_for package_arch => begin
+
+    # strip native static libraries
+    find "${pkgdir}/usr/${_arch}" -name 'libQt5QmlDevTools.a' -exec strip -g {} \;
+% end
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
new file mode 100644
index 000000000000..b851e94157f4
--- /dev/null
+++ b/qtdeclarative-sha256.txt
@@ -0,0 +1 @@
+762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a