Merge branch 'more-xfce4-2' into 'master'

Add xfce4-notifyd and other xfce4 apps

See merge request redox-os/redox!2166
This commit is contained in:
Jeremy Soller 2026-05-25 07:06:02 -06:00
commit 862b29d3d9
15 changed files with 192 additions and 0 deletions

View File

@ -14,6 +14,7 @@ filesystem_size = 2048
adwaita-icon-theme = {}
dbus = {}
gtk3 = {}
libxcursor = {} # loaded dynamically
#mate-common = {}
mesa-demos-x11 = {}
#firefox = {}

View File

@ -7,6 +7,7 @@ dependencies = [
"xfdashboard",
"xfdesktop",
"xfce4-appfinder",
"xfce4-notifyd",
"xfce4-session",
"xfce4-panel",
"xfce4-power-manager",

View File

@ -2,6 +2,7 @@
[source]
# later version uses GTK4
tar = "https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.9.tar.xz"
patches = ["redox.patch"]
[build]
template = "configure"
dependencies = [

View File

@ -0,0 +1,8 @@
[source]
tar = "https://github.com/libexif/libexif/releases/download/v0.6.26/libexif-0.6.26.tar.xz"
patches = ["redox.patch"]
[build]
template = "configure"
configureflags = [
"--disable-docs"
]

View File

@ -0,0 +1,21 @@
diff --color -ruwN source/configure source-new/configure
--- source/configure 2026-04-14 15:22:14.000000000 +0700
+++ source-new/configure 2026-05-25 18:24:23.013642280 +0700
@@ -6862,7 +6862,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
;;
@@ -13006,7 +13006,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

View File

@ -0,0 +1,15 @@
# TODO: requires self compiling
[source]
tar = "https://github.com/libical/libical/releases/download/v3.0.20/libical-3.0.20.tar.gz"
[build]
template = "cmake"
cmakeflags = [
"-DLIBICAL_JAVA_BINDINGS=False",
"-DLIBICAL_GOBJECT_INTROSPECTION=False",
"-DLIBICAL_GLIB_BUILD_DOCS=False",
]
dependencies = [
"libxml2",
"glib",
"libicu",
]

View File

@ -0,0 +1,16 @@
[source]
tar = "https://archive.xfce.org/src/apps/catfish/4.20/catfish-4.20.1.tar.xz"
[build]
dependencies = [
"cairo",
"garcon",
"gdk-pixbuf",
"glib",
"gtk3",
"libxfce4ui",
"libxfce4util",
"xfconf",
]
template = "meson"
mesonflags = []

View File

@ -0,0 +1,17 @@
[source]
tar = "https://archive.xfce.org/src/apps/orage/4.21/orage-4.21.0.tar.xz"
[build]
dependencies = [
"cairo",
"garcon",
"gdk-pixbuf",
"glib",
"gtk3",
"libxfce4ui",
"libxfce4util",
"xfconf",
"libical",
]
template = "meson"
mesonflags = []

View File

@ -0,0 +1,19 @@
[source]
tar = "https://archive.xfce.org/src/apps/parole/4.20/parole-4.20.0.tar.xz"
patches = ["redox.patch"]
[build]
dependencies = [
"cairo",
"garcon",
"gdk-pixbuf",
"glib",
"gtk3",
"libxfce4ui",
"libxfce4util",
"xfconf",
"dbus-glib",
"gstreamer",
]
template = "meson"
mesonflags = []

View File

@ -0,0 +1,11 @@
diff --color -ruwN source/src/parole-subtitle-encoding.c source-new/src/parole-subtitle-encoding.c
--- source/src/parole-subtitle-encoding.c 2025-05-21 13:46:43.000000000 +0700
+++ source-new/src/parole-subtitle-encoding.c 2026-05-25 18:19:44.638244921 +0700
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <glib.h>
#include <libxfce4util/libxfce4util.h>

View File

@ -0,0 +1,17 @@
[source]
tar = "https://archive.xfce.org/src/apps/ristretto/0.14/ristretto-0.14.0.tar.xz"
[build]
dependencies = [
"cairo",
"garcon",
"gdk-pixbuf",
"glib",
"gtk3",
"libxfce4ui",
"libxfce4util",
"xfconf",
"libexif",
]
template = "meson"
mesonflags = []

View File

@ -0,0 +1,23 @@
[source]
tar = "https://archive.xfce.org/src/apps/xfce4-notifyd/0.9/xfce4-notifyd-0.9.7.tar.bz2"
[build]
dependencies = [
"cairo",
"gdk-pixbuf",
"gettext",
"glib",
"gtk3",
"libnotify",
"libxfce4ui",
"libxfce4util",
"sqlite3",
"xfconf",
"xfce4-panel",
]
template = "custom"
script = """
DYNAMIC_INIT
cookbook_meson
patchelf --replace-needed "${COOKBOOK_SYSROOT}/usr/lib/libsqlite3.so" "libsqlite3.so" "${COOKBOOK_STAGE}/usr/lib/xfce4/notifyd/xfce4-notifyd"
"""

View File

@ -0,0 +1,21 @@
[source]
tar = "https://archive.xfce.org/src/apps/xfce4-screenshooter/1.11/xfce4-screenshooter-1.11.3.tar.xz"
patches = ["redox.patch"]
[build]
dependencies = [
"cairo",
"garcon",
"gdk-pixbuf",
"glib",
"gtk3",
"libxfce4ui",
"libxfce4util",
"xfce4-panel",
"xfconf",
]
template = "meson"
mesonflags = [
"-Dwayland=disabled"
]

View File

@ -0,0 +1,21 @@
diff --color -ruwN source/src/meson.build source-new/src/meson.build
--- source/src/meson.build 2025-11-06 04:42:53.000000000 +0700
+++ source-new/src/meson.build 2026-05-25 18:43:46.412549117 +0700
@@ -43,17 +43,3 @@
install: true,
install_dir: get_option('prefix') / get_option('datadir') / 'metainfo',
)
-
-help2man = find_program('help2man', required: false)
-if help2man.found()
- custom_target(
- 'xfce4-screenshooter.1',
- depends: screenshooter,
- output: 'xfce4-screenshooter.1',
- command: [
- help2man, ['--no-info'], '--output=@OUTPUT@', screenshooter.full_path(),
- ],
- install: true,
- install_dir: get_option('prefix') / get_option('mandir') / 'man1',
- )
-endif