diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | LICENSE | 47 | ||||
| -rw-r--r-- | PKGBUILD | 62 | ||||
| -rw-r--r-- | spectrwm-no-preload | 2 | ||||
| -rw-r--r-- | spectrwm.install | 8 |
5 files changed, 108 insertions, 27 deletions
@@ -1,10 +1,11 @@ pkgbase = spectrwm-git - pkgdesc = A minimalistic dynamic tiling window manager that tries to stay out of the way. - pkgver = 3.4.1.r16.g92589af + pkgdesc = A minimalistic automatic tiling window manager that tries to stay out of the way. + pkgver = 3.4.1.r19.g63b9ae4 pkgrel = 1 url = http://www.spectrwm.org - arch = i686 + install = spectrwm.install arch = x86_64 + arch = i686 license = custom:ISC makedepends = git makedepends = libxt @@ -17,17 +18,18 @@ pkgbase = spectrwm-git depends = libxcursor depends = terminus-font optdepends = scrot: screenshots - optdepends = xlockmore: screenlocking - provides = scrotwm + optdepends = xlockmore: great screenlocker provides = spectrwm=3.4.1-1 - conflicts = scrotwm conflicts = spectrwm replaces = scrotwm backup = etc/spectrwm.conf source = git+https://github.com/conformal/spectrwm + source = LICENSE source = baraction.sh + source = spectrwm-no-preload md5sums = SKIP + md5sums = a67cfe51079481e5b0eab1ad371379e3 md5sums = 950d663692e1da56e0ac864c6c3ed80e + md5sums = 974d109ce0af39cc73936d5efd682480 pkgname = spectrwm-git - diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000000..24c04f3a07e2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> + * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Much code and ideas taken from dwm under the following license: + * MIT/X Consortium License + * + * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> + * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> + * 2006-2007 Jukka Salmi <jukka at salmi dot ch> + * 2007 Premysl Hruby <dfenze at gmail dot com> + * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> + * 2007 Christof Musik <christof at sendfax dot de> + * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> + * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> + * 2008 Martin Hurton <martin dot hurton at gmail dot com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ @@ -1,56 +1,78 @@ -# Maintainer: Kyle Keen <keenerd@gmail.com> +# Maintainer: Brian Bidulock <bidulock@openss7.org> +# Contributor: Kyle Keen <keenerd@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm-git -_gitname=spectrwm -pkgver=3.4.1.r16.g92589af +_pkgname=spectrwm +pkgver=3.4.1.r19.g63b9ae4 +_ghver=3_4_1 pkgrel=1 -pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." -arch=('i686' 'x86_64') +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." +arch=('x86_64' 'i686') url="http://www.spectrwm.org" +_watch="https://github.com/conformal/spectrwm/releases" license=('custom:ISC') depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'terminus-font') -backup=(etc/spectrwm.conf) replaces=('scrotwm') makedepends=('git' 'libxt') optdepends=('scrot: screenshots' - 'xlockmore: screenlocking') -source=('git+https://github.com/conformal/spectrwm' - 'baraction.sh') + 'xlockmore: great screenlocker') +backup=(etc/spectrwm.conf) +install=spectrwm.install + +source=(git+https://github.com/conformal/spectrwm + LICENSE + baraction.sh + spectrwm-no-preload) md5sums=('SKIP' - '950d663692e1da56e0ac864c6c3ed80e') -provides=('scrotwm' "spectrwm=${epoch:+$epoch:}${pkgver%%.r*}-${pkgrel}") -conflicts=('scrotwm' 'spectrwm') + 'a67cfe51079481e5b0eab1ad371379e3' + '950d663692e1da56e0ac864c6c3ed80e' + '974d109ce0af39cc73936d5efd682480') + +provides=("spectrwm=${pkgver%%.r*}-${pkgrel}") +conflicts=('spectrwm') pkgver() { - cd "$_gitname" + cd "$_pkgname" git describe --long --tags | sed -E 's/^[^0-9]*//;s/([^-]*-g)/r\1/;s/[-_]/./g' } prepare() { - cd "$srcdir/$_gitname" - #sed -i 's|setenv(\"LD_PRELOAD\", SWM_LIB, 1);|//setenv(\"LD_PRELOAD\", SWM_LIB, 1);|' spectrwm.c + cd "$srcdir/$_pkgname" + sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c + sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - #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 } build() { - cd "$srcdir/$_gitname/linux" + cd "$srcdir/$_pkgname/linux" + make PREFIX="/usr" SYSCONFDIR="/etc" } package() { - cd "$srcdir/$_gitname/linux" + cd "$srcdir/$_pkgname" + cd linux make PREFIX="/usr" SYSCONFDIR="/etc" DESTDIR="$pkgdir" install install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" cd .. install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" - install -Dm755 ../baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" + mkdir -p "$pkgdir/etc/spectrwm" + cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" + 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" + # fix this for real in the makefile rm "$pkgdir/usr/bin/scrotwm" ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" } diff --git a/spectrwm-no-preload b/spectrwm-no-preload new file mode 100644 index 000000000000..12385eddb60b --- /dev/null +++ b/spectrwm-no-preload @@ -0,0 +1,2 @@ +#!/bin/sh +exec env -u LD_PRELOAD $@ diff --git a/spectrwm.install b/spectrwm.install new file mode 100644 index 000000000000..9a2aa1eeb6d2 --- /dev/null +++ b/spectrwm.install @@ -0,0 +1,8 @@ +post_install() { + echo 'As of 3.4.X, "focus_mode = follow_cursor" will lock up spectrwm in some circumstance.' + echo 'Please check your config.' +} + +post_upgrade() { + post_install +} |