Add build and run controls for Flatpak based projects

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac
+        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libjson-glib-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac
     - name: Build
       env:
         DESTDIR: out

README.md

@@ -15,6 +15,7 @@ You'll need the following dependencies:
 * libgtkspell3-3-dev
 * libgranite-dev >= 6.0.0
 * libhandy-1-dev >= 0.90.0
+* libjson-glib-dev
 * libpeas-dev
 * libsoup2.4-dev
 * libvala-0.48-dev (or higher)

flatpak/fuse-2.9.2-namespace-conflict-fix.patch

@@ -0,0 +1,21 @@
+diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
+--- fuse-2.9.2/include/fuse_kernel.h.conflictfix	2013-06-26 09:31:57.862198038 -0400
++++ fuse-2.9.2/include/fuse_kernel.h	2013-06-26 09:32:19.679198365 -0400
+@@ -88,12 +88,16 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+
+-#include <sys/types.h>
++#ifdef __linux__
++#include <linux/types.h>
++#else
++#include <stdint.h>
+ #define __u64 uint64_t
+ #define __s64 int64_t
+ #define __u32 uint32_t
+ #define __s32 int32_t
+ #define __u16 uint16_t
++#endif
+
+ /*
+  * Version negotiation:

flatpak/fuse-disable-sys-mount-under-flatpak.patch

@@ -0,0 +1,25 @@
+From 1ec935f4abecd08957affc7b21bae6bf5be78931 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Thu, 12 Apr 2018 01:47:57 -0700
+Subject: [PATCH] libfuse: disable sys mount under flatpak
+
+---
+ lib/mount.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/mount.c b/lib/mount.c
+index 7a18c11..1667db2 100644
+--- a/lib/mount.c
++++ b/lib/mount.c
+@@ -392,6 +392,9 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
+ 	int fd;
+ 	int res;
+
++	/* disable in flatpak */
++	return -2;
++
+ 	if (!mnt) {
+ 		fprintf(stderr, "fuse: missing mountpoint parameter\n");
+ 		return -1;
+-- 
+2.17.0.rc2

flatpak/fusermount-wrapper.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -z "$_FUSE_COMMFD" ]; then
+    FD_ARGS=
+else
+    FD_ARGS="--env=_FUSE_COMMFD=${_FUSE_COMMFD} --forward-fd=${_FUSE_COMMFD}"
+fi
+
+exec flatpak-spawn --host --forward-fd=1 --forward-fd=2 --forward-fd=3 $FD_ARGS fusermount "$@"

io.elementary.code.yml

@@ -4,23 +4,36 @@ runtime-version: '6'
 sdk: io.elementary.Sdk
 command: io.elementary.code
 finish-args:
+  - '--require-version=1.0.0'
   - '--filesystem=host'
 
+  # flatpak access
+  - '--filesystem=/var/lib/flatpak'
+  - '--filesystem=~/.local/share/flatpak'
+
   - '--share=ipc'
+  - '--share=network'
   - '--socket=fallback-x11'
   - '--socket=wayland'
+  - '--allow=devel'
 
   - '--talk-name=org.gtk.vfs.*'
   - '--talk-name=org.gnome.SettingsDaemon'
   - '--talk-name=org.elementary.Contractor'
+  - '--talk-name=org.freedesktop.Flatpak'
 
   - '--metadata=X-DConf=migrate-path=/io/elementary/code/'
+build-options:
+  env:
+    MOUNT_FUSE_PATH: ../tmp/
+    V: '1'
 cleanup:
   - '/include'
   - '/lib/pkgconfig'
   - '/lib/cmake'
   - '/lib/girepository-1.0'
   - '/share/gir-1.0'
+  - '/share/man'
   - '/share/vala'
   - '*.a'
   - '*.la'
@@ -61,7 +74,6 @@ modules:
           - '-DBUILD_TESTING:BOOL=OFF'
           - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib'
         cleanup:
-          - '/share/man'
           - '/share/doc'
         sources:
           - type: git
@@ -119,6 +131,87 @@ modules:
         url: https://github.com/universal-ctags/ctags.git
         tag: p5.9.20201101.0
 
