summaryrefslogtreecommitdiff
path: root/net-misc/unison/files
diff options
context:
space:
mode:
authorCtibor <ctibor.brancik@seznam.cz>2012-10-23 22:23:48 +0200
committerCtibor <ctibor.brancik@seznam.cz>2012-10-23 22:23:48 +0200
commitb3f80e0306587663a493502e4fcfa1c17c5836fd (patch)
treecbd97925b8af0d81f04fd8ee064e631ae70a788e /net-misc/unison/files
downloadbrancik-overlay-b3f80e0306587663a493502e4fcfa1c17c5836fd.tar.gz
brancik-overlay-b3f80e0306587663a493502e4fcfa1c17c5836fd.tar.bz2
Initial import of the local overlay.
Diffstat (limited to 'net-misc/unison/files')
-rwxr-xr-xnet-misc/unison/files/unison-2.27.57-as-needed.patch11
-rwxr-xr-xnet-misc/unison/files/unison-2.32.52-arch-1.patch12
-rwxr-xr-xnet-misc/unison/files/unison-mymap.patch13
3 files changed, 36 insertions, 0 deletions
diff --git a/net-misc/unison/files/unison-2.27.57-as-needed.patch b/net-misc/unison/files/unison-2.27.57-as-needed.patch
new file mode 100755
index 0000000..ff5be04
--- /dev/null
+++ b/net-misc/unison/files/unison-2.27.57-as-needed.patch
@@ -0,0 +1,11 @@
+--- unison-2.17.1/Makefile.OCaml
++++ unison-2.17.1/Makefile.OCaml
+@@ -330,7 +330,7 @@
+
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ @echo Linking $@
+- $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++ $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
diff --git a/net-misc/unison/files/unison-2.32.52-arch-1.patch b/net-misc/unison/files/unison-2.32.52-arch-1.patch
new file mode 100755
index 0000000..bb364b4
--- /dev/null
+++ b/net-misc/unison/files/unison-2.32.52-arch-1.patch
@@ -0,0 +1,12 @@
+Index: src/terminal.ml
+===================================================================
+--- src/terminal.ml (révision 463)
++++ src/terminal.ml (copie de travail)
+@@ -191,7 +191,6 @@
+ exit 127
+ end
+ | childPid ->
+- Unix.close slaveFd;
+ (Some masterFd, childPid)
+ end
+
diff --git a/net-misc/unison/files/unison-mymap.patch b/net-misc/unison/files/unison-mymap.patch
new file mode 100755
index 0000000..030eb0f
--- /dev/null
+++ b/net-misc/unison/files/unison-mymap.patch
@@ -0,0 +1,13 @@
+Index: unison-2.32.52/update.mli
+===================================================================
+--- unison-2.32.52.orig/update.mli
++++ unison-2.32.52/update.mli
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+
+ type archive =
+ ArchiveDir of Props.t * archive NameMap.t