summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2021-05-17 20:03:26 +0200
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2021-05-18 23:42:07 +0700
commit740d182eff859b31ec4e4215593953a4f8029889 (patch)
treea3e2ee4b9b2bdeaa47dde868adf269b6b43f967e
parent06e6a07ffbf3c72aa0392a54ac183b0f1a0bdb1b (diff)
downloadslackbuilds-740d182eff859b31ec4e4215593953a4f8029889.tar.gz
slackbuilds-740d182eff859b31ec4e4215593953a4f8029889.tar.xz
development/bless: Fix build with the newer mono.
Patch from debian Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/bless/bless.SlackBuild2
-rw-r--r--development/bless/patches/disambiguate-system.range-and-gtk.range.patch92
2 files changed, 94 insertions, 0 deletions
diff --git a/development/bless/bless.SlackBuild b/development/bless/bless.SlackBuild
index 207854b161..7dcc418adc 100644
--- a/development/bless/bless.SlackBuild
+++ b/development/bless/bless.SlackBuild
@@ -82,6 +82,8 @@ patch -p1 < $CWD/patches/fixxmltextwriter.patch
# state if you just press Insert to toggle it.
patch -p1 < $CWD/patches/default_overwrite.patch
+patch -p1 < $CWD/patches/disambiguate-system.range-and-gtk.range.patch
+
# Grr. The configure script doesn't allow setting CS or MCS or CSC or
# anything to override the compiler (like normal stuff does with CC).
# FFS, it's even hardcoded in C# code...
diff --git a/development/bless/patches/disambiguate-system.range-and-gtk.range.patch b/development/bless/patches/disambiguate-system.range-and-gtk.range.patch
new file mode 100644
index 0000000000..fd314c4b53
--- /dev/null
+++ b/development/bless/patches/disambiguate-system.range-and-gtk.range.patch
@@ -0,0 +1,92 @@
+Index: bless/src/buffers/ByteBuffer.cs
+===================================================================
+--- bless.orig/src/buffers/ByteBuffer.cs
++++ bless/src/buffers/ByteBuffer.cs
+@@ -26,6 +26,8 @@ using System.Threading;
+ using Bless.Util;
+ using Bless.Tools;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Buffers {
+
+ ///<summary>
+Index: bless/src/tools/find/IFindStrategy.cs
+===================================================================
+--- bless.orig/src/tools/find/IFindStrategy.cs
++++ bless/src/tools/find/IFindStrategy.cs
+@@ -23,6 +23,8 @@ using System;
+ using Bless.Util;
+ using Bless.Buffers;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Tools.Find {
+
+ public interface IFindStrategy
+@@ -40,4 +42,4 @@ public interface IFindStrategy
+ bool Cancelled { get; set; }
+ }
+
+-} // end namespace
+\ No newline at end of file
++} // end namespace
+Index: bless/src/tools/find/IFinder.cs
+===================================================================
+--- bless.orig/src/tools/find/IFinder.cs
++++ bless/src/tools/find/IFinder.cs
+@@ -23,6 +23,8 @@ using System;
+ using Bless.Util;
+ using Bless.Buffers;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Tools.Find {
+
+ public delegate void FirstFindHandler();
+@@ -41,4 +43,4 @@ public interface IFinder
+ IAsyncResult ReplaceAll(byte[] ba, AsyncCallback ac);
+ }
+
+-} // end namespace
+\ No newline at end of file
++} // end namespace
+Index: bless/src/tools/find/FindOperations.cs
+===================================================================
+--- bless.orig/src/tools/find/FindOperations.cs
++++ bless/src/tools/find/FindOperations.cs
+@@ -24,6 +24,8 @@ using System.IO;
+ using System.Threading;
+ using Bless.Util;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Tools.Find {
+
+ ///<summary>
+Index: bless/src/gui/areas/AreaGroup.cs
+===================================================================
+--- bless.orig/src/gui/areas/AreaGroup.cs
++++ bless/src/gui/areas/AreaGroup.cs
+@@ -25,6 +25,8 @@ using Bless.Buffers;
+ using Bless.Util;
+ using Bless.Gui.Drawers;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Gui.Areas
+ {
+
+Index: bless/src/gui/DataBookFinder.cs
+===================================================================
+--- bless.orig/src/gui/DataBookFinder.cs
++++ bless/src/gui/DataBookFinder.cs
+@@ -26,6 +26,8 @@ using Bless.Util;
+ using Bless.Buffers;
+ using Bless.Tools.Find;
+
++using Range=Bless.Util.Range;
++
+ namespace Bless.Gui {
+
+ public class DataBookFinder : IFinder