+  - name: flatpak
+    config-opts:
+      - '--disable-documentation'
+      - '--disable-seccomp'
+      - '--disable-sandboxed-triggers'
+      - '--disable-system-helper'
+      - '--with-system-install-dir=/var/lib/flatpak'
+      - '--sysconfdir=/var/run/host/etc'
+    cleanup:
+      - '/bin/flatpak-bisect'
+      - '/bin/flatpak-coredumpctl'
+      - '/etc/profile.d'
+      - '/libexec'
+      - '/lib/systemd'
+      - '/share/dbus-1/interfaces/org.freedesktop.*'
+      - '/share/dbus-1/services/org.freedesktop.*'
+      - '/share/fish'
+      - '/share/flatpak/triggers'
+      - '/share/gdm'
+      - '/share/zsh'
+    post-install:
+      - 'cp /usr/bin/update-mime-database /app/bin'
+      - 'cp /usr/bin/update-desktop-database /app/bin'
+    sources:
+      - type: git
+        url: https://github.com/flatpak/flatpak
+        tag: '1.11.2'
+    modules:
+        - name: libfuse
+          config-opts:
+            - 'UDEV_RULES_PATH=/app/etc/udev/rules.d'
+            - 'INIT_D_PATH=/app/etc/init.d'
+          cleanup:
+            - '/bin/ulockmgr_server'
+          post-install:
+            - 'install -m a+rx fusermount-wrapper.sh /app/bin/fusermount'
+          sources:
+            - type: archive
+              url: https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
+              sha256: d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5
+            - type: patch
+              path: flatpak/fuse-2.9.2-namespace-conflict-fix.patch
+            - type: patch
+              path: flatpak/fuse-disable-sys-mount-under-flatpak.patch
+            - type: file
+              path: flatpak/fusermount-wrapper.sh
+        - name: ostree
+          config-opts:
+            - '--disable-man'
+            - '--without-libsystemd'
+          cleanup:
+            - /bin
+            - /etc/grub.d
+            - /etc/ostree
+            - /libexec
+            - /share/ostree
+          sources:
+            - type: git
+              url: https://github.com/ostreedev/ostree
+              branch: v2021.1
+        - name: pyparsing
+          buildsystem: simple
+          build-commands:
+              - 'pip3 install --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST} pyparsing'
+          sources:
+              - type: file
+                url: https://files.pythonhosted.org/packages/b9/b8/6b32b3e84014148dcd60dd05795e35c2e7f4b72f918616c61fdce83d27fc/pyparsing-2.3.1.tar.gz
+                sha256: 66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a
+
+  - name: flatpak-builder
+    sources:
+      - type: git
+        url: https://github.com/flatpak/flatpak-builder
+        tag: '1.0.14'
+    modules:
+      - name: yaml
+        sources:
+          - type: git
+            url: https://github.com/yaml/libyaml
+            tag: '0.2.5'
+
   - name: code
     buildsystem: meson
     config-opts:

meson.build

@@ -31,6 +31,7 @@ gee_dep = dependency('gee-0.8', version: '>=0.8.5')
 gtk_dep = dependency('gtk+-3.0', version: '>=3.6.0')
 granite_dep = dependency('granite', version: '>=6.0.0')
 handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+json_dep = dependency('json-glib-1.0')
 gtksourceview_dep = dependency('gtksourceview-4')
 peas_dep = dependency('libpeas-1.0')
 peasgtk_dep = dependency('libpeas-gtk-1.0')
@@ -51,6 +52,7 @@ dependencies = [
     gtk_dep,
     granite_dep,
     handy_dep,
+    json_dep,
     gtksourceview_dep,
     peas_dep,
     peasgtk_dep,

src/FolderManager/FileView.vala

@@ -26,6 +26,7 @@ namespace Scratch.FolderManager {
         private GLib.Settings settings;
 
         public signal void select (string file);
+        public signal void select_project (string path);
         public signal void close_all_docs_from_path (string path);
 
         // This is a workaround for SourceList silliness: you cannot remove an item
@@ -53,7 +54,18 @@ namespace Scratch.FolderManager {
             }
 
             if (item is FileItem) {
-                select (((FileItem) item).file.path);
+                var file_item = (FileItem) item;
+                var project_path = file_item.file.path;
+
+                select (project_path);
+
+                var item_for_path = (Item?)(expand_to_path (project_path));
+                if (item_for_path != null) {
+                    var search_root = item_for_path.get_root_folder ();
+                    if (search_root is ProjectFolderItem) {
+                        select_project (search_root.file.file.get_path ());
+                    }
+                }
             }
         }
 
@@ -73,6 +85,8 @@ namespace Scratch.FolderManager {
                 return;
             }
 
+            select_project (folder.path);
+
             add_folder (folder, true);
         }