diff --git a/ocaml-lablgtk-svgz.patch b/ocaml-lablgtk-svgz.patch new file mode 100644 index 0000000..18109c4 --- /dev/null +++ b/ocaml-lablgtk-svgz.patch @@ -0,0 +1,12 @@ +--- lablgtk-2.18.13/src/ml_rsvg.c.orig 2022-10-06 01:55:37.000000000 -0600 ++++ lablgtk-2.18.13/src/ml_rsvg.c 2022-10-12 09:01:06.544979170 -0600 +@@ -52,6 +52,9 @@ ML_0(rsvg_handle_new, Val_pointer) + #ifdef HAVE_SVGZ + #include + ML_0 (rsvg_handle_new_gz, Val_pointer) ++#elif defined(LIBRSVG_HAVE_SVGZ) && LIBRSVG_HAVE_SVGZ ++CAMLprim value ml_rsvg_handle_new_gz() ++{ return Val_pointer(rsvg_handle_new ()); } + #else + CAMLprim value ml_rsvg_handle_new_gz() + { failwith ("Doesn't support GZipped SVG files"); return Val_unit; } diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index 0e2ae3c..c9c6da8 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -1,19 +1,26 @@ %undefine _package_note_flags Name: ocaml-lablgtk -Version: 2.18.12 -Release: 5%{?dist} +Version: 2.18.13 +Release: 1%{?dist} Summary: Objective Caml interface to gtk+ -License: LGPLv2 with exceptions +# The project as a whole is LGPL-2.0-only. LGPL-2.1-or-later files: +# - src/gtkSourceView2_types.mli +# - src/introspection/xml-light/* (not included in the binary RPM) +License: LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://garrigue.github.io/lablgtk/ Source: https://github.com/garrigue/lablgtk/archive/%{version}/lablgtk-%{version}.tar.gz +# Provide a definition of ml_rsvg_handle_new_gz for newer versions of librsvg +# which do not explicitly expose an SVGZ interface. +Patch0: %{name}-svgz.patch BuildRequires: help2man BuildRequires: make BuildRequires: ocaml >= 4.06 +BuildRequires: ocaml-camlp-streams-devel BuildRequires: ocaml-findlib >= 1.2.1 BuildRequires: ocaml-ocamldoc BuildRequires: pkgconfig(gtk+-2.0) @@ -58,15 +65,15 @@ chmod a-x README* %build # Parallel builds don't work. unset MAKEFLAGS -%configure --enable-debug --without-gnomeui +%configure --without-gnomeui sed -e "s|-O|%{build_cflags}|" \ -e "s|-shared|& -ccopt '%{build_ldflags}'|" \ -e "s|(CAMLMKLIB)|& -ldopt '%{build_ldflags}'|" \ -e "s|-warn-error [-A-Za-z0-9]\+||" \ -i src/Makefile %ifarch %{ocaml_native_compiler} -make world CAMLOPT="ocamlopt.opt -g" -make opt CAMLOPT="ocamlopt.opt -g" +make world CAMLOPT="ocamlopt.opt -g" CAMLC="ocamlc.opt -g" +make opt CAMLOPT="ocamlopt.opt -g" CAMLC="ocamlc.opt -g" %else make world CAMLC="ocamlc -g" %endif @@ -101,7 +108,7 @@ done popd # Remove .cvsignore files from examples directory. -find examples -name .cvsignore -exec rm {} \; +find examples -name .cvsignore -delete # Generate man pages export LD_LIBRARY_PATH=$PWD/src @@ -128,6 +135,13 @@ sed -i '/propcc/d;/varcc/d' .ofiles %changelog +* Wed Oct 12 2022 Jerry James - 2.18.13-1 +- Version 2.18.13 +- Convert License tag to SPDX +- Provide a working definition of ml_rsvg_handle_new_gz +- BR ocaml-camlp-streams-devel for OCaml 5 compatibility +- Stop building in debug mode + * Fri Jul 22 2022 Fedora Release Engineering - 2.18.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index fc809c8..e2e8b22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lablgtk-2.18.12.tar.gz) = 284a1234ae817c4df49809d28c103ca5e64046da5ec9ff28c6edc0ce999e9d3e6e180dd053f8b1663d4fb3b7ba19570d53b9441c8fa622add924e8d85e41b813 +SHA512 (lablgtk-2.18.13.tar.gz) = 41deafbf8bbb9d15950d74a053e21c65aa0d2d4044a41d048f197e744a82ebbe159d43f67092fa19a8385bf0f7da0250ef2f0a532a0810e88f695d6f1fef4c48