[arch-commits] Commit in spectrwm/trunk (3 files)
Kyle Keen
kkeen at nymeria.archlinux.org
Mon Jan 13 00:22:03 UTC 2014
Date: Monday, January 13, 2014 @ 01:22:03
Author: kkeen
Revision: 103873
upgpkg: spectrwm 2.4.0-2
Added:
spectrwm/trunk/spectrwm-no-preload
spectrwm/trunk/swmhack_path.patch
Modified:
spectrwm/trunk/PKGBUILD
---------------------+
PKGBUILD | 17 ++++++++++++-----
spectrwm-no-preload | 2 ++
swmhack_path.patch | 27 +++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-12 23:58:12 UTC (rev 103872)
+++ PKGBUILD 2014-01-13 00:22:03 UTC (rev 103873)
@@ -4,7 +4,7 @@
pkgname=spectrwm
pkgver=2.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way."
arch=('i686' 'x86_64')
url="http://www.spectrwm.org"
@@ -17,19 +17,22 @@
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
@@ -36,6 +39,9 @@
# 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"
}
@@ -52,6 +58,7 @@
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"
Added: spectrwm-no-preload
===================================================================
--- spectrwm-no-preload (rev 0)
+++ spectrwm-no-preload 2014-01-13 00:22:03 UTC (rev 103873)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec env -u LD_PRELOAD $@
Added: swmhack_path.patch
===================================================================
--- swmhack_path.patch (rev 0)
+++ swmhack_path.patch 2014-01-13 00:22:03 UTC (rev 103873)
@@ -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)\"
More information about the arch-commits
mailing list