Merge branch 'master' of http://git.roojs.com/roobuilder

[roobuilder] / org.roojs.roobuilder.json

diff --git a/org.roojs.roobuilder.json b/org.roojs.roobuilder.json
index 8c51d14..c625c06 100644 (file)
--- a/org.roojs.roobuilder.json
+++ b/org.roojs.roobuilder.json
@@ -3,6 +3,13 @@
     "runtime": "org.gnome.Sdk",
     "runtime-version": "45",
     "sdk": "org.gnome.Sdk",
+    "sdk-extensions": [
+       "org.freedesktop.Sdk.Extension.vala"
+    ],
+    "build-options" : {
+        "append-path" : "/usr/lib/sdk/vala/bin",
+        "prepend-ld-library-path" : "/usr/lib/sdk/vala/lib"
+    },
     "command": "roobuilder",
     "finish-args": [
         "--device=dri",
@@ -11,11 +18,7 @@
         "--socket=fallback-x11",
         "--socket=pulseaudio",
         "--socket=wayland",
-       "--socket=session-bus",
-        "--filesystem=xdg-download:ro",
-        "--filesystem=xdg-music:ro",
-        "--filesystem=xdg-run/gvfsd",
-        "--filesystem=xdg-run/pipewire-0:ro"
+        "--filesystem=home"
     ],
     "cleanup": [
         "/include",
@@ -25,16 +28,17 @@
         "/share/gtk-doc",
         "/share/man",
         "/share/pkgconfig",
-        "/share/vala",
         "*.la",
         "*.a"
     ],
     "modules": [
+       "shared-modules/intltool/intltool-0.51.json",
         {
             "name" : "jsonrpc-glib",
             "config-opts" : [
                 "--buildtype=debugoptimized",
-                "-Denable_tests=false"
+                "-Denable_tests=false",
+                "-Denable_gtk_doc=false"
             ],
             "buildsystem" : "meson",
             "builddir" : true,
@@ -42,7 +46,7 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/jsonrpc-glib.git",
-                    "branch" : "main"
+                    "tag" : "3.44.0"
                 }
             ]
         },
@@ -51,36 +55,23 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-common.git"
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-common.git",
+                    "tag" : "3.18.0"
+
                 }
             ]
         },
-        {
-            "name": "intltool",
-            "cleanup": [ "*" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
-                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
-                }
-            ]
-        },
-        
-           {
-            "name" : "gtksourceview",
+         {
+            "name": "roojspacker",
             "buildsystem" : "meson",
-            "config-opts" : [
-                "--buildtype=debugoptimized",
-                "-Dsysprof=false"
-            ],
-            "sources" : [
+            "builddir" : true,
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git",
-                    "branch" : "master"
+                    "type": "git",
+                    "url": "https://github.com/roojs/roojspacker.git",
+                    "tag": "release-1.5"
                 }
-            ]
+            ] 
         },
         {
             "name": "roobuilder",
@@ -89,14 +80,15 @@
             "sources": [
                 {
                     "type": "git",
-                    "tag": "master",
-                    "url": "https://github.com/roojs/roobuilder.git"
-               },
-               {
-               "type": "patch",
-               "path": "gda_vapi.patch"
-               }
-            ]
+                    "url": "https://github.com/roojs/roobuilder.git",
+                    "tag" : "release-5.0.4"
+                       }
+            ],
+           "post-install": [
+                   "cp -a /usr/lib/sdk/vala/bin/. /app/bin/",
+                   "cp -a /usr/lib/sdk/vala/lib/. /app/lib/",
+                   "cp -a /usr/lib/sdk/vala/share/. /app/share/"
+               ]
         }
     ]
-}
\ No newline at end of file
+}