Update to 5.13.0

5 files changed, 27 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aed00007dbb1..907b73e78c1e 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.12.3
+	pkgver = 5.13.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -19,14 +19,12 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz
-	source = 0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
-	source = 0002-Ensure-static-plugins-are-exported.patch
-	source = 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
-	sha256sums = 839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7
-	sha256sums = a21b730e650a9ebe3cdb72fccef909da783df3dc45fbd063e8c37f3618b3655d
-	sha256sums = b0c26b559483e740dae038d630b5994805642ef8673edacad7b244019c5b83ab
-	sha256sums = 747db2313fc5759c913ebb920b717c990361075622fff11d242843526ea75fa8
+	source = https://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtdeclarative-everywhere-src-5.13.0.tar.xz
+	source = 0001-Ensure-static-plugins-are-exported.patch
+	source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+	sha256sums = b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9
+	sha256sums = d324b621d5947676ea8938f90c0e001b6c6b2f04bb95b4d66efd0f1529d41d3c
+	sha256sums = b68381599c53a84404d75ddc3c0535fea91a01bdc57c1d1c23a64d120c3174c6
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch b/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
deleted file mode 100644
index e591c85ce344..000000000000
--- a/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5a03cad74e06b233dd926b22da4ca2ed7f3e40b3 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 25 Sep 2016 21:24:15 +0200
-Subject: [PATCH 1/3] Ensure QML dev tools is built as static library
-
-This library must be built as static library even when
-using CONFIG+=shared. Otherwise it fails to link.
----
- src/qmldevtools/qmldevtools.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
-index 05aa6f66f..e73c0c23d 100644
---- a/src/qmldevtools/qmldevtools.pro
-+++ b/src/qmldevtools/qmldevtools.pro
-@@ -2,6 +2,8 @@ option(host_build)
- TARGET     = QtQmlDevTools
- QT         = core-private
- CONFIG    += minimal_syncqt internal_module qmldevtools_build generated_privates
-+CONFIG    -= shared
-+CONFIG    += static staticlib
- 
- MODULE_INCNAME = QtQml
- INCLUDEPATH += $$OUT_PWD/../qml
--- 
-2.21.0
-
diff --git a/0002-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index f895070317af..634de8849bed 100644
--- a/0002-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,14 +1,14 @@
-From a41cc5047fadb1a20779ca2094f8f9c51246f237 Mon Sep 17 00:00:00 2001
+From de45939789cc1540d115d8efa194a4a64045725f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
-Subject: [PATCH 2/3] Ensure static plugins are exported
+Subject: [PATCH 1/2] Ensure static plugins are exported
 
 ---
  src/qml/Qt5QmlConfigExtras.cmake.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in
-index 9ddb9885c..9775d85e0 100644
+index 9ddb9885cd..9775d85e08 100644
 --- a/src/qml/Qt5QmlConfigExtras.cmake.in
 +++ b/src/qml/Qt5QmlConfigExtras.cmake.in
 @@ -1,4 +1,4 @@
@@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644
  foreach(_other_plugin ${_qt5qml_other_plugins})
      include(${_other_plugin} OPTIONAL)
 -- 
-2.21.0
+2.22.0
 
diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index 3a00a8a80a2d..fb601e5b50e7 100644
--- a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,19 +1,19 @@
-From a0055bc42f7b847d393732c4fb22618bdfac009e Mon Sep 17 00:00:00 2001
+From af9056f5b275c099fe3a6cf49d043a61e95ac257 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
-Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build
+Subject: [PATCH 2/2] Prevent exporting QML parser symbols on static build
 
 ---
  src/qml/parser/qqmljsglobal_p.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h
-index 0e195994b..8aa451e9d 100644
+index bf8155c6ec..2bfa230bcc 100644
 --- a/src/qml/parser/qqmljsglobal_p.h
 +++ b/src/qml/parser/qqmljsglobal_p.h
-@@ -56,9 +56,9 @@
- #  define QT_QML_BEGIN_NAMESPACE
- #  define QT_QML_END_NAMESPACE
+@@ -54,9 +54,9 @@
+ 
+ #ifdef QT_CREATOR
  
 -#  ifdef QDECLARATIVEJS_BUILD_DIR
 +#  if defined(QDECLARATIVEJS_BUILD_DIR) && !defined(QT_STATIC)
@@ -23,9 +23,9 @@ index 0e195994b..8aa451e9d 100644
  #    define QML_PARSER_EXPORT
  #  else
  #    define QML_PARSER_EXPORT Q_DECL_IMPORT
-@@ -68,7 +68,7 @@
- #  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
- #  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+@@ -64,7 +64,7 @@
+ 
+ #else // !QT_CREATOR
  #  ifndef QT_STATIC
 -#    if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
 +#    if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) || defined(QT_STATIC)
@@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644
  #      define QML_PARSER_EXPORT
  #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.21.0
+2.22.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 92a5731d9cc5..f7a62e065a99 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.12.3
+pkgver=5.13.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -24,13 +24,11 @@ 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-QML-dev-tools-is-built-as-static-library.patch'
-        '0002-Ensure-static-plugins-are-exported.patch'
-        '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7'
-            'a21b730e650a9ebe3cdb72fccef909da783df3dc45fbd063e8c37f3618b3655d'
-            'b0c26b559483e740dae038d630b5994805642ef8673edacad7b244019c5b83ab'
-            '747db2313fc5759c913ebb920b717c990361075622fff11d242843526ea75fa8')
+        '0001-Ensure-static-plugins-are-exported.patch'
+        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
+sha256sums=('b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9'
+            'd324b621d5947676ea8938f90c0e001b6c6b2f04bb95b4d66efd0f1529d41d3c'
+            'b68381599c53a84404d75ddc3c0535fea91a01bdc57c1d1c23a64d120c3174c6')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
@@ -57,16 +55,6 @@ build() {
       mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
       ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
 
-      # search paths for host standard library (/usr/lib) and for Qt5Bootstrap (/usr/$_arch/lib) are not set correctly by qmake
-      # hence we need insert those paths manually
-      make qmake_all
-      find ./src/qmldevtools -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \;
-      find . -type f -iname 'Makefile' -exec sed -i "s|-L$PWD/lib -L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib -L$PWD/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \;
-      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib /usr/$_arch/lib/libQt5Bootstrap.so|g" {} \;
-      #[ ${_config##*=} == 'shared' ] && local _ext='so' || local _ext='a'
-      local _ext='a'
-      find . -type f -iname 'Makefile' -exec sed -i "s|-L$PWD/lib -lQt5QmlDevTools|-L/usr/lib -L$PWD/lib ${srcdir}/${_pkgfqn}/build-${_arch}-${_config##*=}/lib/libQt5QmlDevTools.${_ext}|g" {} \;
-      find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5QmlDevTools|-L/usr/lib ${srcdir}/${_pkgfqn}/build-${_arch}-${_config##*=}/lib/libQt5QmlDevTools.${_ext}|g" {} \;
       make
       popd
     done