diff --git a/config/x11.toml b/config/x11.toml index 627fa9853..b6d105973 100644 --- a/config/x11.toml +++ b/config/x11.toml @@ -157,6 +157,9 @@ set -ex gdk-pixbuf-query-loaders --update-cache /usr/lib/xfce4/xfconf/xfconfd & +/usr/lib/tumbler-1/tumblerd & +/usr/libexec/upowerd & +xfsettingsd & xterm& #zenity --info --text="running xfce4 as $(id)!" diff --git a/recipes/groups/xfce4-common/recipe.toml b/recipes/groups/xfce4-common/recipe.toml index 847334b69..dfaaf31bc 100644 --- a/recipes/groups/xfce4-common/recipe.toml +++ b/recipes/groups/xfce4-common/recipe.toml @@ -1,5 +1,6 @@ [package] dependencies = [ + "mousepad", "thunar", "tumbler", "xfconf", @@ -8,6 +9,7 @@ dependencies = [ "xfce4-appfinder", "xfce4-session", "xfce4-panel", + "xfce4-power-manager", "xfce4-settings", "xfce4-terminal", "xfwm4", diff --git a/recipes/libs/glib/recipe.toml b/recipes/libs/glib/recipe.toml index cabf64265..d004afd09 100644 --- a/recipes/libs/glib/recipe.toml +++ b/recipes/libs/glib/recipe.toml @@ -11,14 +11,17 @@ dependencies = [ "gettext", "libffi", "libiconv", + "libinotify-stub", "pcre2", "zlib", ] script = """ DYNAMIC_INIT +export CFLAGS="$CFLAGS -I$COOKBOOK_SYSROOT/include/inotify" +export LDFLAGS="$LDFLAGS -linotify" cookbook_meson \ -Ddefault_library=shared \ -Dxattr=false \ -Dtests=false \ - -Dfile_monitor_backend=auto + -Dfile_monitor_backend=inotify """ diff --git a/recipes/libs/libinotify-stub/recipe.toml b/recipes/libs/libinotify-stub/recipe.toml new file mode 100644 index 000000000..8b77e15d3 --- /dev/null +++ b/recipes/libs/libinotify-stub/recipe.toml @@ -0,0 +1,9 @@ +[source] +tar = "https://github.com/willnode/inotify-stub/archive/refs/tags/v0.1.tar.gz" + +[build] +template = "custom" +script = """ +DYNAMIC_INIT +make -C "$COOKBOOK_SOURCE" install BUILD="$(pwd)" DESTDIR="$COOKBOOK_STAGE/usr" +""" diff --git a/recipes/wip/icons/adwaita-icon-theme/recipe.toml b/recipes/wip/icons/adwaita-icon-theme/recipe.toml index ce90ad699..1ee7272a8 100644 --- a/recipes/wip/icons/adwaita-icon-theme/recipe.toml +++ b/recipes/wip/icons/adwaita-icon-theme/recipe.toml @@ -5,3 +5,8 @@ patches = ["redox.patch"] [build] template = "meson" + +[package] +dependencies = [ + "librsvg" # adwaita contains svg icons +] diff --git a/recipes/wip/libs/gnome/graphene/recipe.toml b/recipes/wip/libs/gnome/graphene/recipe.toml index c96d54794..7c2cdf8d7 100644 --- a/recipes/wip/libs/gnome/graphene/recipe.toml +++ b/recipes/wip/libs/gnome/graphene/recipe.toml @@ -6,5 +6,4 @@ tar = "https://download.gnome.org/sources/graphene/1.10/graphene-1.10.8.tar.xz" template = "meson" mesonflags = [ "-Dtests=false", - "-Dintrospection=false", ] diff --git a/recipes/wip/libs/gnome/gtksourceview/recipe.toml b/recipes/wip/libs/gnome/gtksourceview/recipe.toml index b6b3ed2f8..9513e8b36 100644 --- a/recipes/wip/libs/gnome/gtksourceview/recipe.toml +++ b/recipes/wip/libs/gnome/gtksourceview/recipe.toml @@ -1,16 +1,12 @@ -#TODO not compiled or tested -# build instructions: https://gitlab.gnome.org/GNOME/gtksourceview#installation +#TODO compiled but not tested [source] -tar = "https://download.gnome.org/sources/gtksourceview/5.10/gtksourceview-5.10.0.tar.xz" +# later version uses GTK4 +tar = "https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.9.tar.xz" [build] -template = "meson" -mesonflags = [ - "-Dbuild-testsuite=false", - "-Dintrospection=false", -] +template = "configure" dependencies = [ "glib", - "gtk4", + "gtk3", "libxml2", "fribidi", "pcre", diff --git a/recipes/wip/libs/gnome/gtksourceview/redox.patch b/recipes/wip/libs/gnome/gtksourceview/redox.patch new file mode 100644 index 000000000..54bb93841 --- /dev/null +++ b/recipes/wip/libs/gnome/gtksourceview/redox.patch @@ -0,0 +1,21 @@ +diff --color -ruwN source/configure source-new/configure +--- source/configure 2018-09-06 01:53:32.000000000 +0700 ++++ source-new/configure 2026-05-24 08:57:06.072736434 +0700 +@@ -5763,7 +5763,7 @@ + ;; + + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | redox*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -11450,7 +11450,7 @@ + ;; + + # This must be glibc/ELF. +-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | redox*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no diff --git a/recipes/wip/x11/mate/marco/recipe.toml b/recipes/wip/x11/mate/marco/recipe.toml index d4c935c41..50f9042ca 100644 --- a/recipes/wip/x11/mate/marco/recipe.toml +++ b/recipes/wip/x11/mate/marco/recipe.toml @@ -20,7 +20,6 @@ template = "meson" [package] dependencies = [ - "librsvg", "mate-settings-daemon", "zenity", ] diff --git a/recipes/wip/x11/upower-glib/recipe.toml b/recipes/wip/x11/upower-glib/recipe.toml new file mode 100644 index 000000000..75724f772 --- /dev/null +++ b/recipes/wip/x11/upower-glib/recipe.toml @@ -0,0 +1,16 @@ + +[source] +tar = "https://gitlab.freedesktop.org/upower/upower/-/archive/v1.91.2/upower-v1.91.2.tar.gz" +[build] +template = "meson" +dependencies = [ + "glib", +] +mesonflags = [ + "-Dintrospection=disabled", + "-Dos_backend=dummy", + "-Dsystemdsystemunitdir=no", + "-Dgtk-doc=false", + "-Dman=false", + "-Dinstalled_tests=false", +] diff --git a/recipes/wip/x11/xfce4/mousepad/recipe.toml b/recipes/wip/x11/xfce4/mousepad/recipe.toml new file mode 100644 index 000000000..cbfcd8348 --- /dev/null +++ b/recipes/wip/x11/xfce4/mousepad/recipe.toml @@ -0,0 +1,14 @@ +[source] +tar = "https://archive.xfce.org/src/apps/mousepad/0.7/mousepad-0.7.0.tar.xz" +[build] +dependencies = [ + "gettext", + "glib", + "gtk3", + "gtksourceview", + "libxfce4ui", + "pango", +] +template = "meson" +mesonflags = [ +] diff --git a/recipes/wip/x11/xfce4/xfce4-power-manager/recipe.toml b/recipes/wip/x11/xfce4/xfce4-power-manager/recipe.toml new file mode 100644 index 000000000..d369dac6d --- /dev/null +++ b/recipes/wip/x11/xfce4/xfce4-power-manager/recipe.toml @@ -0,0 +1,22 @@ + +[source] +tar = "https://archive.xfce.org/src/xfce/xfce4-power-manager/4.21/xfce4-power-manager-4.21.1.tar.xz" +[build] +dependencies = [ + "cairo", + "gettext", + "glib", + "gtk3", + "libnotify", + "libx11", + "libxext", + "libxfce4ui", + "libxfce4util", + "libxrandr", + "upower-glib", + "xfconf", +] +template = "meson" +mesonflags = [ + "-Dwayland=disabled", +]