[arch-commits] Commit in emacs/repos/extra-i686 (6 files)

Jürgen Hötzel juergen at nymeria.archlinux.org
Tue Jan 28 15:18:04 UTC 2014


    Date: Tuesday, January 28, 2014 @ 16:18:04
  Author: juergen
Revision: 204840

archrelease: copy trunk to extra-i686

Added:
  emacs/repos/extra-i686/PKGBUILD
    (from rev 204839, emacs/trunk/PKGBUILD)
  emacs/repos/extra-i686/emacs-24.3-giflib5.patch
    (from rev 204839, emacs/trunk/emacs-24.3-giflib5.patch)
  emacs/repos/extra-i686/emacs.install
    (from rev 204839, emacs/trunk/emacs.install)
Deleted:
  emacs/repos/extra-i686/PKGBUILD
  emacs/repos/extra-i686/emacs-24.3-giflib5.patch
  emacs/repos/extra-i686/emacs.install

--------------------------+
 PKGBUILD                 |   96 ++++++++++++++++++++++-----------------------
 emacs-24.3-giflib5.patch |   52 ++++++++++++------------
 emacs.install            |   64 +++++++++++++++---------------
 3 files changed, 106 insertions(+), 106 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-28 14:14:20 UTC (rev 204839)
+++ PKGBUILD	2014-01-28 15:18:04 UTC (rev 204840)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
-
-pkgname=emacs
-pkgver=24.3
-pkgrel=5
-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' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
-        emacs-24.3-giflib5.patch)
-md5sums=('ea9ed000ca165280265aabb55b9afbd7'
-         'SKIP'
-         '560cdf463299e059c5fadf474bcba218')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np0 -i ../emacs-24.3-giflib5.patch
-}
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # 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/$pkgver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-}

Copied: emacs/repos/extra-i686/PKGBUILD (from rev 204839, emacs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-01-28 15:18:04 UTC (rev 204840)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+
+pkgname=emacs
+pkgver=24.3
+pkgrel=6
+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' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
+install=emacs.install
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
+        emacs-24.3-giflib5.patch)
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         'SKIP'
+         '560cdf463299e059c5fadf474bcba218')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+}
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # 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/$pkgver -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}

Deleted: emacs-24.3-giflib5.patch
===================================================================
--- emacs-24.3-giflib5.patch	2014-01-28 14:14:20 UTC (rev 204839)
+++ emacs-24.3-giflib5.patch	2014-01-28 15:18:04 UTC (rev 204840)
@@ -1,26 +0,0 @@
---- 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);

Copied: emacs/repos/extra-i686/emacs-24.3-giflib5.patch (from rev 204839, emacs/trunk/emacs-24.3-giflib5.patch)
===================================================================
--- emacs-24.3-giflib5.patch	                        (rev 0)
+++ emacs-24.3-giflib5.patch	2014-01-28 15:18:04 UTC (rev 204840)
@@ -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);

Deleted: emacs.install
===================================================================
--- emacs.install	2014-01-28 14:14:20 UTC (rev 204839)
+++ emacs.install	2014-01-28 15:18:04 UTC (rev 204840)
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-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 srecode tramp url vip viper widget wisent woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}

Copied: emacs/repos/extra-i686/emacs.install (from rev 204839, emacs/trunk/emacs.install)
===================================================================
--- emacs.install	                        (rev 0)
+++ emacs.install	2014-01-28 15:18:04 UTC (rev 204840)
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+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 srecode tramp url vip viper widget wisent woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}




More information about the arch-commits mailing list