diff --git a/PKGBUILD b/PKGBUILD index 8f259fcbcb954290d6171844ed04f982d8f60b52..05ff2f5f542f6f99bb440425481532a2b241f481 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,9 +5,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.11.2 +_qtver=5.12.0 pkgver=${_qtver/-/} -pkgrel=4 +pkgrel=2 arch=(x86_64) url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -27,10 +27,8 @@ optdepends=('qt5-svg: to use SVG icon themes' conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" -source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qt5-base-stutter.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch/?id=d4e937a6") -sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107' - '8af697a9bcc3e30dc4465d2b44829553dc48dd29e34c35a885e7f3f65d017d3f') +source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb') prepare() { cd ${_pkgfqn} @@ -41,9 +39,6 @@ prepare() { mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf - - patch -p1 -i ../qt5-base-stutter.patch # https://bugreports.qt.io/browse/QTBUG-70760 - } build() { @@ -81,8 +76,7 @@ package_qt5-base() { cd ${_pkgfqn} make INSTALL_ROOT="${pkgdir}" install - install -D -m644 LGPL_EXCEPTION.txt \ - "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt + install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase # Drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/usr/lib" -type f -name '*.prl' \ @@ -94,7 +88,7 @@ package_qt5-base() { # Symlinks for backwards compatibility for b in "${pkgdir}"/usr/bin/*; do - ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 done } package_qt5-xcb-private-headers() {