Update emacs-bzr and include update pkgdep patch

This commit is contained in:
Tom Willemse 2013-12-11 23:55:01 +01:00
parent 7f6769b12f
commit dd28161e17
2 changed files with 47 additions and 31 deletions

View file

@ -7,7 +7,7 @@
_opt_puresize="1820000"
pkgname=emacs-bzr
pkgver=114727
pkgver=115472
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'
'aa2a780cbd8c22a972673d596dee943f')
'ae8e59b5d23879f7c7b61c0096345d26')

View file

@ -1,31 +1,47 @@
=== modified file 'lisp/emacs-lisp/package.el'
--- lisp/emacs-lisp/package.el 2013-08-03 02:34:22 +0000
+++ lisp/emacs-lisp/package.el 2013-08-16 20:40:09 +0000
@@ -973,6 +973,17 @@
str)
(error nil))))
*** lisp/emacs-lisp/package.el 2013-12-11 21:15:12 +0000
--- lisp/emacs-lisp/package.el 2013-12-11 22:29:35 +0000
***************
*** 1104,1109 ****
--- 1104,1124 ----
(declare-function lm-homepage "lisp-mnt" (&optional file))
+ (defun package--prepare-dependencies (deps)
+ "Turn DEPS into an acceptable list of dependencies.
+
+ Any parts missing a version string get a default version string
+ of \"0\" (meaning any version) and an appropriate level of lists
+ is wrapped around any parts requiring it."
+ (cond
+ ((null deps) nil)
+ ((symbolp deps) `((,deps "0")))
+ ((stringp (cadr deps)) `(,deps))
+ ((and (listp deps) (listp (car deps))
+ (null (cdar deps)))
+ `((,(caar deps) "0")))
+ (t (mapcar (lambda (dep) (if (symbolp dep) `(,dep "0") dep)) deps))))
+
(defun package-buffer-info ()
"Return a `package-desc' describing the package in the current buffer.
***************
*** 1135,1141 ****
"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))
:kind 'single
:url homepage))))
--- 1150,1158 ----
"Package lacks a \"Version\" or \"Package-Version\" header"))
(package-desc-from-define
file-name pkg-version desc
! (if requires-str
! (package--prepare-dependencies
! (package-read-from-string requires-str)))
:kind 'single
:url homepage))))
+(defun package--prepare-dependencies (deps)
+ "Turn DEPS into an acceptable list of dependencies.
+
+Any parts missing a version string get a default version string
+of \"0\" (meaning any version) and an appropriate level of lists
+is wrapped around any parts requiring it."
+ (cond
+ ((symbolp deps) `((,deps "0")))
+ ((stringp (cadr deps)) `(,deps))
+ (t (mapcar (lambda (dep) (if (symbolp dep) `(,dep "0") dep)) deps))))
+
(defun package-buffer-info ()
"Return a `package-desc' describing the package in the current buffer.
@@ -1003,7 +1014,9 @@
"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))
+ (if requires-str
+ (package--prepare-dependencies
+ (package-read-from-string requires-str)))
:kind 'single
:url homepage))))