[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

[Antonio Rojas]

    Date: Friday, March 6, 2020 @ 11:50:26
  Author: arojas
Revision: 376849

Improve qt5-base-cflags.patch as suggested by upstream

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

-----------------------+
 PKGBUILD              |    2 +-
 qt5-base-cflags.patch |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-06 11:40:56 UTC (rev 376848)
+++ PKGBUILD	2020-03-06 11:50:26 UTC (rev 376849)
@@ -31,7 +31,7 @@
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
          qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            '7cbf56fd6076f0c193f06715d1dfdae61905504cb01bd907ac33cc487f48d8c6')
+            'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt5-base-cflags.patch
===================================================================
--- qt5-base-cflags.patch	2020-03-06 11:40:56 UTC (rev 376848)
+++ qt5-base-cflags.patch	2020-03-06 11:50:26 UTC (rev 376849)
@@ -2,27 +2,25 @@
 index a493cd5984..79f2d2fff9 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
+@@ -10,5 +10,5 @@
  
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+ENV_LDFLAGS = $$(LDFLAGS)
-+QMAKE_LFLAGS_RELEASE   += $$split(ENV_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
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -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
-+ENV_CFLAGS = $$(CFLAGS)
-+QMAKE_CFLAGS_RELEASE       += $$split(ENV_CFLAGS, " ")
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$split(ENV_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