diff options
author | Donald Carr | 2016-03-15 11:37:07 -0700 |
---|---|---|
committer | Donald Carr | 2016-03-15 15:51:50 -0700 |
commit | 376b81dc0c11ddd0e8f403e5ea253dd98dbd842a (patch) | |
tree | b23fe6d291f5b28485a4dc0cc2eaf618f856385d /PKGBUILD | |
parent | fa0921d272d4fb9f49bfab6ed5f85fa9684d3e9c (diff) | |
download | aur-376b81dc0c11ddd0e8f403e5ea253dd98dbd842a.tar.gz |
Move to in source build to get qtwayland compiling
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 29 |
1 files changed, 14 insertions, 15 deletions
@@ -22,14 +22,12 @@ _skip_web_engine=false _static_build=false _build_from_head=false _local_qt5_repo="/opt/dev/src/qtproject/qt5" -_wayland_compositor_workaround=true +_wayland_compositor_workaround=false -_pkgvermajmin="5.6" +_pkgvermajmin="5.7" pkgver="${_pkgvermajmin}.0" -# 5.6: 12 -# 5.7: 1 -pkgrel=13 +pkgrel=2 # PKGBUILD _piver=2 @@ -49,16 +47,16 @@ _packaginguser=$(whoami) _libspkgname="${pkgname}-target-libs" _mkspec="linux-rpi${_piver}-g++" -_pkgver=${pkgver}-rc -#_pkgver=${pkgver}-alpha +_pkgver=${pkgver}-alpha _baseprefix=/opt _installprefix=${_baseprefix}/${pkgname} _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} +# Work around packaging bug (lack of postfix in 5.7.0-alpha) +#_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") @@ -68,8 +66,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" "82ed4bc1bf7735747e1612f322f8723dfd84f05fa4dca9398863e6527a0c1971") -#sha256sums=("SKIP" "5d8d12bc72f12532323737894beadd0d0021ee1b4321e53798e722b0352bbc24") +sha256sums=("SKIP" "5d8d12bc72f12532323737894beadd0d0021ee1b4321e53798e722b0352bbc24") options=('!strip') install=qpi.install @@ -110,12 +107,13 @@ if $_wayland_compositor_workaround; then fi # bug(s) in Qt 5.7.0-alpha -#_device_configure_flags="$_device_configure_flags -skip qtlocation -skip qtwayland" +_device_configure_flags="$_device_configure_flags -skip qtlocation" build() { local _srcdir="${srcdir}/${_source_unpackaged_name}" local _basedir="${_srcdir}/qtbase" - local _bindir="${_srcdir}-build" + local _waylanddir="${_srcdir}/qtwayland" + local _bindir="${_srcdir}" local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}" # Qt tries to do the right thing and stores these, breaking cross compilation @@ -156,8 +154,9 @@ 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-journald-test-will-fail-with-certain-toolchains.patch + cd ${_waylanddir} + patch -p1 < ${_patch_dir}/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch # end patch @@ -221,7 +220,7 @@ create_install_script() package() { local _srcdir="${srcdir}/${_source_unpackaged_name}" - local _bindir="${_srcdir}-build" + local _bindir="${_srcdir}" create_install_script |