From b35d5e4895df51be1508690e6ecde39698867e3f Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Mon, 7 Sep 2020 05:46:31 +1100
Subject: [PATCH] upgrel: 5.15.0-6
---
trunk/PKGBUILD | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index e977f17..9238cd8 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="A cross-platform application and UI framework"
_qtver=5.15.0
pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=6
_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
url="https://www.qt.io"
@@ -20,7 +20,9 @@ source=(
"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
'qt5-base-cflags.patch'
- 'qtbug-74252.patch')
+ 'qtbug-74252.patch'
+ qtbug-78966.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=777f2a1c"
+ qtbug-84619.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9d2b474b")
#--BUILD CONFIGURATION-------------------------------------------------------
@@ -46,6 +48,8 @@ prepare() {
patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
+ patch -p1 -i ../qtbug-78966.patch # Fix QToolButton menus on multi-screen systems
+ patch -p1 -i ../qtbug-84619.patch # Fix deadlock
}
#--BUILD---------------------------------------------------------------------
@@ -74,7 +78,8 @@ build() {
-system-harfbuzz \
-no-mimetype-database \
-no-use-gold-linker \
- -reduce-relocations
+ -reduce-relocations \
+ -no-strip
make
}
--
GitLab