Version 3.1.1. Drop upstreamed -fno-common patch.

This commit is contained in:
Jerry James 2020-08-05 13:36:11 -06:00
parent ea08dca673
commit 53debe5c35
3 changed files with 7 additions and 28 deletions

View File

@ -1,22 +0,0 @@
--- a/src/ml_gdk.c
+++ b/src/ml_gdk.c
@@ -48,6 +48,8 @@
#include "gdk_tags.h"
+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
@@ -86,7 +86,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)

View File

@ -5,8 +5,8 @@
%global pkgname lablgtk3
Name: ocaml-%{pkgname}
Version: 3.1.0
Release: 8%{?dist}
Version: 3.1.1
Release: 1%{?dist}
Summary: OCaml interface to gtk3
License: LGPLv2+ with exceptions
@ -14,9 +14,6 @@ URL: http://lablgtk.forge.ocamlcore.org/
Source0: https://github.com/garrigue/lablgtk/releases/download/%{version}/%{pkgname}-%{version}.tbz
# Fedora only patch: unbundle xml-light
Patch0: %{name}-xml-light.patch
# Fix the build with -fno-common
# https://github.com/garrigue/lablgtk/pull/105
Patch1: %{name}-fno-common.patch
BuildRequires: help2man
BuildRequires: ocaml >= 4.05.0
@ -234,6 +231,10 @@ dune runtest
%{_libdir}/ocaml/lablgtk3-sourceview3/opam
%changelog
* Wed Aug 5 2020 Jerry James <loganjerry@gmail.com> - 3.1.1-1
- Version 3.1.1
- Drop upstreamed -fno-common patch
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-8
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (lablgtk3-3.1.0.tbz) = 4bda466717414567a8833c40b06f9b48253035c4580addf4f34de50c9335bc9eecec34165b00aa63c0f4b8c29f21fbc7620e67b83501e385dfa5bd5875d7e0a6
SHA512 (lablgtk3-3.1.1.tbz) = 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3