Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This update also incorporate some patches from upstream to fix an issue with cusom X command While here: - remove dependency on gnu coreutils - remove patches or part of patches which has been upstream PR: 272368 Initial patch send by: embhd@posteo.de
- Loading branch information
Showing
10 changed files
with
148 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,45 @@ | ||
| --- makefile.orig 2020-07-28 15:35:08 UTC | ||
| --- makefile.orig 2023-06-15 07:30:09 UTC | ||
| +++ makefile | ||
| @@ -1,9 +1,9 @@ | ||
| NAME = ly | ||
| CC = gcc | ||
| @@ -3,7 +3,7 @@ FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-paramete | ||
| FLAGS = -std=c99 -pedantic -g | ||
| -FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter | ||
| +FLAGS+= -Wall -Wextra -Wno-unused-parameter | ||
| FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter | ||
| #FLAGS+= -DDEBUG | ||
| -FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" | ||
| +FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\" | ||
| -FLAGS+= -DLY_VERSION=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" | ||
| +FLAGS+= -DLY_VERSION=\"${DISTVERSIONFULL}\" | ||
| LINK = -lpam -lxcb | ||
| VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp | ||
| CMD = ./$(NAME) | ||
| @@ -12,6 +12,10 @@ OS:= $(shell uname -s) | ||
| @@ -12,6 +12,10 @@ endif | ||
| ifeq ($(OS), Linux) | ||
| FLAGS+= -D_DEFAULT_SOURCE | ||
| endif | ||
| +ifeq ($(OS), FreeBSD) | ||
| + FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS} | ||
| + LINK+= ${LIBS} | ||
| + LINK+= ${LIBS} | ||
| +endif | ||
|
|
||
| BIND = bin | ||
| OBJD = obj | ||
| @@ -71,15 +75,14 @@ leakgrind: $(BIND)/$(NAME) | ||
| @@ -71,14 +75,14 @@ install: $(BIND)/$(NAME) | ||
|
|
||
| install: $(BIND)/$(NAME) | ||
| @echo "installing" | ||
| @echo "installing ly" | ||
| - @install -dZ ${DESTDIR}/etc/ly | ||
| - @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin | ||
| - @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly | ||
| - @install -DZ $(RESD)/xsetup.sh -t $(DATADIR) | ||
| - @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 | ||
| + @install -dZ ${DESTDIR}${PREFIX}/etc/ly | ||
| + @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin | ||
| + @install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly | ||
| + @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | ||
| + @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly | ||
| + @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang | ||
| + @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang | ||
| + @install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}${PREFIX}/etc/pam.d | ||
| + @install -d ${DESTDIR}/etc/ly | ||
| + @install $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin | ||
| + @install $(RESD)/config.ini -t ${DESTDIR}/etc/ly | ||
| + @install $(RESD)/xsetup.sh -t $(DATADIR) | ||
| + @install $(RESD)/wsetup.sh -t $(DATADIR) | ||
| + @install -d $(DATADIR)/lang | ||
| + @install $(RESD)/lang/* -t $(DATADIR)/lang | ||
| + @install $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d | ||
|
|
||
| installnoconf: $(BIND)/$(NAME) | ||
| @echo "installing without the configuration file" | ||
| @echo "installing ly without the configuration file" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,78 @@ | ||
| --- res/config.ini.orig 2020-07-28 15:35:08 UTC | ||
| --- res/config.ini.orig 2023-07-31 13:38:18 UTC | ||
| +++ res/config.ini | ||
| @@ -1,3 +1,5 @@ | ||
| +# This is a FreeBSD-ready patched version of the upstream configuration file. | ||
| + | ||
| # animation enabled | ||
| # Animation enabled/disabled | ||
| #animate = false | ||
| #animate = true | ||
| @@ -53,12 +55,14 @@ | ||
|
|
||
| # cookie generator | ||
| #mcookie_cmd = /usr/bin/mcookie | ||
| +mcookie_cmd = /usr/bin/openssl rand -hex 16 | ||
|
|
||
| # event timeout in milliseconds | ||
| #min_refresh_delta = 5 | ||
| @@ -74,6 +76,7 @@ | ||
|
|
||
| # default path | ||
| #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin | ||
| +path = /sbin:/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/usr/sbin:/usr/bin:/usr/bin/env | ||
|
|
||
| # command executed when pressing F2 | ||
| #restart_cmd = /sbin/shutdown -r now | ||
| @@ -68,12 +72,14 @@ | ||
|
|
||
| # file in which to save and load the default desktop and login | ||
| # File in which to save and load the default desktop and login | ||
| #save_file = /etc/ly/save | ||
| +save_file = %%ETCDIR%%/save | ||
| +save_file = /usr/local/etc/ly/save | ||
|
|
||
|
|
||
| # service name (set to ly to use the provided pam config file) | ||
| #service_name = ly | ||
| # Remove power management command hints | ||
| @@ -87,6 +90,7 @@ | ||
|
|
||
| # command executed when pressing F1 | ||
| # Command executed when pressing shutdown_key | ||
| #shutdown_cmd = /sbin/shutdown -a now | ||
| +shutdown_cmd = /sbin/shutdown -p now | ||
|
|
||
| # terminal reset command (tput is faster) | ||
| #term_reset_cmd = /usr/bin/tput reset | ||
| @@ -81,8 +87,12 @@ | ||
| # Command executed when pressing restart_key | ||
| #restart_cmd = /sbin/shutdown -r now | ||
| @@ -100,11 +104,16 @@ | ||
| # tty in use | ||
| #tty = 2 | ||
|
|
||
| +# vt in use by X or Wayland | ||
| +#vt = 9 | ||
| + | ||
| # wayland setup command | ||
| + | ||
| # Console path | ||
| #console_dev = /dev/console | ||
|
|
||
| # Default path | ||
| #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin | ||
| +path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/usr/bin/env | ||
|
|
||
|
|
||
| # Event timeout in milliseconds | ||
| @@ -118,16 +127,19 @@ | ||
|
|
||
| # Cookie generator | ||
| #mcookie_cmd = /usr/bin/mcookie | ||
| +mcookie_cmd = /usr/bin/openssl rand -hex 16 | ||
|
|
||
|
|
||
| # Wayland setup command | ||
| #wayland_cmd = /etc/ly/wsetup.sh | ||
| +wayland_cmd = %%ETCDIR%%/wsetup.sh | ||
| +wayland_cmd = /usr/local/etc/ly/wsetup.sh | ||
|
|
||
| # add wayland specifier to session names | ||
| # Add wayland specifier to session names | ||
| #wayland_specifier = false | ||
| @@ -90,15 +100,20 @@ | ||
|
|
||
| # wayland desktop environments | ||
| # Wayland desktop environments | ||
| #waylandsessions = /usr/share/wayland-sessions | ||
| +waylandsessions = %%LOCALBASE%%/share/wayland-sessions | ||
| +waylandsessions = /usr/local/share/wayland-sessions | ||
|
|
||
|
|
||
| # xinitrc | ||
| @@ -135,12 +147,16 @@ | ||
|
|
||
| # xorg server command | ||
| # Xorg server command | ||
| #x_cmd = /usr/bin/X | ||
| +x_cmd = %%LOCALBASE%%/bin/X | ||
| +x_cmd = /usr/local/bin/X | ||
|
|
||
| # xorg setup command | ||
| # Xorg setup command | ||
| #x_cmd_setup = /etc/ly/xsetup.sh | ||
| +x_cmd_setup = %%ETCDIR%%/xsetup.sh | ||
| +x_cmd_setup = /usr/local/etc/ly/xsetup.sh | ||
|
|
||
| # xorg xauthority edition tool | ||
| # Xorg xauthority edition tool | ||
| #xauth_cmd = /usr/bin/xauth | ||
| +xauth_cmd = %%LOCALBASE%%/bin/xauth | ||
| +xauth_cmd = /usr/local/bin/xauth | ||
|
|
||
| # xorg desktop environments | ||
| # Xorg desktop environments | ||
| #xsessions = /usr/share/xsessions | ||
| +xsessions = %%LOCALBASE%%/share/xsessions | ||
| +xsessions = /usr/local/share/xsessions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.