summaryrefslogtreecommitdiff
path: root/graphics/png/patches
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-01-13 13:27:21 +0000
committerwiz <wiz@pkgsrc.org>2011-01-13 13:27:21 +0000
commitf3c639fe6d70a31720f405653d64532b59ec2428 (patch)
tree5eab94d40931d8fb02a6497b8fffd7ceda665dcc /graphics/png/patches
parent99906972427a00c1c2a5a44689e3266f8684d47a (diff)
downloadpkgsrc-f3c639fe6d70a31720f405653d64532b59ec2428.tar.gz
Update to 1.5.1beta01:
1.5.1beta01 contains a security fix for 1.5.0. The current public release, libpng 1.5.0, continues the evolution of the libpng API, finally hiding the contents of the venerable and hoary png_struct and png_info data structures inside private (i.e., non-installed) header files. (Apps that compiled with libpng 1.4 without warnings about deprecated features should happily compile with 1.5, too.) It also includes a new, more thorough test program (pngvalid.c), a new pnglibconf.h header file that tracks what features were enabled or disabled when libpng was built, and huge thanks to John Bowler, who did most of the work. Complete differences relative to libpng 1.4.x are detailed at http://www.libpng.org/pub/png/src/libpng-1.4.x-to-1.5.x-summary.txt . Since the shlib name changed, next up: PKGREVISION++ all across pkgsrc.
Diffstat (limited to 'graphics/png/patches')
-rw-r--r--graphics/png/patches/patch-aa8
-rw-r--r--graphics/png/patches/patch-ae18
2 files changed, 4 insertions, 22 deletions
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index bc03a5d4e8c..5f12ab83017 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $
+$NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 wiz Exp $
Don't install compat links to libpng. Programs should use
the pkg-config or libpng-config scripts to get the correct png library
name.
---- Makefile.in.orig 2010-09-23 12:18:43.000000000 +0000
+--- Makefile.in.orig 2011-01-06 13:02:45.000000000 +0000
+++ Makefile.in
-@@ -1242,14 +1242,6 @@ install-data-hook:
+@@ -1342,14 +1342,6 @@ install-data-hook:
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
@@ -20,4 +20,4 @@ name.
- done
uninstall-hook:
- cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
+ cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae
deleted file mode 100644
index d8fe379ab95..00000000000
--- a/graphics/png/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2010/09/24 08:58:41 wiz Exp $
-
-Instead of random text that may or may not make compilers error
-out, use #warning.
-
---- pngconf.h.orig 2009-05-07 16:05:28.000000000 +0000
-+++ pngconf.h
-@@ -332,8 +332,8 @@
- /* If you encounter a compiler error here, see the explanation
- * near the end of INSTALL.
- */
-- __pngconf.h__ in libpng already includes setjmp.h;
-- __dont__ include it again.;
-+#warning __pngconf.h__ in libpng already includes setjmp.h;
-+#warning __dont__ include it again.;
- # endif
- # endif /* __linux__ */
- # endif /* PNG_SKIP_SETJMP_CHECK */