diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
| commit | ecec4d4d3ca64d7929f1f63857e82268798e066b (patch) | |
| tree | dfc5421b1f5460a449502c66d612e1132ec5d49f /extra/imlib | |
| parent | eddd84528e605047a994ee8d652ba99686a412fc (diff) | |
| parent | 1ffabe284d9f5a4ac055941d9817af71be1e5b54 (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/imlib')
| -rw-r--r-- | extra/imlib/libpng14.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/extra/imlib/libpng14.patch b/extra/imlib/libpng14.patch deleted file mode 100644 index 2cc174e29..000000000 --- a/extra/imlib/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c ---- imlib-1.9.15-orig/Imlib/load.c 2010-01-18 20:58:27.000000000 -0500 -+++ imlib-1.9.15/Imlib/load.c 2010-01-18 21:02:04.000000000 -0500 -@@ -1619,7 +1619,7 @@ - return 0; - fread(buf, 1, 8, f); - rewind(f); -- return (int)png_check_sig(buf, 8); -+ return (int)png_sig_cmp(buf, 0, 8)==0; - #else - return 0; - #endif |