[gnome-builder/gnome-builder-41] mono: modernize mono gtk-sharp template



commit e1db91e0f32ebee73622599eae5b2d764da9f1e1
Author: Christian Hergert <chergert redhat com>
Date:   Mon Nov 8 11:33:55 2021 -0800

    mono: modernize mono gtk-sharp template
    
    This still depends on https://github.com/GLibSharp/GtkSharp/issues/63 but
    once the patch lands, it should work again.
    
    Fixes #1558

 .../resources/flatpak-gtksharp.json.tmpl           | 24 ++++++----------------
 1 file changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl 
b/src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl
index b3fb2f69a..6102245a5 100644
--- a/src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl
+++ b/src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl
@@ -1,10 +1,10 @@
 {
     "app-id": "{{appid}}",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "3.30",
+    "runtime-version": "41",
     "sdk": "org.gnome.Sdk",
     "command": "{{exec_name}}",
-    "sdk-extensions": ["org.freedesktop.Sdk.Extension.mono5"],
+    "sdk-extensions": ["org.freedesktop.Sdk.Extension.mono6"],
     "finish-args": [
         "--share=network",
         "--share=ipc",
@@ -16,10 +16,10 @@
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "build-options" : {
-        "append-path": "/usr/lib/sdk/mono5/bin",
-        "append-ld-library-path": "/usr/lib/sdk/mono5/lib",
+        "append-path": "/usr/lib/sdk/mono6/bin",
+        "append-ld-library-path": "/usr/lib/sdk/mono6/lib",
         "env": {
-            "PKG_CONFIG_PATH": 
"/app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/mono5/lib/pkgconfig"
+            "PKG_CONFIG_PATH": 
"/app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/mono6/lib/pkgconfig"
         }
     },
     "cleanup": [ "/lib/monodoc", "/lib/pkgconfig" ],
@@ -27,24 +27,12 @@
         {
             "name": "mono-runtime",
             "buildsystem": "simple",
-            "build-commands": ["/usr/lib/sdk/mono5/install.sh "],
+            "build-commands": ["/usr/lib/sdk/mono6/install.sh "],
             "build-options" : {
                 "no-debuginfo": true,
                 "strip": true
             }
         },
-        {
-            "name" : "meson",
-            "buildsystem" : "simple",
-            "build-commands": ["pip3 install -I --prefix=/app ."],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/mesonbuild/meson.git";,
-                    "branch" : "0.48.1"
-                }
-            ]
-        },
         {
             "name": "gtk-sharp3",
             "buildsystem": "meson",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]