diff options
| author | wiz <wiz> | 2010-06-24 22:19:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-06-24 22:19:24 +0000 |
| commit | 051f7fa5fd7d395b59407e1434cd5e0db2299c60 (patch) | |
| tree | abd7add5d5343fc0bafd686e7683bd5bd0b15d7d /editors | |
| parent | 7ef3de0439ab7e421ffeb912705566d01619fa99 (diff) | |
| download | pkgsrc-051f7fa5fd7d395b59407e1434cd5e0db2299c60.tar.gz | |
Add workaround for systems coming with a copy of libpng.
Closes PR pkg/43485 reported by Rob Quinn.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs22/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs22/patches/patch-af | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo index 19a2734a2b4..819e973aada 100644 --- a/editors/emacs22/distinfo +++ b/editors/emacs22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2010/02/20 10:32:19 wiz Exp $ +$NetBSD: distinfo,v 1.8 2010/06/24 22:19:24 wiz Exp $ SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 @@ -8,6 +8,7 @@ SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492 SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f +SHA1 (patch-af) = 0ed58bc8c5c7c15e1f17ceb39708ee4aeabe0c97 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831 diff --git a/editors/emacs22/patches/patch-af b/editors/emacs22/patches/patch-af new file mode 100644 index 00000000000..9fbad4ea85a --- /dev/null +++ b/editors/emacs22/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2010/06/24 22:19:24 wiz Exp $ + +Workaround for systems coming with another copy of libpng (see PR 43485). + +--- src/image.c.orig 2008-08-25 22:18:33.000000000 +0000 ++++ src/image.c +@@ -6328,11 +6328,7 @@ png_image_p (object) + + #ifdef HAVE_PNG + +-#if defined HAVE_LIBPNG_PNG_H +-# include <libpng/png.h> +-#else + # include <png.h> +-#endif + + #ifdef HAVE_NTGUI + /* PNG library details. */ |