[Unison-hackers] patches for 2.10.2 and 2.12.0

[Zvezdan Petkovic]

I've built the new ports for stable and beta for OpenBSD.
However, before they go into the ports tree officially I'd like to apply
all the patches that are important for stability and functionality.

One annoying thing I've noticed is that diff output is missing over ssh
connection.  I've seen the port on the unison-users list (posted by
Jerome).  There seems to be a patch related to assertion failure from
last fall (also by Jerome).  They both seem to be relevant to Unix
users.  Please confirm if this is true?

There were a couple of patches by Jerome related to Windows (or Cygwin).
I'm not sure if I need to apply them to a Unix (OpenBSD) version at all.

One thing that is disturbing is that I have to search through the
mailing list to get the patches that are crucial for the unison
functionality.  Can somebody put these patches together and make a
really stable version like 2.9.1 used to be?
Can you at least put the patches in one place for easy access and a
comment for which platform are they important?

If not, then perhaps, Max Bowsher could help me by sending all the
patches he has applied to his Windows port.  (Thanks Max I use it
between my office machine and my OpenBSD server.)

Please find attached below the patch I have applied to the "stable"
version 2.10.2 to make it compile with GTK1.  I basically applied the
same changes that are in 2.12.0.

Best regards,

	Zvezdan Petkovic
-------------- next part --------------
$OpenBSD$
--- uigtk.ml.orig	Mon Sep  6 15:15:46 2004
+++ uigtk.ml	Tue May 17 02:21:59 2005
@@ -1606,7 +1606,7 @@ in
                   catch (fun () ->
                            Transport.transportItem
                              theSI.ri (Uutil.File.ofLine i)
-                             (fun title text -> Trace.status (Printf.sprintf "\n%s\n\n%s\n\n" title text))
+                             (fun title text -> Trace.status (Printf.sprintf "\n%s\n\n%s\n\n" title text); true)
                            >>= (fun () ->
                            return Util.Succeeded))
                         (fun e ->
@@ -1760,6 +1760,7 @@ in
   actionBar#insert_space ();
   grAdd grDiff (actionBar#insert_button ~text:"Diff" ~callback:diffCmd ());
 
+(*
   let mergeCmd () =
     match !current with
       Some i ->
@@ -1787,7 +1788,7 @@ in
 
   actionBar#insert_space ();
   grAdd grDiff (actionBar#insert_button ~text:"Merge" ~callback:mergeCmd ());
-
+*)
   (*********************************************************************
     Keyboard commands
    *********************************************************************)