banshee: find mono 4.5 versions of required assemblies

2 files changed, 46 insertions, 4 deletions

diff --git a/nonprism/banshee/PKGBUILD b/nonprism/banshee/PKGBUILD
index d540272ee..e5530832d 100644
--- a/nonprism/banshee/PKGBUILD
+++ b/nonprism/banshee/PKGBUILD
@@ -25,6 +25,7 @@ source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
         sqlite_fix.patch
         Remove-IDBusExportable-inheritance-from-exported-int.patch
         Use-dbus-2.patch
+        mono-4.5.patch
         nonprism.patch)
 md5sums=('12dbb8a996783f7081d538062a8589b7'
          '16cbe2ef60e6f9b22015585bb3209648'
@@ -34,6 +35,7 @@ md5sums=('12dbb8a996783f7081d538062a8589b7'
          '2677e6edc2e0d2ce8994adc852dda362'
          '3b28f10e167c0aae27157dcc3b828b67'
          '2c4436f7aba58fdd0c5a38d709d73e5c'
+         '0c1dee22d53b18794778f94d198da8e9'
          '6de2436fb9683866f77e71fa8e139b7b')
 
 prepare() {
@@ -45,11 +47,9 @@ prepare() {
   patch -p1 -i ../sqlite_fix.patch
   patch -p1 -i ../Remove-IDBusExportable-inheritance-from-exported-int.patch
   patch -p1 -i ../Use-dbus-2.patch
+  patch -p1 -i ../mono-4.5.patch
 
   NOCONFIGURE=1 ./autogen.sh
-# Fix build with mono 4.0 (Fedora)
-  sed -i "s#mono/2.0#mono/4.5#g" configure
-  sed -i "s#Mono 2.0#Mono 4.5#g" configure
 
   # Remove Amazon MP3 store extension since it's mandatory from the building
   patch -p1 -i ../nonprism.patch
@@ -60,12 +60,13 @@ prepare() {
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
+  export MCS=/usr/bin/dmcs
   mkdir -p "$MONO_SHARED_DIR"
 
   cd $pkgname-$pkgver
 
   # Disable Youtube extension because it needs gdata-sharp to works. Also disable Ubuntu One Music store too.
-  MCS=/usr/bin/dmcs ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-docs \
               --disable-static \
               --disable-scrollkeeper \
diff --git a/nonprism/banshee/mono-4.5.patch b/nonprism/banshee/mono-4.5.patch
new file mode 100644
index 000000000..642a3ba1c
--- /dev/null
+++ b/nonprism/banshee/mono-4.5.patch
@@ -0,0 +1,41 @@
+From: Iain Lane <laney@debian.org>
+Date: Fri, 1 Apr 2016 00:18:20 +0800
+Subject: Find 4.5 versions of required assemblies
+
+---
+ build/m4/shamrock/mono.m4 | 5 +++++
+ configure.ac              | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
+index c40ecbf..4d8a13f 100644
+--- a/build/m4/shamrock/mono.m4
++++ b/build/m4/shamrock/mono.m4
+@@ -87,6 +87,11 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
+ 	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
+ ])
+ 
++AC_DEFUN([SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES],
++[
++	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5, $*)
++])
++
+ AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
+ [
+ 	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
+diff --git a/configure.ac b/configure.ac
+index 7926526..28d0380 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,9 +65,9 @@ SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
+ 
+ dnl Mono and gmcs
+ SHAMROCK_CHECK_MONO_MODULE(2.4.3)
+-SHAMROCK_FIND_MONO_2_0_COMPILER
++SHAMROCK_FIND_MONO_1_0_COMPILER
+ SHAMROCK_FIND_MONO_RUNTIME
+-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
++SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
+ 
+ dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
+ PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)