From 65b3919800a3469afd4d9930a41c3d8954629ce9 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Thu, 30 Apr 2026 05:30:02 +0000 Subject: [PATCH] rename campaign packages to use -fourier suffix Stock-replacing pkgnames (kwin, qt6-base) hid the campaign carry from 'yay -Sl | grep fouri'. Renamed to -fourier suffix everywhere, with conflicts/provides/replaces so existing stock installs auto-migrate on next pacman -Syu. Pkgrel bumped on each. kwin -> kwin-fourier qt6-base -> qt6-base-fourier qt6-xcb-private-headers -> qt6-xcb-private-headers-fourier ffmpeg-v4l2-request-git -> ffmpeg-v4l2-request-fourier vulkan-panfrost -> vulkan-panfrost-fourier --- arch/ffmpeg-v4l2-request-git/PKGBUILD | 5 +++-- arch/kwin-fourier/PKGBUILD | 7 +++++-- arch/qt6-base-fourier/PKGBUILD | 18 ++++++++++++------ arch/vulkan-panfrost/PKGBUILD | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/arch/ffmpeg-v4l2-request-git/PKGBUILD b/arch/ffmpeg-v4l2-request-git/PKGBUILD index 6d3743c22..7c6dff8aa 100644 --- a/arch/ffmpeg-v4l2-request-git/PKGBUILD +++ b/arch/ffmpeg-v4l2-request-git/PKGBUILD @@ -19,12 +19,12 @@ # Speex dropped — not needed on the Fourier fleet. (No SDL2 means no # `ffplay` binary; mpv covers interactive playback.) -pkgname=ffmpeg-v4l2-request-git +pkgname=ffmpeg-v4l2-request-fourier _srcname=FFmpeg _version='8.1' _commit='b57fbbe50c9b2656fad86a1a7eeabfd2b2a50935' # v4l2-request-n8.1 tip 2026-04-24 pkgver=8.1.r123329.b57fbbe -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc='FFmpeg with V4L2 Request API hwaccel (Rockchip / Allwinner stateless decode)' arch=('aarch64') @@ -76,6 +76,7 @@ provides=( ffmpeg ) conflicts=(ffmpeg) +replaces=(ffmpeg ffmpeg-v4l2-request-git) source=("git+https://github.com/Kwiboo/FFmpeg.git#commit=${_commit}" '0001-libudev-bypass-fallback.patch') sha256sums=('SKIP' 'SKIP') diff --git a/arch/kwin-fourier/PKGBUILD b/arch/kwin-fourier/PKGBUILD index 3039dff9f..c11a3077a 100644 --- a/arch/kwin-fourier/PKGBUILD +++ b/arch/kwin-fourier/PKGBUILD @@ -20,10 +20,10 @@ # directly without exporting an extra sync_file). See # ../chromium-fourier/KWIN_PIVOT.md for the full diagnosis thread. -pkgname=kwin +pkgname=kwin-fourier pkgver=6.6.4 _dirver=$(echo $pkgver | cut -d. -f1-3) -pkgrel=2 +pkgrel=3 epoch=1 arch=(aarch64 x86_64) url='https://kde.org/plasma-desktop/' @@ -97,6 +97,9 @@ makedepends=(extra-cmake-modules xorg-xwayland) optdepends=('plasma-keyboard: virtual keyboard') groups=(plasma) +provides=(kwin) +conflicts=(kwin) +replaces=(kwin) source=(https://download.kde.org/stable/plasma/$_dirver/$pkgname-$pkgver.tar.xz{,.sig} 0001-transaction-bypass-watchDmaBuf-fence-wait.patch) sha256sums=('3f9439760580a977d018daf4b35b62e5a1700def7b21c8dfbfc789d21378d7ad' diff --git a/arch/qt6-base-fourier/PKGBUILD b/arch/qt6-base-fourier/PKGBUILD index cc676191f..b352a0230 100644 --- a/arch/qt6-base-fourier/PKGBUILD +++ b/arch/qt6-base-fourier/PKGBUILD @@ -24,11 +24,11 @@ # build strict precedence over upstream pkgrel=2 until upstream lands # the GL_R8/ES3 fix and we can drop the epoch. pkgbase=qt6-base -pkgname=(qt6-base - qt6-xcb-private-headers) +pkgname=(qt6-base-fourier + qt6-xcb-private-headers-fourier) _pkgver=6.11.0 pkgver=${_pkgver/-/} -pkgrel=2 +pkgrel=3 epoch=1 arch=(aarch64 x86_64) url='https://www.qt.io' @@ -171,18 +171,24 @@ build() { cmake --build build } -package_qt6-base() { +package_qt6-base-fourier() { pkgdesc='A cross-platform application and UI framework' + provides=(qt6-base) + conflicts=(qt6-base) + replaces=(qt6-base) depends+=(qt6-translations) DESTDIR="$pkgdir" cmake --install build install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir"/usr/share/licenses/$pkgbase } -package_qt6-xcb-private-headers() { +package_qt6-xcb-private-headers-fourier() { pkgdesc='Private headers for Qt6 Xcb' + provides=(qt6-xcb-private-headers) + conflicts=(qt6-xcb-private-headers) + replaces=(qt6-xcb-private-headers) - depends=("qt6-base=$pkgver") + depends=("qt6-base-fourier=$pkgver") optdepends=() groups=() diff --git a/arch/vulkan-panfrost/PKGBUILD b/arch/vulkan-panfrost/PKGBUILD index fbe649a42..d22227b27 100644 --- a/arch/vulkan-panfrost/PKGBUILD +++ b/arch/vulkan-panfrost/PKGBUILD @@ -15,9 +15,9 @@ # Bifrost boards anyway; future mesa releases may unblock G52 r1 # without re-packaging. -pkgname=vulkan-panfrost +pkgname=vulkan-panfrost-fourier pkgver=26.0.5 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Mesa Vulkan ICD for Mali Bifrost / Valhall (panvk)' arch=('aarch64')