Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=c1833f5122858fa327581397df61d34961fe2575
commit c1833f5122858fa327581397df61d34961fe2575 Author: Pingax <[email protected]> Date: Fri Aug 24 18:40:17 2012 +0200 mono-addins-0.6.2-2-i686 * Rebuild with latest mono diff --git a/source/xlib-extra/mono-addins/FrugalBuild b/source/xlib-extra/mono-addins/FrugalBuild index e37e2bd..14d61cb 100644 --- a/source/xlib-extra/mono-addins/FrugalBuild +++ b/source/xlib-extra/mono-addins/FrugalBuild @@ -3,17 +3,27 @@ pkgname=mono-addins pkgver=0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for creating extensible applications" url="http://www.mono-project.com/"; -depends=('gtk2-sharp>=2.12.6' 'mono>=2.10.1') +depends=('gtk2-sharp>=2.12.10-6' 'mono>=2.10.1') groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet') _F_mono_aot=0 Finclude mono -up2date="Flasttar http://www.go-mono.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('fc42ee390433505523bbae061446e975f18d64bd') +up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 fix-libdir.patch pkglibdir.patch) +sha1sums=('fc42ee390433505523bbae061446e975f18d64bd' \ + '3049521e07318f5b113a707ad6fecaf66fdafbae' \ + '4df9aed89442cd3fe2aed2d174750ae30a089c5c') + +build() +{ + Fcd + Fmonoexport + Fbuild_mono + Fmonocleanup +} # optimization OK diff --git a/source/xlib-extra/mono-addins/fix-libdir.patch b/source/xlib-extra/mono-addins/fix-libdir.patch new file mode 100644 index 0000000..5fbef28 --- /dev/null +++ b/source/xlib-extra/mono-addins/fix-libdir.patch @@ -0,0 +1,38 @@ +diff -uNr mono-addins-0.6.2.old/configure.ac mono-addins-0.6.2/configure.ac +--- mono-addins-0.6.2.old/configure.ac 2011-08-09 17:52:58.000000000 +0200 ++++ mono-addins-0.6.2/configure.ac 2011-10-25 21:28:18.645867791 +0200 +@@ -33,8 +33,8 @@ + AC_MSG_ERROR([No al tool found. You need to install either the mono or .Net SDK.]) + fi + +-GACUTIL_FLAGS='/package mono-addins /root $(DESTDIR)$(libdir)' +-GACUTIL_POLICY_FLAGS='/root $(DESTDIR)$(libdir)' ++GACUTIL_FLAGS='/package mono-addins /root $(DESTDIR)$(prefix)/lib' ++GACUTIL_POLICY_FLAGS='/root $(DESTDIR)$(prefix)/lib' + + AC_SUBST(GACUTIL) + AC_SUBST(GACUTIL_FLAGS) +diff -uNr mono-addins-0.6.2.old/mautil/Makefile.am mono-addins-0.6.2/mautil/Makefile.am +--- mono-addins-0.6.2.old/mautil/Makefile.am 2011-08-09 17:52:58.000000000 +0200 ++++ mono-addins-0.6.2/mautil/Makefile.am 2011-10-25 21:28:18.645867791 +0200 +@@ -36,7 +36,7 @@ + + include $(top_srcdir)/Makefile.include + +-pkglibdir = $(libdir)/mono/mono-addins ++pkglibdir = $(prefix)/lib/mono/mono-addins + pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles) + + man_MANS = mautil.1 +diff -uNr mono-addins-0.6.2.old/Mono.Addins.MSBuild/Makefile.am mono-addins-0.6.2/Mono.Addins.MSBuild/Makefile.am +--- mono-addins-0.6.2.old/Mono.Addins.MSBuild/Makefile.am 2011-08-09 17:52:58.000000000 +0200 ++++ mono-addins-0.6.2/Mono.Addins.MSBuild/Makefile.am 2011-10-25 21:28:27.643877653 +0200 +@@ -39,7 +39,7 @@ + mkdir -p $(dir $(ASSEMBLY)) + $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) + +-xbuilddir = $(libdir)/mono/xbuild ++xbuilddir = $(prefix)/lib/mono/xbuild + xbuild_DATA = Mono.Addins.targets + + install-data-local: gac-installs diff --git a/source/xlib-extra/mono-addins/pkglibdir.patch b/source/xlib-extra/mono-addins/pkglibdir.patch new file mode 100644 index 0000000..59d3a6f --- /dev/null +++ b/source/xlib-extra/mono-addins/pkglibdir.patch @@ -0,0 +1,13 @@ +--- mono-addins-0.6.2/mautil/Makefile.am.orig 2012-04-30 21:19:16.662933710 +0100 ++++ mono-addins-0.6.2/mautil/Makefile.am 2012-04-30 21:19:51.487818453 +0100 +@@ -36,8 +36,8 @@ + + include $(top_srcdir)/Makefile.include + +-pkglibdir = $(prefix)/lib/mono/mono-addins +-pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles) ++programfilesdir = $(prefix)/lib/mono/mono-addins ++programfiles_SCRIPTS = $(ASSEMBLY) $(build_datafiles) + + man_MANS = mautil.1 + EXTRA_DIST += $(man_MANS) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
