[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Saturday, August 29, 2020 @ 13:10:13
  Author: juergen
Revision: 394896

OCaml 4.11.0 rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-29 13:09:58 UTC (rev 394895)
+++ PKGBUILD2020-08-29 13:10:13 UTC (rev 394896)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=9
+pkgrel=10
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -10,7 +10,7 @@
 arch=('x86_64')
 license=('GPL2')
 optdepends=('gtk2: graphical interface')
-makedepends=('ocaml' 'emacs' 'lablgtk2')
+makedepends=('ocaml>=4.11.0' 'emacs' 'lablgtk2')
 source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz;
 'large.patch'
'4.08-compatibility.patch'

[arch-commits] Commit in unison/trunk (PKGBUILD desktop)

[Gaëtan Bisson via arch-commits]

Date: Tuesday, August 4, 2020 @ 22:19:54
  Author: bisson
Revision: 393153

implement FS#67478

Modified:
  unison/trunk/PKGBUILD
  unison/trunk/desktop

--+
 PKGBUILD |   14 --
 desktop  |2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-04 19:27:11 UTC (rev 393152)
+++ PKGBUILD2020-08-04 22:19:54 UTC (rev 393153)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=8
+pkgrel=9
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -17,8 +17,8 @@
 'desktop')
 sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
 '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
-   '7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
-'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
+'7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
+'2dc5c53386cc065706e6c901d1a1a205808e449dc9676320d1de7a5dd673e174')
 
 options=('!makeflags')
 
@@ -49,7 +49,9 @@
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"
+   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
 }

Modified: desktop
===
--- desktop 2020-08-04 19:27:11 UTC (rev 393152)
+++ desktop 2020-08-04 22:19:54 UTC (rev 393153)
@@ -7,5 +7,5 @@
 Terminal=false
 Type=Application
 Categories=GTK;Application;Network;
-Icon=unison.png
+Icon=unison
 StartupNotify=true

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Monday, May 18, 2020 @ 17:32:28
  Author: juergen
Revision: 385482

Rebuild/Update to OCaml 4.10.0

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-18 17:31:41 UTC (rev 385481)
+++ PKGBUILD2020-05-18 17:32:28 UTC (rev 385482)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=7
+pkgrel=8
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Felix Yan via arch-commits]

Date: Saturday, March 21, 2020 @ 18:27:59
  Author: felixonmars
Revision: 378280

upgpkg: unison 2.51.2-7: rebuild with ocaml 4.09.1

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-21 18:25:51 UTC (rev 378279)
+++ PKGBUILD2020-03-21 18:27:59 UTC (rev 378280)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=6
+pkgrel=7
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Thursday, October 10, 2019 @ 09:52:11
  Author: juergen
Revision: 364314

OCaml 4.09 rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-10 09:51:30 UTC (rev 364313)
+++ PKGBUILD2019-10-10 09:52:11 UTC (rev 364314)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=5
+pkgrel=6
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Saturday, August 24, 2019 @ 12:31:55
  Author: juergen
Revision: 360792

OCaml 4.08.1 rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-24 12:31:55 UTC (rev 360791)
+++ PKGBUILD2019-08-24 12:31:55 UTC (rev 360792)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=4
+pkgrel=5
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Thursday, November 29, 2018 @ 07:10:19
  Author: juergen
Revision: 340594

OCaml 4.07.1 rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-29 07:10:05 UTC (rev 340593)
+++ PKGBUILD2018-11-29 07:10:19 UTC (rev 340594)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=2
+pkgrel=3
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Jürgen Hötzel via arch-commits]

Date: Tuesday, August 14, 2018 @ 15:56:46
  Author: juergen
Revision: 331509

OCaml 4.07.0 rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-14 15:55:02 UTC (rev 331508)
+++ PKGBUILD2018-08-14 15:56:46 UTC (rev 331509)
@@ -4,7 +4,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=1
+pkgrel=2
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaëtan Bisson via arch-commits]

Date: Wednesday, March 21, 2018 @ 20:27:54
  Author: bisson
Revision: 319781

