diff options
author | Alexis Ballier <aballier@gentoo.org> | 2011-02-15 21:01:15 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-15 21:01:15 +0000 |
commit | 6c4b49550c0abe584df02cf4dbe4250e1c494f6f (patch) | |
tree | 3b7b89850f49f6a69185125224154fe16d6ffb70 /dev-ml/camlimages | |
parent | babl 0.1.4 version bump (diff) | |
download | historical-6c4b49550c0abe584df02cf4dbe4250e1c494f6f.tar.gz historical-6c4b49550c0abe584df02cf4dbe4250e1c494f6f.tar.bz2 historical-6c4b49550c0abe584df02cf4dbe4250e1c494f6f.zip |
Fix build with libpng 1.5
Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
Diffstat (limited to 'dev-ml/camlimages')
-rw-r--r-- | dev-ml/camlimages/ChangeLog | 8 | ||||
-rw-r--r-- | dev-ml/camlimages/Manifest | 13 | ||||
-rw-r--r-- | dev-ml/camlimages/camlimages-3.0.2.ebuild | 7 | ||||
-rw-r--r-- | dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch | 62 |
4 files changed, 79 insertions, 11 deletions
diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog index 1360427422ef..16f0de72583c 100644 --- a/dev-ml/camlimages/ChangeLog +++ b/dev-ml/camlimages/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/camlimages -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.28 2010/04/24 12:20:50 aballier Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.29 2011/02/15 21:01:15 aballier Exp $ + + 15 Feb 2011; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild, + +files/camlimages-3.0.2-libpng15.patch: + Fix build with libpng 1.5 24 Apr 2010; Alexis Ballier <aballier@gentoo.org> -camlimages-3.0.1.ebuild, -files/camlimages-3.0.1-CVE-2009-2295.patch, diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest index 9e5a07388503..83cb9408ef19 100644 --- a/dev-ml/camlimages/Manifest +++ b/dev-ml/camlimages/Manifest @@ -2,17 +2,18 @@ Hash: SHA1 AUX camlimages-3.0.2-annot.patch 386 RMD160 05735cb525f633a67115987cd0f343811d6f035b SHA1 58c97e7dea986ef1ae9433f4fcfa9dc648507a57 SHA256 f3c4a883b344f0a54dac5ffc34341e842f76997d7d36e1e18642011e47a8053b +AUX camlimages-3.0.2-libpng15.patch 2392 RMD160 82550e3b5eb75953b354bcebdb1cca002635792b SHA1 02922bd3cd6314c28504a2f0fe080e42277ff523 SHA256 771d38f136cf493938744eca8e5aaf0761778ce1fce58ae24d91455518e3ee29 AUX camlimages-3.0.2-noxpm.patch 444 RMD160 cf4db800eb5c6316f0047a1b6db143b82d0b6077 SHA1 837ebb781bd5810b4c57f431915eb321a364699b SHA256 7fa917003af4bd2b541499d5d724e5e5f8d6ebcf280361544ea680394115de9f AUX camlimages-3.0.2-ocaml-autoconf11.patch 355 RMD160 4775a64d3021dfb4268aede3a121cf78eccfcf65 SHA1 ea69cd1dfb5aca48203584020bab3a948c896087 SHA256 b02c43105ffc90144c66dcef68f8c65dfdc39d0ba39adc8976f05d7f0d7b9668 AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 RMD160 ccf0d82e20c4c11ebe38e7331e8fcee751a78eaa SHA1 71c43011cf3005787678e0885b4904f55473ede1 SHA256 1db69c1993cba70226dfd4e179e9f4754d3d43fcb571e319d97accd91947493f DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c -EBUILD camlimages-3.0.2.ebuild 1478 RMD160 1727286476f82e2e4202b544b7697ccc23c3b679 SHA1 e7dd6e5cb347d487d89623474bf5d9aafde225e5 SHA256 1d91b2239bd55de7b170f03ac006228574e7d144681d50ddd5cc22ee906d0e0f -MISC ChangeLog 4898 RMD160 72b701f8d8cbf29d9a5ba872928ca0e3eccb72e5 SHA1 8fdd2d15b176563e205f59e7043c394b35292b73 SHA256 91320b8493c35aa4dd604d3e6b14c04fc2ee8e7bf96803cd6632dc5534ee535c +EBUILD camlimages-3.0.2.ebuild 1528 RMD160 ef5834b4ddeeb2e781a193d1b4ac21aef5d315c1 SHA1 d59d9dc7dd7eaa95051ddc35e95b23ffdf2d3249 SHA256 3e8b049cc644a9a017a9979b7b92886a84a9f275c82f4eef47182da0c76d72ed +MISC ChangeLog 5046 RMD160 67b4eac689532a5a8e6e5ed044673a5b867c1923 SHA1 a888b16cd8578532541b8ca203a1c6644d74a128 SHA256 d0cf7b54722d5e7642aa22f164dfe7c235903687b2dac9c4edc6cc6428f19415 MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkvS4icACgkQvFcC4BYPU0oEbQCcDYu3dFbXeK+e6Ve0XUCuhylG -dNwAn3VBbf3TlkgOxlENJgJq2qooyQKX -=1LBY +iEYEARECAAYFAk1a6aEACgkQvFcC4BYPU0q0ywCfUhyXdHPrrmVvgg6aixv3GdP+ +D88An1ei7hayl6i1AbLdDsGGYDThc/PZ +=YSFJ -----END PGP SIGNATURE----- diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild index 087db3b9d797..2a16b1650092 100644 --- a/dev-ml/camlimages/camlimages-3.0.2.ebuild +++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.7 2010/04/15 14:47:40 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.8 2011/02/15 21:01:15 aballier Exp $ EAPI=2 @@ -22,7 +22,7 @@ RDEPEND=">=dev-lang/ocaml-3.10.2[X,ocamlopt] gs? ( app-text/ghostscript-gpl ) jpeg? ( media-libs/jpeg ) tiff? ( media-libs/tiff ) - media-libs/libpng + >=media-libs/libpng-1.4 truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) " @@ -35,6 +35,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch" epatch "${FILESDIR}/${P}-annot.patch" epatch "${FILESDIR}/${P}-noxpm.patch" + epatch "${FILESDIR}/${P}-libpng15.patch" eautoreconf } diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch b/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch new file mode 100644 index 000000000000..366a14c0de9a --- /dev/null +++ b/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch @@ -0,0 +1,62 @@ +Index: camlimages-3.0.2/src/pngread.c +=================================================================== +--- camlimages-3.0.2.orig/src/pngread.c ++++ camlimages-3.0.2/src/pngread.c +@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name ) + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ 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); + fclose(fp); +@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name ) + png_set_rows(png_ptr, info_ptr, row_pointers); + + /* Later, we can return something */ +- if (setjmp(png_ptr->jmpbuf)) { ++ 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); + fclose(fp); +@@ -243,7 +243,7 @@ value read_png_file( name ) + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ 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); + fclose(fp); +@@ -302,7 +302,7 @@ value read_png_file( name ) + png_set_rows(png_ptr, info_ptr, row_pointers); + + /* Later, we can return something */ +- if (setjmp(png_ptr->jmpbuf)) { ++ 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); + fclose(fp); +Index: camlimages-3.0.2/src/pngwrite.c +=================================================================== +--- camlimages-3.0.2.orig/src/pngwrite.c ++++ camlimages-3.0.2/src/pngwrite.c +@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); +@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer + } + + /* error handling */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); |