diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
commit | ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch) | |
tree | 365b7a8276a93d738840c4481a1ff5e327920738 /community-testing/scorched3d/libpng14.patch | |
parent | 37936150d275890b518542e93a435ab5815d722b (diff) | |
parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/conntrack-tools/01-config-file-path.patch
community-testing/conntrack-tools/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gigi/PKGBUILD
community-testing/glob2/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haddock/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libnetfilter_conntrack/PKGBUILD
community/libnetfilter_queue/PKGBUILD
community/libnfnetlink/PKGBUILD
community/sfk/PKGBUILD
extra/cabal-install/PKGBUILD
extra/claws-mail/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
social/squirm/PKGBUILD
staging/kdebindings-python/PKGBUILD
testing/curl/PKGBUILD
testing/dnsutils/PKGBUILD
testing/dnsutils/remove-bind.patch
testing/mesa/PKGBUILD
testing/openldap/PKGBUILD
testing/pam/PKGBUILD
testing/subversion/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'community-testing/scorched3d/libpng14.patch')
-rw-r--r-- | community-testing/scorched3d/libpng14.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch new file mode 100644 index 000000000..7a5a9434c --- /dev/null +++ b/community-testing/scorched3d/libpng14.patch @@ -0,0 +1,38 @@ +--- src/common/image/ImagePng.cpp 2009-02-23 04:14:20.000000000 +0100 ++++ src/common/image/ImagePng.cpp_patched 2010-01-24 22:01:04.000000000 +0100 +@@ -189,7 +189,7 @@ + info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+@@ -200,7 +200,7 @@ + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ /* If we get here, we had a problem reading the file */
+ return false;
+ }
+@@ -258,7 +258,7 @@ + }
+ else
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ Logger::log(S3D::formatStringBuffer(
+ "Invalid PNG format.\n"
+@@ -272,7 +272,7 @@ + // END NEW CODE
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* that's it */
+ return true;
|