From 5d40fd3fcf3ed807128256a4b896c16e078e7318 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 | 3 ++- srcpkgs/base-chroot-cyclic-solver/template | 14 ++++++++++++++ .../pipewire-session-manager-bootstrap/template | 11 ----------- 3 files changed, 16 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..9af8895a8492c 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -24,11 +24,12 @@ 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 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..4c946bad50372 --- /dev/null +++ b/srcpkgs/base-chroot-cyclic-solver/template @@ -0,0 +1,14 @@ +# Template file for 'base-chroot-cyclic-solver' +pkgname=base-chroot-cyclic-solver +version=0.1 +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=" + lightdm-greeter-${version}_${revision} + 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 6a69bd16b8fc72658c44653d7977cf7ad5615e80 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 2/7] lightdm-gtk-greeter: provides lightdm-greeter --- srcpkgs/lightdm-gtk-greeter/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index c2c37197fe8c9..987e1a952d0dd 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -1,14 +1,14 @@ # 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" conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel lightdm-devel libxklavier-devel" -depends="lightdm hicolor-icon-theme" +depends="hicolor-icon-theme" short_desc="Light Display Manager GTK+ Greeter (GTK+ 2.x)" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -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 fee7e2603b1fbf2a5ede6fde40464fb3a36e8606 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-gtk3-greeter: provides lightdm-greeter --- srcpkgs/lightdm-gtk3-greeter/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template index df289af9e6b99..9794ce34caca0 100644 --- a/srcpkgs/lightdm-gtk3-greeter/template +++ b/srcpkgs/lightdm-gtk3-greeter/template @@ -1,12 +1,13 @@ # 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" -depends="lightdm hicolor-icon-theme" +makedepends="gtk+3-devel lightdm-devel libayatana-appindicator-devel + ayatana-ido-devel" +depends="hicolor-icon-theme" conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)" maintainer="Orphaned " @@ -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 fed5425a33d374a657f071ac3619629708d18062 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-mini-greeter: provides lightdm-greeter --- srcpkgs/lightdm-mini-greeter/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm-mini-greeter/template b/srcpkgs/lightdm-mini-greeter/template index c63f54a767ffb..bdcc987646faf 100644 --- a/srcpkgs/lightdm-mini-greeter/template +++ b/srcpkgs/lightdm-mini-greeter/template @@ -1,12 +1,12 @@ # 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" makedepends="gtk+3-devel lightdm-devel libxklavier-devel" -depends="lightdm hicolor-icon-theme" +depends="hicolor-icon-theme" short_desc="Minimal, Configurable, Single-User GTK3 LightDM Greeter" maintainer="Alif Rachmawadi " license="GPL-3.0-or-later" @@ -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 25918cdbcc31ff443a908de851b7c3fa736e26fc 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-webkit2-greeter: provides lightdm-greeter --- srcpkgs/lightdm-webkit2-greeter/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template index 99d56791bae21..2bff464e405d8 100644 --- a/srcpkgs/lightdm-webkit2-greeter/template +++ b/srcpkgs/lightdm-webkit2-greeter/template @@ -1,12 +1,12 @@ # 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 webkit2gtk-devel dbus-glib-devel libxklavier-devel" -depends="void-artwork lightdm" +depends="void-artwork" short_desc="Light Display Manager Webkit2 Greeter" maintainer="John " license="GPL-3.0-or-later" @@ -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 67fef1ba390c97ea5657eeb0c15e4cd31f1b78ce 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 6/7] lightdm: depends on lightdm-greeter --- srcpkgs/lightdm/files/README.voidlinux | 4 ---- srcpkgs/lightdm/template | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 srcpkgs/lightdm/files/README.voidlinux diff --git a/srcpkgs/lightdm/files/README.voidlinux b/srcpkgs/lightdm/files/README.voidlinux deleted file mode 100644 index 2a90c9c1fc46c..0000000000000 --- a/srcpkgs/lightdm/files/README.voidlinux +++ /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 c1b6414ef63d9..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" @@ -43,7 +43,6 @@ post_install() { done sed 's|\#session-wrapper=.*|session-wrapper=/etc/lightdm/Xsession|' -i ${DESTDIR}/etc/lightdm/lightdm.conf sed "s|pam_systemd\.so|pam_elogind.so|" -i ${DESTDIR}/etc/pam.d/* - vdoc "${FILESDIR}/README.voidlinux" } liblightdm-gobject_package() { @@ -65,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 From 77c42525e1ce4fb284c8c9b866a2ef77c6429a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 31 Jul 2023 14:54:37 +0700 Subject: [PATCH 7/7] libayatana-appindicator: update to 0.5.92. --- srcpkgs/libayatana-appindicator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template index 01b0a341d20af..1e40f8de25496 100644 --- a/srcpkgs/libayatana-appindicator/template +++ b/srcpkgs/libayatana-appindicator/template @@ -1,6 +1,6 @@ # Template file for 'libayatana-appindicator' pkgname=libayatana-appindicator -version=0.5.91 +version=0.5.92 revision=1 build_helper="gir" build_style=cmake @@ -12,7 +12,7 @@ maintainer="tibequadorian " license="LGPL-3.0-or-later" homepage="https://ayatanaindicators.github.io/" distfiles="https://github.com/AyatanaIndicators/libayatana-appindicator/archive/${version}.tar.gz" -checksum=52eb5d0c0de07177833e50fbaee592dcb3939e96c6b789921e2a8caf40a1ed26 +checksum=adedcf160dae7547971d475b42062cab278d54ec075537e6958ffdbf2d996857 build_options="vala" build_options_default="vala"