From bcdd35876839c30e49adfc868b024cade8cc0136 Mon Sep 17 00:00:00 2001 From: Jill Fiore Date: Tue, 22 Sep 2026 14:11:57 +0700 Subject: [PATCH] chore: get libdex from gnome runtime 51 --- CONTRIBUTING.md | 2 +- .../flatpak/io.github.kolunmi.Bazaar.json | 20 ------------------- src/meson.build | 2 +- subprojects/.gitignore | 1 - subprojects/.wraplock | 0 subprojects/libdex.wrap | 10 ---------- 6 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 subprojects/.gitignore delete mode 100644 subprojects/.wraplock delete mode 100644 subprojects/libdex.wrap diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c99a9b..4b94903 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ You will need the following dependencies installed, along with a C compiler, mes |-------------------------------------------------------------------|-------------------|-------------|-----------------------------------------------------| | [gtk4](https://gitlab.gnome.org/GNOME/gtk/) | `gtk4` | `4.22.1` | GUI | | [libadwaita](https://gitlab.gnome.org/GNOME/libadwaita) | `libadwaita-1` | `1.8` | GNOME styling | -| [libdex](https://gitlab.gnome.org/GNOME/libdex) | `libdex-1` | `1.0` | Async helpers | +| [libdex](https://gitlab.gnome.org/GNOME/libdex) | `libdex-1` | `1.2.0` | Async helpers | | [flatpak](https://github.com/flatpak/flatpak) | `flatpak` | `1.9` | Flatpak installation management | | [appstream](https://github.com/ximion/appstream) | `appstream` | `1.0` | Interpret application metadata | | [xmlb](https://github.com/hughsie/libxmlb) | `xmlb` | `0.3.4` | Handle binary xml appstream bundles/Parse plain xml | diff --git a/build-aux/flatpak/io.github.kolunmi.Bazaar.json b/build-aux/flatpak/io.github.kolunmi.Bazaar.json index 7ec710e..dceae53 100644 --- a/build-aux/flatpak/io.github.kolunmi.Bazaar.json +++ b/build-aux/flatpak/io.github.kolunmi.Bazaar.json @@ -63,26 +63,6 @@ } ], "modules": [ - { - "name": "libdex", - "buildsystem": "meson", - "config-opts": [ - "--buildtype=debugoptimized", - "-Ddocs=false", - "-Dintrospection=enabled", - "-Dexamples=false", - "-Dtests=false", - "-Dsysprof=false" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/libdex.git", - "commit": "26d094f2d7a4561862cce3efa00bb5aa1e4b0720", - "tag": "1.2.beta" - } - ] - }, { "name": "md4c", "buildsystem": "cmake", diff --git a/src/meson.build b/src/meson.build index a5ee842..b767822 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,7 +3,7 @@ xmllint = find_program('xmllint', required: true) gtk_dep = dependency('gtk4', version: '>= 4.22.1') libadwaita_dep = dependency('libadwaita-1', version: '>= 1.8') -libdex_dep = dependency('libdex-1', version: '>= 1.2.beta') +libdex_dep = dependency('libdex-1', version: '>= 1.2.0') flatpak_dep = dependency('flatpak', version: '>= 1.9') appstream_dep = dependency('appstream', version: '>= 1.0') xmlb_dep = dependency('xmlb', version: '>= 0.3.4') diff --git a/subprojects/.gitignore b/subprojects/.gitignore deleted file mode 100644 index f480d3c..0000000 --- a/subprojects/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libdex/ diff --git a/subprojects/.wraplock b/subprojects/.wraplock deleted file mode 100644 index e69de29..0000000 diff --git a/subprojects/libdex.wrap b/subprojects/libdex.wrap deleted file mode 100644 index b6a8d6b..0000000 --- a/subprojects/libdex.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-git] -directory=libdex -url=https://gitlab.gnome.org/GNOME/libdex.git -push-url=ssh://git@ssh.gitlab.gnome.org:GNOME/libdex.git -revision=1.2.beta -depth=1 - -[provide] -dependency_names=libdex-1 -libdex-1=libdex_dep