From c00975c061f0001da2cf9786453cf888502a69ad Mon Sep 17 00:00:00 2001
From: eric <eric@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
Date: Wed, 20 Jan 2010 04:51:27 +0000
Subject: [PATCH] upgpkg: emacs 23.1-5 Fixed libpng patch
git-svn-id: file:///srv/repos/svn-packages/svn@64389 eb2447ed-0c53-47e4-bac8-5bc4a241df78
---
trunk/PKGBUILD | 6 +++---
trunk/libpng14.patch | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index dbd9152..d2a5767 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 0b8bb89..8eeae15 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;
--
GitLab