Date: Saturday, August 24, 2019 @ 12:32:09
Author: juergen
Revision: 360813
archrelease: copy trunk to extra-x86_64
Added:
unison/repos/extra-x86_64/4.08-compatibility.patch
(from rev 360805, unison/trunk/4.08-compatibility.patch)
unison/repos/extra-x86_64/PKGBUILD
(from rev 360805, unison/trunk/PKGBUILD)
unison/repos/extra-x86_64/desktop
(from rev 360807, unison/trunk/desktop)
unison/repos/extra-x86_64/large.patch
(from rev 360808, unison/trunk/large.patch)
Deleted:
unison/repos/extra-x86_64/4.08-compatibility.patch
unison/repos/extra-x86_64/PKGBUILD
unison/repos/extra-x86_64/desktop
unison/repos/extra-x86_64/large.patch
--------------------------+
4.08-compatibility.patch | 104 +++++++++++++++++++++---------------------
PKGBUILD | 110 ++++++++++++++++++++++-----------------------
desktop | 22 ++++-----
large.patch | 98 ++++++++++++++++++++--------------------
4 files changed, 167 insertions(+), 167 deletions(-)
Deleted: 4.08-compatibility.patch
===================================================================
--- 4.08-compatibility.patch 2019-08-24 12:32:09 UTC (rev 360812)
+++ 4.08-compatibility.patch 2019-08-24 12:32:09 UTC (rev 360813)
@@ -1,52 +0,0 @@
-From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
-From: Jaap Boender <ja...@kerguelen.org>
-Date: Thu, 21 Mar 2019 12:26:51 +0000
-Subject: [PATCH] Compatibility with OCaml 4.08
-
----
- src/files.ml | 2 +-
- src/recon.ml | 4 ++--
- src/system/system_generic.ml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/files.ml b/src/files.ml
-index ba42ad57..5babf21e 100644
---- a/src/files.ml
-+++ b/src/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
- with End_of_file ->
- dirh.System.closedir ()
- end;
-- Sort.list (<) !files
-+ List.sort String.compare !files
-
- let ls dir pattern =
- Util.convertUnixErrorsToTransient
-diff --git a/src/recon.ml b/src/recon.ml
-index 5ed358d7..0df2cfe4 100644
---- a/src/recon.ml
-+++ b/src/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
-
- (* Sorts the paths so that they will be displayed in order
*)
- let sortPaths pathUpdatesList =
-- Sort.list
-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+ List.sort
-+ Path.compare
- pathUpdatesList
-
- let rec enterPath p1 p2 t =
-diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
-index ed8e18f3..0e28a781 100755
---- a/src/system/system_generic.ml
-+++ b/src/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
- let h = Unix.opendir f in
Copied: unison/repos/extra-x86_64/4.08-compatibility.patch (from rev 360805,
unison/trunk/4.08-compatibility.patch)
===================================================================
--- 4.08-compatibility.patch (rev 0)
+++ 4.08-compatibility.patch 2019-08-24 12:32:09 UTC (rev 360813)
@@ -0,0 +1,52 @@
+From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
+From: Jaap Boender <ja...@kerguelen.org>
+Date: Thu, 21 Mar 2019 12:26:51 +0000
+Subject: [PATCH] Compatibility with OCaml 4.08
+
+---
+ src/files.ml | 2 +-
+ src/recon.ml | 4 ++--
+ src/system/system_generic.ml | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/files.ml b/src/files.ml
+index ba42ad57..5babf21e 100644
+--- a/src/files.ml
++++ b/src/files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+ with End_of_file ->
+ dirh.System.closedir ()
+ end;
+- Sort.list (<) !files
++ List.sort String.compare !files
+
+ let ls dir pattern =
+ Util.convertUnixErrorsToTransient
+diff --git a/src/recon.ml b/src/recon.ml
+index 5ed358d7..0df2cfe4 100644
+--- a/src/recon.ml
++++ b/src/recon.ml
+@@ -651,8 +651,8 @@ let rec reconcile
+
+ (* Sorts the paths so that they will be displayed in order
*)
+ let sortPaths pathUpdatesList =
+- Sort.list
+- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++ List.sort
++ Path.compare
+ pathUpdatesList
+
+ let rec enterPath p1 p2 t =
+diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
+index ed8e18f3..0e28a781 100755
+--- a/src/system/system_generic.ml
++++ b/src/system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s d = Unix.link s d
+ let openfile = Unix.openfile
+ let opendir f =
+ let h = Unix.opendir f in
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-24 12:32:09 UTC (rev 360812)
+++ PKGBUILD 2019-08-24 12:32:09 UTC (rev 360813)
@@ -1,55 +0,0 @@
-#Maintainer: Gaetan Bisson <bis...@archlinux.org>
-#Contributor: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=unison
-pkgver=2.51.2
-pkgrel=4
-pkgdesc='File-synchronization tool'
-#url='https://github.com/bcpierce00/unison/'
-url='https://www.cis.upenn.edu/~bcpierce/unison/'
-arch=('x86_64')
-license=('GPL2')
-optdepends=('gtk2: graphical interface')
-makedepends=('ocaml' 'emacs' 'lablgtk2')
-source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz";
- 'large.patch'
- '4.08-compatibility.patch'
- 'desktop')
-sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
- '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
- '7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
- 'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
-
-options=('!makeflags')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/region_of_string/region_of_bytes/' -i src/uigtk2.ml
- patch -p0 -i ../large.patch
- patch -p1 -i ../4.08-compatibility.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- for ui in gtk2 text; do
- cp -a . build || true
- pushd build
- export CFLAGS=
- make all UISTYLE=$ui DEBUGGING=false THREADS=true
- mv src/unison src/unison-$ui
- mv src/unison-* ..
- popd
- rm -fr build
- done
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}"/usr/bin
- install -m755 unison-* "${pkgdir}"/usr/bin
- ln -s unison-text "${pkgdir}"/usr/bin/unison
-
- install -d "${pkgdir}"/usr/share/{pixmaps,applications}
- install -m644 icons/U.32x32x16m.png
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
Copied: unison/repos/extra-x86_64/PKGBUILD (from rev 360805,
unison/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-24 12:32:09 UTC (rev 360813)
@@ -0,0 +1,55 @@
+#Maintainer: Gaetan Bisson <bis...@archlinux.org>
+#Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=unison
+pkgver=2.51.2
+pkgrel=5
+pkgdesc='File-synchronization tool'
+#url='https://github.com/bcpierce00/unison/'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('x86_64')
+license=('GPL2')
+optdepends=('gtk2: graphical interface')
+makedepends=('ocaml' 'emacs' 'lablgtk2')
+source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz";
+ 'large.patch'
+ '4.08-compatibility.patch'
+ 'desktop')
+sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
+ '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
+ '7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
+ 'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
+
+options=('!makeflags')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed 's/region_of_string/region_of_bytes/' -i src/uigtk2.ml
+ patch -p0 -i ../large.patch
+ patch -p1 -i ../4.08-compatibility.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ for ui in gtk2 text; do
+ cp -a . build || true
+ pushd build
+ export CFLAGS=
+ make all UISTYLE=$ui DEBUGGING=false THREADS=true
+ mv src/unison src/unison-$ui
+ mv src/unison-* ..
+ popd
+ rm -fr build
+ done
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ install -d "${pkgdir}"/usr/bin
+ install -m755 unison-* "${pkgdir}"/usr/bin
+ ln -s unison-text "${pkgdir}"/usr/bin/unison
+
+ install -d "${pkgdir}"/usr/share/{pixmaps,applications}
+ install -m644 icons/U.32x32x16m.png
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -m644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+}
Deleted: desktop
===================================================================
--- desktop 2019-08-24 12:32:09 UTC (rev 360812)
+++ desktop 2019-08-24 12:32:09 UTC (rev 360813)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Comment=File synchronisation tool for X11
-TryExec=unison-gtk2
-Exec=unison-gtk2
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
Copied: unison/repos/extra-x86_64/desktop (from rev 360807,
unison/trunk/desktop)
===================================================================
--- desktop (rev 0)
+++ desktop 2019-08-24 12:32:09 UTC (rev 360813)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison-gtk2
+Exec=unison-gtk2
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true
Deleted: large.patch
===================================================================
--- large.patch 2019-08-24 12:32:09 UTC (rev 360812)
+++ large.patch 2019-08-24 12:32:09 UTC (rev 360813)
@@ -1,49 +0,0 @@
-diff -Nrua /usr/ports/net/unison/patches/patch-bytearray_stubs_c
./patches/patch-bytearray_stubs_c
---- /usr/ports/net/unison/patches/patch-bytearray_stubs_c Thu Jan 1
01:00:00 1970
-+++ ./patches/patch-bytearray_stubs_c Tue Jan 17 08:44:39 2017
-@@ -0,0 +1,45 @@
-+Fix rare SIGSEGV when transferring large replicas.
-+Fix a theoretical integer overflow.
-+
-+Patches from here:
-+https://caml.inria.fr/mantis/view.php?id=7431#c17026
-+and here:
-+https://caml.inria.fr/mantis/view.php?id=7431#c16962
-+
-+Related issue reports:
-+https://github.com/bcpierce00/unison/issues/48
-+https://caml.inria.fr/mantis/view.php?id=7431
-+https://bugzilla.redhat.com/show_bug.cgi?id=1401759
-+
-+Thanks to Alex Markley and OCaml developers
-+--- bytearray_stubs.c.orig Tue Jan 17 08:41:00 2017
-++++ bytearray_stubs.c Tue Jan 17 08:41:21 2017
-+@@ -5,6 +5,7 @@
-+
-+ #include "caml/intext.h"
-+ #include "caml/bigarray.h"
-++#include "caml/memory.h"
-+
-+ CAMLprim value ml_marshal_to_bigarray(value v, value flags)
-+ {
-+@@ -21,15 +22,18 @@ CAMLprim value ml_marshal_to_bigarray(value v, value f
-+
-+ CAMLprim value ml_unmarshal_from_bigarray(value b, value ofs)
-+ {
-++ CAMLparam1(b); /* Holds [b] live until unmarshalling completes. */
-++ value result;
-+ struct caml_bigarray *b_arr = Bigarray_val(b);
-+- return input_value_from_block (Array_data (b_arr, ofs),
-++ result = input_value_from_block (Array_data (b_arr, ofs),
-+ b_arr->dim[0] - Long_val(ofs));
-++ CAMLreturn(result);
-+ }
-+
-+ CAMLprim value ml_blit_string_to_bigarray
-+ (value s, value i, value a, value j, value l)
-+ {
-+- char *src = String_val(s) + Int_val(i);
-++ char *src = String_val(s) + Long_val(i);
-+ char *dest = Array_data(Bigarray_val(a), j);
-+ memcpy(dest, src, Long_val(l));
-+ return Val_unit;
Copied: unison/repos/extra-x86_64/large.patch (from rev 360808,
unison/trunk/large.patch)
===================================================================
--- large.patch (rev 0)
+++ large.patch 2019-08-24 12:32:09 UTC (rev 360813)
@@ -0,0 +1,49 @@
+diff -Nrua /usr/ports/net/unison/patches/patch-bytearray_stubs_c
./patches/patch-bytearray_stubs_c
+--- /usr/ports/net/unison/patches/patch-bytearray_stubs_c Thu Jan 1
01:00:00 1970
++++ ./patches/patch-bytearray_stubs_c Tue Jan 17 08:44:39 2017
+@@ -0,0 +1,45 @@
++Fix rare SIGSEGV when transferring large replicas.
++Fix a theoretical integer overflow.
++
++Patches from here:
++https://caml.inria.fr/mantis/view.php?id=7431#c17026
++and here:
++https://caml.inria.fr/mantis/view.php?id=7431#c16962
++
++Related issue reports:
++https://github.com/bcpierce00/unison/issues/48
++https://caml.inria.fr/mantis/view.php?id=7431
++https://bugzilla.redhat.com/show_bug.cgi?id=1401759
++
++Thanks to Alex Markley and OCaml developers
++--- bytearray_stubs.c.orig Tue Jan 17 08:41:00 2017
+++++ bytearray_stubs.c Tue Jan 17 08:41:21 2017
++@@ -5,6 +5,7 @@
++
++ #include "caml/intext.h"
++ #include "caml/bigarray.h"
+++#include "caml/memory.h"
++
++ CAMLprim value ml_marshal_to_bigarray(value v, value flags)
++ {
++@@ -21,15 +22,18 @@ CAMLprim value ml_marshal_to_bigarray(value v, value f
++
++ CAMLprim value ml_unmarshal_from_bigarray(value b, value ofs)
++ {
+++ CAMLparam1(b); /* Holds [b] live until unmarshalling completes. */
+++ value result;
++ struct caml_bigarray *b_arr = Bigarray_val(b);
++- return input_value_from_block (Array_data (b_arr, ofs),
+++ result = input_value_from_block (Array_data (b_arr, ofs),
++ b_arr->dim[0] - Long_val(ofs));
+++ CAMLreturn(result);
++ }
++
++ CAMLprim value ml_blit_string_to_bigarray
++ (value s, value i, value a, value j, value l)
++ {
++- char *src = String_val(s) + Int_val(i);
+++ char *src = String_val(s) + Long_val(i);
++ char *dest = Array_data(Bigarray_val(a), j);
++ memcpy(dest, src, Long_val(l));
++ return Val_unit;