upstream update

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-21 20:17:10 UTC (rev 319780)
+++ PKGBUILD2018-03-21 20:27:54 UTC (rev 319781)
@@ -3,9 +3,8 @@
 #Contributor: Tobias Powalowski 
 
 pkgname=unison
-_pkgver=2.48.15v4
-pkgver=${_pkgver%v*}
-pkgrel=3
+pkgver=2.51.2
+pkgrel=1
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -13,10 +12,10 @@
 license=('GPL2')
 optdepends=('gtk2: graphical interface')
 makedepends=('ocaml' 'emacs' 'lablgtk2')
-source=("https://github.com/bcpierce00/unison/archive/v${_pkgver}.tar.gz;
+source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz;
 'large.patch'
 'desktop')
-sha256sums=('f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec'
+sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
 '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
 'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
 
@@ -23,18 +22,18 @@
 options=('!makeflags')
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
sed 's/region_of_string/region_of_bytes/' -i src/uigtk2.ml
patch -p0 -i ../large.patch
 }
 
 build() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
for ui in gtk2 text; do
cp -a . build || true
pushd build
export CFLAGS=
-   make UISTYLE=$ui DEBUGGING=false THREADS=true
+   make all UISTYLE=$ui DEBUGGING=false THREADS=true
mv src/unison src/unison-$ui
mv src/unison-* ..
popd
@@ -43,7 +42,7 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${_pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
install -d "${pkgdir}"/usr/bin
install -m755 unison-* "${pkgdir}"/usr/bin
ln -s unison-text "${pkgdir}"/usr/bin/unison

[arch-commits] Commit in unison/trunk (PKGBUILD desktop)

[Gaëtan Bisson via arch-commits]

Date: Thursday, February 8, 2018 @ 05:12:12
  Author: bisson
Revision: 316179

fix desktop file

Modified:
  unison/trunk/PKGBUILD
  unison/trunk/desktop

--+
 PKGBUILD |4 ++--
 desktop  |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-07 23:44:30 UTC (rev 316178)
+++ PKGBUILD2018-02-08 05:12:12 UTC (rev 316179)
@@ -5,7 +5,7 @@
 pkgname=unison
 _pkgver=2.48.15v4
 pkgver=${_pkgver%v*}
-pkgrel=2
+pkgrel=3
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -18,7 +18,7 @@
 'desktop')
 sha256sums=('f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec'
 '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
-'e9ef4e8b845453e21abafa8c9d153080375024d2465e3bf65f0e5a2ca1f5ea4a')
+'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
 
 options=('!makeflags')
 

Modified: desktop
===
--- desktop 2018-02-07 23:44:30 UTC (rev 316178)
+++ desktop 2018-02-08 05:12:12 UTC (rev 316179)
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Name=unison
 Comment=File synchronisation tool for X11
-TryExec=unison-x11
-Exec=unison-x11
+TryExec=unison-gtk2
+Exec=unison-gtk2
 Terminal=false
 Type=Application
 Categories=GTK;Application;Network;

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaëtan Bisson via arch-commits]

Date: Monday, February 5, 2018 @ 05:24:06
  Author: bisson
Revision: 315882

build gtk2 too

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-05 05:00:27 UTC (rev 315881)
+++ PKGBUILD2018-02-05 05:24:06 UTC (rev 315882)
@@ -5,13 +5,14 @@
 pkgname=unison
 _pkgver=2.48.15v4
 pkgver=${_pkgver%v*}
-pkgrel=1
+pkgrel=2
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
 arch=('x86_64')
 license=('GPL2')
-makedepends=('ocaml' 'emacs')
+optdepends=('gtk2: graphical interface')
+makedepends=('ocaml' 'emacs' 'lablgtk2')
 source=("https://github.com/bcpierce00/unison/archive/v${_pkgver}.tar.gz;
 'large.patch'
 'desktop')
@@ -23,20 +24,28 @@
 
 prepare() {
cd "${srcdir}/${pkgname}-${_pkgver}"
+   sed 's/region_of_string/region_of_bytes/' -i src/uigtk2.ml
patch -p0 -i ../large.patch
 }
 
 build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
