author | Antonio Rojas
<arojas@archlinux.org> 2017-01-23 10:43:41 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2017-01-23 10:43:41 UTC |
parent | f56db6aeaa86f7af709c5416faf73b44100d701c |
PKGBUILD | +5 | -18 |
rebuild.list | +4 | -8 |
diff --git a/PKGBUILD b/PKGBUILD index 81fcde0..344547a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,14 +3,14 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=qt5-base -_qtver=5.7.1 +_qtver=5.8.0 pkgver=${_qtver/-/} -pkgrel=2 +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' 'libgl' 'fontconfig' +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') makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' @@ -26,12 +26,8 @@ optdepends=('qt5-svg: to use SVG icon themes' conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch" - qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch") -md5sums=('f0809befe04160fbb73bbf38a06a2073' - 'c86af27562bbbe05c3defd63d00130fd' - '7b11584d9ea1ccb6c419e9b9816dee63') +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9') prepare() { cd ${_pkgfqn} @@ -46,15 +42,6 @@ prepare() { # Use python2 for Python 2.x find . -name '*.py' -exec sed -i \ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + - - # Fix libsystemd-journal detection - sed -e 's|libsystemd-journal|libsystemd|' -i config.tests/unix/journald/journald.pro -i src/corelib/global/global.pri - - # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061 - patch -p1 -i ../qtbug-49061.patch - - # Fix file chooser segfault on gnome/wayland https://bugreports.qt.io/browse/QTBUG-55583 - patch -p1 -i ../qtbug-55583.patch } build() { diff --git a/rebuild.list b/rebuild.list index 1b3040e..8c2df7f 100644 --- a/rebuild.list +++ b/rebuild.list @@ -1,13 +1,9 @@ -fcitx-qt5 * +fcitx-qt5 plasma-integration gcin calibre -akonadi * -skrooge * +akonadi +skrooge kwin lxqt-qtplugin -pyqt5 * -deepin-qt5integration * -deepin-tool-kit * - -* - Also need rebuild for patch Qt version updates +qt5dxcb-plugin