ryuslash/pkgbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update emacs-bzr and pkgver patch

Browse source
This commit is contained in:
Tom Willemse 2014-03-01 12:40:20 +01:00
parent f9e42ecb6e
commit 4e9a440292
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emacs-bzr/PKGBUILD
View file

@ -7,7 +7,7 @@
_opt_puresize="1820000"
pkgname=emacs-bzr
pkgver=116157
pkgver=116544
pkgrel=1
pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
arch=('i686' 'x86_64')
@ -77,4 +77,4 @@ package() {
}
md5sums=('SKIP'
'3a868e5b80d5912ded06e6bdc040208a'
'4bc4613b3a11577f0b36092b90d40cd9')
'96a3a209798a424ab87c37152d5b2cf1')

51
emacs-bzr/pkgver.patch
View file

@ -1,26 +1,25 @@
=== modified file 'lisp/emacs-lisp/package.el'
*** lisp/emacs-lisp/package.el 2013-12-11 21:15:12 +0000
--- lisp/emacs-lisp/package.el 2013-12-12 20:01:41 +0000
***************
*** 1128,1138 ****
;; 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"))))
(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 (package-read-from-string requires-str))
--- 1128,1136 ----
;; 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"))
! "0"))
(homepage (lm-homepage)))
(package-desc-from-define
file-name pkg-version desc
(if requires-str (package-read-from-string requires-str))
--- 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