-   export CFLAGS=
-   make UISTYLE=text DEBUGGING=false THREADS=true
-   mv src/unison src/unison-text
+   for ui in gtk2 text; do
+   cp -a . build || true
+   pushd build
+   export CFLAGS=
+   make 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 src/unison-* "${pkgdir}"/usr/bin
+   install -m755 unison-* "${pkgdir}"/usr/bin
ln -s unison-text "${pkgdir}"/usr/bin/unison
 
install -d "${pkgdir}"/usr/share/{pixmaps,applications}

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaëtan Bisson via arch-commits]

Date: Saturday, February 3, 2018 @ 19:32:30
  Author: bisson
Revision: 315822

upstream update, drop gtk2

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   41 -
 1 file changed, 16 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-03 18:22:01 UTC (rev 315821)
+++ PKGBUILD2018-02-03 19:32:30 UTC (rev 315822)
@@ -3,18 +3,19 @@
 #Contributor: Tobias Powalowski 
 
 pkgname=unison
-pkgver=2.48.4
-pkgrel=2
+_pkgver=2.48.15v4
+pkgver=${_pkgver%v*}
+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=('gtk2: for gtk2 support')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
+makedepends=('ocaml' 'emacs')
+source=("https://github.com/bcpierce00/unison/archive/v${_pkgver}.tar.gz;
 'large.patch'
 'desktop')
-sha256sums=('30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8'
+sha256sums=('f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec'
 '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
 'e9ef4e8b845453e21abafa8c9d153080375024d2465e3bf65f0e5a2ca1f5ea4a')
 
@@ -21,34 +22,24 @@
 options=('!makeflags')
 
 prepare() {
-   cd "${srcdir}/src"
+   cd "${srcdir}/${pkgname}-${_pkgver}"
patch -p0 -i ../large.patch
 }
 
 build() {
-   cd "${srcdir}/src"
-   CFLAGS=""
-
-   for ui in text gtk2; do
-   make clean
-   make mkProjectInfo 
-   make UISTYLE=$ui DEBUGGING=false THREADS=true
-   mv unison unison-$ui
-   done
+   cd "${srcdir}/${pkgname}-${_pkgver}"
+   export CFLAGS=
+   make UISTYLE=text DEBUGGING=false THREADS=true
+   mv src/unison src/unison-text
 }
 
 package() {
-   cd "${srcdir}/src"
-
+   cd "${srcdir}/${pkgname}-${_pkgver}"
install -d "${pkgdir}"/usr/bin
-   install -m755 unison-* "${pkgdir}"/usr/bin
+   install -m755 src/unison-* "${pkgdir}"/usr/bin
+   ln -s unison-text "${pkgdir}"/usr/bin/unison
 
install -d "${pkgdir}"/usr/share/{pixmaps,applications}
-   convert win32rc/U.ico[1] "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+   install -m644 icons/U.32x32x16m.png 
"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
install -m644 ../desktop 
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-   cd "${pkgdir}"/usr/bin
-   ln -s unison-text unison
-   ln -s unison-gtk2 unison-x11
-   ln -s unison unison-${pkgver%.*}
 }

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaëtan Bisson]

Date: Thursday, March 2, 2017 @ 01:37:43
  Author: bisson
Revision: 289860

switch to sha256sum

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:37:38 UTC (rev 289859)
+++ PKGBUILD2017-03-02 01:37:43 UTC (rev 289860)
@@ -14,9 +14,9 @@
 
source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
 'large.patch'
 'desktop')
-sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
-  '95433c2aa961cba19535fdf556e30bafa414a420'
-  '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
+sha256sums=('30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8'
+'2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
+'e9ef4e8b845453e21abafa8c9d153080375024d2465e3bf65f0e5a2ca1f5ea4a')
 
 options=('!makeflags')
 

[arch-commits] Commit in unison/trunk (PKGBUILD large.patch)

[Gaëtan Bisson]

Date: Tuesday, January 17, 2017 @ 22:15:32
  Author: bisson
Revision: 286899

fix FS#52595

Added:
  unison/trunk/large.patch
Modified:
  unison/trunk/PKGBUILD

-+
 PKGBUILD|9 -
 large.patch |   49 +
 2 files changed, 57 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-17 21:30:14 UTC (rev 286898)
