diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
| commit | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch) | |
| tree | 3eeb67878db60db79eb21dc2232377e6b56a3add /community/jbig2dec | |
| parent | b2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff) | |
| parent | b618c3d0693aec564c6746238fd05d94e31d3b76 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asciijump/PKGBUILD
community/cairo-compmgr/PKGBUILD
community/cwiid/PKGBUILD
community/darcs/PKGBUILD
community/gadmin-samba/PKGBUILD
community/gstm/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-mmap/PKGBUILD
community/lastfm-client/PKGBUILD
community/libtar/PKGBUILD
community/mget/PKGBUILD
community/nexuiz/PKGBUILD
community/pstreams/PKGBUILD
community/pyglet/PKGBUILD
community/python-html5lib/PKGBUILD
community/python-pychm/PKGBUILD
community/qoauth/PKGBUILD
community/quilt/PKGBUILD
community/stormbaancoureur/PKGBUILD
community/winegame/PKGBUILD
community/winestuff/PKGBUILD
community/xdg-user-dirs/PKGBUILD
core/libfetch/PKGBUILD
extra/acpi/PKGBUILD
extra/alex/PKGBUILD
extra/allegro/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/erlang/PKGBUILD
extra/ettercap/PKGBUILD
extra/gftp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/happy/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-fgl/PKGBUILD
extra/haskell-glut/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/libnet/PKGBUILD
extra/linux_logo/PKGBUILD
extra/mailman/PKGBUILD
extra/midori/PKGBUILD
extra/ntrack/PKGBUILD
extra/pwgen/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/qtcurve-kde4/PKGBUILD
extra/ristretto/PKGBUILD
extra/rxvt-unicode/PKGBUILD
extra/telepathy-sofiasip/PKGBUILD
extra/tightvnc/PKGBUILD
extra/vsftpd/PKGBUILD
extra/windowmaker-crm-git/PKGBUILD
libre/aufs2-libre/PKGBUILD
libre/calibre-libre/PKGBUILD
libre/calibre-libre/calibre-mount-helper
libre/calibre-libre/calibre.install
libre/calibre-libre/desktop_integration.patch
libre/ffmpeg-libre/PKGBUILD
mozilla-testing/iceweasel-libre/PKGBUILD
mozilla-testing/iceweasel-libre/libre.patch
mozilla-testing/iceweasel-libre/mozconfig
~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'community/jbig2dec')
| -rw-r--r-- | community/jbig2dec/jbig2dec-0.11-libpng15.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/community/jbig2dec/jbig2dec-0.11-libpng15.patch b/community/jbig2dec/jbig2dec-0.11-libpng15.patch deleted file mode 100644 index c18ccb7af..000000000 --- a/community/jbig2dec/jbig2dec-0.11-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -45,7 +45,7 @@ - fi - dnl libpng requires pow() which may be in libm - AC_SEARCH_LIBS([pow], [m]) -- AC_CHECK_LIB([png], [png_check_sig], [ -+ AC_CHECK_LIB([png], [png_sig_cmp], [ - AC_CHECK_LIB([z], [deflate], [ - AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) - LIBS="-lpng -lz $LIBS" ---- jbig2_image_png.c -+++ jbig2_image_png.c -@@ -33,7 +33,7 @@ - { - png_size_t check; - -- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr); -+ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr)); - if (check != length) { - png_error(png_ptr, "Write Error"); - } -@@ -43,7 +43,7 @@ - jbig2_png_flush(png_structp png_ptr) - { - png_FILE_p io_ptr; -- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr)); -+ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr); - if (io_ptr != NULL) - fflush(io_ptr); - } |