summaryrefslogtreecommitdiff
path: root/extra/libwmf
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
commitecec4d4d3ca64d7929f1f63857e82268798e066b (patch)
treedfc5421b1f5460a449502c66d612e1132ec5d49f /extra/libwmf
parenteddd84528e605047a994ee8d652ba99686a412fc (diff)
parent1ffabe284d9f5a4ac055941d9817af71be1e5b54 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/binutils-avr/PKGBUILD community/freecol/PKGBUILD community/gcc-avr/PKGBUILD community/lightspark/PKGBUILD community/lorcon-old-svn/PKGBUILD community/mdf2iso/PKGBUILD community/pylorcon/PKGBUILD community/qbittorrent/PKGBUILD community/remmina-plugins/PKGBUILD community/systemd/PKGBUILD community/texmaker/PKGBUILD extra/pyqt/PKGBUILD extra/uim/PKGBUILD extra/wesnoth/PKGBUILD libre/kdenetwork-libre/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch multilib-testing/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/libtool-multilib/libtool.install testing/glibc/PKGBUILD testing/shadow/PKGBUILD testing/xf86-video-savage/PKGBUILD
Diffstat (limited to 'extra/libwmf')
-rw-r--r--extra/libwmf/libpng14.patch12
1 files changed, 0 insertions, 12 deletions
diff --git a/extra/libwmf/libpng14.patch b/extra/libwmf/libpng14.patch
deleted file mode 100644
index 3d38c717a..000000000
--- a/extra/libwmf/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c libwmf-0.2.8.4/src/extra/gd/gd_png.c
---- libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c 2005-07-27 23:35:06.000000000 +0300
-+++ libwmf-0.2.8.4/src/extra/gd/gd_png.c 2010-01-17 01:33:58.000000000 +0200
-@@ -136,7 +136,7 @@
- /* first do a quick check that the file really is a PNG image; could
- * have used slightly more general png_sig_cmp() function instead */
- gdGetBuf (sig, 8, infile);
-- if (!png_check_sig (sig, 8))
-+ if (png_sig_cmp (sig, 0, 8))
- return NULL; /* bad signature */
-
- #ifndef PNG_SETJMP_NOT_SUPPORTED