PktSurf
5f5e570fad
Cleaned up build options in several gtk pkg build files Updated gtk buildlist Added code to disable docs compilation in gtk/babl Removed code to disable overlinking in gtk/gspell and gtk/gtk2 Fixed arch variable gtk/gst-plugins-base
46 lines
2.5 KiB
Diff
46 lines
2.5 KiB
Diff
From a00552ad68ae349e89e440dca21b86dbd6bccd30 Mon Sep 17 00:00:00 2001
|
|
From: Ankit Jain <radical@gmail.com>
|
|
Date: Tue, 19 Feb 2019 23:53:27 -0500
|
|
Subject: [PATCH] Fix build failure with mcs caused by C#8 changes in mcs
|
|
(#263)
|
|
|
|
Recent addition of C#8 features to mcs possibly broke this:
|
|
|
|
```
|
|
mcs -out:WidgetViewer.exe -r:../../glib/glib-sharp.dll -r:../../pango/pango-sharp.dll -r:../../atk/atk-sharp.dll -r:../../gdk/gdk-sharp.dll -r:../../gtk/gtk-sharp.dll ./TestCheckButton.cs ./TestColorSelection.cs ./TestRadioButton.cs ./TestRange.cs ./TestStatusbar.cs ./TestDialog.cs ./TestFlipping.cs ./TestSizeGroup.cs ./TestCombo.cs ./TestComboBox.cs ./WidgetViewer.cs
|
|
./TestCombo.cs(17,14): warning CS0612: `Gtk.Combo' is obsolete
|
|
./TestRange.cs(35,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
|
|
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
|
|
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
|
|
./TestRange.cs(35,13): error CS0030: Cannot convert type `Gtk.HScale' to `System.Range'
|
|
./TestRange.cs(42,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
|
|
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
|
|
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
|
|
./TestRange.cs(42,13): error CS0030: Cannot convert type `Gtk.HScrollbar' to `System.Range'
|
|
./TestRange.cs(62,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
|
|
@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
|
|
@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
|
|
./TestRange.cs(62,13): error CS0030: Cannot convert type `Gtk.VScale' to `System.Range'
|
|
```
|
|
|
|
This is because the compiler is resolving `Range` in the test as `System.Range`
|
|
instead of `Gtk.Range`, so we disambiguate it.
|
|
|
|
/cc @marek-safar
|
|
---
|
|
sample/test/TestRange.cs | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
|
|
index 35fc8a6dd..d44a77d85 100644
|
|
--- a/sample/test/TestRange.cs
|
|
+++ b/sample/test/TestRange.cs
|
|
@@ -9,6 +9,8 @@
|
|
using System;
|
|
|
|
using Gtk;
|
|
+// disambiguate, Gtk.Range vs System.Range
|
|
+using Range=Gtk.Range;
|
|
|
|
namespace WidgetViewer {
|
|
|