From b5362184ce83deb314e23434cbbc432459253bf6 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 28 Jul 2025 22:02:28 +0200 Subject: [PATCH] systemd: revert some of the pkgrel bumps Revert some of the pkgrel bumps from 7429bed2 ("*/*: bump pkgrels of packages with systemd subpackages"), as they fail for various reasons in BPO now that are unrelated to rebuilding with the latest abuild + systemd patch. We can't fix all of them now (I've already spent some significant time firefighting here today...), so let's unblock BPO and all pmaports users who currently need to build all of the systemd packages themselves until BPO finishes the repo, and will also run into the same errors when trying to build those packages in particular. * cups -> unkown: https://builds.sr.ht/~postmarketos/job/1540055 https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3867 * gdm -> GCC 15: https://gitlab.alpinelinux.org/alpine/aports/-/commit/a09144387e314c213b69f9ef43265acc7c345e60 (let's add this another time after the queue in BPO is cleared) * networkmanager -> unkown: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3866 * plasma-workspace -> unknown: https://gitlab.alpinelinux.org/alpine/aports/-/issues/17407 [ci:skip-build] [ci:skip-vercheck] Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6837 --- extra-repos/systemd/cups/APKBUILD | 2 +- extra-repos/systemd/gdm/APKBUILD | 2 +- extra-repos/systemd/gnome-session/APKBUILD | 2 +- extra-repos/systemd/networkmanager/APKBUILD | 2 +- extra-repos/systemd/plasma-workspace/APKBUILD | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra-repos/systemd/cups/APKBUILD b/extra-repos/systemd/cups/APKBUILD index 521f377b7..6e168eea9 100644 --- a/extra-repos/systemd/cups/APKBUILD +++ b/extra-repos/systemd/cups/APKBUILD @@ -4,7 +4,7 @@ maintainer="Jane Rachinger " pkgname=cups _pkgver=2.4.12 pkgver=9999$_pkgver -pkgrel=1 +pkgrel=0 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gdm/APKBUILD b/extra-repos/systemd/gdm/APKBUILD index e5a5259e8..b80317964 100644 --- a/extra-repos/systemd/gdm/APKBUILD +++ b/extra-repos/systemd/gdm/APKBUILD @@ -3,7 +3,7 @@ pkgname=gdm pkgver=99948.0 _pkgver=48.0 -pkgrel=3 +pkgrel=2 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" # blocked by gnome-shell diff --git a/extra-repos/systemd/gnome-session/APKBUILD b/extra-repos/systemd/gnome-session/APKBUILD index d10c65e26..6369e65d8 100644 --- a/extra-repos/systemd/gnome-session/APKBUILD +++ b/extra-repos/systemd/gnome-session/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnome-session pkgver=99948.0 _pkgver=48.0 -pkgrel=2 +pkgrel=1 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" # armhf: pmb#2618 diff --git a/extra-repos/systemd/networkmanager/APKBUILD b/extra-repos/systemd/networkmanager/APKBUILD index 1b118e2c8..e459b10a9 100644 --- a/extra-repos/systemd/networkmanager/APKBUILD +++ b/extra-repos/systemd/networkmanager/APKBUILD @@ -5,7 +5,7 @@ maintainer="Jane Rachinger " pkgname=networkmanager pkgver=9991.52.1 _pkgver=1.52.1 -pkgrel=1 +pkgrel=0 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" # armhf: pmb#2618 diff --git a/extra-repos/systemd/plasma-workspace/APKBUILD b/extra-repos/systemd/plasma-workspace/APKBUILD index 00cb6595c..2e3240a86 100644 --- a/extra-repos/systemd/plasma-workspace/APKBUILD +++ b/extra-repos/systemd/plasma-workspace/APKBUILD @@ -3,7 +3,7 @@ pkgname=plasma-workspace pkgver=99996.4.2 _pkgver=6.4.2 -pkgrel=1 +pkgrel=0 pkgdesc="KDE Plasma Workspace" # armhf blocked by qt6-qtdeclarative # armv7 blocked by pmb#2618