upgpkg: 5.15.2+kde+r268-2

trunk/PKGBUILD

@@ -9,14 +9,14 @@
 
 pkgbase=qt5-base
 pkgname=('qt5-base' 'qt5-xcb-private-headers')
-pkgver=5.15.2+kde+r260
-pkgrel=3
+pkgver=5.15.2+kde+r268
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework'
 
 url='https://www.qt.io'
 
 track=commit
-target=00e0ffa0297957871ad1f22626524b6bd8e87260
+target=edb0f568ca1380623325cb18365b0af81cbf65bf
 source=(
     "git+https://invent.kde.org/qt/qt/${pkgbase/5-}#$track=$target"
     'qt5-base-cflags.patch'
@@ -131,7 +131,12 @@ build() {
         -no-mimetype-database \
         -no-use-gold-linker \
         -reduce-relocations \
-        -no-strip
+        -no-strip \
+        -ltcg
+
+    # No configure flag for fat static libs with lto
+    bin/qmake CONFIG+=fat-static-lto -- -redo
+
     make
 }
 
@@ -140,6 +145,7 @@ build() {
 
 package_qt5-base() {
     pkgdesc='A cross-platform application and UI framework'
+    depends+=(qt5-translations)
 
     cd ${pkgbase/5-}
     make INSTALL_ROOT="$pkgdir" install

trunk/qt5-base-cflags.patch

@@ -23,8 +23,8 @@ index 1f919d270a..7ef6046326 100644
 -QMAKE_CFLAGS_DEBUG         += -g
 +SYSTEM_CFLAGS = $$(CFLAGS)
 +SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
 +!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
  QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
@@ -38,8 +38,8 @@ index 1f919d270a..7ef6046326 100644
 -QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
 +SYSTEM_CXXFLAGS = $$(CXXFLAGS)
 +SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
 +!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
  QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
  QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB