diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 21 | ||||
| -rw-r--r-- | qmake-cflags.patch (renamed from qt6-base-cflags.patch) | 8 | ||||
| -rw-r--r-- | qmake-config.patch (renamed from qt6-base-nostrip.patch) | 2 |
4 files changed, 32 insertions, 22 deletions
@@ -1,6 +1,6 @@ pkgbase = qt6-base-headless pkgdesc = A cross-platform application and UI framework - headless build, no QtGui or QtWidgets - pkgver = 6.2.2 + pkgver = 6.2.3 pkgrel = 1 url = https://www.qt.io arch = x86_64 @@ -27,12 +27,19 @@ pkgbase = qt6-base-headless optdepends = shared-mime-info: Freedesktop.org Shared MIME Info provides = qt6-base conflicts = qt6-base - options = !lto - source = https://download.qt.io/official_releases/qt/6.2/6.2.2/submodules/qtbase-everywhere-src-6.2.2.tar.xz - source = qt6-base-cflags.patch - source = qt6-base-nostrip.patch - sha256sums = 85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a - sha256sums = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c - sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 + options = debug + source = https://download.qt.io/official_releases/qt/6.2/6.2.3/submodules/qtbase-everywhere-src-6.2.3.tar.xz + source = qmake-cflags.patch + source = qmake-config.patch + sha256sums = 34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4 + sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 + sha256sums = 4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa pkgname = qt6-base-headless + optdepends = postgresql-libs: PostgreSQL driver + optdepends = mariadb-libs: MariaDB driver + optdepends = md4c: C Markdown parser + optdepends = unixodbc: ODBC driver + optdepends = shared-mime-info: Freedesktop.org Shared MIME Info + optdepends = qt6-translations + optdepends = Translations @@ -4,7 +4,7 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=qt6-base-headless -_qtver=6.2.2 +_qtver=6.2.3 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -21,23 +21,24 @@ optdepends=('postgresql-libs: PostgreSQL driver' groups=(qt6) conflicts=(qt6-base) provides=(qt6-base) -options=(!lto) +options=(debug) _pkgfn="qtbase-everywhere-src-$_qtver" source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qt6-base-cflags.patch - qt6-base-nostrip.patch) -sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a' - 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') + qmake-cflags.patch + qmake-config.patch) +sha256sums=('34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4' + '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' + '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa') prepare() { - patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS - patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake + patch -d $_pkgfn -p1 < qmake-cflags.patch # Use system CFLAGS + patch -d $_pkgfn -p1 < qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 } build() { cmake -B build -S "$_pkgfn" -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DINSTALL_BINDIR=lib/qt6/bin \ -DINSTALL_PUBLICBINDIR=usr/bin \ -DINSTALL_LIBEXECDIR=lib/qt6 \ @@ -50,6 +51,7 @@ build() { -DQT_FEATURE_journald=ON \ -DQT_FEATURE_openssl_linked=ON \ -DQT_FEATURE_system_sqlite=ON \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ \ -DQT_FEATURE_gui=OFF \ -DQT_FEATURE_widgets=OFF \ @@ -60,6 +62,7 @@ build() { } package() { + optdepends+=(qt6-translations Translations) DESTDIR="$pkgdir" cmake --install build install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase diff --git a/qt6-base-cflags.patch b/qmake-cflags.patch index c33aa78e7e93..3325016108f0 100644 --- a/qt6-base-cflags.patch +++ b/qmake-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 diff --git a/qt6-base-nostrip.patch b/qmake-config.patch index 17d24b4b6551..77d9694b37a0 100644 --- a/qt6-base-nostrip.patch +++ b/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 |