diff options
author | wiz <wiz> | 2013-05-29 11:13:03 +0000 |
---|---|---|
committer | wiz <wiz> | 2013-05-29 11:13:03 +0000 |
commit | 5a32176205ba5ecd58922bde43bd8b371035e0d1 (patch) | |
tree | b2280f6cd8f7886b2be425048be333f5ea53339f | |
parent | 77181c82d808ebcacaeaf9398c5a21af6c751734 (diff) | |
download | pkgsrc-5a32176205ba5ecd58922bde43bd8b371035e0d1.tar.gz |
Fix build with mono 3.
-rw-r--r-- | devel/mono-addins/distinfo | 3 | ||||
-rw-r--r-- | devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj | 17 | ||||
-rw-r--r-- | games/gbrainy/distinfo | 3 | ||||
-rw-r--r-- | games/gbrainy/patches/patch-src_Core_Libraries_CSharpCompiler.cs | 24 |
4 files changed, 45 insertions, 2 deletions
diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo index f2d1b8ad182..85f0117fd66 100644 --- a/devel/mono-addins/distinfo +++ b/devel/mono-addins/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2012/10/20 13:21:34 wiz Exp $ +$NetBSD: distinfo,v 1.7 2013/05/29 11:13:03 wiz Exp $ SHA1 (mono-addins-1.0.tar.gz) = f6c4b4c0bb64fcd8ba7d0ef4ade9e4cc42c03434 RMD160 (mono-addins-1.0.tar.gz) = 591dd434a10069cb249f32834248dcb4bccd4928 Size (mono-addins-1.0.tar.gz) = 539596 bytes +SHA1 (patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj) = 467bec67decf82312122b61a75b65ce3a413e35a diff --git a/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj b/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj new file mode 100644 index 00000000000..95c75e7bdc8 --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj @@ -0,0 +1,17 @@ +$NetBSD: patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj,v 1.1 2013/05/29 11:13:03 wiz Exp $ + +Fix +: error CS1705: Assembly `gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f' references `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' which has a higher version number than imported assembly `Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' +Mono.Addins.Gui/HeaderBox.cs(133,47): error CS0012: The type `Cairo.Context' is defined in an assembly that is not referenced. Consider adding a reference to assembly `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' + +--- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig 2012-10-16 10:04:04.000000000 +0000 ++++ Mono.Addins.Gui/Mono.Addins.Gui.csproj +@@ -42,7 +42,7 @@ + <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> +- <Reference Include="Mono.Cairo" /> ++ <Reference Include="Mono.Cairo, Version=4.0.0.0" /> + <Reference Include="System.Core" /> + </ItemGroup> + <ItemGroup> diff --git a/games/gbrainy/distinfo b/games/gbrainy/distinfo index 6ba0d0efff5..5491a338cb3 100644 --- a/games/gbrainy/distinfo +++ b/games/gbrainy/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.31 2013/04/21 14:38:14 wiz Exp $ +$NetBSD: distinfo,v 1.32 2013/05/29 11:13:41 wiz Exp $ SHA1 (gbrainy-2.2.0.tar.gz) = 5751ce78e30b4108ecc9565ea3b744265e220c98 RMD160 (gbrainy-2.2.0.tar.gz) = 68bff13308ae76155034a5dea3af268e5f3b9173 Size (gbrainy-2.2.0.tar.gz) = 2818865 bytes +SHA1 (patch-src_Core_Libraries_CSharpCompiler.cs) = f39a7b2e768aacd4ac61bde3616908d1866aec34 diff --git a/games/gbrainy/patches/patch-src_Core_Libraries_CSharpCompiler.cs b/games/gbrainy/patches/patch-src_Core_Libraries_CSharpCompiler.cs new file mode 100644 index 00000000000..8cbe7a83f4f --- /dev/null +++ b/games/gbrainy/patches/patch-src_Core_Libraries_CSharpCompiler.cs @@ -0,0 +1,24 @@ +$NetBSD: patch-src_Core_Libraries_CSharpCompiler.cs,v 1.1 2013/05/29 11:13:41 wiz Exp $ + +Fix +./Libraries/CSharpCompiler.cs(48,20): error CS1729: The type `Mono.CSharp.Report' does not contain a constructor that takes `1' arguments +/usr/pkg/lib/mono/4.0/Mono.CSharp.dll (Location of the symbol related to previous error) +./Libraries/CSharpCompiler.cs(50,16): error CS1729: The type `Mono.CSharp.Evaluator' does not contain a constructor that takes `2' arguments +/usr/pkg/lib/mono/4.0/Mono.CSharp.dll (Location of the symbol related to previous error) +from +http://svnweb.freebsd.org/ports/head/games/gbrainy/files/patch-CSharpCompiler.cs?revision=297313&view=markup + +--- src/Core/Libraries/CSharpCompiler.cs.orig 2011-07-19 18:22:43.000000000 +0000 ++++ src/Core/Libraries/CSharpCompiler.cs +@@ -44,10 +44,7 @@ namespace gbrainy.Core.Libraries + + public CSharpCompiler () + { +- CompilerSettings settings = new CompilerSettings (); +- Report report = new Report (new NullReportPrinter ()); +- +- evaluator = new Evaluator (settings, report); ++ evaluator = new Evaluator (new CompilerContext (new CompilerSettings (), new NullReportPrinter ())); + } + + public void EvaluateCode (string code) |