diff options
| author |  Tom Willemse | 2014-04-05 14:58:28 +0200 |
|---|---|---|
| committer | Tom Willemse | 2014-04-05 14:58:28 +0200 |
| commit | a27eb2dbb8fdda65a787cbd92964259befacb397 (patch) | |
| tree | df2dc8d61f285eb0ab4fca1e486c337e7e344115 | |
| parent | 391987f3ea449c635975692b3cc0af164ee4d04a (diff) | |
| download | pkgbuilds-a27eb2dbb8fdda65a787cbd92964259befacb397.tar.gz pkgbuilds-a27eb2dbb8fdda65a787cbd92964259befacb397.zip | |
Update emacs-bzr
| -rw-r--r-- | emacs-bzr/PKGBUILD | 9 | ||||
| -rw-r--r-- | emacs-bzr/pkgver.patch | 25 |
2 files changed, 3 insertions, 31 deletions
diff --git a/emacs-bzr/PKGBUILD b/emacs-bzr/PKGBUILD index b7543d2..7f20cb9 100644 --- a/emacs-bzr/PKGBUILD +++ b/emacs-bzr/PKGBUILD @@ -7,7 +7,7 @@ _opt_puresize="1820000" pkgname=emacs-bzr -pkgver=116544 +pkgver=116906 pkgrel=1 pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository' arch=('i686' 'x86_64') @@ -20,8 +20,7 @@ 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' - 'pkgver.patch') + 'docstrings2.patch') _mandir=/usr/share/man @@ -48,7 +47,6 @@ build() { --with-xft \ --with-x-toolkit=lucid || return 1 patch -p0 -i "$srcdir"/docstrings2.patch || return 1 - patch -p0 -i "$srcdir"/pkgver.patch || return 1 make bootstrap } @@ -76,5 +74,4 @@ package() { bzr revert } md5sums=('SKIP' - '3a868e5b80d5912ded06e6bdc040208a' - '96a3a209798a424ab87c37152d5b2cf1') + '3a868e5b80d5912ded06e6bdc040208a') diff --git a/emacs-bzr/pkgver.patch b/emacs-bzr/pkgver.patch deleted file mode 100644 index 31946a7..0000000 --- a/emacs-bzr/pkgver.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 |