Thu Apr 3 03:29:12 UTC 2014

5 files changed, 46 insertions, 49 deletions

diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD
index b987b5233..e27aa1828 100644
--- a/extra/mono-tools/PKGBUILD
+++ b/extra/mono-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177070 2013-02-05 18:08:20Z eric $
+# $Id: PKGBUILD 209742 2014-04-02 13:13:33Z jgc $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
@@ -10,29 +10,36 @@
 # properly.
 
 pkgname=mono-tools
-pkgver=2.10
-pkgrel=2
+pkgver=2.11
+pkgrel=1
 pkgdesc="collection of testing and development tools for use with mono (including monodoc browser)"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.mono-project.com/"
-depends=('libgnome-sharp' 'gtkhtml-sharp')
-makedepends=('gconf-sharp')
+depends=('libgnome-sharp' 'webkit-sharp')
+makedepends=('gconf-sharp' 'git' 'zip')
 install=$pkgname.install
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('da178df2c119c696c08c09dc9eb01994')
+options=('!makeflags')
+source=('git+https://github.com/mono/mono-tools.git#commit=d858f5f27fa8b10d734ccce7ffba631b995093e5'
+        fix-build.patch)
+md5sums=('SKIP'
+         '9b4671fbfce76d883abbf779cbc504f3')
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../fix-build.patch
+  mv configure.in configure.ac
+}
 
 build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-  cd "$srcdir/$pkgname-$pkgver"
-  autoreconf -fi 
-  ./configure --prefix=/usr
+  cd $pkgname
+  glib-gettextize --force
+  autoreconf -fi
+  GMCS=/usr/bin/dmcs ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GACUTIL="/usr/bin/gacutil /root $pkgdir/usr/lib" DESTDIR="$pkgdir" install
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
  }
diff --git a/extra/mono-tools/fix-build.patch b/extra/mono-tools/fix-build.patch
new file mode 100644
index 000000000..e5dac2cb8
--- /dev/null
+++ b/extra/mono-tools/fix-build.patch
@@ -0,0 +1,24 @@
+Index: mono-tools.git/webdoc/Makefile.am
+===================================================================
+--- mono-tools.git.orig/webdoc/Makefile.am	2013-10-10 01:14:56.927106468 +0200
++++ mono-tools.git/webdoc/Makefile.am	2013-10-10 10:48:14.179831385 +0200
+@@ -117,18 +117,14 @@
+ 	 $(INSTALL_DATA) $(srcdir)/App_Code/Plugins/*cs                                         $(DESTDIR)$(webdir)/App_Code/Plugins
+ 	 $(INSTALL_DATA) $(srcdir)/views/*css                                                   $(DESTDIR)$(webdir)/views
+ 	 $(INSTALL_DATA) $(srcdir)/views/*js                                                    $(DESTDIR)$(webdir)/views
+-	 $(INSTALL_DATA) $(srcdir)/views/*html                                                  $(DESTDIR)$(webdir)/views
+ 	 $(INSTALL_DATA) $(srcdir)/views/images/*png                                            $(DESTDIR)$(webdir)/views/images
+-	 $(INSTALL_DATA) $(srcdir)/views/images/*gif                                            $(DESTDIR)$(webdir)/views/images
++	 $(INSTALL_DATA) $(srcdir)/views/images/*ico                                            $(DESTDIR)$(webdir)/views/images
+ 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/header*                                  $(DESTDIR)$(webdir)/skins/mono-external
+ 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/footer*                                  $(DESTDIR)$(webdir)/skins/mono-external
+ 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/*css                                     $(DESTDIR)$(webdir)/skins/mono-external
+-	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/*js                                      $(DESTDIR)$(webdir)/skins/mono-external
+ 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*png                              $(DESTDIR)$(webdir)/skins/mono-external/images
+ 	 $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*gif                              $(DESTDIR)$(webdir)/skins/mono-external/images
+-	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugins/*css                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
+ 	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/iframe-plugin
+-	 $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*html                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
+ 	 $(INSTALL_DATA) $(srcdir)/plugins/tooltip-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/tooltip-plugin
+ 	 $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*css                                  $(DESTDIR)$(webdir)/plugins/sidebar-plugin
+ 	 $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*js                                   $(DESTDIR)$(webdir)/plugins/sidebar-plugin
diff --git a/extra/mono-tools/gnome-sharp-2.20.patch b/extra/mono-tools/gnome-sharp-2.20.patch
deleted file mode 100644
index d4629d52d..000000000
--- a/extra/mono-tools/gnome-sharp-2.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2008-03-24 14:36:16.000000000 +0000
-+++ configure.in	2008-03-24 14:36:24.000000000 +0000
-@@ -37,7 +37,7 @@
- AC_SUBST(MONODOC_LIBS)
- 
- 
--PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0)
-+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0)
- #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
- AC_SUBST(GTK_SHARP_LIBS)
- 
diff --git a/extra/mono-tools/gunit.patch b/extra/mono-tools/gunit.patch
deleted file mode 100644
index 881bf248b..000000000
--- a/extra/mono-tools/gunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnunit/src/main.cs	2006-10-04 09:13:30.000000000 +0200
-+++ gnunit/src/main.cs.patched	2006-11-23 09:10:21.000000000 +0100
-@@ -563,7 +563,7 @@
- 		}
- 
- 		// Window event handlers
--		void OnWindowDelete (object sender, EventArgs args)
-+		void OnWindowDelete (object sender, Gtk.DeleteEventArgs args)
- 		{
- 			OnQuitActivate (sender, args);
- 		}
diff --git a/extra/mono-tools/mono-tools.install b/extra/mono-tools/mono-tools.install
index d4891227b..745b1ac24 100644
--- a/extra/mono-tools/mono-tools.install
+++ b/extra/mono-tools/mono-tools.install
@@ -1,26 +1,14 @@
 post_install() {
-  echo "update icon cache..." 
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
-
-pre_upgrade() {
-  echo "removing index..."
-  rm -f  /opt/mono/lib/monodoc/monodoc.index
-  rm -rf /opt/mono/lib/monodoc/search_index
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   post_install $1
 }
 
 post_remove() {
-  echo "removing index..."
   rm -f  /usr/lib/monodoc/monodoc.index
   rm -rf /usr/lib/monodoc/search_index
-  echo "update icon cache..."
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }