diff options
| -rw-r--r-- | libre/spectrwm-libre/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/spectrwm-libre/spectrwm-no-preload | 2 | ||||
| -rw-r--r-- | libre/spectrwm-libre/swmhack_path.patch | 27 |
3 files changed, 42 insertions, 6 deletions
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index 854b9f409..d7d01b498 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101697 2013-11-30 11:24:42Z bpiotrowski $ +# $Id: PKGBUILD 103873 2014-01-13 00:22:03Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') url="http://www.spectrwm.org" @@ -20,25 +20,31 @@ optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ - baraction.sh) + baraction.sh \ + swmhack_path.patch \ + spectrwm-no-preload) md5sums=('23e32c1e292f2fc94ed88195ffe60023' 'a67cfe51079481e5b0eab1ad371379e3' - '950d663692e1da56e0ac864c6c3ed80e') + '950d663692e1da56e0ac864c6c3ed80e' + '8914dc2bef96e3587fc9317a25c1cbe8' + '974d109ce0af39cc73936d5efd682480') build() { cd "$srcdir/$_pkgname-$pkgver" - # it is like a patch, only less fragile sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - # crashes if defaults can't be found, use smaller defaults + # crashes if defaults can't be found, use less massive defaults sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf # see spectrwm FS#403 sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c + # FS#37998, remove on 2.4.1 + patch -p1 -i "$srcdir/swmhack_path.patch" + cd linux make PREFIX="/usr" } @@ -55,6 +61,7 @@ package() { cd "$srcdir" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" + install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" diff --git a/libre/spectrwm-libre/spectrwm-no-preload b/libre/spectrwm-libre/spectrwm-no-preload new file mode 100644 index 000000000..12385eddb --- /dev/null +++ b/libre/spectrwm-libre/spectrwm-no-preload @@ -0,0 +1,2 @@ +#!/bin/sh +exec env -u LD_PRELOAD $@ diff --git a/libre/spectrwm-libre/swmhack_path.patch b/libre/spectrwm-libre/swmhack_path.patch new file mode 100644 index 000000000..a4f1c3cf0 --- /dev/null +++ b/libre/spectrwm-libre/swmhack_path.patch @@ -0,0 +1,27 @@ +diff --git a/linux/Makefile b/linux/Makefile +index 73c3d37..f48a32f 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -1,16 +1,16 @@ +-CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g +-CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" +-LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor +- + PREFIX?= /usr/local + BINDIR?= $(PREFIX)/bin + LIBDIR?= $(PREFIX)/lib + MANDIR?= $(PREFIX)/share/man + +-CC?= cc +- + LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) + ++CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g ++CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" ++LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor ++ ++CC?= cc ++ + BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) + ifneq ("${BUILDVERSION}", "") + CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" |