Attachment 243849 Details for Bug 272950 – 0001-x11-toolkits-gtk-sharp-Unbreak-ports-for-lang-mono6..patch

[patch] 0001-x11-toolkits-gtk-sharp-Unbreak-ports-for-lang-mono6..patch

0001-x11-toolkits-gtk-sharp-Unbreak-ports-for-lang-mono6..patch (text/plain), 3.98 KB, created by Marcin Cieślak on 2023-08-04 23:19:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieślak

Created: 2023-08-04 23:19:33 UTC

Size: 3.98 KB

patch

obsolete

>From fcf62aaafc5cd8b6133d42b12a280d828a2db0ce Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= <saper@saper.info>
>Date: Sat, 5 Aug 2023 00:59:04 +0200
>Subject: [PATCH] x11-toolkits/gtk-sharp*: Unbreak ports for lang/mono6.8
>
>---
> x11-toolkits/gtk-sharp20/Makefile             |  8 +-----
> .../files/patch-sample_test_TestRange.cs      | 28 +++++++++++++++++++
> x11-toolkits/gtk-sharp30/Makefile             |  8 +-----
> .../files/patch-sample_test_TestRange.cs      | 11 ++++++++
> 4 files changed, 41 insertions(+), 14 deletions(-)
> create mode 100644 x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs
> create mode 100644 x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs
>
>diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
>index b38bc2c6c308..dc2cbd290b27 100644
>--- a/x11-toolkits/gtk-sharp20/Makefile
>+++ b/x11-toolkits/gtk-sharp20/Makefile
>@@ -25,14 +25,8 @@ SHEBANG_FILES=	parser/*.pl
> GNU_CONFIGURE=	yes
> MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
>-BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
> 		${WRKSRC}/glib/glue/*.c
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs b/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs
>new file mode 100644
>index 000000000000..ac009e65f700
>--- /dev/null
>+++ b/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs
>@@ -0,0 +1,28 @@
>+--- sample/test/TestRange.cs.orig	2016-09-21 11:49:20 UTC
>++++ sample/test/TestRange.cs
>+@@ -32,14 +32,14 @@ namespace WidgetViewer {
>+ 
>+ 			HScale hscale = new HScale (adjustment);
>+ 			hscale.SetSizeRequest (150, -1);
>+-			((Range) hscale).UpdatePolicy = UpdateType.Delayed;
>++			((Gtk.Range) hscale).UpdatePolicy = UpdateType.Delayed;
>+ 
>+ 			hscale.Digits = 1;
>+ 			hscale.DrawValue = true;
>+ 			box2.PackStart (hscale, true, true, 0);
>+ 
>+ 			HScrollbar hscrollbar = new HScrollbar (adjustment);
>+-			((Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
>++			((Gtk.Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
>+ 			box2.PackStart (hscrollbar, true, true, 0);
>+ 
>+ 			hscale = new HScale (adjustment);
>+@@ -59,7 +59,7 @@ namespace WidgetViewer {
>+ 			vscale.SetSizeRequest (-1, 200);
>+ 			vscale.Digits = 2;
>+ 			vscale.DrawValue = true;
>+-			((Range) vscale).Inverted = true;
>++			((Gtk.Range) vscale).Inverted = true;
>+ 			hbox.PackStart (vscale, true, true, 0);
>+ 
>+ 			vscale = new VScale (adjustment);
>diff --git a/x11-toolkits/gtk-sharp30/Makefile b/x11-toolkits/gtk-sharp30/Makefile
>index 87f04bbe7fad..7c7a2d72342d 100644
>--- a/x11-toolkits/gtk-sharp30/Makefile
>+++ b/x11-toolkits/gtk-sharp30/Makefile
>@@ -24,14 +24,8 @@ SHEBANG_FILES=	parser/*.pl
> USE_PERL5=	run
> MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
>-BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|gmcs|mcs|g' \
> 		${WRKSRC}/configure
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs b/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs
>new file mode 100644
>index 000000000000..ef5a1e2aff1a
>--- /dev/null
>+++ b/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs
>@@ -0,0 +1,11 @@
>+--- sample/test/TestRange.cs.orig	2013-08-18 15:32:57 UTC
>++++ sample/test/TestRange.cs
>+@@ -57,7 +57,7 @@ namespace WidgetViewer {
>+ 			vscale.SetSizeRequest (-1, 200);
>+ 			vscale.Digits = 2;
>+ 			vscale.DrawValue = true;
>+-			((Range) vscale).Inverted = true;
>++			((Gtk.Range) vscale).Inverted = true;
>+ 			hbox.PackStart (vscale, true, true, 0);
>+ 
>+ 			vscale = new VScale (adjustment);
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 272950: 243849