Update Gnome runtime to 46

And drop python3-scour.json webp-pixbuf-loader dep as it's included in runtime now
Huluti · Apr 8, 2024 · 9a2a0b0 · 9a2a0b0
1 parent aa63d3d
commit 9a2a0b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/com.github.huluti.Curtail.json b/com.github.huluti.Curtail.json
@@ -1,7 +1,7 @@
 {
     "id": "com.github.huluti.Curtail",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "45",
+    "runtime-version": "46",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -12,8 +12,7 @@
         "--socket=fallback-x11",
         "--socket=wayland",
         "--device=dri",
-        "--filesystem=home",
-        "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+        "--filesystem=home"
     ],
     "modules": [
         {
@@ -59,36 +58,6 @@
                 }
             ]
         },
-        "python3-scour.json",
-        {
-            "name": "webp-pixbuf-loader",
-            "buildsystem": "meson",
-            "config-opts":[
-                "-Dgdk_pixbuf_moduledir=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/aruiz/webp-pixbuf-loader.git",
-                    "tag": "0.2.4",
-                    "commit": "a35014104a226265e44fe30fcdb4df9305af3466"
-                }
-            ],
-            "post-install": [
-                "GDK_PIXBUF_MODULEDIR=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/ gdk-pixbuf-query-loaders > /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
-                "gdk-pixbuf-query-loaders >> /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-            ]
-        },
-        {
-            "name": "curtail",
-            "builddir": true,
-            "buildsystem": "meson",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/Huluti/Curtail"
-                }
-            ]
-        }
+        "python3-scour.json"
     ]
 }
diff --git a/src/meson.build b/src/meson.build
@@ -4,7 +4,7 @@ moduledir = join_paths(pkgdatadir, 'curtail')
 python = import('python')
 
 conf = configuration_data()
-conf.set('PYTHON', python.find_installation('python3').path())
+conf.set('PYTHON', python.find_installation('python3').full_path())
 conf.set('VERSION', meson.project_version())
 conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set('pkgdatadir', pkgdatadir)