From 695946aae2ef7d1dfe759f19e79f9a1f4a3f6650 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Thu, 7 Feb 2019 11:23:25 +1100
Subject: [PATCH] upgpkg : 5.12.1-2
---
PKGBUILD | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index 05ff2f5..1100ad3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,22 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.12.0
+_qtver=5.12.1
pkgver=${_qtver/-/}
pkgrel=2
arch=(x86_64)
-url='http://qt-project.org/'
+url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'mesa'
'tslib' 'libinput' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion')
-makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+makedepends=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'icu')
optdepends=('qt5-svg: to use SVG icon themes'
+ 'qt5-translations: for some native UI translations'
'postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
+ 'mariadb-libs: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'freetds: MS SQL driver'
@@ -27,8 +28,12 @@ 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")
-sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt-delayed-highlight.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=f8f0f3ee
+ qtbug-69310.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fcba9fa8")
+sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
+ '0080b1e208090c729018db1ac224e5940d06a38b9c28c918a892b01f84a82cf9'
+ '2186ce7b8d6310ebc005da9b00dcc88388df3e8b83bff37230fa1bb9253c4970')
prepare() {
cd ${_pkgfqn}
@@ -39,6 +44,9 @@ prepare() {
mkspecs/common/gcc-base.conf
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
mkspecs/common/g++-unix.conf
+
+ patch -p1 -i ../qt-delayed-highlight.patch # https://codereview.qt-project.org/#/c/249881/
+ patch -p1 -i ../qtbug-69310.patch # https://bugreports.qt.io/browse/QTBUG-69310
}
build() {
--
GitLab