Move to 5.7.0-rc

Change-Id: I3b803fa0bb44cf0e1d45189fa6f539ec36caa82d

8 files changed, 5 insertions, 245 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34e348e499fd..1f7bcd9ad9c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Jun  4 01:24:59 UTC 2016
+# Sun Jun  5 20:04:19 UTC 2016
 pkgbase = qt-sdk-raspberry-pi1
 	pkgdesc = Qt SDK for the Raspberry Pi1
 	pkgver = 5.7.0
@@ -18,9 +18,9 @@ pkgbase = qt-sdk-raspberry-pi1
 	conflicts = qt-sdk-raspberry-pi1
 	options = !strip
 	source = git://github.com/sirspudd/mkspecs.git
-	source = https://download.qt.io/development_releases/qt/5.7/5.7.0-beta/single/qt-everywhere-opensource-src-5.7.0-beta.7z
+	source = https://download.qt.io/development_releases/qt/5.7/5.7.0-rc/single/qt-everywhere-opensource-src-5.7.0-rc.7z
 	sha256sums = SKIP
-	sha256sums = d3df816772492d3d4e9bd542d5dfb45071821ab973ab8c426ae96fda4a47a8b9
+	sha256sums = d258b7cc0db37f9b5c61467862d4f4a5171bce7b8bbb718be95e02b9b7cdc44c
 
 pkgname = qt-sdk-raspberry-pi1
 
diff --git a/0001-Always-define-arm_thumb.patch b/0001-Always-define-arm_thumb.patch
deleted file mode 100644
index c0a7874d07d3..000000000000
--- a/0001-Always-define-arm_thumb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0311a69dcec83d90fc29c37527e4d59e9b3d57a8 Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Tue, 15 Mar 2016 19:20:28 -0700
-Subject: [PATCH] Always define arm_thumb
-
-Change-Id: Ia453970c597e4c634df91fd1279c67e76e08f34e
----
- src/core/gyp_run.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-index 8aa4ad2..57745ab 100644
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -81,6 +81,7 @@ contains(QT_ARCH, "arm") {
-     }
- 
-     contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1
-+    else: GYP_CONFIG += arm_thumb=0
- }
- 
- contains(QT_ARCH, "x86_64"): GYP_CONFIG += target_arch=x64
--- 
-2.7.3
-
diff --git a/0001-Include-neon-support-for-any-fpu-.-neon.patch b/0001-Include-neon-support-for-any-fpu-.-neon.patch
deleted file mode 100644
index 777b47ea8c32..000000000000
--- a/0001-Include-neon-support-for-any-fpu-.-neon.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 133d09c9c65cea0addec7963abd32992b2144a0d Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Tue, 15 Mar 2016 18:48:24 -0700
-Subject: [PATCH] Include neon support for any -fpu=.*neon.*
-
-Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e
----
- src/core/gyp_run.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-index dea1a22..8aa4ad2 100644
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -75,7 +75,7 @@ contains(QT_ARCH, "arm") {
-         # If the toolchain does not explicitly specify to use NEON instructions
-         # we use arm_neon_optional for ARMv7 and newer and let chromium decide
-         # about the mfpu option.
--        contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
-+        contains(MFPU, ".*neon.*"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
-         else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1
-         else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0
-     }
--- 
-2.7.3
-
diff --git a/0001-Make-CFLAGS-CXXFLAGS-behave-consistently-in-config.t.patch b/0001-Make-CFLAGS-CXXFLAGS-behave-consistently-in-config.t.patch
deleted file mode 100644
index fa4513b1e296..000000000000
--- a/0001-Make-CFLAGS-CXXFLAGS-behave-consistently-in-config.t.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 5a20bfa307598828a89dd12ec66d4963230cb8aa Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Thu, 24 Mar 2016 18:37:57 -0700
-Subject: [PATCH 1/2] Make CFLAGS/CXXFLAGS behave consistently in config.tests
-
-The journald test was failing as sysroot was not being passed to the
-compiler in the compile test. This is due to the fact we were explicitly
-defining sysroot in the CXXFLAGS and not in CFLAGS.
-
-Change-Id: I4b4bda71f9aabc8e420e0e89ff3cc8fa3bbca201
----
- config.tests/unix/compile.test | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
-index c8929a3..a80e81a 100755
---- a/config.tests/unix/compile.test
-+++ b/config.tests/unix/compile.test
-@@ -15,6 +15,7 @@ QTCONF=$9
- shift 9
- LFLAGS="$SYSROOT_FLAG"
- INCLUDEPATH=""
-+CFLAGS="$SYSROOT_FLAG"
- CXXFLAGS="$SYSROOT_FLAG"
- MAC_ARCH_CXXFLAGS=""
- MAC_ARCH_LFLAGS=""
-@@ -31,12 +32,14 @@ while [ "$#" -gt 0 ]; do
-         shift
-         ;;
-     -arch)
-+        MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2"
-         MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2"
-         MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2"
-         shift
-         ;;
-     -F*|-m*|-x*)
-         LFLAGS="$LFLAGS \"$PARAM\""
-+        CFLAGS="$CFLAGS \"$PARAM\""
-         CXXFLAGS="$CXXFLAGS \"$PARAM\""
-         ;;
-     -L*|-l*|-pthread)
-@@ -47,10 +50,12 @@ while [ "$#" -gt 0 ]; do
-         INCLUDEPATH="$INCLUDEPATH \"$INC\""
-         ;;
-     -f*|-D*)
-+        CFLAGS="$CFLAGS \"$PARAM\""
-         CXXFLAGS="$CXXFLAGS \"$PARAM\""
-         ;;
-     -Qoption)
- 	# Two-argument form for the Sun Compiler
-+    CFLAGS="$CFLAGS $PARAM \"$2\""
- 	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
- 	shift
- 	;;
-@@ -72,7 +77,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
- # Make sure output from possible previous tests is gone
- rm -f "$EXE" "${EXE}.exe"
- 
--set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" $QMAKE_ARGS "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CFLAGS*=$CFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" $QMAKE_ARGS "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- if [ "$VERBOSE" = "yes" ]; then
-     OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
- else
--- 
-2.7.4
-
diff --git a/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch b/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
deleted file mode 100644
index f9ab096dbc19..000000000000
--- a/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c689bcafd3196aad22372e8056fe0ccb13c15f35 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 12 Feb 2016 12:37:15 +0100
-Subject: [PATCH] Search for libsystemd first, fall back to libsystemd-journal
-
-systemd >= 209 merged the individual libraries libsystemd-journal,
-libsystemd-login, libsystemd-id128 and libsystemd-daemon into
-a single library, libsystemd. To ease the transition one could pass
-an option to its build to generate stub libraries and matching
-pkg-config files. With systemd >= 229 this option has now been
-removed, causing the build to fail when the journald option is
-enabled.
-
-Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
----
- config.tests/unix/journald/journald.pro | 6 +++++-
- src/corelib/global/global.pri           | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro
-index 2bb50ce..ea76564 100644
---- a/config.tests/unix/journald/journald.pro
-+++ b/config.tests/unix/journald/journald.pro
-@@ -1,6 +1,10 @@
- SOURCES = journald.c
- 
- CONFIG += link_pkgconfig
--PKGCONFIG_PRIVATE += libsystemd-journal
-+
-+packagesExist(libsystemd): \
-+    PKGCONFIG_PRIVATE += libsystemd
-+else: \
-+    PKGCONFIG_PRIVATE += libsystemd-journal
- 
- CONFIG -= qt
-diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
-index aa4945f..dd84695 100644
---- a/src/corelib/global/global.pri
-+++ b/src/corelib/global/global.pri
-@@ -53,7 +53,10 @@ slog2 {
- 
- journald {
-     CONFIG += link_pkgconfig
--    PKGCONFIG_PRIVATE += libsystemd-journal
-+    packagesExist(libsystemd): \
-+        PKGCONFIG_PRIVATE += libsystemd
-+    else: \
-+        PKGCONFIG_PRIVATE += libsystemd-journal
-     DEFINES += QT_USE_JOURNALD
- }
- 
--- 
-2.7.2
-
diff --git a/0001-journald-test-will-fail-with-certain-toolchains.patch b/0001-journald-test-will-fail-with-certain-toolchains.patch
deleted file mode 100644
index 1849de80937d..000000000000
--- a/0001-journald-test-will-fail-with-certain-toolchains.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fa629e87eea5ac43abe5bedbfb46af6546b9083c Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Mon, 7 Mar 2016 18:49:57 -0800
-Subject: [PATCH] journald test will fail with certain toolchains
-
-which don't include default system paths
-
-Change-Id: I58043a9c9569e091fac18934cb1a2484cb9f61e2
----
- config.tests/unix/journald/journald.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro
-index ea76564..59f920b 100644
---- a/config.tests/unix/journald/journald.pro
-+++ b/config.tests/unix/journald/journald.pro
-@@ -7,4 +7,6 @@ packagesExist(libsystemd): \
- else: \
-     PKGCONFIG_PRIVATE += libsystemd-journal
- 
-+# toolchain does not include usr include by default
-+INCLUDEPATH *= /usr/include
- CONFIG -= qt
--- 
-2.7.2
-
diff --git a/0002-Adjust-egl-config.test-to-pass-sysrooted-libs.patch b/0002-Adjust-egl-config.test-to-pass-sysrooted-libs.patch
deleted file mode 100644
index 36df62b5e6d3..000000000000
--- a/0002-Adjust-egl-config.test-to-pass-sysrooted-libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ff84397f2dd8492386e025c73e595f004c3f69cd Mon Sep 17 00:00:00 2001
-From: Donald Carr <sirspudd@gmail.com>
-Date: Thu, 24 Mar 2016 20:11:53 -0700
-Subject: [PATCH 2/2] Adjust egl config.test to pass sysrooted libs
-
-We should really start using -L=/foo and -I=/foo inside of sysroots, and
-this test was preventing us from doing so (while arguably buying us
-nothing).
-
-Change-Id: If6e67631c585493871231e5d8a9354fa72e07343
----
- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-index ce16a3a..d8b1c3e 100644
---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-@@ -5,7 +5,7 @@ CONFIG -= qt
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
- 
- for(p, QMAKE_LIBDIR_EGL) {
--    exists($$p):LIBS += -L$$p
-+    LIBS += -L$$p
- }
- 
- LIBS += -lEGL -lGLESv2 -lbcm_host
--- 
-2.7.4
-
diff --git a/PKGBUILD b/PKGBUILD
index afee8895af64..4b6715a45224 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,7 +45,7 @@ _packaginguser=$(whoami)
 _libspkgname="${pkgname}-target-libs"
 _mkspec="linux-rpi${_piver}-g++"
 
-_pkgver=${pkgver}-beta
+_pkgver=${pkgver}-rc
 
 _baseprefix=/opt
 _installprefix=${_baseprefix}/${pkgname}
@@ -60,7 +60,7 @@ depends=("qpi-toolchain" "qtcreator")
 makedepends=("git" "pkgconfig" "gcc")
 source=("git://github.com/sirspudd/mkspecs.git" "https://download.qt.io/development_releases/qt/${_pkgvermajmin}/${_pkgver}/single/${_source_package_name}.7z")
 
-sha256sums=("SKIP" "d3df816772492d3d4e9bd542d5dfb45071821ab973ab8c426ae96fda4a47a8b9")
+sha256sums=("SKIP" "d258b7cc0db37f9b5c61467862d4f4a5171bce7b8bbb718be95e02b9b7cdc44c")
 
 options=('!strip')
 install=qpi.install
@@ -149,17 +149,6 @@ fi
   # Work around our embarresing propensity to stomp on your own tailored build configuration
   sed -i "s/O[23]/Os/"  ${_basedir}/mkspecs/common/gcc-base.conf || exit 1
 
-  # incorporate journald fix
-  local _patch_dir=${startdir}
-  cd ${_basedir}
-  patch -p1 < ${_patch_dir}/0001-Make-CFLAGS-CXXFLAGS-behave-consistently-in-config.t.patch
-  patch -p1 < ${_patch_dir}/0002-Adjust-egl-config.test-to-pass-sysrooted-libs.patch
-  cd ${_webenginedir}
-  patch -p1 < ${_patch_dir}/0001-Include-neon-support-for-any-fpu-.-neon.patch
-  patch -p1 < ${_patch_dir}/0001-Always-define-arm_thumb.patch
-
-  # end patch
-
   mkdir -p ${_bindir}
   cd ${_bindir}