From 4e775c3302189f27c64ee1fd26a7acda7738f05b Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 5 Mar 2026 12:45:09 +0700 Subject: [PATCH] Replace itstool, libxml2-utils into host cookbook --- podman/redox-base-containerfile | 6 ++---- recipes/wip/doc/gtk-doc/recipe.toml | 9 ++++++++- recipes/wip/libs/gnome/dconf/recipe.toml | 1 + recipes/wip/libs/gnome/libnotify/recipe.toml | 2 ++ recipes/wip/libs/gnome/zenity/recipe.toml | 3 +++ recipes/wip/tools/itstool/recipe.toml | 5 +---- recipes/wip/x11/mate/libmatekbd/recipe.toml | 3 +++ recipes/wip/x11/mate/libmateweather/recipe.toml | 3 +++ recipes/wip/x11/mate/mate-control-center/recipe.toml | 3 +++ recipes/wip/x11/mate/mate-panel/recipe.toml | 4 ++++ recipes/wip/x11/mate/mate-terminal/recipe.toml | 3 +++ recipes/wip/x11/xserver-xorg/recipe.toml | 2 +- 12 files changed, 34 insertions(+), 10 deletions(-) diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 45807435c..12af4f60f 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -31,18 +31,15 @@ RUN apt-get update \ help2man \ ipxe-qemu \ intltool \ - itstool \ libaudiofile-dev \ libdbus-glib-1-dev-bin \ libfuse3-dev \ libgdk-pixbuf2.0-bin \ libglib2.0-dev-bin \ libhtml-parser-perl \ - libparse-yapp-perl \ librsvg2-common \ libsdl1.2-dev \ libsdl2-ttf-dev \ - libxml2-utils \ lzip \ m4 \ make \ @@ -61,6 +58,7 @@ RUN apt-get update \ qemu-efi-aarch64 \ python3 \ python3-dev \ + python3-libxml2 \ python3-mako \ python3-venv \ rsync \ @@ -73,7 +71,7 @@ RUN apt-get update \ wget \ xdg-utils \ xfonts-utils \ - xorg-dev \ + xserver-xorg-dev \ xutils-dev \ xxd \ zip \ diff --git a/recipes/wip/doc/gtk-doc/recipe.toml b/recipes/wip/doc/gtk-doc/recipe.toml index 853dfd10a..208e7fed2 100644 --- a/recipes/wip/doc/gtk-doc/recipe.toml +++ b/recipes/wip/doc/gtk-doc/recipe.toml @@ -1,5 +1,12 @@ -#TODO not compiled or tested +#TODO compiling, not tested [source] tar = "https://download.gnome.org/sources/gtk-doc/1.33/gtk-doc-1.33.2.tar.xz" [build] template = "meson" +mesonflags = [ + "-Dtests=false", + "-Dyelp_manual=false", +] +dev-dependencies = [ + "host:libxslt", +] diff --git a/recipes/wip/libs/gnome/dconf/recipe.toml b/recipes/wip/libs/gnome/dconf/recipe.toml index 40fcd4697..44a9fb773 100644 --- a/recipes/wip/libs/gnome/dconf/recipe.toml +++ b/recipes/wip/libs/gnome/dconf/recipe.toml @@ -11,6 +11,7 @@ dependencies = [ template = "meson" mesonflags = [ "-Dbash_completion=false", + "-Dman=false", "-Dvapi=false", "--force-fallback-for=gvdb", ] diff --git a/recipes/wip/libs/gnome/libnotify/recipe.toml b/recipes/wip/libs/gnome/libnotify/recipe.toml index 6efb5c3f1..5a8c1daba 100644 --- a/recipes/wip/libs/gnome/libnotify/recipe.toml +++ b/recipes/wip/libs/gnome/libnotify/recipe.toml @@ -10,6 +10,8 @@ dependencies = [ template = "meson" mesonflags = [ "-Dgtk_doc=false", + "-Dman=false", + "-Dtests=false", "-Dintrospection=disabled", ] diff --git a/recipes/wip/libs/gnome/zenity/recipe.toml b/recipes/wip/libs/gnome/zenity/recipe.toml index bc9f40acd..39a9ed04c 100644 --- a/recipes/wip/libs/gnome/zenity/recipe.toml +++ b/recipes/wip/libs/gnome/zenity/recipe.toml @@ -6,4 +6,7 @@ blake3 = "de4c662bd33107e9247c23d248e4b1b51a68994b01ecefda77422e1007b11c1e" dependencies = [ "gtk3", ] +dev-dependencies = [ + "host:itstool" +] template = "meson" diff --git a/recipes/wip/tools/itstool/recipe.toml b/recipes/wip/tools/itstool/recipe.toml index 15c9800ec..cbf08e99f 100644 --- a/recipes/wip/tools/itstool/recipe.toml +++ b/recipes/wip/tools/itstool/recipe.toml @@ -1,8 +1,5 @@ -#TODO require a Python module for libxml2 +#TODO compiling, not tested [source] tar = "http://files.itstool.org/itstool/itstool-2.0.7.tar.bz2" [build] template = "configure" -dependencies = [ - "libxml2", -] diff --git a/recipes/wip/x11/mate/libmatekbd/recipe.toml b/recipes/wip/x11/mate/libmatekbd/recipe.toml index 340c1c99d..1a50d0e4b 100644 --- a/recipes/wip/x11/mate/libmatekbd/recipe.toml +++ b/recipes/wip/x11/mate/libmatekbd/recipe.toml @@ -10,6 +10,9 @@ dependencies = [ "gtk3", "libxklavier", ] +dev-dependencies = [ + "host:libxml2" +] template = "custom" script = """ DYNAMIC_INIT diff --git a/recipes/wip/x11/mate/libmateweather/recipe.toml b/recipes/wip/x11/mate/libmateweather/recipe.toml index 56aa8b366..f766597e3 100644 --- a/recipes/wip/x11/mate/libmateweather/recipe.toml +++ b/recipes/wip/x11/mate/libmateweather/recipe.toml @@ -11,6 +11,9 @@ dependencies = [ "gtk3", "libsoup", ] +dev-dependencies = [ + "host:libxml2" +] template = "custom" script = """ DYNAMIC_INIT diff --git a/recipes/wip/x11/mate/mate-control-center/recipe.toml b/recipes/wip/x11/mate/mate-control-center/recipe.toml index 5e91b9125..2f0cee64a 100644 --- a/recipes/wip/x11/mate/mate-control-center/recipe.toml +++ b/recipes/wip/x11/mate/mate-control-center/recipe.toml @@ -11,6 +11,9 @@ dependencies = [ "libxscrnsaver", "marco", ] +dev-dependencies = [ + "host:itstool" +] template = "meson" mesonflags = [ "-Dlibappindicator=no", diff --git a/recipes/wip/x11/mate/mate-panel/recipe.toml b/recipes/wip/x11/mate/mate-panel/recipe.toml index c2037931c..3ec084705 100644 --- a/recipes/wip/x11/mate/mate-panel/recipe.toml +++ b/recipes/wip/x11/mate/mate-panel/recipe.toml @@ -16,6 +16,10 @@ dependencies = [ "libsm", "libwnck3", ] +dev-dependencies = [ + "host:itstool", + "host:libxml2" +] template = "custom" script = """ DYNAMIC_INIT diff --git a/recipes/wip/x11/mate/mate-terminal/recipe.toml b/recipes/wip/x11/mate/mate-terminal/recipe.toml index eecc852ad..08fd7d7e0 100644 --- a/recipes/wip/x11/mate/mate-terminal/recipe.toml +++ b/recipes/wip/x11/mate/mate-terminal/recipe.toml @@ -9,4 +9,7 @@ dependencies = [ "libstdcxx", "vte", ] +dev-dependencies = [ + "host:itstool", +] template = "meson" diff --git a/recipes/wip/x11/xserver-xorg/recipe.toml b/recipes/wip/x11/xserver-xorg/recipe.toml index 4e918772e..86849c243 100644 --- a/recipes/wip/x11/xserver-xorg/recipe.toml +++ b/recipes/wip/x11/xserver-xorg/recipe.toml @@ -22,7 +22,7 @@ dependencies = [ "libxkbfile", "libxxf86vm", "mesa-x11", - "openssl1", + "openssl3", "pixman", "x11proto", "xtrans",