From nobody Sun Aug 06 12:43:23 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJfJD0ds5z4q0LZ; Sun, 6 Aug 2023 12:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJfJC6f9Vz4RrZ; Sun, 6 Aug 2023 12:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNOu+x+VKEEiS2gFBdcyTMldZCqHZf1A8AuguYMGhWA=; b=bt3H32qa78XARR12EeD2peNMy7oIQqnF8O4F44sKXx3iVOFSAUM+pB6eRZWgOyibZ6tBHp f2cOZfV29fApbvG0BI3ylV81s002LlhtrdWZNHtWhRs+U1EqCK+m35uj8yJZJyPqD/rdJh T9OSjDgAf0dTBMTRUAu9FXfSZ7VdjYdVNtUZ93pGusX2U4GZT2ZaLc0hVr+/LiuDz98s+v Czg6ZjeO5OaTP5Wh5GHE2PU+Ej4hvvqaOX1d36x2DZfzflZLeh5R8D2LnBayyXYuwuOwpu if3lfCHfYw1pC/MGvtDZLY+a5QbMQrxNXA0aU+8v8VFohRbYOPTT/ONLsJ6vAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNOu+x+VKEEiS2gFBdcyTMldZCqHZf1A8AuguYMGhWA=; b=uLsYBS7Ohd5Wc8M0RjtBlNJpGtQIGFya3ih0CxyNS7mcsOXckmQtyB+grcanMKjJcM2eer SZfYlcnweBs8c1+nFaxCIqs44MZkcDqfuqXQKq2Ek3lj//FHVQlaC5XFJ4kW9et2Q/717N h4zvw8faC+VYMzCtZ3r3qkzThuDwe0ygefslV4By9+iFoEmK8Z4zE5q7Ep6MEIwCPI1Xn6 A2Hk6qtj/X8Mwmk+jPh3wAsRnaP4bdfBcf5zl311pxfr1bmY4vh3jGoSnamgfn5cw2qrZO O2yQmJXnoaWZ8O973YFF5hIG8Xdxhi9gTACqq2ibU0WXT6gDM/sDYuYI3rDT8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691325803; a=rsa-sha256; cv=none; b=Yr9Z1IPGEBowvgRzlNOvb2u6TOZUcBpeC1czBZf6zMqCej+qWnmoQxRqk87Yk0TO6TC/ix R+HeUk6z+uc44dsGFDC4HFMZ/uq5Gw4mOdt4l05sXTeQcfQHZIfVr8jG5H2n5Zi2JCTlpo l5WRcF69enZaqABvW5KyKxcjLt+Bl277z1+0CersKASBCDgQuv4KEKwE29d19H+sZIN96Q 3Xy7rQ9UA5rA9k9rlWGflINgOfjcXnz1GMsZWxe+v1cbJSSKTZtGx/fxqCPfGKGBXef9BA 59z7b4ILdmzvdZ6zCIFEhjHsvF2tqwTzX3hKpTB8Xp6buA2ztrPa+z6dU/EWxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJfJC5lySz19FZ; Sun, 6 Aug 2023 12:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376ChNow057831; Sun, 6 Aug 2023 12:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376ChNVE057830; Sun, 6 Aug 2023 12:43:23 GMT (envelope-from git) Date: Sun, 6 Aug 2023 12:43:23 GMT Message-Id: <202308061243.376ChNVE057830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 90301b32a60b - main - x11-toolkits/gtk-sharp*: Unbreak ports for lang/mono6.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90301b32a60b21fa3b832f079c53177ef3418284 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=90301b32a60b21fa3b832f079c53177ef3418284 commit 90301b32a60b21fa3b832f079c53177ef3418284 Author: Marcin Cieślak AuthorDate: 2023-08-04 22:59:04 +0000 Commit: Robert Clausecker CommitDate: 2023-08-06 12:42:47 +0000 x11-toolkits/gtk-sharp*: Unbreak ports for lang/mono6.8 See also: https://svnweb.freebsd.org/changeset/ports/558398 PR: 272950 Approved by: portmgr (build fix blanket) MFH: 2023Q3 --- 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(-) 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 - -.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 +.include 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 - -.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 +.include 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);