diff options
Diffstat (limited to 'emacs-bzr')
-rw-r--r-- | emacs-bzr/PKGBUILD | 10 | ||||
-rw-r--r-- | emacs-bzr/pkgdep.patch | 49 | ||||
-rw-r--r-- | emacs-bzr/pkgver.patch | 26 |
3 files changed, 31 insertions, 54 deletions
diff --git a/emacs-bzr/PKGBUILD b/emacs-bzr/PKGBUILD index b766337..f60f39f 100644 --- a/emacs-bzr/PKGBUILD +++ b/emacs-bzr/PKGBUILD @@ -7,7 +7,7 @@ _opt_puresize="1820000" pkgname=emacs-bzr -pkgver=115490 +pkgver=116076 pkgrel=1 pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository' arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ provides=("emacs=$pkgver") conflicts=('emacs' 'emacs-nox' 'emacs-otf' 'emacs-cvs' 'emacs-git') install=$pkgname.install source=("bzr+http://bzr.savannah.gnu.org/r/emacs/trunk/" - 'docstrings2.patch' - 'pkgdep.patch') + 'docstrings2.patch' + 'pkgver.patch') _mandir=/usr/share/man @@ -48,7 +48,7 @@ build() { --with-xft \ --with-x-toolkit=lucid || return 1 patch -p0 -i "$srcdir"/docstrings2.patch || return 1 - patch -p0 -i "$srcdir"/pkgdep.patch || return 1 + patch -p0 -i "$srcdir"/pkgver.patch || return 1 make bootstrap } @@ -77,4 +77,4 @@ package() { } md5sums=('SKIP' '3a868e5b80d5912ded06e6bdc040208a' - '32afd921141d3d47e821a2dacb645550') + '4bc4613b3a11577f0b36092b90d40cd9') diff --git a/emacs-bzr/pkgdep.patch b/emacs-bzr/pkgdep.patch deleted file mode 100644 index 8afa06e..0000000 --- a/emacs-bzr/pkgdep.patch +++ /dev/null @@ -1,49 +0,0 @@ -=== 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 19:13:00 +0000 -*************** -*** 1104,1109 **** ---- 1104,1128 ---- - - (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) -+ ((or (symbolp deps) -+ (and (listp deps) -+ (symbolp (car deps)) -+ (stringp (cadr deps)))) -+ (error "Invalid requirement specifier: %s" deps)) -+ ((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)))) - ---- 1154,1162 ---- - "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)))) diff --git a/emacs-bzr/pkgver.patch b/emacs-bzr/pkgver.patch new file mode 100644 index 0000000..a5bd245 --- /dev/null +++ b/emacs-bzr/pkgver.patch @@ -0,0 +1,26 @@ +=== 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)) |