author | Antonio Rojas
<arojas@archlinux.org> 2017-05-31 16:16:33 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2017-05-31 16:16:33 UTC |
parent | c5b5014d085ef392fc887b5ceb02c9f51da58d0d |
PKGBUILD | +8 | -21 |
diff --git a/PKGBUILD b/PKGBUILD index b0ac34b..b752365 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,16 +4,16 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.8.0 +_qtver=5.9.0 pkgver=${_qtver/-/} -pkgrel=14.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' - 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' - 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0') + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2' + 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0' 'double-conversion') makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' 'gtk3' 'libpulse' 'cups' 'freetds') optdepends=('qt5-svg: to use SVG icon themes' @@ -26,16 +26,8 @@ optdepends=('qt5-svg: to use SVG icon themes' conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch" - plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch - plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch - plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch) -md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9' - 'e9ab6de042b599638f506d2974598164' - '438f85a8ecc0f8c066dc0deb5961b6fa' - '763a796776f3f8bf46cd4a0ed13d4028' - 'ffacccebfc17dc5a87724d13cefe38e5') +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c') prepare() { cd ${_pkgfqn} @@ -51,13 +43,8 @@ prepare() { find . -name '*.py' -exec sed -i \ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + - # Fix logging to systemd journal - patch -p1 -i ../qt5-base-journald.patch - - # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763 - patch -p1 -i ../plasma-crash-1.patch - patch -p1 -i ../plasma-crash-2.patch - patch -p1 -i ../plasma-crash-3.patch + # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 + sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf } build() {