From 399abef4aca5974e6fdca9bac3b9558a9157de5f Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 27 Apr 2024 15:36:02 -0400 Subject: [PATCH] gsettings schema fixes fixing gext still requires https://gitlab.gnome.org/GNOME/gnome-shell ref: https://github.com/pkgxdev/pantry/issues/5991#issuecomment-2081154003 --- projects/gnome.org/glib/package.yml | 3 +++ .../gsettings-desktop-schemas/package.yml | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/gnome.org/glib/package.yml b/projects/gnome.org/glib/package.yml index 41c475ac..3aaeffe3 100644 --- a/projects/gnome.org/glib/package.yml +++ b/projects/gnome.org/glib/package.yml @@ -18,6 +18,9 @@ dependencies: pcre.org: 8 pcre.org/v2: 10 +companions: + gnome.org/gsettings-desktop-schemas: '*' + runtime: env: PYTHONPATH: '{{prefix}}/lib/python{{deps.python.org.version.major}}/site-packages:$PYTHONPATH' diff --git a/projects/gnome.org/gsettings-desktop-schemas/package.yml b/projects/gnome.org/gsettings-desktop-schemas/package.yml index ba8938ad..19751532 100644 --- a/projects/gnome.org/gsettings-desktop-schemas/package.yml +++ b/projects/gnome.org/gsettings-desktop-schemas/package.yml @@ -9,6 +9,10 @@ dependencies: gnome.org/glib: '*' libexpat.github.io: '*' +runtime: + env: + SCHEMADIR: '{{prefix}}/share/glib-2.0/schemas' + build: dependencies: gnome.org/gobject-introspection: '*' @@ -16,10 +20,12 @@ build: ninja-build.org: '*' freedesktop.org/pkg-config: '*' python.org: ~3.11 - script: | - meson setup build $ARGS - meson compile -C build --verbose - meson install -C build + script: + - meson setup build $ARGS + - meson compile -C build --verbose + - meson install -C build + - run: glib-compile-schemas . + working-directory: '{{prefix}}/share/glib-2.0/schemas' env: DESTDIR: '/' ARGS: @@ -34,4 +40,4 @@ test: script: | pkg-config --modversion gsettings-desktop-schemas | grep {{version.marketing}} cc test.c -I{{prefix}}/include/gsettings-desktop-schemas -o test - ./test \ No newline at end of file + ./test