diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
| commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
| tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch | |
| parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
| parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch')
| -rw-r--r-- | staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch deleted file mode 100644 index 2bb636380..000000000 --- a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/spuunmux.c -+++ src/spuunmux.c -@@ -39,6 +39,7 @@ - #include <netinet/in.h> - - #include <png.h> -+#include <zlib.h> - - #include "rgb.h" - #include "common.h" -@@ -610,7 +611,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return -1; - } /*if*/ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); |