[arch-commits] Commit in spectrwm/trunk (PKGBUILD swmhack_path.patch)

[Kyle Keen]

    Date: Wednesday, February 26, 2014 @ 17:09:20
  Author: kkeen
Revision: 106288

upgpkg: spectrwm 2.5.0-1

Modified:
  spectrwm/trunk/PKGBUILD
Deleted:
  spectrwm/trunk/swmhack_path.patch

--------------------+
 PKGBUILD           |   11 +++--------
 swmhack_path.patch |   27 ---------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-26 15:19:55 UTC (rev 106287)
+++ PKGBUILD	2014-02-26 16:09:20 UTC (rev 106288)
@@ -3,8 +3,8 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spectrwm
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64')
 url="http://www.spectrwm.org"
@@ -18,12 +18,10 @@
 source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh \
-        swmhack_path.patch \
         spectrwm-no-preload)
-md5sums=('23e32c1e292f2fc94ed88195ffe60023'
+md5sums=('22355256693393779b2d366d312c4577'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e'
-         '8914dc2bef96e3587fc9317a25c1cbe8'
          '974d109ce0af39cc73936d5efd682480')
 
 build() {
@@ -39,9 +37,6 @@
   # 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"
 }

Deleted: swmhack_path.patch
===================================================================
--- swmhack_path.patch	2014-02-26 15:19:55 UTC (rev 106287)
+++ swmhack_path.patch	2014-02-26 16:09:20 UTC (rev 106288)
@@ -1,27 +0,0 @@
-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)\"