From 0c23819683aa401cc0f9b010fc934fa906c71d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 7 Jul 2023 10:41:28 +0700 Subject: [PATCH 1/7] base-chroot-cyclic-solver: Rename from pipewire-session-manager --- etc/defaults.virtual | 2 +- srcpkgs/base-chroot-cyclic-solver/template | 13 +++++++++++++ srcpkgs/pipewire-session-manager-bootstrap/template | 11 ----------- 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/base-chroot-cyclic-solver/template delete mode 100644 srcpkgs/pipewire-session-manager-bootstrap/template diff --git a/etc/defaults.virtual b/etc/defaults.virtual index f399b12998405..99a5ac1499ecb 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -28,7 +28,7 @@ nodejs-runtime nodejs ntp-daemon chrony phonon-backend phonon-backend-gstreamer phonon-qt5-backend phonon-qt5-backend-gstreamer -pipewire-session-manager pipewire-session-manager-bootstrap +pipewire-session-manager base-chroot-cyclic-solver rkt-stage1 rkt-stage1-coreos smtp-server opensmtpd tex texlive diff --git a/srcpkgs/base-chroot-cyclic-solver/template b/srcpkgs/base-chroot-cyclic-solver/template new file mode 100644 index 0000000000000..e199381092f07 --- /dev/null +++ b/srcpkgs/base-chroot-cyclic-solver/template @@ -0,0 +1,13 @@ +# Template file for 'base-chroot-cyclic-solver' +pkgname=base-chroot-cyclic-solver +version=0 +revision=1 +build_style=meta +short_desc="Dummy provider for all cyclic packages" +maintainer="Andrew J. Hesford " +license="Public Domain" +homepage="https://voidlinux.org" +provides=" + pipewire-session-manager-${version}_${revision} +" +repository=bootstrap diff --git a/srcpkgs/pipewire-session-manager-bootstrap/template b/srcpkgs/pipewire-session-manager-bootstrap/template deleted file mode 100644 index 355313ab40dd8..0000000000000 --- a/srcpkgs/pipewire-session-manager-bootstrap/template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'pipewire-session-manager-bootstrap' -pkgname=pipewire-session-manager-bootstrap -version=0 -revision=1 -build_style=meta -short_desc="Dummy pipewire-session-manager provider" -maintainer="Andrew J. Hesford " -license="Public Domain" -homepage="https://voidlinux.org" -provides="pipewire-session-manager-${version}_${revision}" -repository=bootstrap From 760268859c3627812a050e05619c1da1e8127e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 28 Jul 2023 23:00:14 +0700 Subject: [PATCH 2/7] base-chroot-cyclic-solver: provide lightdm-greeter --- etc/defaults.virtual | 1 + srcpkgs/base-chroot-cyclic-solver/template | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/defaults.virtual b/etc/defaults.virtual index 99a5ac1499ecb..9af8895a8492c 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -24,6 +24,7 @@ emacs emacs java-environment openjdk8 java-runtime openjdk8-jre libudev eudev-libudev +lightdm-greeter base-chroot-cyclic-solver nodejs-runtime nodejs ntp-daemon chrony phonon-backend phonon-backend-gstreamer diff --git a/srcpkgs/base-chroot-cyclic-solver/template b/srcpkgs/base-chroot-cyclic-solver/template index e199381092f07..4c946bad50372 100644 --- a/srcpkgs/base-chroot-cyclic-solver/template +++ b/srcpkgs/base-chroot-cyclic-solver/template @@ -1,6 +1,6 @@ # Template file for 'base-chroot-cyclic-solver' pkgname=base-chroot-cyclic-solver -version=0 +version=0.1 revision=1 build_style=meta short_desc="Dummy provider for all cyclic packages" @@ -8,6 +8,7 @@ maintainer="Andrew J. Hesford " license="Public Domain" homepage="https://voidlinux.org" provides=" + lightdm-greeter-${version}_${revision} pipewire-session-manager-${version}_${revision} " repository=bootstrap From 7e2543e0c784d174c3e08ea3b688be3ec04fa5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 8 Jul 2023 11:27:01 +0700 Subject: [PATCH 3/7] lightdm-gtk-greeter: provides lightdm-greeter --- srcpkgs/lightdm-gtk-greeter/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index c2c37197fe8c9..556fdb28f1500 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-gtk-greeter' pkgname=lightdm-gtk-greeter version=1.8.5 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-static --with-gtk2 --enable-compile-warnings=no" @@ -16,6 +16,7 @@ homepage="https://launchpad.net/lightdm-gtk-greeter" distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz" checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68 conflicts="lightdm-gtk3-greeter>=0" +provides="lightdm-greeter-1_0" post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure From 6925c813f1ed057df71b25b14423cfc532468b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 8 Jul 2023 11:27:01 +0700 Subject: [PATCH 4/7] lightdm-gtk3-greeter: provides lightdm-greeter --- srcpkgs/lightdm-gtk3-greeter/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template index df289af9e6b99..fc52758d4bc41 100644 --- a/srcpkgs/lightdm-gtk3-greeter/template +++ b/srcpkgs/lightdm-gtk3-greeter/template @@ -1,11 +1,12 @@ # Template file for 'lightdm-gtk3-greeter' pkgname=lightdm-gtk3-greeter version=2.0.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-maintainer-mode" hostmakedepends="pkg-config intltool" -makedepends="gtk+3-devel lightdm-devel libxklavier-devel" +makedepends="gtk+3-devel lightdm-devel libayatana-appindicator-devel + ayatana-ido-devel" depends="lightdm hicolor-icon-theme" conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)" @@ -15,3 +16,4 @@ homepage="https://github.com/Xubuntu/lightdm-gtk-greeter" distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz" checksum=befbb300c7b34ff21865fdbc881201f730fc7c560e9e01d17e899e9477150613 conflicts="lightdm-gtk-greeter>=0" +provides="lightdm-greeter-1_0" From c7e6fabe098083ce8ab1369acbfdf1274d48d43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 8 Jul 2023 11:27:01 +0700 Subject: [PATCH 5/7] lightdm-mini-greeter: provides lightdm-greeter --- srcpkgs/lightdm-mini-greeter/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-mini-greeter/template b/srcpkgs/lightdm-mini-greeter/template index c63f54a767ffb..2eb377304fa66 100644 --- a/srcpkgs/lightdm-mini-greeter/template +++ b/srcpkgs/lightdm-mini-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-mini-greeter' pkgname=lightdm-mini-greeter version=0.5.1 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/lightdm/lightdm-mini-greeter.conf" hostmakedepends="pkg-config automake" @@ -14,6 +14,7 @@ homepage="https://github.com/prikhi/lightdm-mini-greeter" changelog="https://raw.githubusercontent.com/prikhi/lightdm-mini-greeter/master/CHANGELOG.md" distfiles="https://github.com/prikhi/lightdm-mini-greeter/archive/${version}.tar.gz" checksum=2c48b6686209d9e2940da4dcbb7d5fea2caf68f5a2a11270f536bbdb625ca677 +provides="lightdm-greeter-1_0" pre_configure() { ./autogen.sh From b523dd750fdbae7d9271fc0bb9d12ab9341df32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 8 Jul 2023 11:27:01 +0700 Subject: [PATCH 6/7] lightdm-webkit2-greeter: provides lightdm-greeter --- srcpkgs/lightdm-webkit2-greeter/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template index 99d56791bae21..2ab2238a351b4 100644 --- a/srcpkgs/lightdm-webkit2-greeter/template +++ b/srcpkgs/lightdm-webkit2-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-webkit2-greeter' pkgname=lightdm-webkit2-greeter version=2.2.5 -revision=4 +revision=5 build_style=meson hostmakedepends="pkg-config glib-devel gettext" makedepends="accountsservice-devel gnome-backgrounds lightdm-devel @@ -14,6 +14,7 @@ homepage="https://github.com/Antergos/web-greeter" distfiles="https://github.com/Antergos/web-greeter/archive/${version}.tar.gz" checksum=f3223db35d0efaae76b2157f312dd10979c133f5a85add8fc75fd66ecb3186e3 conf_files="/etc/lightdm/lightdm-webkit2-greeter.conf" +provides="lightdm-greeter-1_0" post_extract() { mv themes/antergos themes/void From 89cc407e76730bda2ead0e17fd71f34ba65cbef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 8 Jul 2023 11:27:28 +0700 Subject: [PATCH 7/7] lightdm: depends on lightdm-greeter --- srcpkgs/lightdm/INSTALL.msg | 4 ---- srcpkgs/lightdm/template | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 srcpkgs/lightdm/INSTALL.msg diff --git a/srcpkgs/lightdm/INSTALL.msg b/srcpkgs/lightdm/INSTALL.msg deleted file mode 100644 index 2a90c9c1fc46c..0000000000000 --- a/srcpkgs/lightdm/INSTALL.msg +++ /dev/null @@ -1,4 +0,0 @@ -To make lightdm work a greeter package must be installed: - - lightdm-gtk-greeter: for a GTK+ greeter - lightdm-gtk3-greeter: for a GTK+3 greeter diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index d1129af789c82..05efc5855c423 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.32.0 -revision=4 +revision=5 build_style=gnu-configure build_helper="gir" configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter @@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir 'gobject-introspectio makedepends="dbus-glib-devel libxklavier-devel libxml2-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel libgcrypt-devel accountsservice-devel qt5-devel" -depends="dbus accountsservice" +depends="dbus accountsservice virtual?lightdm-greeter" short_desc="Light Display Manager" maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-2.0-or-later" @@ -64,7 +64,7 @@ liblightdm-qt5_package() { lightdm-devel_package() { depends="libglib-devel liblightdm-gobject-${version}_${revision} - liblightdm-qt5-${version}_${revision}" + libxklavier-devel libX11-devel liblightdm-qt5-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include