[arch-commits] Commit in emacs/trunk (PKGBUILD libpng14.patch)
Eric Bélanger
eric at archlinux.org
Mon Jan 18 04:58:21 UTC 2010
Date: Sunday, January 17, 2010 @ 23:58:20
Author: eric
Revision: 63609
upgpkg: emacs 23.1-4
Built against libpng 1.4/libjpeg 8
Added:
emacs/trunk/libpng14.patch
Modified:
emacs/trunk/PKGBUILD
----------------+
PKGBUILD | 16 ++++++++--------
libpng14.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-18 03:55:07 UTC (rev 63608)
+++ PKGBUILD 2010-01-18 04:58:20 UTC (rev 63609)
@@ -3,19 +3,23 @@
# Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
pkgname=emacs
pkgver=23.1
-pkgrel=3
+pkgrel=4
pkgdesc="The Emacs Editor"
arch=(i686 x86_64)
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL')
options=(docs)
-depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg>=7' 'gtk2' 'texinfo' 'hicolor-icon-theme')
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
-md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3')
+depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch)
+md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\
+ 'ad06d0cbbff8cba40fd33a37407258c1')
+sha1sums=('e993445d14d2fdedd1418bc32c8c4ea30442bc51' '50060b676382719955c4e43e28a597ec0bc5805a'\
+ '2c7c13708eaf4cab102d6c9cddecfc06a0538413')
install=emacs.install
build() {
cd $startdir/src/$pkgname-$pkgver
+ patch -p1 < ../libpng14.patch || return 1
mandir=/usr/share/man
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
--localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk
@@ -38,10 +42,6 @@
chown -R root:50 ${startdir}/pkg/var/games
- # remove info dir
- rm $startdir/pkg/usr/share/info/dir
- gzip -9nf $startdir/pkg/usr/share/info/*
-
# fix FS#9253
mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications
install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications
Added: libpng14.patch
===================================================================
--- libpng14.patch (rev 0)
+++ libpng14.patch 2010-01-18 04:58:20 UTC (rev 63609)
@@ -0,0 +1,48 @@
+diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c
+--- emacs-23.1-orig/src/image.c 2010-01-17 23:12:10.000000000 -0500
++++ emacs-23.1/src/image.c 2010-01-17 23:18:16.000000000 -0500
+@@ -5793,7 +5793,7 @@
+ /* PNG library details. */
+
+ DEF_IMGLIB_FN (png_get_io_ptr);
+-DEF_IMGLIB_FN (png_check_sig);
++DEF_IMGLIB_FN (png_sig_cmp);
+ DEF_IMGLIB_FN (png_create_read_struct);
+ DEF_IMGLIB_FN (png_create_info_struct);
+ DEF_IMGLIB_FN (png_destroy_read_struct);
+@@ -5824,7 +5824,7 @@
+ return 0;
+
+ LOAD_IMGLIB_FN (library, png_get_io_ptr);
+- LOAD_IMGLIB_FN (library, png_check_sig);
++ LOAD_IMGLIB_FN (library, png_sig_cmp);
+ LOAD_IMGLIB_FN (library, png_create_read_struct);
+ LOAD_IMGLIB_FN (library, png_create_info_struct);
+ LOAD_IMGLIB_FN (library, png_destroy_read_struct);
+@@ -5849,7 +5849,7 @@
+ #else
+
+ #define fn_png_get_io_ptr png_get_io_ptr
+-#define fn_png_check_sig png_check_sig
++#define fn_png_sig_cmp png_sig_cmp
+ #define fn_png_create_read_struct png_create_read_struct
+ #define fn_png_create_info_struct png_create_info_struct
+ #define fn_png_destroy_read_struct png_destroy_read_struct
+@@ -5996,7 +5996,7 @@
+
+ /* Check PNG signature. */
+ if (fread (sig, 1, sizeof sig, fp) != sizeof sig
+- || !fn_png_check_sig (sig, sizeof sig))
++ || !fn_png_sig_cmp (sig, 0, sizeof sig))
+ {
+ image_error ("Not a PNG file: `%s'", file, Qnil);
+ UNGCPRO;
+@@ -6013,7 +6013,7 @@
+
+ /* Check PNG signature. */
+ if (tbr.len < sizeof sig
+- || !fn_png_check_sig (tbr.bytes, sizeof sig))
++ || !fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
+ {
+ image_error ("Not a PNG image: `%s'", img->spec, Qnil);
+ UNGCPRO;
More information about the arch-commits
mailing list