[arch-commits] Commit in emacs/repos (8 files)
Jan de Groot
jgc at nymeria.archlinux.org
Wed Jun 11 12:00:16 UTC 2014
Date: Wednesday, June 11, 2014 @ 14:00:16
Author: jgc
Revision: 214998
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
emacs/repos/staging-i686/
emacs/repos/staging-i686/PKGBUILD
(from rev 214997, emacs/trunk/PKGBUILD)
emacs/repos/staging-i686/emacs-24.3-giflib5.patch
(from rev 214997, emacs/trunk/emacs-24.3-giflib5.patch)
emacs/repos/staging-i686/emacs.install
(from rev 214997, emacs/trunk/emacs.install)
emacs/repos/staging-x86_64/
emacs/repos/staging-x86_64/PKGBUILD
(from rev 214997, emacs/trunk/PKGBUILD)
emacs/repos/staging-x86_64/emacs-24.3-giflib5.patch
(from rev 214997, emacs/trunk/emacs-24.3-giflib5.patch)
emacs/repos/staging-x86_64/emacs.install
(from rev 214997, emacs/trunk/emacs.install)
-----------------------------------------+
staging-i686/PKGBUILD | 48 ++++++++++++++
staging-i686/emacs-24.3-giflib5.patch | 97 ++++++++++++++++++++++++++++++
staging-i686/emacs.install | 32 +++++++++
staging-x86_64/PKGBUILD | 48 ++++++++++++++
staging-x86_64/emacs-24.3-giflib5.patch | 97 ++++++++++++++++++++++++++++++
staging-x86_64/emacs.install | 32 +++++++++
6 files changed, 354 insertions(+)
Copied: emacs/repos/staging-i686/PKGBUILD (from rev 214997, emacs/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-06-11 12:00:16 UTC (rev 214998)
@@ -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=7
+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'
+ 'ccbe4e77440ff6ea56c8532ebc960446')
+
+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/staging-i686/emacs-24.3-giflib5.patch (from rev 214997, emacs/trunk/emacs-24.3-giflib5.patch)
===================================================================
--- staging-i686/emacs-24.3-giflib5.patch (rev 0)
+++ staging-i686/emacs-24.3-giflib5.patch 2014-06-11 12:00:16 UTC (rev 214998)
@@ -0,0 +1,97 @@
+--- 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);
+@@ -7225,7 +7225,11 @@
+ if (!check_image_size (f, gif->SWidth, gif->SHeight))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7234,7 +7238,11 @@
+ if (rc == GIF_ERROR || gif->ImageCount <= 0)
+ {
+ image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7246,7 +7254,11 @@
+ {
+ image_error ("Invalid image number `%s' in image `%s'",
+ image_number, img->spec);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+ }
+@@ -7264,14 +7276,22 @@
+ if (!check_image_size (f, width, height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+ /* Create the X image and pixmap. */
+ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+ {
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7447,7 +7467,11 @@
+ Fcons (make_number (gif->ImageCount),
+ img->lisp_data));
+
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+
+ /* Maybe fill in the background field while we have ximg handy. */
+ if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
Copied: emacs/repos/staging-i686/emacs.install (from rev 214997, emacs/trunk/emacs.install)
===================================================================
--- staging-i686/emacs.install (rev 0)
+++ staging-i686/emacs.install 2014-06-11 12:00:16 UTC (rev 214998)
@@ -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
+}
Copied: emacs/repos/staging-x86_64/PKGBUILD (from rev 214997, emacs/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-06-11 12:00:16 UTC (rev 214998)
@@ -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=7
+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'
+ 'ccbe4e77440ff6ea56c8532ebc960446')
+
+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/staging-x86_64/emacs-24.3-giflib5.patch (from rev 214997, emacs/trunk/emacs-24.3-giflib5.patch)
===================================================================
--- staging-x86_64/emacs-24.3-giflib5.patch (rev 0)
+++ staging-x86_64/emacs-24.3-giflib5.patch 2014-06-11 12:00:16 UTC (rev 214998)
@@ -0,0 +1,97 @@
+--- 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);
+@@ -7225,7 +7225,11 @@
+ if (!check_image_size (f, gif->SWidth, gif->SHeight))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7234,7 +7238,11 @@
+ if (rc == GIF_ERROR || gif->ImageCount <= 0)
+ {
+ image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7246,7 +7254,11 @@
+ {
+ image_error ("Invalid image number `%s' in image `%s'",
+ image_number, img->spec);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+ }
+@@ -7264,14 +7276,22 @@
+ if (!check_image_size (f, width, height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+ /* Create the X image and pixmap. */
+ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+ {
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+ return 0;
+ }
+
+@@ -7447,7 +7467,11 @@
+ Fcons (make_number (gif->ImageCount),
+ img->lisp_data));
+
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ fn_DGifCloseFile (gif, NULL);
++#else
+ fn_DGifCloseFile (gif);
++#endif
+
+ /* Maybe fill in the background field while we have ximg handy. */
+ if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
Copied: emacs/repos/staging-x86_64/emacs.install (from rev 214997, emacs/trunk/emacs.install)
===================================================================
--- staging-x86_64/emacs.install (rev 0)
+++ staging-x86_64/emacs.install 2014-06-11 12:00:16 UTC (rev 214998)
@@ -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