* [PR PATCH] lightdm: explicitly requires a greeter.
@ 2023-07-28 16:10 sgn
2023-07-31 2:03 ` [PR PATCH] [Updated] " sgn
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: sgn @ 2023-07-28 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 10507 bytes --]
From 73da64a1f5313d083618672d5b0112dcbccb31e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-license="Public Domain"
-homepage="https://voidlinux.org"
-provides="pipewire-session-manager-${version}_${revision}"
-repository=bootstrap
From 6dc771e8c5e2bd1bacf27cf7db7cee1c047aee3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
license="Public Domain"
homepage="https://voidlinux.org"
provides="
+ lightdm-greeter-${version}_${revision}
pipewire-session-manager-${version}_${revision}
"
repository=bootstrap
From 542e7b3cde66a29f348fabf0f2bd0c8c0e60ec2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 4439ad83f9c50bf5a79e2abcb7b7bd64b319478d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 4/7] lightdm-gtk3-greeter: provides lightdm-greeter
---
srcpkgs/lightdm-gtk3-greeter/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
index df289af9e6b99..ba0f4f479d663 100644
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ b/srcpkgs/lightdm-gtk3-greeter/template
@@ -1,7 +1,7 @@
# 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"
@@ -15,3 +15,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 2c1078b5219ffeeedec9c124b13b0eb17343e4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 b0cfb4fcdfa85d1f444abc0095c660c15ff52ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 9f40260e901154fb5f70a06e3cade14e2e5a0051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 | 4 ++--
2 files changed, 2 insertions(+), 6 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..18ce6cf38f386 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 <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
@ 2023-07-31 2:03 ` sgn
2023-07-31 2:27 ` sgn
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-07-31 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 10507 bytes --]
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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
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?=
<congdanhqx@gmail.com>
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 3e0a4c204e6fa9be7d8e78f96319956b2f2b6afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 4/7] lightdm-gtk3-greeter: provides lightdm-greeter
---
srcpkgs/lightdm-gtk3-greeter/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
index df289af9e6b99..ba0f4f479d663 100644
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ b/srcpkgs/lightdm-gtk3-greeter/template
@@ -1,7 +1,7 @@
# 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"
@@ -15,3 +15,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 1b0699271dd8dcb5e6ad6b53925a72b10060f1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 3ce83a2c196f1338ab4300825a29f221560fb13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 2f407e2290b53ba6e9c0c9885e03f706205e2d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 | 4 ++--
2 files changed, 2 insertions(+), 6 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..18ce6cf38f386 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 <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.0-or-later"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
2023-07-31 2:03 ` [PR PATCH] [Updated] " sgn
@ 2023-07-31 2:27 ` sgn
2023-08-28 5:01 ` sgn
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-07-31 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 11146 bytes --]
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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
2023-07-31 2:03 ` [PR PATCH] [Updated] " sgn
2023-07-31 2:27 ` sgn
@ 2023-08-28 5:01 ` sgn
2023-09-30 11:05 ` sgn
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-08-28 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 11146 bytes --]
From 340e13016a4b19704db514375dd38dd7655d2424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-license="Public Domain"
-homepage="https://voidlinux.org"
-provides="pipewire-session-manager-${version}_${revision}"
-repository=bootstrap
From d8488597deb23b5e01877b7a5d8ff6b4cf171ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
license="Public Domain"
homepage="https://voidlinux.org"
provides="
+ lightdm-greeter-${version}_${revision}
pipewire-session-manager-${version}_${revision}
"
repository=bootstrap
From fb9a747444bb6ab1fc6e29e05526a53bad2b2f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 26cc79276cf5aa0c5d47aae4373a710ae277172f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 8f8e68f0d75ed2efbaf3e847ef3e4898784c699b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 fc135f803e693a3d0858600af9050c377d30610f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 5db0eb973ac090426440d7e6515cb74879e85c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
` (2 preceding siblings ...)
2023-08-28 5:01 ` sgn
@ 2023-09-30 11:05 ` sgn
2023-09-30 11:06 ` sgn
2023-09-30 15:59 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-09-30 11:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 13692 bytes --]
From 2d08da481a1cdf60265e5d0f07e2de3cbca85725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 7 Jul 2023 10:41:28 +0700
Subject: [PATCH 1/8] 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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-license="Public Domain"
-homepage="https://voidlinux.org"
-provides="pipewire-session-manager-${version}_${revision}"
-repository=bootstrap
From 23bd8fe7eaef55efc47e93713ff06a089530a31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 28 Jul 2023 23:00:14 +0700
Subject: [PATCH 2/8] 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 <ajh@sideband.org>"
license="Public Domain"
homepage="https://voidlinux.org"
provides="
+ lightdm-greeter-${version}_${revision}
pipewire-session-manager-${version}_${revision}
"
repository=bootstrap
From 1f1057eb8ad2fce965203151036971e0cedea11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 3/8] 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 <orphan@voidlinux.org>"
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 0c24b2fc383dfc3347d6405b8b402bf9a58d7b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 4/8] 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 <orphan@voidlinux.org>"
@@ -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 bc98c99ded8f6ade768f1b18472b309749effc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 5/8] 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 <arch@subosito.com>"
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 59dfe6569b6e7f31acb0a5377c0aad45a52e9060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:01 +0700
Subject: [PATCH 6/8] 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 <me@johnnynator.dev>"
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 478a546be81fd9eaf937b3a652e35c06f84b5967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jul 2023 11:27:28 +0700
Subject: [PATCH 7/8] 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 <orphan@voidlinux.org>"
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 8076af048b4dfee47570b73527050060cbb81c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 31 Jul 2023 14:54:37 +0700
Subject: [PATCH 8/8] 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 <tibequadorian@posteo.de>"
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
` (3 preceding siblings ...)
2023-09-30 11:05 ` sgn
@ 2023-09-30 11:06 ` sgn
2023-09-30 15:59 ` [PR PATCH] [Merged]: " sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-09-30 11:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lightdm-greeter
https://github.com/void-linux/void-packages/pull/45298
lightdm: explicitly requires a greeter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lightdm-greeter-45298.patch --]
[-- Type: text/x-diff, Size: 12352 bytes --]
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?=
<congdanhqx@gmail.com>
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 <ajh@sideband.org>"
+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 <ajh@sideband.org>"
-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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
@@ -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?=
<congdanhqx@gmail.com>
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 <arch@subosito.com>"
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?=
<congdanhqx@gmail.com>
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 <me@johnnynator.dev>"
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?=
<congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
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?=
<congdanhqx@gmail.com>
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 <tibequadorian@posteo.de>"
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: lightdm: explicitly requires a greeter.
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
` (4 preceding siblings ...)
2023-09-30 11:06 ` sgn
@ 2023-09-30 15:59 ` sgn
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-09-30 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]
There's a merged pull request on the void-packages repository
lightdm: explicitly requires a greeter.
https://github.com/void-linux/void-packages/pull/45298
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-09-30 15:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-28 16:10 [PR PATCH] lightdm: explicitly requires a greeter sgn
2023-07-31 2:03 ` [PR PATCH] [Updated] " sgn
2023-07-31 2:27 ` sgn
2023-08-28 5:01 ` sgn
2023-09-30 11:05 ` sgn
2023-09-30 11:06 ` sgn
2023-09-30 15:59 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).