From 592e3cad43ef12c53f523145d0fd981b54f2a049 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 8 Sep 2010 07:32:44 +0000
Subject: unison: update to 2.32 to match the updated server versoin.

---
 abs/extra-testing/unison/PKGBUILD                  | 22 +++++++++++++++++++---
 abs/extra-testing/unison/ocaml-3.08-extnames.patch | 14 --------------
 2 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 abs/extra-testing/unison/ocaml-3.08-extnames.patch

diff --git a/abs/extra-testing/unison/PKGBUILD b/abs/extra-testing/unison/PKGBUILD
index b1efa5b..6b3dc00 100644
--- a/abs/extra-testing/unison/PKGBUILD
+++ b/abs/extra-testing/unison/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 57697 2009-11-01 15:08:02Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=unison
-pkgver=2.27.57
+pkgver=2.32.52
 pkgrel=1
 pkgdesc="Unison is a file-synchronization tool"
 arch=(i686 x86_64)
@@ -10,6 +10,7 @@ license=('GPL2')
 url="http://www.cis.upenn.edu/~bcpierce/unison"
 depends=('glibc')
 #makedepends=('ocaml' 'lablgtk' 'lablgtk2' 'imagemagick')
+#makedepends=('ocaml' 'imagemagick')
 makedepends=('ocaml' )
 source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz \
         $pkgname.desktop)
@@ -23,6 +24,21 @@ build() {
   make UISTYLE=text DEBUGGING=false THREADS=true || return 1
   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
+#  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
+#  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
+ # convert win32rc/U.ico unison.png
+ # install -Dm644 ${pkgname}-1.png  $startdir/pkg/usr/share/pixmaps/$pkgname.png
+ # make symlink for .desktop file
+ # cd $startdir/pkg//usr/bin
+ # ln -s unison-gtk2 unison-x11
 }
-md5sums=('4ba0a3e4bf4b4ad0c063f86391371f78'
+md5sums=('0701f095c1721776a0454b94607eda48'
          '2daecba7705455a8e4b769e48b059872')
diff --git a/abs/extra-testing/unison/ocaml-3.08-extnames.patch b/abs/extra-testing/unison/ocaml-3.08-extnames.patch
deleted file mode 100644
index e959be2..0000000
--- a/abs/extra-testing/unison/ocaml-3.08-extnames.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur unison-2.9.1/ubase/uprintf.ml unison-2.9.1.patched/ubase/uprintf.ml
---- unison-2.9.1/ubase/uprintf.ml	2002-04-11 07:13:23.000000000 +0200
-+++ unison-2.9.1.patched/ubase/uprintf.ml	2004-08-08 14:10:09.784776851 +0200
-@@ -10,8 +10,8 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--external format_int: string -> int -> string = "format_int"
--external format_float: string -> float -> string = "format_float"
-+external format_int: string -> int -> string = "caml_format_int"
-+external format_float: string -> float -> string = "caml_format_float"
- 
- let fprintf outchan doafter format =
-   let format = (Obj.magic format : string) in
-- 
cgit v0.12

