spectrwm: update to 3.5.0
This commit is contained in:
parent
6a34d32813
commit
7696bfcb06
@ -1,7 +1,16 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
lrwxrwxrwx root/root usr/bin/scrotwm -> spectrwm
|
||||
-rwxr-xr-x root/root usr/bin/spectrwm
|
||||
drwxr-xr-x root/root usr/etc/
|
||||
-rw-r--r-- root/root usr/etc/spectrwm.conf
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
lrwxrwxrwx root/root usr/lib/libswmhack.so -> libswmhack.so.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libswmhack.so.0 -> libswmhack.so.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libswmhack.so.0.0
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rwxr-xr-x root/root usr/share/man/man1/spectrwm.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/spectrwm.1.gz
|
||||
drwxr-xr-x root/root usr/share/xsessions/
|
||||
-rw-r--r-- root/root usr/share/xsessions/spectrwm.desktop
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/atidfFO6j4daRZtXSA2wrqVRFKht2IHTgq90sP6Cve0BSVyLG9ypc/QKP92A1/rvvgPf0r1KyjGO6OudZNqnQk=
|
||||
SHA256 (Pkgfile) = ad8bebe5268f7f3b29bdf218d963dcc3ad861dc25be488af621f493f1231aa7f
|
||||
SHA256 (.footprint) = 353b10b6033a1b5dd0ace6434990102537b6c5d3dd9d448ce73cd4d810c3d334
|
||||
SHA256 (SPECTRWM_3_4_1.tar.gz) = c030ef30bd11bbdfce3d4a1daf51f0c1358821ba95ebdc4cdb32d3944c8ce03c
|
||||
SHA256 (spectrwm-remove_libswmhack.patch) = 3ca7cea91b9d2fabaef923d929fb205e9047cd2771e33f455e48edb22d19716a
|
||||
RWSE3ohX2g5d/fn3Pc1HGfX0ovU4GY9q2Zdj7381NrhjTAIb5clKDjRMui39FJxQSQdJRpok+YjUhvMpcJ3sIH6ClQZGXdT02gw=
|
||||
SHA256 (Pkgfile) = affb03e352e685a319ac631162b52213f87a6e64bf8317fbcd484c30ba210b0f
|
||||
SHA256 (.footprint) = f6c304b7e590b176067eb93e5e9431d890bd8da6136adcc630606bb5c0f78265
|
||||
SHA256 (SPECTRWM_3_5_0.tar.gz) = b4de8b2c592fc5aa4ca4dbd0e8a421f7fd168b7d5f54c7ad81997adc00dac20f
|
||||
|
||||
@ -1,19 +1,15 @@
|
||||
# Description: Minimalistic tiling window manager
|
||||
# URL: https://github.com/conformal/spectrwm
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Depends on: xorg-libxcursor xorg-libxft xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libxrandr
|
||||
# URL: https://github.com/conformal/spectrwm
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Depends on: xorg-libxcursor xorg-libxft xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libxrandr
|
||||
|
||||
name=spectrwm
|
||||
version=3.4.1
|
||||
version=3.5.0
|
||||
release=1
|
||||
source=(https://github.com/conformal/spectrwm/archive/SPECTRWM_${version//./_}.tar.gz
|
||||
$name-remove_libswmhack.patch)
|
||||
source=(https://github.com/conformal/spectrwm/archive/SPECTRWM_${version//./_}.tar.gz)
|
||||
|
||||
build () {
|
||||
cd $name-SPECTRWM_${version//./_}/linux
|
||||
patch -p1 -d.. -i $SRC/$name-remove_libswmhack.patch
|
||||
make PREFIX=/usr
|
||||
install -d $PKG/usr/{bin,share/man/man1}
|
||||
install spectrwm $PKG/usr/bin
|
||||
install ../spectrwm.1 $PKG/usr/share/man/man1
|
||||
build() {
|
||||
cd $name-SPECTRWM_${version//./_}/linux
|
||||
make PREFIX=/usr DESTDIR=$PKG install
|
||||
rm -r $PKG/usr/share/doc
|
||||
}
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
diff -Nru spectrwm-SPECTRWM_3_4_0.orig/linux/Makefile spectrwm-SPECTRWM_3_4_0/linux/Makefile
|
||||
--- spectrwm-SPECTRWM_3_4_0.orig/linux/Makefile 2020-06-18 19:13:58.945671800 +0200
|
||||
+++ spectrwm-SPECTRWM_3_4_0/linux/Makefile 2020-06-18 19:14:28.289107455 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
|
||||
MAINT_LDFLAGS = -Wl,--as-needed
|
||||
-MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
|
||||
+MAINT_CPPFLAGS = -I. -D_GNU_SOURCE
|
||||
|
||||
ifneq ("${BUILDVERSION}", "")
|
||||
MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
|
||||
@@ -29,7 +29,7 @@
|
||||
LIB_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11)
|
||||
LIB_LDLIBS = $(shell $(PKG_CONFIG) --libs x11) -ldl
|
||||
|
||||
-all: spectrwm libswmhack.so.$(LIBVERSION)
|
||||
+all: spectrwm
|
||||
|
||||
spectrwm: spectrwm.o linux.o
|
||||
$(CC) $(MAINT_LDFLAGS) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS)
|
||||
diff -Nru spectrwm-SPECTRWM_3_4_0.orig/spectrwm.c spectrwm-SPECTRWM_3_4_0/spectrwm.c
|
||||
--- spectrwm-SPECTRWM_3_4_0.orig/spectrwm.c 2020-06-18 19:13:58.949005145 +0200
|
||||
+++ spectrwm-SPECTRWM_3_4_0/spectrwm.c 2020-06-18 19:14:28.292440799 +0200
|
||||
@@ -309,9 +309,9 @@
|
||||
#define SWM_CONF_DEFAULT (0)
|
||||
#define SWM_CONF_KEYMAPPING (1)
|
||||
|
||||
-#ifndef SWM_LIB
|
||||
+/* #ifndef SWM_LIB
|
||||
#define SWM_LIB "/usr/local/lib/libswmhack.so"
|
||||
-#endif
|
||||
+#endif */
|
||||
|
||||
char **start_argv;
|
||||
xcb_atom_t a_state;
|
||||
@@ -4526,6 +4526,7 @@
|
||||
|
||||
close(xcb_get_file_descriptor(conn));
|
||||
|
||||
+ /*
|
||||
if ((ret = getenv("LD_PRELOAD"))) {
|
||||
if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
|
||||
warn("spawn: asprintf LD_PRELOAD");
|
||||
@@ -4536,6 +4537,7 @@
|
||||
} else {
|
||||
setenv("LD_PRELOAD", SWM_LIB, 1);
|
||||
}
|
||||
+ */
|
||||
|
||||
if (asprintf(&ret, "%d", ws_idx) == -1) {
|
||||
warn("spawn: asprintf SWM_WS");
|
||||
Loading…
x
Reference in New Issue
Block a user