diff options
author | Donald Carr | 2016-03-07 15:50:10 -0800 |
---|---|---|
committer | Donald Carr | 2016-03-07 23:24:41 -0800 |
commit | 50393e3a345c2e7c9615535d56acee7406c87dfa (patch) | |
tree | bea5cdef1d2fd1bc3eeaacbe3eb420bd4b57494d | |
parent | c724f6320736c938c35543a2a3f579af068ba1d0 (diff) | |
download | aur-50393e3a345c2e7c9615535d56acee7406c87dfa.tar.gz |
We should be using journald everywhere
Start to collect patches
Adjust plenty of stale documentation
We are not allowed to have a subdir in our aur; pivot
-rw-r--r-- | 0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch | 56 | ||||
-rw-r--r-- | 0001-journald-test-will-fail-with-certain-toolchains.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 41 |
3 files changed, 106 insertions, 17 deletions
diff --git a/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch b/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch new file mode 100644 index 000000000000..f9ab096dbc19 --- /dev/null +++ b/0001-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch @@ -0,0 +1,56 @@ +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 new file mode 100644 index 000000000000..1849de80937d --- /dev/null +++ b/0001-journald-test-will-fail-with-certain-toolchains.patch @@ -0,0 +1,26 @@ +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 + @@ -25,7 +25,7 @@ _local_qt5_repo="/opt/dev/src/qtproject/qt5" _wayland_compositor=true pkgver=5.6.0 -pkgrel=10 +pkgrel=11 # PKGBUILD _piver=2 @@ -79,7 +79,7 @@ fi #end sanity check if $_static_build || $_skip_web_engine || [[ ${_piver} = "1" ]]; then - _device_configure_flags="$_device_configure_flags -skip qtwebengine" + _device_configure_flags="$_device_configure_flags -skip qtwebengine -no-icu" fi if $_static_build; then @@ -91,13 +91,14 @@ if $_build_from_head; then fi if $_wayland_compositor; then - _device_configure_flags="$_device_configure_flags -skip qtwayland" + _device_configure_flags="$_device_configure_flags -skip qtwayland" fi build() { local _srcdir="${srcdir}/${_source_package_name}" + local _basedir="${_srcdir}/qtbase" local _bindir="${_srcdir}-build" - local _mkspec_dir="${_srcdir}/qtbase/mkspecs/devices/${_mkspec}" + local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}" # Qt tries to do the right thing and stores these, breaking cross compilation unset LDFLAGS @@ -108,17 +109,14 @@ if $_build_from_head; then _srcdir="${_local_qt5_repo}" fi + cd ${_srcdir} + # Get our mkspec rm -Rf $_mkspec_dir cp -r "${srcdir}/mkspecs/${_mkspec}" $_mkspec_dir - mkdir -p ${_bindir} - cd ${_bindir} - - # skipping due to build issues: qtquickcontrols2 # skipping on principle: qtscript xcb - # skipping because of the target in question: widgets qtwebchannel - # TODO: qtwebengine, a little bulky but useful + # skipping because of the target in question: widgets # Too bleeding big # -developer-build \ @@ -127,22 +125,33 @@ fi # Chromium requires python2 to be the system python on your build host # I literally symlink /usr/bin/python to /usr/bin/python2 on arch - # patch + # build qtwebengine with our mkspec local _webenginefileoverride="${_srcdir}/qtwebengine/tools/qmake/mkspecs/features/functions.prf" sed -i "s/linux-clang/linux*/" ${_webenginefileoverride} || exit 1 - local _reducerelocations="${_srcdir}/qtbase/config.tests/unix/bsymbolic_functions.test" + + # hard coded off, so we have to hard code it on + local _reducerelocations="${_basedir}/config.tests/unix/bsymbolic_functions.test" sed -i "s/error/warning/" ${_reducerelocations} || exit 1 - # No longer required as we explicitly set CFLAGS = foo in the mkspec # Work around our embarresing propensity to stomp on your own tailored build configuration - sed -i "s/O[23]/Os/" ${_srcdir}/qtbase/mkspecs/common/gcc-base.conf || exit 1 + 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-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch + patch -p1 < ${_patch_dir}/0001-journald-test-will-fail-with-certain-toolchains.patch # end patch + mkdir -p ${_bindir} + cd ${_bindir} + # Breaks in qtwayland # -qtnamespace Pi \ ${_srcdir}/configure \ + -v \ -qreal float \ -release \ -silent \ @@ -158,7 +167,7 @@ fi -prefix ${_installprefix} \ -opengl es2 \ -egl \ - -no-icu \ + -journald \ \ -no-widgets \ -make libs \ @@ -239,7 +248,5 @@ fi cd ${_libsdir} runuser -l ${_packaginguser} -c 'makepkg -d -f' || exit 1 - echo "the libs package for the Raspberry Pi${_piver} is in the ${_packaginguser} home directory awaiting deployment" - mv ${_libsdir}/${_libspkgname}-${pkgver}-${pkgrel}-any.pkg.tar.xz ${startdir} } |