extra/qt5-base to 5.14.1-3

extra/qt5-base/PKGBUILD

@@ -10,7 +10,7 @@ pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,14 +28,15 @@ optdepends=('qt5-svg: to use SVG icon themes'
             'unixodbc: ODBC driver'
             'libfbclient: Firebird/iBase driver'
             'freetds: MS SQL driver'
-            'gtk3: GTK platform plugin')
+            'gtk3: GTK platform plugin'
+            'perl: for fixqt4headers and syncqt')
 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"
          qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            '3d6524381b2bbd35c9d85fe6d9f3e39be645e12658a810604dfe981633f78d8b')
+            'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf')
 
 prepare() {
   cd ${_pkgfqn}
@@ -59,7 +60,6 @@ build() {
     -openssl-linked \
     -nomake examples \
     -no-rpath \
-    -optimized-qmake \
     -dbus-linked \
     -system-harfbuzz \
     -journald \

extra/qt5-base/qt5-base-cflags.patch

@@ -7,7 +7,7 @@ index a493cd5984..79f2d2fff9 100644
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+QMAKE_LFLAGS_RELEASE   += $$(LDFLAGS)
++eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
 index 4d82321cba..4a61fc9d25 100644
@@ -19,8 +19,8 @@ index 4d82321cba..4a61fc9d25 100644
  QMAKE_CFLAGS_WARN_OFF      += -w
 -QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-+QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE $$(CFLAGS)
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g $$(CFLAGS)
++eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS))
++eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS))
  QMAKE_CFLAGS_DEBUG         += -g
  QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC