From 852d9ccc3dc400c0d05230a44c44dafd23e65968 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Sun, 27 Apr 2025 22:30:57 -0300 Subject: [PATCH 1/2] gtk-sharp3 update and improvements #262 --- .../gtk-sharp3/0001-fixup-gmcs-to-mcs.patch | 14 -------------- recipes-mono/gtk-sharp/gtk-sharp3_2.99.3.bb | 2 +- recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb | 7 +++---- recipes-mono/images/test-image-mono.bb | 1 + 4 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch diff --git a/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch b/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch deleted file mode 100644 index 4b65118e..00000000 --- a/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [Yocto specific] - -diff -ur gtk-sharp-2.99.3.org/configure.ac gtk-sharp-2.99.3/configure.ac ---- gtk-sharp-2.99.3.org/configure.ac 2014-06-06 14:03:34.000000000 +0100 -+++ gtk-sharp-2.99.3/configure.ac 2015-09-28 11:27:29.157332268 +0100 -@@ -133,7 +133,7 @@ - RUNTIME="mono$RUNTIME_DEBUG_FLAGS" - fi - --AC_PATH_PROG(CSC, gmcs, no) -+AC_PATH_PROG(CSC, mcs, no) - if test `uname -s` = "Darwin"; then - LIB_PREFIX= - LIB_SUFFIX=.dylib diff --git a/recipes-mono/gtk-sharp/gtk-sharp3_2.99.3.bb b/recipes-mono/gtk-sharp/gtk-sharp3_2.99.3.bb index 72bc7ccb..77adb53a 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp3_2.99.3.bb +++ b/recipes-mono/gtk-sharp/gtk-sharp3_2.99.3.bb @@ -2,7 +2,7 @@ require gtk-sharp.inc inherit pkgconfig -DEPENDS += " gtk+3 atk pango cairo glib-2.0 libglade mono" +DEPENDS += " gtk+3 atk pango cairo glib-2.0 glade mono" RDEPENDS:${PN} += " perl gtk+3" LIC_FILES_CHKSUM = "file://COPYING;md5=8754deb904d22254188cb67189b87f19" diff --git a/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb b/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb index 035f2b90..7db97c0d 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb +++ b/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb @@ -2,14 +2,13 @@ require gtk-sharp.inc inherit pkgconfig -DEPENDS += " gtk+3 atk pango cairo glib-2.0 libglade mono" +DEPENDS += " gtk+3 atk pango cairo glib-2.0 glade mono" RDEPENDS:${PN} += " perl gtk+3" LIC_FILES_CHKSUM = "file://COPYING;md5=8754deb904d22254188cb67189b87f19" -SRCREV = "9a72bb67fff7e4845b7bb430a608282668c3e4da" -SRC_URI = "git://github.com/mono/gtk-sharp.git;protocol=https;branch=master \ - file://0001-fixup-gmcs-to-mcs.patch" +SRCREV = "dadc19cf1b90c5743f2776c675faac990e397a56" +SRC_URI = "git://github.com/mono/gtk-sharp.git;protocol=https;branch=main" S = "${WORKDIR}/git" diff --git a/recipes-mono/images/test-image-mono.bb b/recipes-mono/images/test-image-mono.bb index 693c5309..1484e095 100644 --- a/recipes-mono/images/test-image-mono.bb +++ b/recipes-mono/images/test-image-mono.bb @@ -8,6 +8,7 @@ DEFAULT_TEST_SUITES:pn-${PN}:prepend = "dotnet " IMAGE_INSTALL += "msbuild \ dotnet \ dotnet-helloworld \ + gtk-sharp3 \ python3-pythonnet \ " From f60df6f809dfe4e2f923a73a5840b2b78d3c6647 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Tue, 29 Apr 2025 09:47:27 -0300 Subject: [PATCH 2/2] Add 0001-fixup-gmcs-to-mcs.patch file used by gtk-sharp3_2.99.3.bb and remove of gtk-sharp3_2.99.4.bb --- .../gtk-sharp3/0001-fixup-gmcs-to-mcs.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch diff --git a/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch b/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch new file mode 100644 index 00000000..4b65118e --- /dev/null +++ b/recipes-mono/gtk-sharp/gtk-sharp3/0001-fixup-gmcs-to-mcs.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [Yocto specific] + +diff -ur gtk-sharp-2.99.3.org/configure.ac gtk-sharp-2.99.3/configure.ac +--- gtk-sharp-2.99.3.org/configure.ac 2014-06-06 14:03:34.000000000 +0100 ++++ gtk-sharp-2.99.3/configure.ac 2015-09-28 11:27:29.157332268 +0100 +@@ -133,7 +133,7 @@ + RUNTIME="mono$RUNTIME_DEBUG_FLAGS" + fi + +-AC_PATH_PROG(CSC, gmcs, no) ++AC_PATH_PROG(CSC, mcs, no) + if test `uname -s` = "Darwin"; then + LIB_PREFIX= + LIB_SUFFIX=.dylib