archrelease: copy trunk to extra-x86_64

git-svn-id: file:///srv/repos/svn-packages/svn@161423 eb2447ed-0c53-47e4-bac8-5bc4a241df78

repos/extra-x86_64/PKGBUILD

@@ -3,26 +3,20 @@
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
-pkgver=23.4
-pkgrel=2
+pkgver=24.1
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}
-  emacs-subversion17.patch
-  emacs-23.3-xgselect_init.patch)
-md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0'
-         '55eb16eb48b44987693c0e3ea5ab8075'
-         '12e2e7a66df5cc5ded54e1d30083a1fb'
-	 '0d3b3d701ba1295613ace30e8d67ca88')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
+md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4')
+
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i ../emacs-subversion17.patch
-  patch -p1 -i ../emacs-23.3-xgselect_init.patch
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk --with-xft
   make
@@ -34,7 +28,7 @@ package() {
 
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
   # fix all the 777 perms on directories
   find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files

repos/extra-x86_64/emacs-23.3-xgselect_init.patch

-diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c
---- emacs-23.3/src/xgselect.c.xgselect_init	2011-01-08 18:45:14.000000000 +0100
-+++ emacs-23.3/src/xgselect.c	2011-11-11 13:00:53.211765255 +0100
-@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti
-   do {
-     if (n_gfds > gfds_size) 
-       {
-+        if (gfds_size == 0)
-+          xgselect_initialize ();
-+
-         while (n_gfds > gfds_size) 
-           gfds_size *= 2;
-         xfree (gfds);

repos/extra-x86_64/emacs-subversion17.patch

-From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001
-From: Karl Pflästerer <k@rl.pflaesterer.de>
-Date: Sat, 12 Feb 2011 01:12:53 +0000
-Subject: Adapt to Subversion change, with no .svn directory in each sub directory.
-
-http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html
-
-* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
-(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
-(vc-svn-repository-hostname): Use "svn info".
----
-(limited to 'lisp/vc/vc-svn.el')
-
-diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
-index aefef50..20c7689 100644
---- a/lisp/vc-svn.el
-+++ b/lisp/vc-svn.el
-@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t."
- ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
- ;;;###autoload                           "_svn")
- ;;;###autoload                          (t ".svn"))))
--;;;###autoload     (when (file-readable-p (expand-file-name
--;;;###autoload                             (concat admin-dir "/entries")
--;;;###autoload                             (file-name-directory f)))
-+;;;###autoload     (when (vc-find-root f admin-dir)
- ;;;###autoload       (load "vc-svn")
- ;;;###autoload       (vc-svn-registered f))))
- 
- (defun vc-svn-registered (file)
-   "Check if FILE is SVN registered."
--  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
--						   "/entries")
--					   (file-name-directory file)))
-+  (when (vc-svn-root file)
-     (with-temp-buffer
-       (cd (file-name-directory file))
-       (let* (process-file-side-effects
-@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches'
- to the SVN command."
-   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
- 
--(defun vc-svn-responsible-p (file)
--  "Return non-nil if SVN thinks it is responsible for FILE."
--  (file-directory-p (expand-file-name vc-svn-admin-directory
--				      (if (file-directory-p file)
--					  file
--					(file-name-directory file)))))
-+(defun vc-svn-root (file)
-+  (vc-find-root file vc-svn-admin-directory))
- 
--(defalias 'vc-svn-could-register 'vc-svn-responsible-p
-+(defalias 'vc-svn-responsible-p 'vc-svn-root)
-+
-+(defalias 'vc-svn-could-register 'vc-svn-root
-   "Return non-nil if FILE could be registered in SVN.
- This is only possible if SVN is responsible for FILE's directory.")
- 
-@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
- 
- (defun vc-svn-repository-hostname (dirname)
-   (with-temp-buffer
--    (let ((coding-system-for-read
--	   (or file-name-coding-system
--	       default-file-name-coding-system)))
--      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
--						"/entries")
--					dirname)))
-+    (let (process-file-side-effects)
-+      (vc-svn-command t t dirname "info" "--xml"))
-     (goto-char (point-min))
--    (when (re-search-forward
--	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
--	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
--		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
--		   "url=\"\\(?1:[^\"]+\\)\""
--                   ;; Yet newer ones don't use XML any more.
--                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
-+    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
-       ;; This is not a hostname but a URL.  This may actually be considered
-       ;; as a feature since it allows vc-svn-stay-local to specify different
-       ;; behavior for different modules on the same server.
---
-cgit v0.9.0.2