From b3c9a7ab120f52be4694d1513715cbdf2dbd7898 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 30 Jan 2020 01:04:13 +0000 Subject: [PATCH] extra/qt5-base to 5.14.1-1 --- extra/qt5-base/PKGBUILD | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD index 88ba50db1..78a5d566d 100644 --- a/extra/qt5-base/PKGBUILD +++ b/extra/qt5-base/PKGBUILD @@ -8,9 +8,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) -_qtver=5.14.0 +_qtver=5.14.1 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=1 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -32,12 +32,8 @@ optdepends=('qt5-svg: to use SVG icon themes' conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtbug-80967.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=b31852c4" - qtbug-81272.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=e6f1fde2") -sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463' - '52504c98cfd226548973d82b9ceb69c7557ba199993d189a3cb526b303dee740' - 'e93ca83adbf0becc0c78b7db8fed32eed123a62907fe0274e4d352aa169daad1') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7') prepare() { cd ${_pkgfqn} @@ -48,9 +44,6 @@ prepare() { mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf - - patch -p1 -i ../qtbug-80967.patch # Fix font rendering regression - patch -p1 -i ../qtbug-81272.patch # https://bugreports.qt.io/browse/QTBUG-81272 } build() {