diff options
Diffstat (limited to 'devel/monodevelop/files')
9 files changed, 197 insertions, 0 deletions
diff --git a/devel/monodevelop/files/patch-LibApr.cs b/devel/monodevelop/files/patch-LibApr.cs new file mode 100644 index 000000000000..0efe88d44193 --- /dev/null +++ b/devel/monodevelop/files/patch-LibApr.cs @@ -0,0 +1,11 @@ +--- src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs.orig 2008-12-22 19:02:40.000000000 -0300 ++++ src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2008-12-22 19:02:53.000000000 -0300 +@@ -65,7 +65,7 @@ + + public class LibApr0: LibApr + { +- private const string aprlib = "libapr-0.so.0"; ++ private const string aprlib = "libapr-1.so.3"; + + public override void initialize() { apr_initialize (); } + public override IntPtr pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); } diff --git a/devel/monodevelop/files/patch-LibSvnClient.cs b/devel/monodevelop/files/patch-LibSvnClient.cs new file mode 100644 index 000000000000..0e441a5a2b98 --- /dev/null +++ b/devel/monodevelop/files/patch-LibSvnClient.cs @@ -0,0 +1,53 @@ + +$FreeBSD$ + +--- src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs.orig ++++ src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs +@@ -600,6 +600,7 @@ + + public class LibSvnClient0 : LibSvnClient { + private const string svnclientlib = "libsvn_client-1.so.0"; ++ private const string svnsubrlib = "libsvn_subr-1.so.0"; + + public override void config_ensure (string config_dir, IntPtr pool) + { +@@ -843,11 +844,11 @@ + return svn_client_prop_get (out value, name, target, ref revision, recurse, ctx, pool); + } + +- [DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool); +- [DllImport(svnclientlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool); +- [DllImport(svnclientlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool); +- [DllImport(svnclientlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value); +- [DllImport(svnclientlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name); ++ [DllImport(svnsubrlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool); ++ [DllImport(svnsubrlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool); ++ [DllImport(svnsubrlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool); ++ [DllImport(svnsubrlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value); ++ [DllImport(svnsubrlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name); + [DllImport(svnclientlib)] static extern void svn_client_get_simple_provider (IntPtr item, IntPtr pool); + [DllImport(svnclientlib)] static extern void svn_client_get_simple_prompt_provider (IntPtr item, svn_auth_simple_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool); + [DllImport(svnclientlib)] static extern void svn_client_get_username_provider (IntPtr item, IntPtr pool); +@@ -880,7 +881,7 @@ + IntPtr receiver_baton, + IntPtr ctx, IntPtr pool); + +- [DllImport(svnclientlib)] static extern IntPtr svn_time_from_cstring (out long aprtime, string time, IntPtr pool); ++ [DllImport(svnsubrlib)] static extern IntPtr svn_time_from_cstring (out long aprtime, string time, IntPtr pool); + + [DllImport(svnclientlib)] static extern IntPtr svn_client_url_from_path (ref IntPtr url, string path_or_url, IntPtr pool); + +@@ -889,11 +890,11 @@ + ref Rev revision, + IntPtr ctx, IntPtr pool); + +- [DllImport(svnclientlib)] static extern IntPtr svn_stream_create (IntPtr baton, IntPtr pool); ++ [DllImport(svnsubrlib)] static extern IntPtr svn_stream_create (IntPtr baton, IntPtr pool); + + //[DllImport(svnclientlib)] static extern IntPtr svn_stream_set_read (IntPtr stream, svn_readwrite_fn_t reader); + +- [DllImport(svnclientlib)] static extern IntPtr svn_stream_set_write (IntPtr stream, svn_readwrite_fn_t writer); ++ [DllImport(svnsubrlib)] static extern IntPtr svn_stream_set_write (IntPtr stream, svn_readwrite_fn_t writer); + + [DllImport(svnclientlib)] static extern IntPtr svn_client_update (IntPtr result_rev, string path, ref Rev revision, + int recurse, IntPtr ctx, IntPtr pool); diff --git a/devel/monodevelop/files/patch-SystemAssemblyService.cs b/devel/monodevelop/files/patch-SystemAssemblyService.cs new file mode 100644 index 000000000000..b12aef4be1c1 --- /dev/null +++ b/devel/monodevelop/files/patch-SystemAssemblyService.cs @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs.orig ++++ src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs +@@ -412,6 +412,7 @@ + + string[] suffixes = new string [] { + Path.Combine ("lib", "pkgconfig"), ++ Path.Combine ("libdata", "pkgconfig"), + Path.Combine ("lib64", "pkgconfig"), + Path.Combine ("share", "pkgconfig"), + }; diff --git a/devel/monodevelop/files/patch-WelcomePageContent.xml b/devel/monodevelop/files/patch-WelcomePageContent.xml new file mode 100644 index 000000000000..e316de5a8f86 --- /dev/null +++ b/devel/monodevelop/files/patch-WelcomePageContent.xml @@ -0,0 +1,14 @@ +--- src/addins/WelcomePage/WelcomePageContent.xml.orig 2008-12-22 20:22:30.000000000 -0300 ++++ src/addins/WelcomePage/WelcomePageContent.xml 2008-12-22 20:24:10.000000000 -0300 +@@ -16,6 +16,11 @@ + + <Links _title="Support Links"> + <Link ++ href="http://www.mono-project.com/Mono:FreeBSD" ++ _title="BSD# Project Home Page" ++ /> ++ <Link ++ + href="http://www.monodevelop.com" + _title="MonoDevelop Home Page" + /> diff --git a/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs b/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs new file mode 100644 index 000000000000..dfdc58dc48ce --- /dev/null +++ b/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs.orig ++++ src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs +@@ -97,7 +97,7 @@ + check_ctags = true; + + try { +- ProcessWrapper p = Runtime.ProcessService.StartProcess ("ctags", "--version", null, null); ++ ProcessWrapper p = Runtime.ProcessService.StartProcess ("exctags", "--version", null, null); + p.WaitForOutput (); + have_ctags = true; + } catch { diff --git a/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs b/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs new file mode 100644 index 000000000000..c56278107f7a --- /dev/null +++ b/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- src/addins/CBinding/Parser/TagDatabaseManager.cs.orig ++++ src/addins/CBinding/Parser/TagDatabaseManager.cs +@@ -86,7 +86,7 @@ + return false; + } + try { +- Runtime.ProcessService.StartProcess ("ctags", "--version", null, null).WaitForOutput (); ++ Runtime.ProcessService.StartProcess ("exctags", "--version", null, null).WaitForOutput (); + } catch { + LoggingService.LogWarning ("Cannot update C/C++ tags database because exuberant ctags is not installed."); + return false; +@@ -273,7 +273,7 @@ + try { + output = new System.IO.StringWriter (); + +- p = Runtime.ProcessService.StartProcess ("ctags", ctags_options, null, null, output, null); ++ p = Runtime.ProcessService.StartProcess ("exctags", ctags_options, null, null, output, null); + p.WaitForOutput (10000); + if (p.ExitCode != 0 || !File.Exists (tagFullFileName)) { + LoggingService.LogError ("Ctags did not successfully populate the tags database '{0}' within ten seconds.\nOutput: {1}", tagFullFileName, output.ToString ()); +@@ -377,7 +377,7 @@ + output = new System.IO.StringWriter (); + error = new System.IO.StringWriter (); + +- p = Runtime.ProcessService.StartProcess ("ctags", ctags_options, project.BaseDirectory, output, error, null); ++ p = Runtime.ProcessService.StartProcess ("exctags", ctags_options, project.BaseDirectory, output, error, null); + p.WaitForOutput (10000); + if (p.ExitCode != 0) { + LoggingService.LogError ("Ctags did not successfully populate the tags database from '{0}' within ten seconds.\nError output: {1}", filename, error.ToString ()); diff --git a/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs b/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs new file mode 100644 index 000000000000..0b223e85aa75 --- /dev/null +++ b/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- src/addins/MonoDevelop.Autotools/SolutionDeployer.cs.orig ++++ src/addins/MonoDevelop.Autotools/SolutionDeployer.cs +@@ -171,7 +171,7 @@ + chainedOutput.ChainWriter (monitor.Log); + chainedOutput.ChainWriter (sw); + +- ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", ++ ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", + "dist", + baseDir, + chainedOutput, +@@ -180,7 +180,7 @@ + process.WaitForOutput (); + + if ( process.ExitCode > 0 ) +- throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "make dist") ); ++ throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "gmake dist") ); + + monitor.Step ( 1 ); + diff --git a/devel/monodevelop/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config b/devel/monodevelop/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config new file mode 100644 index 000000000000..ae1ddc2c72c9 --- /dev/null +++ b/devel/monodevelop/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config.orig ++++ src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config +@@ -1,4 +1,4 @@ + <configuration> +- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux" /> ++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="!osx,windows" /> + <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx" /> + </configuration> diff --git a/devel/monodevelop/files/patch-theme-icons_icon-theme-installer b/devel/monodevelop/files/patch-theme-icons_icon-theme-installer new file mode 100644 index 000000000000..724d380760f7 --- /dev/null +++ b/devel/monodevelop/files/patch-theme-icons_icon-theme-installer @@ -0,0 +1,26 @@ + +$FreeBSD$ + +--- theme-icons/icon-theme-installer.orig ++++ theme-icons/icon-theme-installer +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # icon-theme-installer + # Copyright (C) 2006 Novell, Inc. +@@ -101,12 +101,12 @@ + exit 1 + fi + +-if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then ++if ! which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then + echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)" + exit 1 + fi + +-if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then ++if ! which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then + echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)" + exit 1 + fi |