improve flatpak build

Author: arch

build_flatpak.sh

@@ -2,8 +2,12 @@
 
 sudo sysctl kernel.unprivileged_userns_clone=1
 sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-sudo flatpak install -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
-sudo flatpak install -y flathub org.gnome.Platform//3.38 org.gnome.Sdk//3.38
 sudo flatpak install -y flathub org.kde.Platform//5.15 org.kde.Sdk//5.15
-sudo flatpak install -y flathub org.gtk.Gtk3theme.Breeze-Dark
-flatpak-builder --repo=repo --force-clean build-dir org.flatpak.PythonFunscriptEditor.json
+
+if [ "$@" = "--install" ]; then
+    flatpak-builder --user --install --force-clean build-dir org.flatpak.PythonFunscriptEditor.json
+else
+    flatpak-builder --repo=repo --force-clean build-dir org.flatpak.PythonFunscriptEditor.json
+fi
+
+sudo sysctl kernel.unprivileged_userns_clone=0

environment_flatpak.yaml

@@ -20,7 +20,6 @@ dependencies:
   - cryptography=3.4.7=py38hd23ed53_0
   - dbus=1.13.18=hb2f20db_0
   - expat=2.4.1=h2531618_2
-  - ffmpeg=4.3.1=hca11adc_2
   - fontconfig=2.13.1=h6c09931_0
   - freetype=2.10.4=h5ab3b9f_0
   - gettext=0.19.8.1=h0b5b191_1005

org.flatpak.PythonFunscriptEditor.json

@@ -13,36 +13,9 @@
     "--socket=pulseaudio",
     "--filesystem=xdg-pictures",
     "--filesystem=home:rw",
-    "--talk-name=org.gtk.vfs",
-    "--talk-name=org.gtk.vfs.*",
-    "--talk-name=org.gnome.SettingsDaemon.MediaKeys",
     "--env=LC_NUMERIC=C"
   ],
   "modules": [
-    {
-      "name": "install-runtime",
-      "buildsystem": "simple",
-      "build-options": {
-        "build-args": ["--share=network"]
-      },
-      "build-commands": [
-        "export CONDA_ALWAYS_YES=\"true\"",
-        "bash Miniconda3-py38_4.10.3-Linux-x86_64.sh -b -p /app/bin/conda -f",
-        "/app/bin/conda/bin/activate",
-        "/app/bin/conda/bin/conda env update -f environment_flatpak.yaml"
-      ],
-      "sources": [
-        {
-          "type": "file",
-          "url": "https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh",
-          "sha256": "935d72deb16e42739d69644977290395561b7a6db059b316958d97939e9bdf3d"
-        },
-        {
-          "type": "file",
-          "path": "environment_flatpak.yaml"
-        }
-      ]
-    },
     {
       "name": "luajit",
       "no-autogen": true,
@@ -187,26 +160,26 @@
       ]
     },
     {
-      "name": "kdecoration",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
+      "name": "install-runtime",
+      "buildsystem": "simple",
+      "build-options": {
+        "build-args": ["--share=network"]
+      },
+      "build-commands": [
+        "export CONDA_ALWAYS_YES=\"true\"",
+        "bash Miniconda3-py38_4.10.3-Linux-x86_64.sh -b -p /app/bin/conda -f",
+        "/app/bin/conda/bin/activate",
+        "/app/bin/conda/bin/conda env update -f environment_flatpak.yaml --prune"
+      ],
       "sources": [
         {
-          "type": "git",
-          "url": "https://invent.kde.org/kde/kdecoration.git",
-          "commit": "70a98b43f3a866fc39c420176af90709dd34df70"
-        }
-      ]
-    },
-    {
-      "name": "breeze",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "sources": [
+          "type": "file",
+          "url": "https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh",
+          "sha256": "935d72deb16e42739d69644977290395561b7a6db059b316958d97939e9bdf3d"
+        },
         {
-          "type": "git",
-          "url": "https://invent.kde.org/kde/breeze.git",
-          "commit": "945ba0cc712fb1e4f68ce8862d1fbcb864f3e6fa"
+          "type": "file",
+          "path": "environment_flatpak.yaml"
         }
       ]
     },