summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Sander van Rossem <s.vanrossem@gmail.com> 2015-03-26 12:09:40 +0100
committerAvatar Gerrit Code Review <tomcat@galileo.mailstation.de> 2015-05-05 15:48:06 +0200
commita5635c92d67769a2512a4af5af6d604f3bfe3708 (patch)
tree3033389207418d0f86cadd785e101501732e8c0d
parentc7ad0ed6ef9d7af94f846245c1e17ddc17c770c0 (diff)
downloadlisp-a5635c92d67769a2512a4af5af6d604f3bfe3708.tar.gz
lisp-a5635c92d67769a2512a4af5af6d604f3bfe3708.tar.xz
Version bump to stumpwm-0.9.9
modified: stumpwm.exlib Change-Id: I68138442752eae3f05fbb1b6398ad18a5f8da4a2
-rw-r--r--packages/x11-wm/stumpwm/files/stumpwm-exherbo.el.in1
-rw-r--r--packages/x11-wm/stumpwm/files/stumpwm-printing.patch81
-rw-r--r--packages/x11-wm/stumpwm/stumpwm-0.9.9.exheres-0 (renamed from packages/x11-wm/stumpwm/stumpwm-0.9.8.exheres-0)3
-rw-r--r--packages/x11-wm/stumpwm/stumpwm-scm.exheres-06
-rw-r--r--packages/x11-wm/stumpwm/stumpwm.exlib33
5 files changed, 9 insertions, 115 deletions
diff --git a/packages/x11-wm/stumpwm/files/stumpwm-exherbo.el.in b/packages/x11-wm/stumpwm/files/stumpwm-exherbo.el.in
deleted file mode 100644
index 9733d42..0000000
--- a/packages/x11-wm/stumpwm/files/stumpwm-exherbo.el.in
+++ /dev/null
@@ -1 +0,0 @@
-(autoload 'stumpwm-mode "stumpwm-mode" nil t)
diff --git a/packages/x11-wm/stumpwm/files/stumpwm-printing.patch b/packages/x11-wm/stumpwm/files/stumpwm-printing.patch
deleted file mode 100644
index 5c0d6af..0000000
--- a/packages/x11-wm/stumpwm/files/stumpwm-printing.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Source: Elias Pipping <pipping@exherbo.org>
-Upstream: https://github.com/sabetts/stumpwm/pull/67
-Reason: A window whose title contains the string ^\ cannot have it printed
-
-From 17bb444d3a973ab4f64b42d46aa513f18898b212 Mon Sep 17 00:00:00 2001
-From: Elias Pipping <pipping@exherbo.org>
-Date: Sun, 23 Feb 2014 13:45:50 +0100
-Subject: [PATCH 1/2] Typo
-
----
- primitives.lisp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/primitives.lisp b/primitives.lisp
-index 569a789..1079341 100644
---- a/primitives.lisp
-+++ b/primitives.lisp
-@@ -784,7 +784,7 @@ do:
- (format t "%~a~@[~a~]" len from-left-p)
- (let* ((fmt (cadr (assoc (car cur) fmt-alist :test 'char=)))
- (str (cond (fmt
-- ;; it can return any type, not jut as string.
-+ ;; it can return any type, not just a string.
- (format nil "~a" (apply fmt args)))
- ((char= (car cur) #\%)
- (string #\%))
---
-1.8.5.4
-
-From ac062001b0a15ce9d708ebbe787a6493f53a9298 Mon Sep 17 00:00:00 2001
-From: Elias Pipping <pipping@exherbo.org>
-Date: Sun, 23 Feb 2014 14:02:51 +0100
-Subject: [PATCH 2/2] Escape window titles before `format-expand`ing them
-
-To reproduce the bug addressed by this commit:
-
- (1) run `xterm -T '^\'` on the command line
- (2) call the stumpwm command `echo-windows`
-
-Prior to this patch, an error would occur
----
- primitives.lisp | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/primitives.lisp b/primitives.lisp
-index 1079341..6e388cf 100644
---- a/primitives.lisp
-+++ b/primitives.lisp
-@@ -763,6 +763,16 @@ do:
- ;;;
- ;;; formatting routines
-
-+(defun escape-caret (str)
-+ "Escape carets by doubling them"
-+ (let (buf)
-+ (map nil #'(lambda (ch)
-+ (push ch buf)
-+ (when (char= ch #\^)
-+ (push #\^ buf)))
-+ str)
-+ (coerce (reverse buf) 'string)))
-+
- (defun format-expand (fmt-alist fmt &rest args)
- (let* ((chars (coerce fmt 'list))
- (output "")
-@@ -783,9 +793,9 @@ do:
- (if (null cur)
- (format t "%~a~@[~a~]" len from-left-p)
- (let* ((fmt (cadr (assoc (car cur) fmt-alist :test 'char=)))
-- (str (cond (fmt
-- ;; it can return any type, not just a string.
-- (format nil "~a" (apply fmt args)))
-+ (str (cond (fmt (escape-caret
-+ ;; it can return any type, not just a string.
-+ (format nil "~a" (apply fmt args))))
- ((char= (car cur) #\%)
- (string #\%))
- (t
---
-1.8.5.4
-
diff --git a/packages/x11-wm/stumpwm/stumpwm-0.9.8.exheres-0 b/packages/x11-wm/stumpwm/stumpwm-0.9.9.exheres-0
index 3181cd3..7ff44d5 100644
--- a/packages/x11-wm/stumpwm/stumpwm-0.9.8.exheres-0
+++ b/packages/x11-wm/stumpwm/stumpwm-0.9.9.exheres-0
@@ -4,6 +4,3 @@
require stumpwm
PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/stumpwm-printing.patch )
-
diff --git a/packages/x11-wm/stumpwm/stumpwm-scm.exheres-0 b/packages/x11-wm/stumpwm/stumpwm-scm.exheres-0
index cd18f48..7ff44d5 100644
--- a/packages/x11-wm/stumpwm/stumpwm-scm.exheres-0
+++ b/packages/x11-wm/stumpwm/stumpwm-scm.exheres-0
@@ -3,10 +3,4 @@
require stumpwm
-DEPENDENCIES="
- build+run:
- dev-lisp/clx-truetype
-"
-
PLATFORMS="~amd64"
-
diff --git a/packages/x11-wm/stumpwm/stumpwm.exlib b/packages/x11-wm/stumpwm/stumpwm.exlib
index eb9ac63..0298384 100644
--- a/packages/x11-wm/stumpwm/stumpwm.exlib
+++ b/packages/x11-wm/stumpwm/stumpwm.exlib
@@ -2,18 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
require github autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ none ] ]
-if ! ever is_scm; then
- require elisp-optional [ source_directory=contrib ]
-fi
SUMMARY="A tiling, keyboard driven X11 Window Manager written entirely in Common Lisp"
-HOMEPAGE="http://www.nongnu.org/stumpwm/"
+HOMEPAGE="https://stumpwm.github.io"
LICENCES="GPL-2"
SLOT="0"
-if ! ever is_scm; then
- MYOPTIONS="emacs"
-fi
DEPENDENCIES="
build:
@@ -31,29 +25,20 @@ DEPENDENCIES="
RESTRICT="strip"
DEFAULT_SRC_CONFIGURE_PARAMS=( --with-lisp=sbcl )
-DEFAULT_SRC_COMPILE_PARAMS=( -j1 LISP='/usr/bin/sbcl --non-interactive' )
+DEFAULT_SRC_COMPILE_PARAMS=( -j1 )
src_prepare() {
+ if [[ $PV == 0.9.9 ]]; then
+ # Upstream didn't change the version before packaging
+ sed -i "${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die
+ # Does not build with asdf:oos, using require to load the package
+ sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
+ fi
+
default
eautoconf
}
-if ! ever is_scm; then
- src_compile() {
- default
- elisp-optional_src_compile
- }
-fi
-
src_install() {
emake install destdir="${IMAGE}"
-
- if ! ever is_scm; then
- insinto /usr/share/${PN}/contrib
- doins contrib/*.lisp
-
- dobin contrib/stumpish
- elisp-optional_src_install
- fi
}
-