diff options
| author |  Tom Willemse | 2014-03-01 12:40:20 +0100 |
|---|---|---|
| committer | Tom Willemse | 2014-03-01 12:40:20 +0100 |
| commit | 4e9a44029282c2e9c93d6d15e8daf39eb9b8b3cc (patch) | |
| tree | 64143bd7d09e8c984d8610e67477ae3a0edb1f14 /emacs-bzr/pkgver.patch | |
| parent | f9e42ecb6e61c9e102007ddd576294f1d5e3b4d1 (diff) | |
| download | pkgbuilds-4e9a44029282c2e9c93d6d15e8daf39eb9b8b3cc.tar.gz pkgbuilds-4e9a44029282c2e9c93d6d15e8daf39eb9b8b3cc.zip | |
Update emacs-bzr and pkgver patch
Diffstat (limited to 'emacs-bzr/pkgver.patch')
| -rw-r--r-- | emacs-bzr/pkgver.patch | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/emacs-bzr/pkgver.patch b/emacs-bzr/pkgver.patch index a5bd245..31946a7 100644 --- a/emacs-bzr/pkgver.patch +++ b/emacs-bzr/pkgver.patch @@ -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 |