upgrel: 5.14.1-4

trunk/PKGBUILD

@@ -13,11 +13,13 @@ pkgdesc="A cross-platform application and UI framework"
 
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 
 _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")
+source=(
+	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+	'qt5-base-cflags.patch')
 
 #-------------------------------------| BUILD CONFIGURATION |-----------------------------------
 
@@ -40,12 +42,7 @@ makedepends=(
 prepare() {
 	cd ${_pkgfqn}
 
-	## Build qmake using Arch {C,LD}FLAGS
-	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-	  mkspecs/common/gcc-base.conf
-	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-	  mkspecs/common/g++-unix.conf
+	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 
 #--------------------------------------------| BUILD |------------------------------------------
@@ -70,7 +67,6 @@ build() {
 		-openssl-linked \
 		-nomake examples \
 		-no-rpath \
-		-optimized-qmake \
 		-dbus-linked \
 		-system-harfbuzz \
 		-no-mimetype-database \
@@ -158,12 +154,13 @@ optdepends=(
 	'unixodbc: ODBC driver'
 	'libfbclient: Firebird/iBase driver'
 	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin')
+	'gtk3: GTK platform plugin'
+	'perl: for fixqt4hearders and syncqt')
 	
 #-------------------------------------| SECURITY AND LICENCE |----------------------------------
 
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
-            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
+sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
+            'b8c99219e5c2d7bf51d1fe2860168fea4b439e89b40e5e56b475694a1e2039a6')
 

trunk/qt5-base-cflags.patch

+diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+index a493cd5984..79f2d2fff9 100644
+--- a/mkspecs/common/g++-unix.conf
++++ b/mkspecs/common/g++-unix.conf
+@@ -10,5 +10,5 @@
+ 
+ include(g++-base.conf)
+ 
+-QMAKE_LFLAGS_RELEASE   += -Wl,-O1
++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
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ QMAKE_CFLAGS_DEPS          += -M
+ QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
+ QMAKE_CFLAGS_WARN_OFF      += -w
+-QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
++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
+