From 0a089c12f18539d09a658dc52fc70a81c31af471 Mon Sep 17 00:00:00 2001 From: Achill Gilgenast Date: Tue, 20 Jan 2026 15:32:13 +0100 Subject: [PATCH] */*: use consistent pkgver scheme for Alpine forks Standardize the use of pkgver=9999$_pkgver, allowing easier upgrades but also a single expected behaviour for users like nightly-builder. [ci:skip-vercheck]: some package have the same $pkgver-r$pkgrel [ci:ignore-count]: this is expected Part-of: --- extra-repos/systemd/accountsservice/APKBUILD | 2 +- extra-repos/systemd/dbus/APKBUILD | 4 ++-- extra-repos/systemd/dsme/APKBUILD | 2 +- extra-repos/systemd/gdm/APKBUILD | 4 ++-- extra-repos/systemd/gnome-desktop/APKBUILD | 4 ++-- extra-repos/systemd/gnome-keyring/APKBUILD | 4 ++-- extra-repos/systemd/gnome-session/APKBUILD | 4 ++-- extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD | 4 ++-- extra-repos/systemd/gnome-settings-daemon/APKBUILD | 4 ++-- extra-repos/systemd/gnome-shell-mobile/APKBUILD | 4 ++-- extra-repos/systemd/gnome-shell/APKBUILD | 4 ++-- extra-repos/systemd/kscreenlocker/APKBUILD | 2 +- extra-repos/systemd/kwin/APKBUILD | 2 +- extra-repos/systemd/mutter-mobile/APKBUILD | 4 ++-- extra-repos/systemd/mutter/APKBUILD | 4 ++-- extra-repos/systemd/networkmanager/APKBUILD | 2 +- extra-repos/systemd/pipewire/APKBUILD | 4 ++-- extra-repos/systemd/plasma-workspace/APKBUILD | 2 +- extra-repos/systemd/polkit/APKBUILD | 2 +- extra-repos/systemd/sddm/APKBUILD | 2 +- extra-repos/systemd/wireplumber/APKBUILD | 2 +- extra-repos/systemd/xorg-server/APKBUILD | 2 +- temp/iio-sensor-proxy/APKBUILD | 2 +- temp/usb-moded/APKBUILD | 6 +++--- temp/xkeyboard-config/APKBUILD | 4 ++-- 25 files changed, 40 insertions(+), 40 deletions(-) diff --git a/extra-repos/systemd/accountsservice/APKBUILD b/extra-repos/systemd/accountsservice/APKBUILD index a3a87555d..c705ca093 100644 --- a/extra-repos/systemd/accountsservice/APKBUILD +++ b/extra-repos/systemd/accountsservice/APKBUILD @@ -3,8 +3,8 @@ # from dbus by invoking logind maintainer="" pkgname=accountsservice -pkgver=99923.13.9 _pkgver=23.13.9 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="D-Bus interface for user account query and manipulation" url="https://www.freedesktop.org/software/accountsservice/" diff --git a/extra-repos/systemd/dbus/APKBUILD b/extra-repos/systemd/dbus/APKBUILD index 2cfb0a746..184783564 100644 --- a/extra-repos/systemd/dbus/APKBUILD +++ b/extra-repos/systemd/dbus/APKBUILD @@ -1,9 +1,9 @@ # Forked from Alpine to enable systemd maintainer="" pkgname=dbus -pkgver=9991.16.2 _pkgver=1.16.2 -pkgrel=6 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="Freedesktop.org message bus system" url="https://www.freedesktop.org/Software/dbus" # armhf: pmb#2618 diff --git a/extra-repos/systemd/dsme/APKBUILD b/extra-repos/systemd/dsme/APKBUILD index 73b59c7c3..af6b3fda8 100644 --- a/extra-repos/systemd/dsme/APKBUILD +++ b/extra-repos/systemd/dsme/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to enable systemd support maintainer="Bart Ribbers " pkgname=dsme -pkgver=99990.84.7 _pkgver=0.84.7 +pkgver=9999$_pkgver pkgrel=1 _commit_dbusglib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="Device State Management Entity" diff --git a/extra-repos/systemd/gdm/APKBUILD b/extra-repos/systemd/gdm/APKBUILD index 0c5f7c505..ba6d9175d 100644 --- a/extra-repos/systemd/gdm/APKBUILD +++ b/extra-repos/systemd/gdm/APKBUILD @@ -3,9 +3,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gdm -pkgver=99949.0.1 _pkgver=49.0.1 -pkgrel=1 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" # blocked by gnome-shell diff --git a/extra-repos/systemd/gnome-desktop/APKBUILD b/extra-repos/systemd/gnome-desktop/APKBUILD index 677dd6dfb..5254a0ec8 100644 --- a/extra-repos/systemd/gnome-desktop/APKBUILD +++ b/extra-repos/systemd/gnome-desktop/APKBUILD @@ -4,8 +4,8 @@ maintainer="Newbyte " pkgname=gnome-desktop _pkgver=44.4 -pkgver=999$_pkgver -pkgrel=1 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME desktop core libraries" url="https://gitlab.gnome.org/GNOME/gnome-desktop" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-keyring/APKBUILD b/extra-repos/systemd/gnome-keyring/APKBUILD index 09f435ed4..62c9062ba 100644 --- a/extra-repos/systemd/gnome-keyring/APKBUILD +++ b/extra-repos/systemd/gnome-keyring/APKBUILD @@ -4,9 +4,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-keyring -pkgver=99948.0 _pkgver=48.0 -pkgrel=3 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-session/APKBUILD b/extra-repos/systemd/gnome-session/APKBUILD index effc973df..fab4ddaa2 100644 --- a/extra-repos/systemd/gnome-session/APKBUILD +++ b/extra-repos/systemd/gnome-session/APKBUILD @@ -6,9 +6,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-session -pkgver=99949.0 _pkgver=49.0 -pkgrel=1 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD index ecb7ad58a..6a785c815 100644 --- a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD @@ -3,9 +3,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-settings-daemon-mobile -pkgver=99948.0 _pkgver=48.0 -pkgrel=3 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-settings-daemon/APKBUILD b/extra-repos/systemd/gnome-settings-daemon/APKBUILD index 90b0178d4..058894078 100644 --- a/extra-repos/systemd/gnome-settings-daemon/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon/APKBUILD @@ -3,9 +3,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-settings-daemon -pkgver=99948.1 _pkgver=48.1 -pkgrel=4 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-shell-mobile/APKBUILD b/extra-repos/systemd/gnome-shell-mobile/APKBUILD index 7275d8363..57c6d7934 100644 --- a/extra-repos/systemd/gnome-shell-mobile/APKBUILD +++ b/extra-repos/systemd/gnome-shell-mobile/APKBUILD @@ -3,9 +3,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-shell-mobile -pkgver=99948.0 _pkgver=48.0 -pkgrel=5 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME shell mobile" url="https://wiki.gnome.org/Projects/GnomeShell" # gjs / riscv64: mutter-mobile diff --git a/extra-repos/systemd/gnome-shell/APKBUILD b/extra-repos/systemd/gnome-shell/APKBUILD index fcc4a7ceb..8aea0d46e 100644 --- a/extra-repos/systemd/gnome-shell/APKBUILD +++ b/extra-repos/systemd/gnome-shell/APKBUILD @@ -4,8 +4,8 @@ maintainer="Newbyte " pkgname=gnome-shell _pkgver=49.2 -pkgver="999$_pkgver" -pkgrel=1 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="GNOME shell" url="https://gitlab.gnome.org/GNOME/gnome-shell" # gjs -> mozjs diff --git a/extra-repos/systemd/kscreenlocker/APKBUILD b/extra-repos/systemd/kscreenlocker/APKBUILD index 378ff3a25..804876ed3 100644 --- a/extra-repos/systemd/kscreenlocker/APKBUILD +++ b/extra-repos/systemd/kscreenlocker/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to add systemd! maintainer="" pkgname=kscreenlocker -pkgver=99996.5.5 _pkgver=6.5.5 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="Library and components for secure lock screen architecture" # armhf blocked by qt6-qtdeclarative -> ki18n diff --git a/extra-repos/systemd/kwin/APKBUILD b/extra-repos/systemd/kwin/APKBUILD index 28aaffd94..82de7ac65 100644 --- a/extra-repos/systemd/kwin/APKBUILD +++ b/extra-repos/systemd/kwin/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to add systemd! maintainer="" pkgname=kwin -pkgver=99996.5.5 _pkgver=6.5.5 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="An easy to use, but flexible, composited Window Manager" # armhf blocked by qt6-qtdeclarative diff --git a/extra-repos/systemd/mutter-mobile/APKBUILD b/extra-repos/systemd/mutter-mobile/APKBUILD index 92ada2df8..0e02353d0 100644 --- a/extra-repos/systemd/mutter-mobile/APKBUILD +++ b/extra-repos/systemd/mutter-mobile/APKBUILD @@ -3,9 +3,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=mutter-mobile -pkgver=99948.0 _pkgver=48.0 -pkgrel=2 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" # ricsv64: doesn't build currently: diff --git a/extra-repos/systemd/mutter/APKBUILD b/extra-repos/systemd/mutter/APKBUILD index 604f3ce0b..1c0652081 100644 --- a/extra-repos/systemd/mutter/APKBUILD +++ b/extra-repos/systemd/mutter/APKBUILD @@ -4,8 +4,8 @@ maintainer="Newbyte " pkgname=mutter _pkgver=49.2 -pkgver="999$_pkgver" -pkgrel=1 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://gitlab.gnome.org/GNOME/mutter" # armhf: pmb#2618 diff --git a/extra-repos/systemd/networkmanager/APKBUILD b/extra-repos/systemd/networkmanager/APKBUILD index ce5f55a33..6cb0d3097 100644 --- a/extra-repos/systemd/networkmanager/APKBUILD +++ b/extra-repos/systemd/networkmanager/APKBUILD @@ -2,8 +2,8 @@ # integrates with logind for sleepmonitor and sessionmonitor. maintainer="Jane Rachinger " pkgname=networkmanager -pkgver=9991.54.3 _pkgver=1.54.3 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" diff --git a/extra-repos/systemd/pipewire/APKBUILD b/extra-repos/systemd/pipewire/APKBUILD index 7336e9dc4..215fd2187 100644 --- a/extra-repos/systemd/pipewire/APKBUILD +++ b/extra-repos/systemd/pipewire/APKBUILD @@ -2,8 +2,8 @@ maintainer="Achill Gilgenast " pkgname=pipewire _pkgver=1.4.9 -pkgver=999$_pkgver -pkgrel=2 +pkgver=9999$_pkgver +pkgrel=0 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" diff --git a/extra-repos/systemd/plasma-workspace/APKBUILD b/extra-repos/systemd/plasma-workspace/APKBUILD index 78e97ef38..2448aa0a6 100644 --- a/extra-repos/systemd/plasma-workspace/APKBUILD +++ b/extra-repos/systemd/plasma-workspace/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to add systemd! maintainer="" pkgname=plasma-workspace -pkgver=99996.5.5 _pkgver=6.5.5 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="KDE Plasma Workspace" # armhf blocked by qt6-qtdeclarative diff --git a/extra-repos/systemd/polkit/APKBUILD b/extra-repos/systemd/polkit/APKBUILD index 555750197..c18231ee7 100644 --- a/extra-repos/systemd/polkit/APKBUILD +++ b/extra-repos/systemd/polkit/APKBUILD @@ -2,7 +2,7 @@ maintainer="Jane Rachinger " pkgname=polkit _pkgver=127 -pkgver=999$_pkgver +pkgver=9999$_pkgver pkgrel=0 pkgdesc="Application development toolkit for controlling system-wide privileges" url="https://github.com/polkit-org/polkit" diff --git a/extra-repos/systemd/sddm/APKBUILD b/extra-repos/systemd/sddm/APKBUILD index 0947ac380..714034932 100644 --- a/extra-repos/systemd/sddm/APKBUILD +++ b/extra-repos/systemd/sddm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers maintainer="Bart Ribbers " pkgname=sddm -pkgver=99990.21.0 _pkgver=0.21.0 +pkgver=9999$_pkgver pkgrel=4 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" diff --git a/extra-repos/systemd/wireplumber/APKBUILD b/extra-repos/systemd/wireplumber/APKBUILD index a7cf80095..4b4b50c1a 100644 --- a/extra-repos/systemd/wireplumber/APKBUILD +++ b/extra-repos/systemd/wireplumber/APKBUILD @@ -2,7 +2,7 @@ maintainer="" pkgname=wireplumber _pkgver=0.5.13 -pkgver=999$_pkgver +pkgver=9999$_pkgver pkgrel=0 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.org/" diff --git a/extra-repos/systemd/xorg-server/APKBUILD b/extra-repos/systemd/xorg-server/APKBUILD index a196fd39e..553d8cd02 100644 --- a/extra-repos/systemd/xorg-server/APKBUILD +++ b/extra-repos/systemd/xorg-server/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to adjust dependencies for systemd maintainer="" pkgname=xorg-server -pkgver=999921.1.21 _pkgver=21.1.21 +pkgver=9999$_pkgver pkgrel=0 pkgdesc="X.Org X servers" url="https://www.x.org/wiki" diff --git a/temp/iio-sensor-proxy/APKBUILD b/temp/iio-sensor-proxy/APKBUILD index 6782baa9b..018a70fe0 100644 --- a/temp/iio-sensor-proxy/APKBUILD +++ b/temp/iio-sensor-proxy/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to add Qualcomm SSC support with libssc maintainer="Dylan Van Assche " pkgname=iio-sensor-proxy -pkgver=99993.8 _pkgver=3.8 +pkgver=9999$_pkgver pkgrel=5 pkgdesc="IIO sensors to D-Bus proxy" url="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy" diff --git a/temp/usb-moded/APKBUILD b/temp/usb-moded/APKBUILD index 79d89a3bb..01cf568e2 100644 --- a/temp/usb-moded/APKBUILD +++ b/temp/usb-moded/APKBUILD @@ -3,8 +3,8 @@ maintainer="Dylan Van Assche " pkgname=usb-moded _pkgver=0.86.0.69 -pkgver="999$_pkgver" -pkgrel=2 +pkgver=9999$_pkgver +pkgrel=0 _commit_dbus_glib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="A daemon activating a certain USB profile based on the usb cable connection status" url="https://github.com/sailfishos/usb-moded" @@ -88,7 +88,7 @@ package() { } sha512sums=" -55c8892c9f9c5a9cc6b526e8c1f9c55cd5f61922dbc52b1c85abb2850a00d1146c0d8e4f7a631bd0d7927e40908dae2541870bf1cc591b9d527ce29306051829 usb-moded-9990.86.0.69.tar.gz +55c8892c9f9c5a9cc6b526e8c1f9c55cd5f61922dbc52b1c85abb2850a00d1146c0d8e4f7a631bd0d7927e40908dae2541870bf1cc591b9d527ce29306051829 usb-moded-99990.86.0.69.tar.gz 665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256 dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz d6548342e6b83fe08d050d81825d14f07aa5ede4961dd7e34d5fca45fbe474e786198559f89e4de3002c7d86737c69e85d21932a5f8c6785c5f2f2b51cbf65bf usb-moded.confd 38f263a9f1c6711396b2672e53b297dbaa2f41222061da7eb90e2646e52f124b126b9bcedcec5b85e387518d455c132c37ce2196e5975f8e7732be240ead490d usb-moded.initd diff --git a/temp/xkeyboard-config/APKBUILD b/temp/xkeyboard-config/APKBUILD index 50dd08abc..d6371efd5 100644 --- a/temp/xkeyboard-config/APKBUILD +++ b/temp/xkeyboard-config/APKBUILD @@ -3,9 +3,9 @@ # * https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/856 maintainer="Paul Sajna " pkgname=xkeyboard-config -pkgver=9999 _pkgver=2.46 -pkgrel=5 +pkgver=9999$_pkgver +pkgrel=0 pkgdesc="X keyboard configuration files" url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" arch="aarch64 armv7"