OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -3,3 +3,7 @@ camlimages-2.2.0.tgz
 camlimages-3.0.1.tar.gz
 camlimages-3.0.2.tgz
 /v4.0.1.tar.gz
+/4.1.0.tar.gz
+/4.2.2.tar.gz
+/4.2.4.tar.gz
+/4.2.5.tar.gz

camlimages-4.2.5-add-g-flag.patch

@@ -0,0 +1,24 @@
+diff -ur camlspotter-camlimages-8ca76028cff3.old/OMakefile camlspotter-camlimages-8ca76028cff3/OMakefile
+--- camlspotter-camlimages-8ca76028cff3.old/OMakefile	2017-11-20 10:50:59.000000000 +0000
++++ camlspotter-camlimages-8ca76028cff3/OMakefile	2017-11-22 14:19:46.903902025 +0000
+@@ -19,7 +19,7 @@
+ # For release, -warn-error should not be put
+ 
+ # OCAMLFLAGS= -w A-4-9-35-37-40-41-42-44-45-48
+-OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string
++OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string -g
+ 
+ # For the development, -warn-error A is turned on
+ if $(file-exists DEV)
+diff -ur camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot camlspotter-camlimages-8ca76028cff3/OMyMakeroot
+--- camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot	2017-11-20 10:50:59.000000000 +0000
++++ camlspotter-camlimages-8ca76028cff3/OMyMakeroot	2017-11-22 14:19:32.461902772 +0000
+@@ -133,7 +133,7 @@
+ OCamlMkLibC(name, files, ldflags) =
+   protected.COBJS=$(addsuffix .o, $(files))
+   dll$(name).so lib$(name).a: $(COBJS)
+-    $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
++    $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
+   return $(array dll$(name).so, lib$(name).a)
+ 
+ # If ocamlmklib does not work for you, you can do:

camlimages-4.2.5-safe-string.patch

@@ -0,0 +1,33 @@
+--- ./camlspotter-camlimages-8ca76028cff3.old/examples/tiffps/tiffps.ml	2017-11-20 10:50:59.000000000 +0000
++++ ./camlspotter-camlimages-8ca76028cff3/examples/tiffps/tiffps.ml	2017-11-22 14:24:13.276888193 +0000
+@@ -58,7 +58,7 @@
+ 
+ (* Scanlined loader *)
+ type scanlined_loader = {
+-    read_next_line: (string -> unit);
++    read_next_line: (bytes -> unit);
+     close: (unit -> unit)
+   }
+ 
+@@ -410,7 +410,7 @@
+             function x ->
+               let adrs = x * 3 in
+               for i = 0 to 2 do
+-                print_string (sprintf "%02x" (Char.code buf.[adrs+i]))
++                print_string (sprintf "%02x" (Char.code (Bytes.get buf (adrs+i))))
+               done
+           else
+             let mono r g b =
+@@ -418,9 +418,9 @@
+             function x ->
+               let adrs = x * 3 in
+               let m =
+-                mono (Char.code buf.[adrs])
+-                     (Char.code buf.[adrs + 1])
+-                     (Char.code buf.[adrs + 2]) in
++                mono (Char.code (Bytes.get buf adrs))
++                     (Char.code (Bytes.get buf (adrs + 1)))
++                     (Char.code (Bytes.get buf (adrs + 2))) in
+               for _i = 0 to 2 do print_string (sprintf "%02x" m) done in
+         if not conf.mirror
+         then for x = x1 to x1 + w - 1 do print_pixel x done

ocaml-camlimages-libpng15.patch

@@ -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);

ocaml-camlimages.spec

@@ -1,31 +1,35 @@
-%define debug_package %{nil}
+# XXX This indicates a bug somewhere.  We are not passing the -g flag
+# through when creating the libraries.  However I cannot see exactly
+# what is wrong.
+%undefine _debugsource_packages
 
 Name:           ocaml-camlimages
-Version:        4.0.1
-Release:        10%{?dist}
+Version:        4.2.5
+Release:        28%{?dist}
 Summary:        OCaml image processing library
-
-Group:          Development/Libraries
 License:        LGPLv2 with exceptions
-URL:            http://cristal.inria.fr/camlimages/eng.html
 
-Source0:        https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz
+URL:            http://gallium.inria.fr/camlimages/
+Source0:        https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.gz
 
 # This file isn't published any more (that I could find).
 # It's probably dated but at least should provide some info on how to
 # use the library.
 Source1:        camlimages-2.2.0-htmlref.tar.gz
 
-Patch0:         ocaml-camlimages-libpng15.patch
+Patch1:         camlimages-4.2.5-add-g-flag.patch
+# Fix an example which has safe-string problems.
+Patch2:         camlimages-4.2.5-safe-string.patch
 
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-omake
 BuildRequires:  ocaml-lablgtk-devel
-BuildRequires:  ocaml-x11
-BuildRequires:  lablgtk, libpng-devel, libjpeg-devel
-BuildRequires:  libXpm-devel, ghostscript-devel, freetype-devel
+BuildRequires:  rgb
+BuildRequires:  libpng-devel, libjpeg-devel, libexif-devel
+BuildRequires:  libXpm-devel, libgs-devel, freetype-devel
 BuildRequires:  giflib-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  gtk2-devel
+Requires:       rgb
 
 %description
 This is an image processing library, which provides some basic
