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 =================================================================== --- PKGBUILD 2010-11-01 19:33:38 UTC (rev 97745) +++ PKGBUILD 2010-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