+++ PKGBUILD2017-01-17 22:15:32 UTC (rev 286899)
@@ -4,7 +4,7 @@
 
 pkgname=unison
 pkgver=2.48.4
-pkgrel=1
+pkgrel=2
 pkgdesc='File-synchronization tool'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
 arch=('i686' 'x86_64')
@@ -12,12 +12,19 @@
 optdepends=('gtk2: for gtk2 support')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
 
source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
+'large.patch'
 'desktop')
 sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
+  '95433c2aa961cba19535fdf556e30bafa414a420'
   '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
 
 options=('!makeflags')
 
+prepare() {
+   cd "${srcdir}/src"
+   patch -p0 -i ../large.patch
+}
+
 build() {
cd "${srcdir}/src"
CFLAGS=""

Added: large.patch
===
--- large.patch (rev 0)
+++ large.patch 2017-01-17 22:15:32 UTC (rev 286899)
@@ -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.origTue 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;

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaëtan Bisson]

Date: Tuesday, November 1, 2016 @ 22:12:15
  Author: bisson
Revision: 279725

add https

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 22:12:10 UTC (rev 279724)
+++ PKGBUILD2016-11-01 22:12:15 UTC (rev 279725)
@@ -6,12 +6,12 @@
 pkgver=2.48.4
 pkgrel=1
 pkgdesc='File-synchronization tool'
-url='http://www.cis.upenn.edu/~bcpierce/unison/'
+url='https://www.cis.upenn.edu/~bcpierce/unison/'
 arch=('i686' 'x86_64')
 license=('GPL2')
 optdepends=('gtk2: for gtk2 support')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-source=("http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
+source=("https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
 'desktop')
 sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
   '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Gaetan Bisson]

Date: Wednesday, June 8, 2016 @ 21:09:45
  Author: bisson
Revision: 269149

upstream update

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-08 18:42:39 UTC (rev 269148)
+++ PKGBUILD2016-06-08 19:09:45 UTC (rev 269149)
@@ -3,8 +3,8 @@
 #Contributor: Tobias Powalowski 
 
 pkgname=unison
-pkgver=2.48.3
-pkgrel=2
+pkgver=2.48.4
+pkgrel=1
 pkgdesc='File-synchronization tool'
 url='http://www.cis.upenn.edu/~bcpierce/unison/'
 arch=('i686' 'x86_64')
@@ -13,13 +13,13 @@
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
 
source=("http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
 'desktop')
-sha1sums=('74f1c087ee49dc1db4680ad779280f7333d5c968'
+sha1sums=('baeff0e3a942c710ce551cca118b891feca137c5'
   '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
 
 options=('!makeflags')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/src"
CFLAGS=""
 
for ui in text gtk2; do
@@ -31,7 +31,7 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/src"
 
install -d "${pkgdir}"/usr/bin
install -m755 unison-* "${pkgdir}"/usr/bin

[arch-commits] Commit in unison/trunk (PKGBUILD unison-ssh-ocaml.patch unison.install)

[Gaetan Bisson]

Date: Tuesday, February 3, 2015 @ 21:11:18
  Author: bisson
Revision: 230405

upstream update, remove obsolete files

Modified:
  unison/trunk/PKGBUILD
Deleted:
  unison/trunk/unison-ssh-ocaml.patch
  unison/trunk/unison.install

+
 PKGBUILD   |8 
 unison-ssh-ocaml.patch |   25 -
 unison.install |   28 
 3 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-03 19:21:06 UTC (rev 230404)
+++ PKGBUILD2015-02-03 20:11:18 UTC (rev 230405)
@@ -2,8 +2,8 @@
 #Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
-pkgver=2.40.102
-pkgrel=2
+pkgver=2.48.3
+pkgrel=1
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
@@ -13,6 +13,8 @@
 optdepends=('gtk2: for gtk2 support')
 
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
 $pkgname.desktop)
+sha1sums=('74f1c087ee49dc1db4680ad779280f7333d5c968'
+  'a5181e97d954925c8b14be8f73cd473ca5bd21ba')
 
 options=(!makeflags)
 
@@ -50,5 +52,3 @@
  # make versioned symlink #29827
   ln -s unison unison-2.40
 }
-md5sums=('42caf869f40440ed0e75eef07a605b2e'
- '2daecba7705455a8e4b769e48b059872')

Deleted: unison-ssh-ocaml.patch
===
--- unison-ssh-ocaml.patch  2015-02-03 19:21:06 UTC (rev 230404)
+++ unison-ssh-ocaml.patch  2015-02-03 20:11:18 UTC (rev 230405)
@@ -1,25 +0,0 @@
-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
- 
-Index: src/update.mli
-===
 src/update.mli (révision 463)
-+++ src/update.mli (copie de travail)
-@@ -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

Deleted: unison.install
===
--- unison.install  2015-02-03 19:21:06 UTC (rev 230404)
+++ unison.install  2015-02-03 20:11:18 UTC (rev 230405)
@@ -1,28 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo NOTE:
-  echo   For gtk1 frontend please add 'gtk' package.
-  echo   For gtk2 frontend please add 'gtk2' package.
-  echo   Default X11 frontend is set to gtk2. 
-  echo 
-  echo   If you want to default to gtk1 unison: 
-  echo   'rm /usr/bin/unison-x11'
-  echo   'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'
-  echo 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}

