All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono
@ 2021-06-05 21:14 Fabrice Fontaine
  2021-06-06  7:43 ` Yann E. MORIN
  2021-06-10 20:27 ` Peter Korsgaard
  0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-06-05 21:14 UTC (permalink / raw)
  To: buildroot

Fix build failure with latest mono which is raised since commit
4c8a285b6e35c4028341f874760bfa9226ebff94

Fixes:
 - http://autobuild.buildroot.org/results/ff3edfe406f00a29429d2fa4258af12c87e5fb96

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0002-Mono-compilation-error-branch.patch  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch

diff --git a/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch b/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch
new file mode 100644
index 0000000000..0d52401b4a
--- /dev/null
+++ b/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch
@@ -0,0 +1,25 @@
+From fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b Mon Sep 17 00:00:00 2001
+From: plprevost <plprevost@sii.fr>
+Date: Wed, 12 May 2021 16:46:16 +0200
+Subject: [PATCH] refs issue:#298 Fix mono compilation errors
+
+[Retrieved from:
+https://github.com/mono/gtk-sharp/pull/299/commits/fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ sample/test/TestRange.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
+index 82fb81105..8727c9a77 100644
+--- a/sample/test/TestRange.cs
++++ b/sample/test/TestRange.cs
+@@ -8,7 +8,7 @@
+ 
+ using System;
+ 
+-using Gtk;
++using Gtk; using Range = Gtk.Range;
+ 
+ namespace WidgetViewer {
+ 
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono
  2021-06-05 21:14 [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono Fabrice Fontaine
@ 2021-06-06  7:43 ` Yann E. MORIN
  2021-06-10 20:27 ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2021-06-06  7:43 UTC (permalink / raw)
  To: buildroot

Fabrice, All,

On 2021-06-05 23:14 +0200, Fabrice Fontaine spake thusly:
> Fix build failure with latest mono which is raised since commit
> 4c8a285b6e35c4028341f874760bfa9226ebff94
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/ff3edfe406f00a29429d2fa4258af12c87e5fb96
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  .../0002-Mono-compilation-error-branch.patch  | 25 +++++++++++++++++++
>  1 file changed, 25 insertions(+)
>  create mode 100644 package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch
> 
> diff --git a/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch b/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch
> new file mode 100644
> index 0000000000..0d52401b4a
> --- /dev/null
> +++ b/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch
> @@ -0,0 +1,25 @@
> +From fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b Mon Sep 17 00:00:00 2001
> +From: plprevost <plprevost@sii.fr>
> +Date: Wed, 12 May 2021 16:46:16 +0200
> +Subject: [PATCH] refs issue:#298 Fix mono compilation errors
> +
> +[Retrieved from:
> +https://github.com/mono/gtk-sharp/pull/299/commits/fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + sample/test/TestRange.cs | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
> +index 82fb81105..8727c9a77 100644
> +--- a/sample/test/TestRange.cs
> ++++ b/sample/test/TestRange.cs
> +@@ -8,7 +8,7 @@
> + 
> + using System;
> + 
> +-using Gtk;
> ++using Gtk; using Range = Gtk.Range;
> + 
> + namespace WidgetViewer {
> + 
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono
  2021-06-05 21:14 [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono Fabrice Fontaine
  2021-06-06  7:43 ` Yann E. MORIN
@ 2021-06-10 20:27 ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2021-06-10 20:27 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix build failure with latest mono which is raised since commit
 > 4c8a285b6e35c4028341f874760bfa9226ebff94

 > Fixes:
 >  - http://autobuild.buildroot.org/results/ff3edfe406f00a29429d2fa4258af12c87e5fb96

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono
  2019-05-21 20:20 Fabrice Fontaine
@ 2019-05-23  8:07 ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2019-05-23  8:07 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fixes:
 >  - http://autobuild.buildroot.org/results/7cae5b32285fe0edf69eab3297be9c6a4e76b7b8

This is a failure on next, but as mono hasn't been updated in next I
guess this applies to master.

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono
@ 2019-05-21 20:20 Fabrice Fontaine
  2019-05-23  8:07 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2019-05-21 20:20 UTC (permalink / raw)
  To: buildroot

Fixes:
 - http://autobuild.buildroot.org/results/7cae5b32285fe0edf69eab3297be9c6a4e76b7b8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-MONO_PROFILE_ENTER_LEAVE-undeclared.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch

diff --git a/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch b/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch
new file mode 100644
index 0000000000..6596849a89
--- /dev/null
+++ b/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch
@@ -0,0 +1,28 @@
+From c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea Mon Sep 17 00:00:00 2001
+From: Jordi Mas <jmas@softcatala.org>
+Date: Tue, 12 Mar 2019 12:24:19 +0100
+Subject: [PATCH] Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling with
+ newer versions of Mono (#266)
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/mono/gtk-sharp/commit/c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea]
+---
+ gtk/gui-thread-check/profiler/gui-thread-check.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gtk/gui-thread-check/profiler/gui-thread-check.c b/gtk/gui-thread-check/profiler/gui-thread-check.c
+index 11838e3b0..9f45fe6b2 100644
+--- a/gtk/gui-thread-check/profiler/gui-thread-check.c
++++ b/gtk/gui-thread-check/profiler/gui-thread-check.c
+@@ -86,6 +86,10 @@ simple_method_enter (MonoProfiler *prof, MonoMethod *method)
+ 	}
+ }
+ 
++#ifndef MONO_PROFILE_ENTER_LEAVE
++#define MONO_PROFILE_ENTER_LEAVE (1 << 12)
++#endif
++
+ void
+ mono_profiler_startup (const char *desc)
+ {
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-10 20:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-05 21:14 [Buildroot] [PATCH 1/1] package/mono-gtksharp3: fix build with latest mono Fabrice Fontaine
2021-06-06  7:43 ` Yann E. MORIN
2021-06-10 20:27 ` Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2019-05-21 20:20 Fabrice Fontaine
2019-05-23  8:07 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.