Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

5 files changed, 15 insertions, 8 deletions

diff --git a/libre/evince-libre/PKGBUILD b/libre/evince-libre/PKGBUILD
index 1072f097f..e31379442 100644
--- a/libre/evince-libre/PKGBUILD
+++ b/libre/evince-libre/PKGBUILD
@@ -25,7 +25,7 @@ install=evince.install
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
         libarchive.patch)
-sha256sums=('ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137'
+sha256sums=('30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d'
             '023f01f40c5efb8bf245d97067b3ef1da74f96a0bc53e53eb3d990d6c29b9e5e')
 prepare() {
   cd $_pkgname-$pkgver
diff --git a/libre/spectrwm-libre/LICENSE b/libre/spectrwm-parabola/LICENSE
index 24c04f3a0..24c04f3a0 100644
--- a/libre/spectrwm-libre/LICENSE
+++ b/libre/spectrwm-parabola/LICENSE
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-parabola/PKGBUILD
index ed632759b..082f189c5 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-parabola/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110857 2014-05-08 17:25:29Z kkeen $
+# $Id: PKGBUILD 117835 2014-08-24 14:10:25Z kkeen $
 # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
 # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 _pkgname=spectrwm
-pkgname=spectrwm-libre
-pkgver=2.5.1
+pkgname=spectrwm-parabola
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,19 +12,25 @@ url="http://www.spectrwm.org"
 _watch="https://opensource.conformal.com/snapshots/spectrwm/"
 license=('custom:ISC')
 depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
-replaces=('spectrwm' 'scrotwm')
-conflicts=('spectrwm')
+replaces=('spectrwm' 'scrotwm' 'spectrwm-libre')
+conflicts=('spectrwm' 'spectrwm-libre')
 provides=("spectrwm=$pkgver")
 makedepends=('libxt')
 optdepends=('scrot: screenshots'
             'xlockmore: great screenlocker'
             'terminus-font: great font')
 backup=(etc/spectrwm.conf)
+
+# the 2.6.0 linux makefile does not build
+# so download and use the 2.5.1 makefile until this is fixed
+
 source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
+	http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-2.5.1.tgz \
 	LICENSE \
         baraction.sh \
         spectrwm-no-preload)
-md5sums=('d9aec3342920e31cbe60f1032571043a'
+md5sums=('278acafe23d2fa2b1d7a3705bcbe95de'
+         'd9aec3342920e31cbe60f1032571043a'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e'
          '974d109ce0af39cc73936d5efd682480')
@@ -33,7 +39,7 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver"
   
   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/verbose_layout = false;/verbose_layout = true;/' spectrwm.c
   sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
   # crashes if defaults can't be found, use less massive defaults
   sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
@@ -43,6 +49,7 @@ build() {
   sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
 
   cd linux
+  cp "$srcdir/$_pkgname-2.5.1/linux/Makefile" ./
   make PREFIX="/usr"
 }
 
diff --git a/libre/spectrwm-libre/baraction.sh b/libre/spectrwm-parabola/baraction.sh
index 96a8a7b1a..96a8a7b1a 100644
--- a/libre/spectrwm-libre/baraction.sh
+++ b/libre/spectrwm-parabola/baraction.sh
diff --git a/libre/spectrwm-libre/spectrwm-no-preload b/libre/spectrwm-parabola/spectrwm-no-preload
index 12385eddb..12385eddb 100644
--- a/libre/spectrwm-libre/spectrwm-no-preload
+++ b/libre/spectrwm-parabola/spectrwm-no-preload