[arch-commits] Commit in unison/trunk (PKGBUILD desktop unison.desktop)

[Gaetan Bisson]

Date: Tuesday, February 3, 2015 @ 22:17:21
  Author: bisson
Revision: 230409

update versioned symlink, modernize PKGBUILD

Added:
  unison/trunk/desktop
(from rev 230408, unison/trunk/unison.desktop)
Modified:
  unison/trunk/PKGBUILD
Deleted:
  unison/trunk/unison.desktop

+
 PKGBUILD   |   73 ---
 desktop|   11 
 unison.desktop |   13 -
 3 files changed, 44 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-03 20:38:31 UTC (rev 230408)
+++ PKGBUILD2015-02-03 21:17:21 UTC (rev 230409)
@@ -1,54 +1,47 @@
 # $Id$
-#Maintainer: Tobias Powalowski tp...@archlinux.org
+#Maintainer: Gaetan Bisson bis...@archlinux.org
+#Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
 pkgver=2.48.3
-pkgrel=1
-pkgdesc=Unison is a file-synchronization tool
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc='File-synchronization tool'
+url='http://www.cis.upenn.edu/~bcpierce/unison/'
+arch=('i686' 'x86_64')
 license=('GPL2')
-url=http://www.cis.upenn.edu/~bcpierce/unison;
-depends=('glibc')
+optdepends=('gtk2: for gtk2 support')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
-$pkgname.desktop)
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz;
+'desktop')
 sha1sums=('74f1c087ee49dc1db4680ad779280f7333d5c968'
-  'a5181e97d954925c8b14be8f73cd473ca5bd21ba')
+  '9dad1737dd8d90e7ee2744a96cf71bd9f802a12a')
 
-options=(!makeflags)
+options=('!makeflags')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  CFLAGS=
-  make clean
-  make mkProjectInfo 
-  make UISTYLE=text DEBUGGING=false THREADS=true 
-  mv unison unison-text
- 
- # clean the builddir and rebuild with gtk support
-  # broken at the moment!
-  # make clean
-  # make mkProjectInfo
-  # make UISTYLE=gtk DEBUGGING=false THREADS=true
-  # install -Dm755 unison $pkgdir/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
-  make clean
-  make mkProjectInfo
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
+   cd ${srcdir}/${pkgname}-${pkgver}
+   CFLAGS=
+
+   for ui in text gtk2; do
+   make clean
+   make mkProjectInfo 
+   make UISTYLE=$ui DEBUGGING=false THREADS=true
+   mv unison unison-$ui
+   done
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm755 unison-text $pkgdir/usr/bin/unison
-  install -Dm755 unison $pkgdir/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install 
the png
-  install -Dm644 ../$pkgname.desktop 
$pkgdir/usr/share/applications/$pkgname.desktop
-  convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  $pkgdir/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
-  cd $pkgdir/usr/bin
-  ln -s unison-gtk2 unison-x11
- # make versioned symlink #29827
-  ln -s unison unison-2.40
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   install -d ${pkgdir}/usr/bin
+   install -m755 unison-* ${pkgdir}/usr/bin
+
+   install -d ${pkgdir}/usr/share/{pixmaps,applications}
+   convert win32rc/U.ico[1] ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+   install -m644 ../desktop 
${pkgdir}/usr/share/applications/${pkgname}.desktop
+
+   cd ${pkgdir}/usr/bin
+   ln -s unison-text unison
+   ln -s unison-gtk2 unison-x11
+   ln -s unison unison-${pkgver%.*}
 }

