summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
2 files changed, 19 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e4752e7e200..3b4a92d9627 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt6-base-headless
pkgdesc = A cross-platform application and UI framework - headless build, no QtGui or QtWidgets
- pkgver = 6.0.4
+ pkgver = 6.1.1
pkgrel = 1
url = https://www.qt.io
arch = x86_64
@@ -26,12 +26,12 @@ pkgbase = qt6-base-headless
optdepends = shared-mime-info: Freedesktop.org Shared MIME Info
provides = qt6-base
conflicts = qt6-base
- source = https://download.qt.io/official_releases/qt/6.0/6.0.4/submodules/qtbase-everywhere-src-6.0.4.tar.xz
+ options = !lto
+ source = https://download.qt.io/official_releases/qt/6.1/6.1.1/submodules/qtbase-everywhere-src-6.1.1.tar.xz
source = qt6-base-cflags.patch
source = qt6-base-nostrip.patch
- sha256sums = c42757932d7cb264a043cc2a0eed30774d938f63db67bfff11d8e319c0c8799a
+ sha256sums = 21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
sha256sums = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094
pkgname = qt6-base-headless
-
diff --git a/PKGBUILD b/PKGBUILD
index 7ec0dbd14cf..bc342ed0b9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=qt6-base-headless
-_qtver=6.0.4
+_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@@ -20,11 +20,12 @@ optdepends=('postgresql-libs: PostgreSQL driver'
groups=(qt6)
conflicts=(qt6-base)
provides=(qt6-base)
-_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=('c42757932d7cb264a043cc2a0eed30774d938f63db67bfff11d8e319c0c8799a'
+options=(!lto)
+_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=('21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2'
'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
@@ -37,6 +38,8 @@ build() {
cmake -G Ninja -B build -S "$_pkgfn" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DINSTALL_BINDIR=lib/qt6/bin \
+ -DINSTALL_PUBLICBINDIR=usr/bin \
+ -DINSTALL_LIBEXECDIR=lib/qt6 \
-DINSTALL_DOCDIR=share/doc/qt6 \
-DINSTALL_ARCHDATADIR=lib/qt6 \
-DINSTALL_DATADIR=share/qt6 \
@@ -60,9 +63,10 @@ package() {
install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
- # Symlinks for backwards compatibility
- mkdir -p "$pkgdir"/usr/bin
- for _b in $(ls "$pkgdir"/usr/lib/qt6/bin); do
- ln -rs "$pkgdir"/usr/lib/qt6/bin/$_b "$pkgdir"/usr/bin/$_b-qt6
- done
+# Install symlinks for user-facing tools
+ cd "$pkgdir"
+ mkdir usr/bin
+ while read _line; do
+ ln -s $_line
+ done < "$srcdir"/build/user_facing_tool_links.txt
}