Date: Tuesday, May 2, 2023 @ 15:17:41
Author: arojas
Revision: 476342
archrelease: copy trunk to extra-x86_64
Added:
unison/repos/extra-x86_64/PKGBUILD
(from rev 476341, unison/trunk/PKGBUILD)
unison/repos/extra-x86_64/desktop
(from rev 476341, unison/trunk/desktop)
unison/repos/extra-x86_64/large.patch
(from rev 476341, unison/trunk/large.patch)
Deleted:
unison/repos/extra-x86_64/PKGBUILD
unison/repos/extra-x86_64/desktop
unison/repos/extra-x86_64/large.patch
-------------+
PKGBUILD | 104 +++++++++++++++++++++++++++++-----------------------------
desktop | 22 ++++++------
large.patch | 98 +++++++++++++++++++++++++++---------------------------
3 files changed, 112 insertions(+), 112 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-02 15:17:27 UTC (rev 476341)
+++ PKGBUILD 2023-05-02 15:17:41 UTC (rev 476342)
@@ -1,52 +0,0 @@
-#Maintainer: Gaetan Bisson <[email protected]>
-#Contributor: Tobias Powalowski <[email protected]>
-
-pkgname=unison
-pkgver=2.53.2
-pkgrel=1
-pkgdesc='File-synchronization tool'
-#url='https://github.com/bcpierce00/unison/'
-url='https://www.cis.upenn.edu/~bcpierce/unison/'
-arch=('x86_64')
-license=('GPL2')
-optdepends=('gtk3: graphical interface')
-makedepends=('ocaml>=4.11.0' 'emacs' 'lablgtk3')
-source=("https://github.com/bcpierce00/unison/archive/v$pkgver/$pkgname-$pkgver.tar.gz";
- 'large.patch'
- 'desktop')
-sha512sums=('b08694fc277ac3367176f3372b608285232639c6bea0480e9013b79788f1c4b2081c2b447d14b06975346be48e323a066518d40a2c1464dd60bc06071573f62b'
-
'e2f7a5e6e832ee9c694f36e399178652456d2047b22cba86603982cd6f6caf54e520fc87a8bde1940b2da46102cf3aa89f3e062c965efc77cd840b47e01b4d2f'
-
'2043acd79dde45b9b724076e361f117a6b42ec0c0321a2d2836b55a7fe5b03c45d81200819f64bc3e7d446f979a5a4a66c3d8c3ac7bdf1fe469c480ae2ac9464')
-options=('!makeflags')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p0 -i ../large.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- for ui in gtk3 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 ${pkgname}-${pkgver}
- install -d "${pkgdir}"/usr/bin
- install -m755 unison-* "${pkgdir}"/usr/bin
- ln -s unison-text "${pkgdir}"/usr/bin/unison
-
- install -Dm644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 icons/U.svg
"${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
- for i in 16 24 32 48 256; do
- install -Dm644 icons/U.${i}x${i}x16m.png
"${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
- done
-}
Copied: unison/repos/extra-x86_64/PKGBUILD (from rev 476341,
unison/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-02 15:17:41 UTC (rev 476342)
@@ -0,0 +1,52 @@
+#Maintainer: Gaetan Bisson <[email protected]>
+#Contributor: Tobias Powalowski <[email protected]>
+
+pkgname=unison
+pkgver=2.53.3
+pkgrel=1
+pkgdesc='File-synchronization tool'
+#url='https://github.com/bcpierce00/unison/'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('x86_64')
+license=('GPL2')
+optdepends=('gtk3: graphical interface')
+makedepends=('ocaml>=4.11.0' 'emacs' 'lablgtk3')
+source=("https://github.com/bcpierce00/unison/archive/v$pkgver/$pkgname-$pkgver.tar.gz";
+ 'large.patch'
+ 'desktop')
+sha512sums=('f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b'
+
'e2f7a5e6e832ee9c694f36e399178652456d2047b22cba86603982cd6f6caf54e520fc87a8bde1940b2da46102cf3aa89f3e062c965efc77cd840b47e01b4d2f'
+
'2043acd79dde45b9b724076e361f117a6b42ec0c0321a2d2836b55a7fe5b03c45d81200819f64bc3e7d446f979a5a4a66c3d8c3ac7bdf1fe469c480ae2ac9464')
+options=('!makeflags')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i ../large.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ for ui in gtk3 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 ${pkgname}-${pkgver}
+ install -d "${pkgdir}"/usr/bin
+ install -m755 unison-* "${pkgdir}"/usr/bin
+ ln -s unison-text "${pkgdir}"/usr/bin/unison
+
+ install -Dm644 ../desktop
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 icons/U.svg
"${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+ for i in 16 24 32 48 256; do
+ install -Dm644 icons/U.${i}x${i}x16m.png
"${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
+ done
+}
Deleted: desktop
===================================================================
--- desktop 2023-05-02 15:17:27 UTC (rev 476341)
+++ desktop 2023-05-02 15:17:41 UTC (rev 476342)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Comment=File synchronisation tool for X11
-TryExec=unison-gtk3
-Exec=unison-gtk3
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison
-StartupNotify=true
Copied: unison/repos/extra-x86_64/desktop (from rev 476341,
unison/trunk/desktop)
===================================================================
--- desktop (rev 0)
+++ desktop 2023-05-02 15:17:41 UTC (rev 476342)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison-gtk3
+Exec=unison-gtk3
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison
+StartupNotify=true
Deleted: large.patch
===================================================================
--- large.patch 2023-05-02 15:17:27 UTC (rev 476341)
+++ large.patch 2023-05-02 15:17:41 UTC (rev 476342)
@@ -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 476341,
unison/trunk/large.patch)
===================================================================
--- large.patch (rev 0)
+++ large.patch 2023-05-02 15:17:41 UTC (rev 476342)
@@ -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;