Copied: unison/trunk/desktop (from rev 230408, unison/trunk/unison.desktop)
===
--- desktop (rev 0)
+++ desktop 2015-02-03 21:17:21 UTC (rev 230409)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Comment=File synchronisation tool for X11
+TryExec=unison-x11
+Exec=unison-x11
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true

Deleted: unison.desktop
===
--- unison.desktop  2015-02-03 20:38:31 UTC (rev 230408)
+++ unison.desktop  2015-02-03 21:17:21 UTC (rev 230409)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Monday, June 30, 2014 @ 08:53:59
  Author: tpowa
Revision: 215677

upgpkg: unison 2.40.102-2

mtree rebuild

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-30 06:51:34 UTC (rev 215676)
+++ PKGBUILD2014-06-30 06:53:59 UTC (rev 215677)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.40.102
-pkgrel=1
+pkgrel=2
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Monday, November 26, 2012 @ 11:22:34
  Author: tpowa
Revision: 172028

upgpkg: unison 2.40.102-1

bump to latest version

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-26 16:17:46 UTC (rev 172027)
+++ PKGBUILD2012-11-26 16:22:34 UTC (rev 172028)
@@ -2,7 +2,7 @@
 #Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
-pkgver=2.40.65
+pkgver=2.40.102
 pkgrel=1
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
@@ -50,5 +50,5 @@
  # make versioned symlink #29827
   ln -s unison unison-2.40
 }
-md5sums=('ade42565aa0f94834664040108119f5e'
+md5sums=('42caf869f40440ed0e75eef07a605b2e'
  '2daecba7705455a8e4b769e48b059872')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Friday, September 7, 2012 @ 12:52:13
  Author: tpowa
Revision: 166405

upgpkg: unison 2.40.65-1

bump to latest version

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-07 16:52:02 UTC (rev 166404)
+++ PKGBUILD2012-09-07 16:52:13 UTC (rev 166405)
@@ -2,8 +2,8 @@
 #Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
-pkgver=2.40.63
-pkgrel=4
+pkgver=2.40.65
+pkgrel=1
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
@@ -11,10 +11,9 @@
 depends=('glibc')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
 optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
 $pkgname.desktop)
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
- '2daecba7705455a8e4b769e48b059872')
+
 options=(!makeflags)
 
 build() {
@@ -51,3 +50,5 @@
  # make versioned symlink #29827
   ln -s unison unison-2.40
 }
+md5sums=('ade42565aa0f94834664040108119f5e'
+ '2daecba7705455a8e4b769e48b059872')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Monday, June 11, 2012 @ 09:28:36
  Author: tpowa
Revision: 161431

upgpkg: unison 2.40.63-4

add version symlink # 29827

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-11 13:06:12 UTC (rev 161430)
+++ PKGBUILD2012-06-11 13:28:36 UTC (rev 161431)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.40.63
-pkgrel=3
+pkgrel=4
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
@@ -48,4 +48,6 @@
  # make symlink for .desktop file
   cd $pkgdir/usr/bin
   ln -s unison-gtk2 unison-x11
+ # make versioned symlink #29827
+  ln -s unison unison-2.40
 }

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Eric Bélanger]

Date: Wednesday, January 25, 2012 @ 00:10:04
  Author: eric
Revision: 147255

upgpkg: unison 2.40.63-3

Rebuild against libpng 1.5 and libtiff 4.0, Add gtk2 optdepends

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 04:37:32 UTC (rev 147254)
+++ PKGBUILD2012-01-25 05:10:04 UTC (rev 147255)
@@ -3,44 +3,49 @@
 
 pkgname=unison
 pkgver=2.40.63
-pkgrel=2
+pkgrel=3
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
 url=http://www.cis.upenn.edu/~bcpierce/unison;
 depends=('glibc')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
 
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
 $pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+ '2daecba7705455a8e4b769e48b059872')
 options=(!makeflags)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   CFLAGS=
   make clean
   make mkProjectInfo 
   make UISTYLE=text DEBUGGING=false THREADS=true 
-  mkdir -p $startdir/pkg/usr/bin 
-  install -Dm755 unison $startdir/pkg/usr/bin/unison
+  mv unison unison-text
  
  # clean the builddir and rebuild with gtk support
   # broken at the moment!
   # make clean
   # make mkProjectInfo
   # make UISTYLE=gtk DEBUGGING=false THREADS=true
-  # install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
+  # install -Dm755 unison $pkgdir/usr/bin/unison-gtk
  # clean the builddir and rebuild with gtk2 support
   make clean
   make mkProjectInfo
   make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -Dm755 unison-text $pkgdir/usr/bin/unison
+  install -Dm755 unison $pkgdir/usr/bin/unison-gtk2
  # install a .desktop file; create a compliant icon from ico file and install 
the png
-  install -Dm644 ../$pkgname.desktop 
$startdir/pkg/usr/share/applications/$pkgname.desktop
+  install -Dm644 ../$pkgname.desktop 
$pkgdir/usr/share/applications/$pkgname.desktop
   convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  $startdir/pkg/usr/share/pixmaps/$pkgname.png
+  install -Dm644 ${pkgname}-1.png  $pkgdir/usr/share/pixmaps/$pkgname.png
  # make symlink for .desktop file
-  cd $startdir/pkg//usr/bin
+  cd $pkgdir/usr/bin
   ln -s unison-gtk2 unison-x11
 }
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
- '2daecba7705455a8e4b769e48b059872')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Wednesday, June 8, 2011 @ 10:56:27
  Author: tpowa
Revision: 126883

upgpkg: unison 2.40.63-1
bump to latest version

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-08 14:41:01 UTC (rev 126882)
+++ PKGBUILD2011-06-08 14:56:27 UTC (rev 126883)
@@ -2,7 +2,7 @@
 #Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
-pkgver=2.40.61
+pkgver=2.40.63
 pkgrel=1
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
@@ -42,5 +42,5 @@
   cd $startdir/pkg//usr/bin
   ln -s unison-gtk2 unison-x11
 }
-md5sums=('9d48796b115704321c6a4a50dd0928ee'
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
  '2daecba7705455a8e4b769e48b059872')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Wednesday, June 8, 2011 @ 16:05:25
  Author: tpowa
Revision: 126943

upgpkg: unison 2.40.63-2
rebuild against glibc 2.14

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-08 20:02:32 UTC (rev 126942)
+++ PKGBUILD2011-06-08 20:05:25 UTC (rev 126943)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.40.63
-pkgrel=1
+pkgrel=2
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')

[arch-commits] Commit in unison/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Tuesday, February 22, 2011 @ 02:48:24
  Author: tpowa
Revision: 110780

upgpkg: unison 2.40.61-1
bump to latest version, removed gtk version and install file

Modified:
  unison/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-22 05:32:44 UTC (rev 110779)
+++ PKGBUILD2011-02-22 07:48:24 UTC (rev 110780)
@@ -2,35 +2,36 @@
 #Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=unison
-pkgver=2.32.52
-pkgrel=2
+pkgver=2.40.61
+pkgrel=1
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
 url=http://www.cis.upenn.edu/~bcpierce/unison;
 depends=('glibc')
-makedepends=('ocaml' 'lablgtk' 'lablgtk2' 'imagemagick')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
 
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
-unison-ssh-ocaml.patch 
 $pkgname.desktop)
 options=(!makeflags)
-install=unison.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   CFLAGS=
-  patch -Np1 -i ../unison-ssh-ocaml.patch
   make clean
-  make UISTYLE=text DEBUGGING=false THREADS=true
+  make mkProjectInfo 
+  make UISTYLE=text DEBUGGING=false THREADS=true 
   mkdir -p $startdir/pkg/usr/bin 
   install -Dm755 unison $startdir/pkg/usr/bin/unison
  
  # clean the builddir and rebuild with gtk support
-  make clean
-  make UISTYLE=gtk DEBUGGING=false THREADS=true
-  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
+  # broken at the moment!
+  # make clean
+  # make mkProjectInfo
+  # make UISTYLE=gtk DEBUGGING=false THREADS=true
+  # install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
  # clean the builddir and rebuild with gtk2 support
   make clean
+  make mkProjectInfo
   make UISTYLE=gtk2 DEBUGGING=false THREADS=true
   install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
  # install a .desktop file; create a compliant icon from ico file and install 
the png
@@ -41,6 +42,5 @@
   cd $startdir/pkg//usr/bin
   ln -s unison-gtk2 unison-x11
 }
-md5sums=('0701f095c1721776a0454b94607eda48'
- '81a28349471434c75a4206d07ad21eb1'
+md5sums=('9d48796b115704321c6a4a50dd0928ee'
  '2daecba7705455a8e4b769e48b059872')

[arch-commits] Commit in unison/trunk (PKGBUILD unison-ssh-ocaml.patch)

[Tobias Powalowski]

Date: Monday, November 1, 2010 @ 15:34:20
  Author: tpowa
Revision: 97746

upgpkg: unison 2.32.52-2
fix ssh and ocaml 3.12 build issues

Added:
  unison/trunk/unison-ssh-ocaml.patch
Modified:
  unison/trunk/PKGBUILD

+
 PKGBUILD   |   14 +-
 unison-ssh-ocaml.patch |   25 +
 2 files changed, 34 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-01 19:33:38 UTC (rev 97745)
+++ PKGBUILD2010-11-01 19:34:20 UTC (rev 97746)
@@ -3,14 +3,15 @@
 
 pkgname=unison
 pkgver=2.32.52
-pkgrel=1
+pkgrel=2
 pkgdesc=Unison is a file-synchronization tool
 arch=(i686 x86_64)
 license=('GPL2')
 url=http://www.cis.upenn.edu/~bcpierce/unison;
 depends=('glibc')
 makedepends=('ocaml' 'lablgtk' 'lablgtk2' 'imagemagick')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
 \
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
+unison-ssh-ocaml.patch 
 $pkgname.desktop)
 options=(!makeflags)
 install=unison.install
@@ -18,17 +19,19 @@
 build() {
   cd $startdir/src/$pkgname-$pkgver
   CFLAGS=
+  patch -Np1 -i ../unison-ssh-ocaml.patch
   make clean
-  make UISTYLE=text DEBUGGING=false THREADS=true || return 1
+  make UISTYLE=text DEBUGGING=false THREADS=true
   mkdir -p $startdir/pkg/usr/bin 
   install -Dm755 unison $startdir/pkg/usr/bin/unison
+ 
  # clean the builddir and rebuild with gtk support
   make clean
-  make UISTYLE=gtk DEBUGGING=false THREADS=true || return 1
+  make UISTYLE=gtk DEBUGGING=false THREADS=true
   install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
  # clean the builddir and rebuild with gtk2 support
   make clean
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true || return 1
+  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
   install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
  # install a .desktop file; create a compliant icon from ico file and install 
the png
   install -Dm644 ../$pkgname.desktop 
$startdir/pkg/usr/share/applications/$pkgname.desktop
@@ -39,4 +42,5 @@
   ln -s unison-gtk2 unison-x11
 }
 md5sums=('0701f095c1721776a0454b94607eda48'
+ '81a28349471434c75a4206d07ad21eb1'
  '2daecba7705455a8e4b769e48b059872')

Added: unison-ssh-ocaml.patch
===
--- unison-ssh-ocaml.patch  (rev 0)
+++ unison-ssh-ocaml.patch  2010-11-01 19:34:20 UTC (rev 97746)
@@ -0,0 +1,25 @@
+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
+ 
+Index: src/update.mli
+===
+--- src/update.mli (révision 463)
 src/update.mli (copie de travail)
+@@ -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