Attachment #243849 for bug #272950

View | Details | Raw Unified | Return to bug 272950
Collapse All | Expand All




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.mk>




--- 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);




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.mk>

Added Link Here

(-)b/x11-toolkits/gtk-sharp30/files/patch-sample_test_TestRange.cs (-1 / +11 lines)
0	-	1	--- sample/test/TestRange.cs.orig 2013-08-18 15:32:57 UTC
		2	+++ sample/test/TestRange.cs
		3	@@ -57,7 +57,7 @@ namespace WidgetViewer {
		4	vscale.SetSizeRequest (-1, 200);
		5	vscale.Digits = 2;
		6	vscale.DrawValue = true;
		7	- ((Range) vscale).Inverted = true;
		8	+ ((Gtk.Range) vscale).Inverted = true;
		9	hbox.PackStart (vscale, true, true, 0);
		10
		11	vscale = new VScale (adjustment);

Return to bug 272950

Lines 25-38 SHEBANG_FILES= parser/*.pl Link Here

(-)b/x11-toolkits/gtk-sharp20/Makefile (-7 / +1 lines)
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP}	26	MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP}
27		27
28	.include <bsd.port.pre.mk>
29
30	.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
31	BROKEN= fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
32	.endif
33
34	post-patch:	28	post-patch:
35	@${REINPLACE_CMD} -e 's\|glib/.*\.h>\|glib.h>\|g' \	29	@${REINPLACE_CMD} -e 's\|glib/.*\.h>\|glib.h>\|g' \
36	${WRKSRC}/glib/glue/*.c	30	${WRKSRC}/glib/glue/*.c
37		31
38	.include <bsd.port.post.mk>	32	.include <bsd.port.mk>

Added Link Here

(-)b/x11-toolkits/gtk-sharp20/files/patch-sample_test_TestRange.cs (+28 lines)
1	--- sample/test/TestRange.cs.orig 2016-09-21 11:49:20 UTC
2	+++ sample/test/TestRange.cs
3	@@ -32,14 +32,14 @@ namespace WidgetViewer {
4
5	HScale hscale = new HScale (adjustment);
6	hscale.SetSizeRequest (150, -1);
7	- ((Range) hscale).UpdatePolicy = UpdateType.Delayed;
8	+ ((Gtk.Range) hscale).UpdatePolicy = UpdateType.Delayed;
9
10	hscale.Digits = 1;
11	hscale.DrawValue = true;
12	box2.PackStart (hscale, true, true, 0);
13
14	HScrollbar hscrollbar = new HScrollbar (adjustment);
15	- ((Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
16	+ ((Gtk.Range) hscrollbar).UpdatePolicy = UpdateType.Continuous;
17	box2.PackStart (hscrollbar, true, true, 0);
18
19	hscale = new HScale (adjustment);
20	@@ -59,7 +59,7 @@ namespace WidgetViewer {
21	vscale.SetSizeRequest (-1, 200);
22	vscale.Digits = 2;
23	vscale.DrawValue = true;
24	- ((Range) vscale).Inverted = true;
25	+ ((Gtk.Range) vscale).Inverted = true;
26	hbox.PackStart (vscale, true, true, 0);
27
28	vscale = new VScale (adjustment);

Lines 24-37 SHEBANG_FILES= parser/*.pl Link Here

(-)b/x11-toolkits/gtk-sharp30/Makefile (-7 / +1 lines)
24	USE_PERL5= run	24	USE_PERL5= run
25	MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP}	25	MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP}
26		26
27	.include <bsd.port.pre.mk>
28
29	.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
30	BROKEN= fails to build with Mono version ${MONO_DEFAULT}: 'Range' is an ambiguous reference between 'System.Range' and 'Gtk.Range'
31	.endif
32
33	post-patch:	27	post-patch:
34	@${REINPLACE_CMD} -e 's\|gmcs\|mcs\|g' \	28	@${REINPLACE_CMD} -e 's\|gmcs\|mcs\|g' \
35	${WRKSRC}/configure	29	${WRKSRC}/configure
36		30
37	.include <bsd.port.post.mk>	31	.include <bsd.port.mk>