diff --git a/ocaml-lablgtk-unix.patch b/ocaml-lablgtk-unix.patch new file mode 100644 index 0000000..6692253 --- /dev/null +++ b/ocaml-lablgtk-unix.patch @@ -0,0 +1,26 @@ +--- lablgtk-2.18.13/configure.in.orig 2022-10-06 01:55:37.000000000 -0600 ++++ lablgtk-2.18.13/configure.in 2023-09-27 12:16:38.789928991 -0600 +@@ -220,8 +220,8 @@ AC_MSG_RESULT(use $THREADS_LIB threads) + # Check for dll support + HAS_DLL_SUPPORT="no" + AC_MSG_CHECKING(for ocaml dll support) +-if test -r "$OCAMLLIB/stublibs/dllunix.so" || +- test -r "$OCAMLLIB/stublibs/dllunix.dll" ++if test -r "$OCAMLLIB/stublibs/dllunixnat.so" || ++ test -r "$OCAMLLIB/stublibs/dllunixbyt.so" + then HAS_DLL_SUPPORT="yes" + fi + AC_MSG_RESULT($HAS_DLL_SUPPORT) +--- lablgtk-2.18.13/configure.orig 2022-10-06 01:55:37.000000000 -0600 ++++ lablgtk-2.18.13/configure 2023-09-27 13:31:10.122363877 -0600 +@@ -3172,8 +3172,8 @@ printf "%s\n" "use $THREADS_LIB threads" + HAS_DLL_SUPPORT="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ocaml dll support" >&5 + printf %s "checking for ocaml dll support... " >&6; } +-if test -r "$OCAMLLIB/stublibs/dllunix.so" || +- test -r "$OCAMLLIB/stublibs/dllunix.dll" ++if test -r "$OCAMLLIB/stublibs/dllunixnat.so" || ++ test -r "$OCAMLLIB/stublibs/dllunixbyt.so" + then HAS_DLL_SUPPORT="yes" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAS_DLL_SUPPORT" >&5 diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index d2fc6d3..07207bf 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -22,6 +22,8 @@ Patch0: %{name}-svgz.patch Patch1: %{name}-precious.patch # Adapt to OCaml 5 Patch2: %{name}-ocaml5.patch +# Adapt to new paths to Unix library in OCaml 5.1.0 +Patch3: %{name}-unix.patch BuildRequires: help2man BuildRequires: make @@ -29,6 +31,7 @@ BuildRequires: ocaml >= 4.06 BuildRequires: ocaml-camlp-streams-devel BuildRequires: ocaml-findlib >= 1.2.1 BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-rpm-macros BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(gtkspell-2.0) @@ -38,7 +41,6 @@ BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(zlib) -BuildRequires: python3 %global __ocaml_requires_opts -i GtkSourceView2_types @@ -149,6 +151,9 @@ sed -i '/propcc/d;/varcc/d' .ofiles %changelog +* Wed Oct 4 2023 Jerry James - 2.18.13-6 +- Add patch for new Unix library name in OCaml 5.1.0 + * Thu Jul 20 2023 Fedora Release Engineering - 2.18.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild