Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] New package: ly-0.5.2
@ 2020-08-04  5:01 cinerea0
  2020-08-04  5:25 ` cinerea0
                   ` (79 more replies)
  0 siblings, 80 replies; 81+ messages in thread
From: cinerea0 @ 2020-08-04  5:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages ly
https://github.com/void-linux/void-packages/pull/24038

[WIP] New package: ly-0.5.2
[ly](https://github.com/nullgemm/ly) is a simple TUI display manager. It recently had a new tagged release, and I thought this would be a good time to try to package it. ly has been requested multiple times (https://github.com/void-linux/void-packages/issues/1577, https://github.com/void-linux/void-packages/issues/13583), and there have been multiple attempts to package it (https://github.com/void-linux/void-packages/pull/1702, https://github.com/void-linux/void-packages/pull/13649, https://github.com/void-linux/void-packages/pull/20496). The template is based almost entirely on [this template](https://github.com/ericonr/void-packages/commit/eadabab675acaff062d138a2607d5920b125bfde) by @ericonr, and the service files were taken from [a fork of ly made to work with Void](https://github.com/drozdowsky/ly-void/commit/b972fe48a143e709dc695ac8e2c83dc57cee279f). The patches make minor adjustments to make ly display on the standard TTY 7 and remove the systemD service.

ly is able to build properly on my machine; I'll soon see if it build properly through travis. The problem with this package is that it doesn't seem to work quite right after it starts running. I get PAM errors when attempting to log in using ly; you can see those errors in [this issue in the ly repository](https://github.com/nullgemm/ly/issues/216). My hunch is that the problem lies in [ly's PAM file](https://github.com/nullgemm/ly/blob/master/res/pam.d/ly). Does anyone know how to patch this to work properly?

A patch file from https://github.com/void-linux/void-packages/pull/24038.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ly-24038.patch --]
[-- Type: text/x-diff, Size: 7751 bytes --]

From e51c0ae763b1aaa477d45d41806df79e5a759907 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 4 Aug 2020 00:41:29 -0400
Subject: [PATCH] New package: ly-0.5.2

---
 srcpkgs/ly/INSTALL.msg              |  1 +
 srcpkgs/ly/files/ly/conf            | 14 +++++++
 srcpkgs/ly/files/ly/finish          |  4 ++
 srcpkgs/ly/files/ly/run             | 15 +++++++
 srcpkgs/ly/patches/config.c.patch   | 12 ++++++
 srcpkgs/ly/patches/config.ini.patch | 12 ++++++
 srcpkgs/ly/patches/makefile.patch   | 27 ++++++++++++
 srcpkgs/ly/template                 | 64 +++++++++++++++++++++++++++++
 8 files changed, 149 insertions(+)
 create mode 100644 srcpkgs/ly/INSTALL.msg
 create mode 100644 srcpkgs/ly/files/ly/conf
 create mode 100755 srcpkgs/ly/files/ly/finish
 create mode 100755 srcpkgs/ly/files/ly/run
 create mode 100644 srcpkgs/ly/patches/config.c.patch
 create mode 100644 srcpkgs/ly/patches/config.ini.patch
 create mode 100644 srcpkgs/ly/patches/makefile.patch
 create mode 100644 srcpkgs/ly/template

diff --git a/srcpkgs/ly/INSTALL.msg b/srcpkgs/ly/INSTALL.msg
new file mode 100644
index 00000000000..32e01462159
--- /dev/null
+++ b/srcpkgs/ly/INSTALL.msg
@@ -0,0 +1 @@
+ly requires either xinit or sx to be available.
diff --git a/srcpkgs/ly/files/ly/conf b/srcpkgs/ly/files/ly/conf
new file mode 100644
index 00000000000..1fea45318e6
--- /dev/null
+++ b/srcpkgs/ly/files/ly/conf
@@ -0,0 +1,14 @@
+if [ -x /sbin/agetty -o -x /bin/agetty ]; then
+	# util-linux specific settings
+	if [ "${tty}" = "tty1" ]; then
+		GETTY_ARGS="--noclear"
+	fi
+fi
+
+BAUD_RATE=38400
+TERM_NAME=linux
+
+StandardInput=tty
+TTYPath=/dev/tty7
+TTYReset=yes
+TTYVHangup=yes 
diff --git a/srcpkgs/ly/files/ly/finish b/srcpkgs/ly/files/ly/finish
new file mode 100755
index 00000000000..e758d36fe52
--- /dev/null
+++ b/srcpkgs/ly/files/ly/finish
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+tty=${PWD##*-}
+exec utmpset -w $tty
diff --git a/srcpkgs/ly/files/ly/run b/srcpkgs/ly/files/ly/run
new file mode 100755
index 00000000000..74f5613ca03
--- /dev/null
+++ b/srcpkgs/ly/files/ly/run
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+tty=${PWD##*-}
+
+[ -r conf ] && . ./conf
+
+if [ -x /sbin/getty -o -x /bin/getty ]; then
+	# busybox
+	GETTY=getty
+elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
+	# util-linux
+	GETTY=agetty
+fi
+
+exec setsid ${GETTY} ${GETTY_ARGS} -nl /usr/bin/ly tty7 "${BAUD_RATE}" "${TERM_NAME}"
diff --git a/srcpkgs/ly/patches/config.c.patch b/srcpkgs/ly/patches/config.c.patch
new file mode 100644
index 00000000000..ddc60056cac
--- /dev/null
+++ b/srcpkgs/ly/patches/config.c.patch
@@ -0,0 +1,12 @@
+Change default tty to 7
+--- src/config.c	2020-07-28 11:35:08.000000000 -0400
++++ "src/config copy.c"	2020-08-02 21:36:05.334018482 -0400
+@@ -288,7 +288,7 @@
+ 	config.service_name = strdup("ly");
+ 	config.shutdown_cmd = strdup("/sbin/shutdown -a now");
+ 	config.term_reset_cmd = strdup("/usr/bin/tput reset");
+-	config.tty = 2;
++	config.tty = 7;
+ 	config.wayland_cmd = strdup(DATADIR "/wsetup.sh");
+ 	config.wayland_specifier = false;
+ 	config.waylandsessions = strdup("/usr/share/wayland-sessions");
diff --git a/srcpkgs/ly/patches/config.ini.patch b/srcpkgs/ly/patches/config.ini.patch
new file mode 100644
index 00000000000..aec293c5f3b
--- /dev/null
+++ b/srcpkgs/ly/patches/config.ini.patch
@@ -0,0 +1,12 @@
+Change default tty to 7
+--- res/config.ini	2020-07-28 11:35:08.000000000 -0400
++++ "res/config copy.ini"	2020-08-02 21:37:52.572343702 -0400
+@@ -79,7 +79,7 @@
+ #term_reset_cmd = /usr/bin/tput reset
+ 
+ # tty in use
+-#tty = 2
++#tty = 7
+ 
+ # wayland setup command
+ #wayland_cmd = /etc/ly/wsetup.sh
diff --git a/srcpkgs/ly/patches/makefile.patch b/srcpkgs/ly/patches/makefile.patch
new file mode 100644
index 00000000000..8c56843ac28
--- /dev/null
+++ b/srcpkgs/ly/patches/makefile.patch
@@ -0,0 +1,27 @@
+Remove systemd service from install and uninstall targets
+--- makefile	2020-07-28 11:35:08.000000000 -0400
++++ "makefile copy"	2020-08-02 21:40:10.283778154 -0400
+@@ -78,7 +78,6 @@
+ 	@install -DZ $(RESD)/wsetup.sh -t $(DATADIR)
+ 	@install -dZ $(DATADIR)/lang
+ 	@install -DZ $(RESD)/lang/* -t $(DATADIR)/lang
+-	@install -DZ $(RESD)/ly.service -m 644 -t ${DESTDIR}/usr/lib/systemd/system
+ 	@install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d
+ 
+ installnoconf: $(BIND)/$(NAME)
+@@ -89,7 +88,6 @@
+ 	@install -DZ $(RESD)/wsetup.sh -t $(DATADIR)
+ 	@install -dZ $(DATADIR)/lang
+ 	@install -DZ $(RESD)/lang/* -t $(DATADIR)/lang
+-	@install -DZ $(RESD)/ly.service -m 644 -t ${DESTDIR}/usr/lib/systemd/system
+ 	@install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d
+ 
+ uninstall:
+@@ -97,7 +95,6 @@
+ 	@rm -rf ${DESTDIR}/etc/ly
+ 	@rm -rf $(DATADIR)
+ 	@rm -f ${DESTDIR}/usr/bin/ly
+-	@rm -f ${DESTDIR}/usr/lib/systemd/system/ly.service
+ 	@rm -f ${DESTDIR}/etc/pam.d/ly
+ 
+ clean:
diff --git a/srcpkgs/ly/template b/srcpkgs/ly/template
new file mode 100644
index 00000000000..6a47efc9784
--- /dev/null
+++ b/srcpkgs/ly/template
@@ -0,0 +1,64 @@
+# Template file for 'ly'
+pkgname=ly
+version=0.5.2
+revision=1
+_argoat_githash=0eb7afae7a001094c9166a8959e021375707522c
+_testoasterror_githash=ee7c9d031d4632a6f381a6c174a38539bac04068
+_configator_githash=8cec1786196ae6f6a8b35e66181277457f2a2bb2
+_ctypes_githash=eb4b36559de8d17015f9416861ed085d06f5f5ed
+_dragonfail_githash=0a2492c6aab3ff64e182db894ce4d40b26799fbd
+_termbox_githash=23fff64470b0730959b39c70aa31fbddd776d9bc
+build_style=gnu-makefile
+make_build_args="FLAGS=\"$CFLAGS\""
+conf_files="/etc/ly/config.ini"
+hostmakedepends="git"
+makedepends="ncurses-devel pam-devel xcb-util-devel libX11-devel"
+depends="pam util-linux xauth"
+short_desc="TUI (ncurses-like) display manager"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="WTFPL"
+homepage="https://github.com/nullgemm/ly"
+distfiles="https://github.com/nullgemm/ly/archive/v${version}.tar.gz
+ https://github.com/nullgemm/argoat/archive/${_argoat_githash}.tar.gz>argoat-${_argoat_githash}.tar.gz
+ https://github.com/nullgemm/testoasterror/archive/${_testoasterror_githash}.tar.gz>testoasterror-${_testoasterror_githash}.tar.gz
+ https://github.com/nullgemm/configator/archive/${_configator_githash}.tar.gz>configator-${_configator_githash}.tar.gz
+ https://raw.githubusercontent.com/nullgemm/ctypes/${_ctypes_githash}/ctypes.h>ctypes-${_ctypes_githash}.h
+ https://github.com/nullgemm/dragonfail/archive/${_dragonfail_githash}.tar.gz>dragonfail-${_dragonfail_githash}.tar.gz
+ https://github.com/nullgemm/termbox_next/archive/${_termbox_githash}.tar.gz>termbox_next-${_termbox_githash}.tar.gz"
+checksum="3460c2c8015add2946f9ff5d3e4bf051d7c07005698fe61279cedacd1283e010
+ 65b0b5d688f8538513f335795156441365b9cb319a28d2defbb29d81ea43a188
+ d627845bcece46499801bbef5b2ccf3e0bfe39493b52a16ae34478e54ab11bd6
+ 2067100f9779eceb5abefa9402ed56546314ca5ad6b3d5156d3e1eb46c853679
+ ef169974c68b548dc8ac83bd4714622775b024fab07dc2b7fe96e8e8f102dbab
+ d5cdd6d528a43c35d08e7fcac849370c07d949671ef592cfecb02b23ad3c4dad
+ 76d73183d2191e9e37285f39f2b1bd51f1dc2d991637902ff3c1aa35111b288d"
+skip_extraction="ctypes-${_ctypes_githash}.h"
+
+post_extract() {
+	cp -rv ../argoat-${_argoat_githash}/* sub/argoat/
+	cp -rv ../testoasterror-${_testoasterror_githash}/* sub/argoat/sub/testoasterror/
+	cp -rv ../configator-${_configator_githash}/* sub/configator/
+	cp -rv $XBPS_SRCDISTDIR/$pkgname-$version/ctypes-${_ctypes_githash}.h sub/ctypes/ctypes.h
+	cp -rv ../dragonfail-${_dragonfail_githash}/* sub/dragonfail/
+	cp -rv ../termbox_next-${_termbox_githash}/* sub/termbox_next/
+}
+
+_make() {
+	make CC="$CC" FLAGS="$CFLAGS"
+}
+
+pre_build() {
+	exit
+	cd sub/argoat/sub/testoasterror
+	_make
+	cd ../../
+	_make
+}
+
+do_build() {
+	_make
+}
+
+post_install() {
+	vsv ly
+}

^ permalink raw reply	[flat|nested] 81+ messages in thread
end of thread, other threads:[~2021-11-06 22:37 UTC | newest]

Thread overview: 81+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04  5:01 [PR PATCH] [WIP] New package: ly-0.5.2 cinerea0
2020-08-04  5:25 ` cinerea0
2020-08-04  5:34 ` ericonr
2020-08-04  5:37 ` [PR REVIEW] " ericonr
2020-08-04  5:37 ` ericonr
2020-08-04  5:37 ` ericonr
2020-08-04  5:37 ` ericonr
2020-08-04  5:37 ` ericonr
2020-08-04  5:37 ` ericonr
2020-08-04 13:45 ` ericonr
2020-08-04 13:45 ` ericonr
2020-08-04 13:56 ` [PR REVIEW] " ericonr
2020-08-04 14:30 ` ericonr
2020-08-04 15:36 ` [PR REVIEW] " cinerea0
2020-08-04 15:39 ` cinerea0
2020-08-04 15:40 ` cinerea0
2020-08-04 15:41 ` cinerea0
2020-08-04 15:51 ` ericonr
2020-08-04 15:56 ` cinerea0
2020-08-04 15:59 ` cinerea0
2020-08-04 17:20 ` [PR REVIEW] " ericonr
2020-08-04 17:21 ` ericonr
2020-08-04 17:27 ` ericonr
2020-08-05  0:13 ` [PR REVIEW] " cinerea0
2020-08-05  0:20 ` cinerea0
2020-08-05  0:32 ` cinerea0
2020-08-05  1:33 ` ericonr
2020-08-05  1:34 ` ericonr
2020-08-05  1:42 ` [PR PATCH] [Updated] " cinerea0
2020-08-05  1:53 ` [PR REVIEW] " cinerea0
2020-08-05  1:55 ` cinerea0
2020-08-05  2:44 ` ericonr
2020-08-05  2:46 ` ericonr
2020-08-05  2:47 ` ericonr
2020-08-05  2:48 ` ericonr
2020-08-05  4:08 ` [PR PATCH] [Updated] " cinerea0
2020-08-05  4:10 ` [PR REVIEW] " cinerea0
2020-08-05  4:18 ` ericonr
2020-08-05  4:18 ` ericonr
2020-08-05  4:39 ` cinerea0
2020-08-05  4:40 ` cinerea0
2020-08-05  4:46 ` [PR PATCH] [Updated] " cinerea0
2020-08-05  4:49 ` [PR REVIEW] " cinerea0
2020-08-05  4:52 ` cinerea0
2020-08-05 18:26 ` ericonr
2020-08-06  0:30 ` ericonr
2020-08-06  1:05 ` [PR REVIEW] " ericonr
2020-08-06  2:00 ` [PR PATCH] [Updated] " cinerea0
2020-08-06  2:04 ` [PR REVIEW] " cinerea0
2020-08-06  2:30 ` cinerea0
2020-08-06  2:37 ` ericonr
2020-08-06  2:37 ` ericonr
2020-08-06  3:36 ` ericonr
2020-08-06  3:46 ` ericonr
2020-08-06  4:00 ` ericonr
2020-08-06  4:50 ` [PR PATCH] [Updated] " cinerea0
2020-08-06  4:53 ` cinerea0
2020-08-06  5:19 ` ericonr
2020-08-06 13:39 ` cinerea0
2020-08-06 14:37 ` ericonr
2020-08-06 14:49 ` [PR REVIEW] " ericonr
2020-08-06 15:13 ` cinerea0
2020-08-06 15:23 ` ericonr
2020-08-06 19:32 ` [PR PATCH] [Updated] " cinerea0
2020-08-06 19:33 ` [PR REVIEW] " cinerea0
2020-08-06 19:38 ` [WIP] " cinerea0
2020-08-06 19:42 ` ericonr
2020-08-06 20:16 ` cinerea0
2020-08-06 20:34 ` ericonr
2020-08-06 21:18 ` cinerea0
2020-08-06 21:44 ` ericonr
2020-08-06 23:41 ` cinerea0
2020-08-10 19:37 ` cinerea0
2020-08-11 14:45 ` PaperMountainStudio
2020-08-11 19:38 ` cinerea0
2020-08-11 19:41 ` PaperMountainStudio
2020-08-12  1:58 ` [PR PATCH] [Updated] " cinerea0
2020-08-12  2:36 ` cinerea0
2020-08-13 14:41 ` cinerea0
2021-11-06 22:37 ` [WIP] " abenson
2021-11-06 22:37 ` [PR PATCH] [Closed]: " abenson

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).