From 39dc264b600f281afcec0f278e24858e9d26480a Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 19 Jul 2014 12:22:35 +0200
Subject: Update emacs-bzr

---
 emacs-bzr/PKGBUILD     |  3 ++-
 emacs-bzr/pkgver.patch | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 emacs-bzr/pkgver.patch

diff --git a/emacs-bzr/PKGBUILD b/emacs-bzr/PKGBUILD
index 7f20cb9..84663cc 100644
--- a/emacs-bzr/PKGBUILD
+++ b/emacs-bzr/PKGBUILD
@@ -7,7 +7,7 @@
 _opt_puresize="1820000"
 
 pkgname=emacs-bzr
-pkgver=116906
+pkgver=117550
 pkgrel=1
 pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
 arch=('i686' 'x86_64')
@@ -45,6 +45,7 @@ build() {
       --mandir=${_mandir} \
       --without-sound \
       --with-xft \
+      --without-gif \
       --with-x-toolkit=lucid || return 1
   patch -p0 -i "$srcdir"/docstrings2.patch || return 1
   make bootstrap
diff --git a/emacs-bzr/pkgver.patch b/emacs-bzr/pkgver.patch
new file mode 100644
index 0000000..31946a7
--- /dev/null
+++ b/emacs-bzr/pkgver.patch
@@ -0,0 +1,25 @@
+--- 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
-- 
cgit v1.2.3-54-g00ecf