update emacs-lucid, move it from [~lukeshu] to [pcr]

4 files changed, 55 insertions, 30 deletions

diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD
index ebc49645d..f88607e0a 100644
--- a/~lukeshu/emacs-lucid/PKGBUILD
+++ b/pcr/emacs-lucid/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
+# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org>
-# Contributor (Arch): Renchi Raju <renchi@green.tam.uiuc.edu>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 _pkgname=emacs
 pkgname=emacs-lucid
-pkgver=24.2
-pkgrel=2
-pkgdesc="The extensible, customizable, self-documenting real-time display editor (lucid tooklit instead of GTK3)"
-
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
+pkgver=24.3
+pkgrel=4
+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' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig}
+        emacs-24.3-giflib5.patch)
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         'SKIP'
+         '560cdf463299e059c5fadf474bcba218')
 
+pkgdesc+=", with the Lucid X11 toolkit"
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+}
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=lucid --with-xft
   make
 }
@@ -35,10 +42,10 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs -type d -exec chmod 755 {} \;
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
new file mode 100644
index 000000000..b8571abb2
--- /dev/null
+++ b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
@@ -0,0 +1,26 @@
+--- src/image.c
++++ src/image.c	2013-05-21 15:49:41.945819346 +0000
+@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
+ 	}
+ 
+       /* Open the GIF file.  */
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpenFileName (SSDATA (file));
++#else
++      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
++#endif
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
+       memsrc.len = SBYTES (specified_data);
+       memsrc.index = 0;
+ 
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++#else
++      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
++#endif
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
diff --git a/~lukeshu/emacs-lucid/emacs.install b/pcr/emacs-lucid/emacs.install
index d84f1de14..6712f44ba 100644
--- a/~lukeshu/emacs-lucid/emacs.install
+++ b/pcr/emacs-lucid/emacs.install
@@ -1,11 +1,11 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/~lukeshu/emacs-lucid/librenamcap b/~lukeshu/emacs-lucid/librenamcap
deleted file mode 100644
index a42ac9e22..000000000
--- a/~lukeshu/emacs-lucid/librenamcap
+++ /dev/null
@@ -1,8 +0,0 @@
-emacs-lucid E: incorrect-owner var/games (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/snake-scores (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/tetris-scores (root:games)
-emacs-lucid W: file-in-non-standard-dir var/games/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/snake-scores
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/tetris-scores