diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index dbd91521ee6b37dda795c1f099323f51583691aa..d2a576726662a733ffb493337db7c4d916017f06 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=23.1 -pkgrel=4 +pkgrel=5 pkgdesc="The Emacs Editor" arch=(i686 x86_64) url="http://www.gnu.org/software/emacs/emacs.html" @@ -12,9 +12,9 @@ options=(docs) 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') + 'd3e657091f41504fba7bdb0e96ec9b38') sha1sums=('e993445d14d2fdedd1418bc32c8c4ea30442bc51' '50060b676382719955c4e43e28a597ec0bc5805a'\ - '2c7c13708eaf4cab102d6c9cddecfc06a0538413') + 'f206f65465f32c96e08aeb37ffb5008fb818f59d') install=emacs.install build() { diff --git a/trunk/libpng14.patch b/trunk/libpng14.patch index 0b8bb893142b4c9618adf27546605509ed717ff5..8eeae15bcca05476167aa87906481699c85a5222 100644 --- a/trunk/libpng14.patch +++ b/trunk/libpng14.patch @@ -33,7 +33,7 @@ diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c /* 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)) ++ || fn_png_sig_cmp (sig, 0, sizeof sig)) { image_error ("Not a PNG file: `%s'", file, Qnil); UNGCPRO; @@ -42,7 +42,7 @@ diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c /* 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)) ++ || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) { image_error ("Not a PNG image: `%s'", img->spec, Qnil); UNGCPRO;