Update emacs-bzr
This commit is contained in:
parent
cf22f0e1c2
commit
39dc264b60
2 changed files with 27 additions and 1 deletions
|
@ -7,7 +7,7 @@
|
||||||
_opt_puresize="1820000"
|
_opt_puresize="1820000"
|
||||||
|
|
||||||
pkgname=emacs-bzr
|
pkgname=emacs-bzr
|
||||||
pkgver=116906
|
pkgver=117550
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
|
pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
|
@ -45,6 +45,7 @@ build() {
|
||||||
--mandir=${_mandir} \
|
--mandir=${_mandir} \
|
||||||
--without-sound \
|
--without-sound \
|
||||||
--with-xft \
|
--with-xft \
|
||||||
|
--without-gif \
|
||||||
--with-x-toolkit=lucid || return 1
|
--with-x-toolkit=lucid || return 1
|
||||||
patch -p0 -i "$srcdir"/docstrings2.patch || return 1
|
patch -p0 -i "$srcdir"/docstrings2.patch || return 1
|
||||||
make bootstrap
|
make bootstrap
|
||||||
|
|
25
emacs-bzr/pkgver.patch
Normal file
25
emacs-bzr/pkgver.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
--- lisp/emacs-lisp/package.el 2014-02-12 01:20:34 +0000
|
||||||
|
+++ lisp/emacs-lisp/package.el 2014-02-20 22:49:57 +0000
|
||||||
|
@@ -1128,6 +1128,8 @@
|
||||||
|
((symbolp dep) `(,dep "0"))
|
||||||
|
((stringp dep)
|
||||||
|
(error "Invalid requirement specifier: %S" dep))
|
||||||
|
+ ((and (listp dep) (null (cdr dep)))
|
||||||
|
+ (list (car dep) "0"))
|
||||||
|
(t dep)))
|
||||||
|
deps))))
|
||||||
|
|
||||||
|
@@ -1155,11 +1157,9 @@
|
||||||
|
;; probably wants us to use it. Otherwise try Version.
|
||||||
|
(pkg-version
|
||||||
|
(or (package-strip-rcs-id (lm-header "package-version"))
|
||||||
|
- (package-strip-rcs-id (lm-header "version"))))
|
||||||
|
+ (package-strip-rcs-id (lm-header "version"))
|
||||||
|
+ "0"))
|
||||||
|
(homepage (lm-homepage)))
|
||||||
|
- (unless pkg-version
|
||||||
|
- (error
|
||||||
|
- "Package lacks a \"Version\" or \"Package-Version\" header"))
|
||||||
|
(package-desc-from-define
|
||||||
|
file-name pkg-version desc
|
||||||
|
(if requires-str
|
Loading…
Reference in a new issue