Fixing flatpak build (#273)

GradienceTeam · Aug 26, 2022 · 78bda9d · 78bda9d
2 parents 553b4b0 + a7fdcef
commit 78bda9d
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 18 deletions.
diff --git a/com.github.GradienceTeam.Gradience.Devel.json b/com.github.GradienceTeam.Gradience.Devel.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "com.github.GradienceTeam.Gradience.Devel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
+    "runtime-version" : "42",
     "sdk" : "org.gnome.Sdk",
     "command" : "gradience",
     "finish-args" : [
@@ -27,17 +27,17 @@
     "modules" : [
         "pypi-dependencies.json",
         {
-            "name": "python-lxml",
-            "buildsystem": "simple",
-            "build-commands": [
+            "name" : "python-lxml",
+            "buildsystem" : "simple",
+            "build-commands" : [
                 "python3 setup.py build --with-cython",
                 "python3 setup.py install --prefix=/app --root=/"
             ],
-            "sources": [
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.1/lxml-4.9.1.tar.gz",
-                    "sha256": "fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"
+                    "type" : "archive",
+                    "url" : "https://github.com/lxml/lxml/releases/download/lxml-4.9.1/lxml-4.9.1.tar.gz",
+                    "sha256" : "fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"
                 }
             ]
         },
@@ -53,22 +53,79 @@
             ]
         },
         {
-            "name": "libportal",
+            "name": "libsass",
+            "buildsystem": "simple",
+            "build-commands": [
+                "autoreconf --force --install",
+                "./configure --enable-shared --prefix=/app",
+                "make",
+                "make install"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/sass/libsass.git",
+                    "tag": "3.6.5"
+                }
+            ]
+        },
+        {
+            "name": "sassc",
+            "buildsystem": "simple",
+            "build-commands": [
+                "autoreconf --force --install",
+                "./configure --prefix=/app",
+                "make",
+                "make install"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/sass/sassc.git",
+                    "tag": "3.6.2"
+                }
+            ]
+        },
+        {
+            "name": "libadwaita",
             "buildsystem": "meson",
-            "config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
+            "config-opts": [
+                "-Dvapi=false",
+                "-Dtests=false",
+                "-Dexamples=false",
+                "-Dintrospection=enabled"
+            ],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/flatpak/libportal",
-                    "branch": "main"
+                    "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
+                    "tag": "1.2.beta"
+                }
+            ]
+        },
+        {
+            "name" : "libportal",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Ddocs=false",
+                "-Dvapi=false",
+                "-Dbackends=gtk4"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/flatpak/libportal",
+                    "branch" : "main"
                 }
             ]
         },
         {
             "name" : "gradience",
             "builddir" : true,
             "buildsystem" : "meson",
-            "config-opts": ["-Dbuildtype=debug"],
+            "config-opts" : [
+                "-Dbuildtype=debug"
+            ],
             "sources" : [
                 {
                     "type" : "git",

diff --git a/com.github.GradienceTeam.Gradience.json b/com.github.GradienceTeam.Gradience.json
@@ -52,10 +52,49 @@
                 }
             ]
         },
+        {
+            "name": "libsass",
+            "buildsystem": "simple",
+            "build-commands": [
+                "autoreconf --force --install",
+                "./configure --enable-shared --prefix=/app",
+                "make",
+                "make install"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/sass/libsass.git",
+                    "tag": "3.6.5"
+                }
+            ]
+        },
+        {
+            "name": "sassc",
+            "buildsystem": "simple",
+            "build-commands": [
+                "autoreconf --force --install",
+                "./configure --prefix=/app",
+                "make",
+                "make install"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/sass/sassc.git",
+                    "tag": "3.6.2"
+                }
+            ]
+        },
         {
             "name": "libadwaita",
             "buildsystem": "meson",
-            "config-opts": ["-Dvapi=false", "-Dtests=false", "-Dexamples=false", "-Dintrospection=true"],
+            "config-opts": [
+                "-Dvapi=false",
+                "-Dtests=false",
+                "-Dexamples=false",
+                "-Dintrospection=enabled"
+            ],
             "sources": [
                 {
                     "type": "git",
@@ -67,7 +106,11 @@
         {
             "name": "libportal",
             "buildsystem": "meson",
-            "config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
+            "config-opts": [
+                "-Ddocs=false",
+                "-Dvapi=false",
+                "-Dbackends=gtk4"
+            ],
             "sources": [
                 {
                     "type": "git",
@@ -80,7 +123,9 @@
             "name" : "gradience",
             "builddir" : true,
             "buildsystem" : "meson",
-            "config-opts": ["-Dbuildtype=release"],
+            "config-opts": [
+                "-Dbuildtype=release"
+            ],
             "sources" : [
                 {
                     "type" : "dir",

diff --git a/pypi-dependencies.json b/pypi-dependencies.json
@@ -50,8 +50,8 @@
                 },
                 {
                     "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/5a/d8/ab8f7bc42d944b4c9f018884299e561c272f7efe4d64c09f3254e48c63d8/material_color_utilities_python-0.1.4-py3-none-any.whl",
-                    "sha256": "017fdc343a2d4f5d22a3f4a0ca7653ae7ea8fbdc31162ac1503a60a2f1857f4e"
+                    "url": "https://files.pythonhosted.org/packages/31/65/a8e0f3e2bad0d4eabeb1931b22cdae08344a955f28022dc83420a128683c/material_color_utilities_python-0.1.5-py2.py3-none-any.whl",
+                    "sha256": "48abd8695a1355ab3ad43fe314ca8664c66282a86fbf94a717571273bf422bdf"
                 }
             ]
         },