The patch for libpng 15+ is no longer needed
This commit is contained in:
parent
cdef64b3e7
commit
c4f8819fc1
@ -1,58 +0,0 @@
|
|||||||
--- src/pngwrite.c.libpng 2011-06-22 13:04:32.000000000 -0500
|
|
||||||
+++ src/pngwrite.c 2012-01-29 13:58:34.231905872 -0600
|
|
||||||
@@ -62,7 +62,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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);
|
|
||||||
--- src/pngread.c.libpng 2012-01-29 14:00:42.285180786 -0600
|
|
||||||
+++ src/pngread.c 2012-01-29 14:02:24.978232543 -0600
|
|
||||||
@@ -69,7 +69,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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 @@
|
|
||||||
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 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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 @@
|
|
||||||
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);
|
|
@ -14,8 +14,6 @@ Source0: https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.
|
|||||||
# use the library.
|
# use the library.
|
||||||
Source1: camlimages-2.2.0-htmlref.tar.gz
|
Source1: camlimages-2.2.0-htmlref.tar.gz
|
||||||
|
|
||||||
Patch0: ocaml-camlimages-libpng15.patch
|
|
||||||
|
|
||||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
|
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
|
||||||
BuildRequires: ocaml-lablgtk-devel
|
BuildRequires: ocaml-lablgtk-devel
|
||||||
BuildRequires: ocaml-x11
|
BuildRequires: ocaml-x11
|
||||||
@ -47,7 +45,6 @@ Includes documentation provided by ocamldoc
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n camlspotter-camlimages-668faa3494fe
|
%setup -q -n camlspotter-camlimages-668faa3494fe
|
||||||
%setup -q -T -D -a 1 -n camlspotter-camlimages-668faa3494fe
|
%setup -q -T -D -a 1 -n camlspotter-camlimages-668faa3494fe
|
||||||
%patch0 -b .libpng
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
omake
|
omake
|
||||||
@ -87,6 +84,7 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
|
|||||||
* Sun Sep 15 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-1
|
* Sun Sep 15 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-1
|
||||||
- Update to 4.1.0
|
- Update to 4.1.0
|
||||||
- Enable debug output
|
- Enable debug output
|
||||||
|
- Patch for recent libpng is no longer needed
|
||||||
|
|
||||||
* Sat Sep 14 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-13
|
* Sat Sep 14 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-13
|
||||||
- Rebuild for OCaml 4.01.0
|
- Rebuild for OCaml 4.01.0
|
||||||
|
Loading…
Reference in New Issue
Block a user