@@ -36,7 +40,6 @@ creates swap files and escapes them to reduce the memory usage).
 
 %package        devel
 Summary:        Development files for camlimages
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release} 
 
 
@@ -47,12 +50,13 @@ developing applications using camlimages
 Includes documentation provided by ocamldoc
 
 %prep
-%setup -q -n camlspotter-camlimages-c803efa9d5d3
-%setup -q -T -D -a 1 -n camlspotter-camlimages-c803efa9d5d3
-%patch0 -b .libpng
+%setup -q -n camlspotter-camlimages-8ca76028cff3
+%setup -q -T -D -a 1 -n camlspotter-camlimages-8ca76028cff3
+%patch1 -p1
+%patch2 -p2
 
 %build
-omake
+omake CFLAGS="$RPM_OPT_FLAGS" --verbose
 
 %install
 # These rules work if the library uses 'ocamlfind install' to install itself.
@@ -61,16 +65,16 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 omake install
 
-strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages-4.0.1
-cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages-4.0.1
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
+cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
 
 %files
-%doc README License.txt
+%doc README.md License.txt
 %{_libdir}/ocaml/camlimages
 %exclude %{_libdir}/ocaml/camlimages/*.a
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/camlimages/*.cmxa
+%endif
 # There aren't any *.cmx files
 #%exclude %{_libdir}/ocaml/camlimages/*.cmx
 %exclude %{_libdir}/ocaml/camlimages/*.mli
@@ -79,15 +83,202 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages-4.0.1
 
 
 %files devel
-%doc htmlref
+%{_docdir}/%{name}/htmlref/
 %{_libdir}/ocaml/camlimages/*.a
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/camlimages/*.cmxa
+%endif
 # There aren't any *.cmx files
 #%{_libdir}/ocaml/camlimages/*.cmx
 %{_libdir}/ocaml/camlimages/*.mli
 
 
 %changelog
+* Mon Mar  1 19:41:31 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-28
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-26
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-25
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 4.2.5-24
+- {Build,}Require rgb not xorg-x11-server-utils
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-22
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-21
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-20
+- OCaml 4.11.0 pre-release
+
+* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-19
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-18
+- OCaml 4.10.0 final.
+
+* Thu Feb 06 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-17
+- Remove bogus "lablgtk" dependency.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-15
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-14
+- OCaml 4.09.0 for riscv64
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-13
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-12
+- OCaml 4.08.1 (final) rebuild.
+
+* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-11
+- Rebuild against new ocaml-lablgtk.
+
+* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-10
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-6
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-5
+- OCaml 4.07.0-rc1 rebuild.
+
+* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 4.2.5-4
+- Rebuild (giflib)
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.5-3
+- Escape macros in %%changelog
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-1
+- New upstream version 4.2.5.
+- New version fixes compatibility with latest lablgtk.
+
+* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-2
+- OCaml 4.06.0 rebuild.
+
+* Wed Aug 09 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-1
+- New upstream version 4.2.4.
+- Replace opt test with ocaml_native_compiler.
+- Pass -g option to ocamlopt so debuginfo is generated correctly.
+
+* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-7
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-4
+- OCaml 4.04.2 rebuild.
+
+* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-3
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-1
+- New upstream version 4.2.2.
+- Drop patch for exif handling which is included upstream.
+- Drop patch for warn-error since this is fixed upstream.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Aug 16 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-18
+- devel shouldn't cover all doc files
+
+* Tue Aug 11 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-17
+- Don't use %%doc to copy over htmlref for -devel package
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-16
+- Bump release and rebuild.
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-15
+- OCaml 4.02.3 rebuild.
+
+* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-14
+- Enable bytecode compilation.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-13
+- ocaml-4.02.2 final rebuild.
+
+* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-12
+- ocaml-4.02.2 rebuild.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-10
+- ocaml-4.02.1 rebuild.
+
+* Fri Oct 31 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-9
+- Rebuild to link with updated dependencies
+
+* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-8
+- ocaml-4.02.0 final rebuild.
+
+* Tue Aug 19 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-7
+- Kill -warn-error A so we can build on OCaml 4.02.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 15 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-5
+- Rebuild for ocaml update
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Dec 25 2013 Ville Skyttä <ville.skytta@iki.fi> - 4.1.0-3
+- Fix -debuginfo, enable exif and rgb.txt support (#1009155).
+
+* Fri Sep 27 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-2
+- Try to get actual debug output
+
+* Sun Sep 15 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-1
+- Update to 4.1.0
+- 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
+- Rebuild for OCaml 4.01.0
+
+* Sun Aug 11 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-12
+- Move to unversioned doc directory
+- Fixes FTBFS bug 992390
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-d6b9494b56a72b65fd302d1858efff7c  v4.0.1.tar.gz
-fb1633c9c8df0b2b2d0f892d8c4ac2ee  camlimages-2.2.0-htmlref.tar.gz
+SHA512 (camlimages-2.2.0-htmlref.tar.gz) = 20cc6b7d92494f2e38700e9c9aed0d9663bed857662037a532241e60a80c5a2dcb308426007c50dfcfbf718098e930fd886ecdc22d5b8c168d08b4f287ab4d02
+SHA512 (4.2.5.tar.gz) = 8ca5f4f9c49dc2ad86dac3da640422f45816f510ace5fba975eda0046e4973b624d13022b50a4d5f93d425d0fe1e126ca7a008f3421b8383f43ca7c27442bceb