diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 1243800d0f79e8ec906571046c09b8c21ce8e5e9..10c6328239244e864b9df7878445d82d8b03a0e3 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -10,23 +10,23 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.13.0 +_qtver=5.13.1 pkgver=${_qtver/-/} -pkgrel=8 +pkgrel=3 arch=('x86_64') url="https://www.qt.io" license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc="A cross-platform application and UI framework" _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117" - qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77" - virtualbox-focus.patch) + 'qtbug-77364.patch') conflicts=( 'qtchooser') + groups=( 'qt' 'qt5') + depends=( 'libjpeg-turbo' 'xcb-util-keysyms' @@ -47,6 +47,7 @@ depends=( 'libproxy' 'libcups' 'double-conversion') + makedepends=( 'libfbclient' 'mariadb-libs' @@ -60,6 +61,7 @@ makedepends=( 'cups' 'freetds' 'vulkan-headers') + optdepends=( 'qt5-svg: to use SVG icon themes' 'qt5-translations: for some native UI translations' @@ -81,9 +83,7 @@ prepare() { sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf - patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze - patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility - patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742 + patch -p1 -i ../qtbug-77364.patch # Fix keyboard input in webengine } build() { @@ -125,15 +125,15 @@ package_qt5-base() { ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; ## Fix wrong qmake path in pri file sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \ - "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri ## Symlinks for backwards compatibility for b in "${pkgdir}"/usr/bin/*; do - ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done }