New upstream version 2.18.11. Drop upstreamed -fno-common patch.
This commit is contained in:
parent
d9d9c6a3ef
commit
1a79dca850
|
@ -1,22 +0,0 @@
|
|||
--- a/src/ml_gdk.c
|
||||
+++ b/src/ml_gdk.c
|
||||
@@ -55,6 +55,8 @@
|
||||
#define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL
|
||||
#endif
|
||||
|
||||
+lookup_info *ml_table_extension_events;
|
||||
+
|
||||
CAMLprim void ml_raise_gdk (const char *errmsg)
|
||||
{
|
||||
static const value * exn = NULL;
|
||||
--- a/src/ml_gdk.h
|
||||
+++ b/src/ml_gdk.h
|
||||
@@ -102,7 +102,7 @@ CAMLexport value Val_GdkEvent (GdkEvent
|
||||
CAMLexport int OptFlags_GdkModifier_val (value);
|
||||
CAMLexport int Flags_GdkModifier_val (value);
|
||||
CAMLexport int Flags_Event_mask_val (value);
|
||||
-CAMLexport lookup_info *ml_table_extension_events;
|
||||
+CAMLextern lookup_info *ml_table_extension_events;
|
||||
#define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key)
|
||||
|
||||
#define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)
|
|
@ -1,8 +1,6 @@
|
|||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
|
||||
Name: ocaml-lablgtk
|
||||
Version: 2.18.10
|
||||
Release: 7%{?dist}
|
||||
Version: 2.18.11
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: Objective Caml interface to gtk+
|
||||
|
||||
|
@ -10,9 +8,6 @@ License: LGPLv2 with exceptions
|
|||
|
||||
URL: http://lablgtk.forge.ocamlcore.org/
|
||||
Source: https://github.com/garrigue/lablgtk/archive/%{version}/lablgtk-%{version}.tar.gz
|
||||
# Fix the build with -fno-common
|
||||
# https://github.com/garrigue/lablgtk/pull/105
|
||||
Patch0: %{name}-fno-common.patch
|
||||
|
||||
BuildRequires: help2man
|
||||
BuildRequires: ocaml >= 3.12.1-3
|
||||
|
@ -65,7 +60,7 @@ sed -e "s|-O|$RPM_OPT_FLAGS|" \
|
|||
-e "s|-shared|& -ccopt \"$RPM_LD_FLAGS\"|" \
|
||||
-e "s|(CAMLMKLIB)|& -ldopt \"$RPM_LD_FLAGS\"|" \
|
||||
-i src/Makefile
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
make world CAMLOPT="ocamlopt.opt -g"
|
||||
make opt CAMLOPT="ocamlopt.opt -g"
|
||||
%else
|
||||
|
@ -120,7 +115,7 @@ done
|
|||
%dir %{_libdir}/ocaml/lablgtk2
|
||||
%{_libdir}/ocaml/lablgtk2/*.cmi
|
||||
%{_libdir}/ocaml/lablgtk2/*.cma
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/lablgtk2/*.cmxs
|
||||
%endif
|
||||
%{_libdir}/ocaml/stublibs/*.so*
|
||||
|
@ -137,7 +132,7 @@ done
|
|||
%dir %{_libdir}/ocaml/lablgtk2
|
||||
%{_libdir}/ocaml/lablgtk2/META
|
||||
%{_libdir}/ocaml/lablgtk2/*.a
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/lablgtk2/*.cmxa
|
||||
%{_libdir}/ocaml/lablgtk2/*.cmx
|
||||
%endif
|
||||
|
@ -145,12 +140,12 @@ done
|
|||
%{_libdir}/ocaml/lablgtk2/*.ml
|
||||
%{_libdir}/ocaml/lablgtk2/*.h
|
||||
%{_libdir}/ocaml/lablgtk2/gtkInit.cmo
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/lablgtk2/gtkInit.o
|
||||
%endif
|
||||
%{_libdir}/ocaml/lablgtk2/gtkThInit.cmo
|
||||
%{_libdir}/ocaml/lablgtk2/gtkThread.cmo
|
||||
%if %{opt}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/lablgtk2/gtkThread.o
|
||||
%endif
|
||||
%{_libdir}/ocaml/lablgtk2/propcc
|
||||
|
@ -158,6 +153,10 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 29 2020 Jerry James <loganjerry@gmail.com> - 2.18.11-1
|
||||
- New upstream version 2.18.11
|
||||
- Drop upstreamed -fno-common patch
|
||||
|
||||
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-7
|
||||
- OCaml 4.11.0+dev2-2020-04-22 rebuild
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (lablgtk-2.18.10.tar.gz) = 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
|
||||
SHA512 (lablgtk-2.18.11.tar.gz) = adc840df68aa5f9541db44f888f344b313e40c7d8f5cd35f2a45f1bc84e7136dde4b39f873de011db5d5fdfd904c0a097cd9d105458ea9f483cdab3954a2ee05
|
||||
|
|
Loading…
Reference in New Issue