upgrel: 5.12.2-6

trunk/PKGBUILD

@@ -12,13 +12,15 @@ pkgdesc="A cross-platform application and UI framework"
 
 _qtver=5.15.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=6
 
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 url="https://www.qt.io"
 source=(
     "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
     'qt5-base-cflags.patch'
+    'qt5-base-nostrip.patch'
+    kdebug-428095.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch?id=c5336057"
 )
 #--BUILD CONFIGURATION-------------------------------------------------------
 
@@ -41,6 +43,8 @@ makedepends=(
 prepare() {
     cd ${_pkgfqn}
     patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+    patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
+    patch -p1 -i ../kdebug-428095.patch # Fix black border on some menus with Breeze
 }
 
 #--BUILD---------------------------------------------------------------------

trunk/qt5-base-nostrip.patch

+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 99d77156fd..fc840fe9f6 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -31,6 +31,8 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+
++CONFIG += nostrip
++
+ QMAKE_CFLAGS_OPTIMIZE      = -O2
+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og