Attachment 908329 Details for Bug 1106642 – Patch for rawhide

[patch] Patch for rawhide

planets-Add-Debian-patch-to-fix-FTBFS-with-ocaml-4.01-110664.patch (text/plain), 5.12 KB, created by Yaakov Selkowitz on 2014-06-12 22:44:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-12 22:44:37 UTC

Size: 5.12 KB

patch

obsolete

>From f7ffbf248dcdd928ea50ba97979a281d5bd5ff53 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 12 Jun 2014 17:38:12 -0500
>Subject: [PATCH] Add Debian patch to fix FTBFS with ocaml-4.01 (#1106642)
>
>---
> planets-0.1.13-ocaml4.patch | 111 ++++++++++++++++++++++++++++++++++++++++++++
> planets.spec                |   7 ++-
> 2 files changed, 117 insertions(+), 1 deletion(-)
> create mode 100644 planets-0.1.13-ocaml4.patch
>
>diff --git a/planets-0.1.13-ocaml4.patch b/planets-0.1.13-ocaml4.patch
>new file mode 100644
>index 0000000..ade2ef8
>--- /dev/null
>+++ b/planets-0.1.13-ocaml4.patch
>@@ -0,0 +1,111 @@
>+Description: Fix compilation with OCaml 4.01.0
>+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731218
>+
>+diff --git a/options.ml b/options.ml
>+index 0b5e47a..94fc28b 100644
>+--- a/options.ml
>++++ b/options.ml
>+@@ -93,7 +93,7 @@ end
>+ (*********************************************************************)
>+ (* 'a is the data type, 'b is the widget type *)
>+ 
>+-class virtual ['a,'b] option ?name ~text ~set:(set:'a->unit) ~get () =
>++class virtual ['a,'b,'c] option ?name ~text ~set:(set:'a->unit) ~get () =
>+   let name = (match name with
>+ 		  None -> random_name 10
>+ 		| Some name -> name ) in
>+@@ -104,7 +104,7 @@ object (self)
>+   val name = name
>+   val text = (text : string)
>+ 
>+-  method virtual build_widget : live:bool -> 'b 
>++  method virtual build_widget : live:bool -> 'b
>+   method display ~live parent =
>+     ignore (self#build_widget ~live parent);
>+     match widget with 
>+@@ -126,9 +126,9 @@ end
>+ 
>+ (*********************)
>+ 
>+-class ['b] toggle_option ?name ~text ~set ~get () =
>++class ['b,'c] toggle_option ?name ~text ~set ~get () =
>+ object (self)
>+-  inherit [bool,'b] option ?name ~text ~set ~get ()
>++  inherit [bool,'b,'c] option ?name ~text ~set ~get ()
>+     
>+   method set_tk bool = 
>+     Textvariable.set tk_var (if bool then "true" else "false")
>+@@ -153,9 +153,9 @@ end
>+ 
>+ (*********************)
>+ 
>+-class ['b] int_scale_option ?name ~min ~max ~text ~set ~get () =
>++class ['b,'c] int_scale_option ?name ~min ~max ~text ~set ~get () =
>+ object (self)
>+-  inherit [int,'b] option ?name ~text ~set ~get ()
>++  inherit [int,'b,'c] option ?name ~text ~set ~get ()
>+   val min = min
>+   val max = max
>+ 
>+@@ -192,10 +192,10 @@ end
>+ 
>+ (*******************************************************)
>+ 
>+-class ['b] float_scale_option ?name ~min ~max ?(resolution=1.0) 
>++class ['b, 'c] float_scale_option ?name ~min ~max ?(resolution=1.0)
>+   ~text ~set ~get () = 
>+ object (self)
>+-  inherit [float, 'b] option ?name ~text ~set ~get ()
>++  inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
>+   val min = min
>+   val max = max
>+ 
>+@@ -236,10 +236,10 @@ let string_of_float x =
>+   then string ^ "0"
>+   else string
>+ 
>+-class ['b] float_entry_option ?name ?(mult=1.1) 
>++class ['b, 'c] float_entry_option ?name ?(mult=1.1)
>+   ~text ~set ~get () =
>+ object (self)
>+-  inherit [float, 'b] option ?name ~text ~set ~get ()
>++  inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
>+ 
>+   val mutable entry = None
>+ 
>+@@ -303,9 +303,9 @@ end
>+ 
>+ (*******************************************************)
>+ 
>+-class ['b] float_entry_display ?name ~text ~set ~get () =
>++class ['b, 'c] float_entry_display ?name ~text ~set ~get () =
>+ object (self)
>+-  inherit [float, 'b] option ?name ~text ~set ~get ()
>++  inherit [float, 'b, 'c] option ?name ~text ~set ~get ()
>+ 
>+   val mutable display = None
>+ 
>+@@ -337,9 +337,9 @@ end
>+ 
>+ (*******************************************************)
>+ 
>+-class ['b] int_entry_display ?name ~text ~set ~get () =
>++class ['b, 'c] int_entry_display ?name ~text ~set ~get () =
>+ object (self)
>+-  inherit [int, 'b] option ?name ~text ~set ~get ()
>++  inherit [int, 'b, 'c] option ?name ~text ~set ~get ()
>+ 
>+   val mutable display = None
>+ 
>+@@ -371,9 +371,9 @@ end
>+ 
>+ (*******************************************************)
>+ 
>+-class ['b] void_entry_display ?name ~text () =
>++class ['b, 'c] void_entry_display ?name ~text () =
>+ object (self)
>+-  inherit [unit, 'b] option ?name ~text 
>++  inherit [unit, 'b, 'c] option ?name ~text
>+     ~set:(fun x -> ()) ~get:(fun () -> ())
>+     ()
>+ 
>diff --git a/planets.spec b/planets.spec
>index d869b2a..cac9b29 100644
>--- a/planets.spec
>+++ b/planets.spec
>@@ -1,13 +1,14 @@
> %define debug_package %{nil}
> Name: planets
> Version:  0.1.13
>-Release:  13%{?dist}
>+Release:  14%{?dist}
> Summary: A celestial simulator  
> 
> Group: Amusements/Games 
> License: GPLv2+
> URL: http://planets.homedns.org/
> Source0: http://planets.homedns.org/dist/planets-%{version}.tgz
>+Patch0:  planets-0.1.13-ocaml4.patch
> BuildRequires: desktop-file-utils, ocaml-labltk-devel, ocaml-camlp4-devel
> Requires: hicolor-icon-theme
> 
>@@ -17,6 +18,7 @@ of planetary systems
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> %build
> 
>@@ -63,6 +65,9 @@ fi
> %{_mandir}/man1/planets.1.gz
> 
> %changelog
>+* Thu Jun 12 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.13-14
>+- Add Debian patch to fix FTBFS with ocaml-4.01 (#1106642)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.13-13
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106642: 904892 | 904893 | 904894 | 908329