Update to 5.8.0

5 files changed, 61 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5129eb97856f..a189df50ac9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 # Generated by mksrcinfo v8
-# Sat Dec 24 12:13:56 UTC 2016
+# Thu Feb  9 20:00:26 UTC 2017
 pkgbase = mingw-w64-qt5-declarative
 	pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
-	pkgver = 5.7.1
+	pkgver = 5.8.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
 	arch = x86_64
-	groups = mingw-w64-qt
 	groups = mingw-w64-qt5
 	license = GPL3
 	license = LGPL3
 	license = FDL
 	license = custom
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-pkg-config
 	makedepends = python
 	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
@@ -21,12 +21,14 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz
 	source = 0001-Build-QML-dev-tools-as-shared-library.patch
 	source = 0002-Ensure-static-plugins-are-exported.patch
-	md5sums = e8940f4237bcedc67c8e9e753beb10d2
-	md5sums = 3fae1f1d463a55606be17d89a2ae7cc9
-	md5sums = a5f0f56fd42bb72f38aac6909c860d6d
+	source = 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+	md5sums = 4f55b3617abdff14706d02d761d5a0aa
+	md5sums = 8739ad352da4053430efb01fadff2a52
+	md5sums = bfa8bbcc3b92bf8fe7e15266ba195380
+	md5sums = 8bf08d300c039dbdd58bab8b602eb175
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Build-QML-dev-tools-as-shared-library.patch b/0001-Build-QML-dev-tools-as-shared-library.patch
index b422a11486ac..c238beda506a 100644
--- a/0001-Build-QML-dev-tools-as-shared-library.patch
+++ b/0001-Build-QML-dev-tools-as-shared-library.patch
@@ -1,7 +1,7 @@
-From fe5ec96e7fafdc589ae3c0d69c02c2b8781e565e Mon Sep 17 00:00:00 2001
+From 9c2df30c4438c8741258cdef5ecb13bcf62b8d76 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:24:15 +0200
-Subject: [PATCH 1/2] Build QML dev tools as shared library
+Subject: [PATCH 1/3] Build QML dev tools as shared library
 
 ---
  src/qmldevtools/qmldevtools.pro | 2 +-
diff --git a/0002-Ensure-static-plugins-are-exported.patch b/0002-Ensure-static-plugins-are-exported.patch
index e78ebb82f15b..6946b707bbfd 100644
--- a/0002-Ensure-static-plugins-are-exported.patch
+++ b/0002-Ensure-static-plugins-are-exported.patch
@@ -1,7 +1,7 @@
-From 361ef2263f38e5c605bc7fa1c1c35aabefd0935a Mon Sep 17 00:00:00 2001
+From b480b775adc7224a83338356a9228bed5d538618 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
-Subject: [PATCH 2/2] Ensure static plugins are exported
+Subject: [PATCH 2/3] Ensure static plugins are exported
 
 ---
  src/qml/Qt5QmlConfigExtras.cmake.in | 2 +-
diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
new file mode 100644
index 000000000000..f69fd721e504
--- /dev/null
+++ b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -0,0 +1,37 @@
+From 8b4bae62d27ed0eb5df5dd06653b76f4890eb409 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
+
+---
+ 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 933c8f520..914a5b5e8 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
+ 
+-#  ifdef QDECLARATIVEJS_BUILD_DIR
++#  if defined(QDECLARATIVEJS_BUILD_DIR) || !defined(QT_STATIC)
+ #    define QML_PARSER_EXPORT Q_DECL_EXPORT
+-#  elif QML_BUILD_STATIC_LIB
++#  elif defined(QML_BUILD_STATIC_LIB) || defined(QT_STATIC)
+ #    define QML_PARSER_EXPORT
+ #  else
+ #    define QML_PARSER_EXPORT Q_DECL_IMPORT
+@@ -67,7 +67,7 @@
+ #else // !QT_CREATOR
+ #  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
+ #  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+-#  if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
++#  if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) || defined(QT_STATIC)
+      // QmlDevTools is a static library
+ #    define QML_PARSER_EXPORT
+ #  elif defined(QT_BUILD_QML_LIB)
+-- 
+2.11.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 169a33e6b840..ef65cdab72fe 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,23 +12,25 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.7.1
+pkgver=5.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base')
-makedepends=('mingw-w64-gcc' 'python')
-options=(!strip !buildflags staticlibs)
-groups=(mingw-w64-qt mingw-w64-qt5)
+makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'python')
+options=('!strip' '!buildflags' 'staticlibs')
+groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-url="https://www.qt.io/"
+url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Build-QML-dev-tools-as-shared-library.patch'
-        '0002-Ensure-static-plugins-are-exported.patch')
-md5sums=('e8940f4237bcedc67c8e9e753beb10d2'
-         '3fae1f1d463a55606be17d89a2ae7cc9'
-         'a5f0f56fd42bb72f38aac6909c860d6d')
+        '0002-Ensure-static-plugins-are-exported.patch'
+        '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
+md5sums=('4f55b3617abdff14706d02d761d5a0aa'
+         '8739ad352da4053430efb01fadff2a52'
+         'bfa8bbcc3b92bf8fe7e15266ba195380'
+         '8bf08d300c039dbdd58bab8b602eb175')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \