Build the 5.7.0-alpha

1 files changed, 27 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 693dfc899632..7e2670953982 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,14 +18,18 @@
 _sysroot=/mnt/pi
 
 # Options
-_skip_web_engine=false
+_skip_web_engine=true
 _static_build=false
 _build_from_head=false
 _local_qt5_repo="/opt/dev/src/qtproject/qt5"
-_wayland_compositor=true
+_wayland_compositor_workaround=false
 
-pkgver=5.6.0
-pkgrel=12
+_pkgvermajmin="5.7"
+pkgver="${_pkgvermajmin}.0"
+
+# 5.6: 12
+# 5.7: 1
+pkgrel=1
 
 # PKGBUILD
 _piver=2
@@ -36,7 +40,7 @@ if $_static_build; then
 fi
 
 if $_build_from_head; then
-  _pkgver=6.6.6
+  pkgver=6.6.6
 fi
 
 provides=("${pkgname}")
@@ -44,18 +48,23 @@ conflicts=("${pkgname}")
 _packaginguser=$(whoami)
 _libspkgname="${pkgname}-target-libs"
 _mkspec="linux-rpi${_piver}-g++"
-_pkgver=${pkgver}-rc
+#_pkgver=${pkgver}-rc
+_pkgver=${pkgver}-alpha
 _baseprefix=/opt
 _installprefix=${_baseprefix}/${pkgname}
-_source_package_name=qt-everywhere-opensource-src-${_pkgver}
+_qt_package_name_prefix="qt-everywhere-opensource-src"
+_source_package_name=${_qt_package_name_prefix}-${_pkgver}
+#_source_unpackaged_name=${_source_package_name}
+_source_unpackaged_name=${_qt_package_name_prefix}-${pkgver}
 pkgdesc="Qt SDK for the Raspberry Pi${_piver}"
 arch=("x86_64")
 url="http://www.qt.io"
 license=("LGPL3" "GPL3")
 depends=("qpi-toolchain" "qtcreator")
 makedepends=("git" "pkgconfig" "gcc")
-source=("git://github.com/sirspudd/mkspecs.git" "https://download.qt.io/development_releases/qt/5.6/${_pkgver}/single/${_source_package_name}.7z")
-sha256sums=("SKIP" "82ed4bc1bf7735747e1612f322f8723dfd84f05fa4dca9398863e6527a0c1971")
+source=("git://github.com/sirspudd/mkspecs.git" "https://download.qt.io/development_releases/qt/${_pkgvermajmin}/${_pkgver}/single/${_source_package_name}.7z")
+#sha256sums=("SKIP" "82ed4bc1bf7735747e1612f322f8723dfd84f05fa4dca9398863e6527a0c1971")
+sha256sums=("SKIP" "5d8d12bc72f12532323737894beadd0d0021ee1b4321e53798e722b0352bbc24")
 options=('!strip')
 install=qpi.install
 _fully_qualified_install_script="${startdir}/${install}"
@@ -90,12 +99,15 @@ if $_build_from_head; then
   _device_configure_flags="$_device_configure_flags -skip qt3d -skip qtsystems -skip qttools -skip qtwebkit"
 fi
 
-if $_wayland_compositor; then
+if $_wayland_compositor_workaround; then
   _device_configure_flags="$_device_configure_flags -skip qtwayland"
 fi
 
+# bug(s) in Qt 5.7.0-alpha
+_device_configure_flags="$_device_configure_flags -skip qtlocation -skip qtwayland"
+
 build() {
-  local _srcdir="${srcdir}/${_source_package_name}"
+  local _srcdir="${srcdir}/${_source_unpackaged_name}"
   local _basedir="${_srcdir}/qtbase"
   local _bindir="${_srcdir}-build"
   local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}"
@@ -138,7 +150,7 @@ fi
   # incorporate journald fix
   local _patch_dir=${startdir}
   cd ${_basedir}
-  patch -p1 < ${_patch_dir}/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
+  #patch -p1 < ${_patch_dir}/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
   patch -p1 < ${_patch_dir}/0001-journald-test-will-fail-with-certain-toolchains.patch
 
   # end patch
@@ -181,7 +193,7 @@ fi
 
   make || exit 1
 
-if $_wayland_compositor; then
+if $_wayland_compositor_workaround; then
   # regrettably required, as qtwayland barfs on shadow builds
   # as private header paths not included: no clue how to fix, bypassing
 
@@ -202,7 +214,7 @@ create_install_script()
 }
 
 package() {
-  local _srcdir="${srcdir}/${_source_package_name}"
+  local _srcdir="${srcdir}/${_source_unpackaged_name}"
   local _bindir="${_srcdir}-build"
 
   create_install_script
@@ -214,7 +226,7 @@ package() {
   cd "${_bindir}"
   INSTALL_ROOT="$pkgdir" make install || exit 1
 
-if $_wayland_compositor; then
+if $_wayland_compositor_workaround; then
   # regrettably required
   cd "${_bindir}/qtwayland"
   INSTALL_ROOT="$pkgdir" make install || exit 1