diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD index 42f49dce5..4305778de 100644 --- a/extra/qt5-base/PKGBUILD +++ b/extra/qt5-base/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) pkgver=5.15.2+kde+r297 -pkgrel=1 +pkgrel=2 _commit=d16bf02a11953dcac01dca73e6f3778f293adefe arch=('x86_64') url='https://www.qt.io' @@ -34,11 +34,11 @@ conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn=qtbase source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit - qt5-base-cflags.patch - qt5-base-nostrip.patch) + qmake-cflags.patch + qmake-config.patch) sha256sums=('SKIP' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') + '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa') options=(debug) pkgver() { @@ -51,8 +51,8 @@ prepare() { git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump - patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake - patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake + patch -p1 < ../qmake-cflags.patch # Use system CFLAGS in qmake + patch -p1 < ../qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 } build() { diff --git a/extra/qt5-base/qt5-base-cflags.patch b/extra/qt5-base/qmake-cflags.patch similarity index 100% rename from extra/qt5-base/qt5-base-cflags.patch rename to extra/qt5-base/qmake-cflags.patch diff --git a/extra/qt5-base/qt5-base-nostrip.patch b/extra/qt5-base/qmake-config.patch similarity index 93% rename from extra/qt5-base/qt5-base-nostrip.patch rename to extra/qt5-base/qmake-config.patch index 17d24b4b6..77d9694b3 100644 --- a/extra/qt5-base/qt5-base-nostrip.patch +++ b/extra/qt5-base/qmake-config.patch @@ -6,7 +6,7 @@ index 99d77156fd..fc840fe9f6 100644 # you can use the manual test in tests/manual/mkspecs. # -+CONFIG += nostrip ++CONFIG += nostrip ltcg + QMAKE_CFLAGS_OPTIMIZE = -O2 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3