Merge branch redox:master into zola

2026-06-22 12:54:20 +08:00 · 2026-06-18 10:52:00 +00:00 · 2026-06-18 10:52:00 +00:00 · 22d97a2567
commit 22d97a2567
parent 2b7146adb1 5524142ed2
34 changed files with 329 additions and 81 deletions
--- a/recipes/wip/archives/cpio/recipe.toml
+++ b/recipes/wip/archives/cpio/recipe.toml
@ -0,0 +1,5 @@
+#TODO compile and test
+[source]
+tar = "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.bz2"
+[build]
+template = "configure"
--- a/recipes/wip/gnome/evolution/recipe.toml
+++ b/recipes/wip/gnome/evolution/recipe.toml
@ -0,0 +1,17 @@
+#TODO discover minimum dependencies from cmake log
+# build instructions: https://gitlab.gnome.org/GNOME/evolution#configuring-evolution
+[source]
+tar = "https://download.gnome.org/sources/evolution/3.60/evolution-3.60.2.tar.xz"
+[build]
+template = "cmake"
+cmakeflags = [
+    "-DENABLE_GNOME_DESKTOP=OFF",
+    "-DENABLE_ALARM_NOTIFY_MODULE=OFF",
+    "-DENABLE_CANBERRA=OFF",
+    "-DENABLE_AUTOAR=OFF",
+    "-DWITH_HELP=OFF",
+    "-DENABLE_TEXT_HIGHLIGHT=OFF",
+    "-DENABLE_WEATHER=OFF",
+    "-DENABLE_CONTACT_MAPS=OFF",
+    "-DENABLE_PST_IMPORT=OFF",
+]
--- a/recipes/wip/hw/arduino-cli/recipe.toml
+++ b/recipes/wip/hw/arduino-cli/recipe.toml
@ -0,0 +1,8 @@
+#TODO add script for building: https://arduino.github.io/arduino-cli/1.5/CONTRIBUTING/#building-the-source-code
+# does the go template can be used?
+[source]
+git = "https://github.com/arduino/arduino-cli"
+rev = "v1.5.1"
+shallow_clone = true
+[build]
+template = "custom"
--- a/recipes/wip/hw/espflash/recipe.toml
+++ b/recipes/wip/hw/espflash/recipe.toml
@ -0,0 +1,10 @@
+#TODO compile and test
+[source]
+git = "https://github.com/esp-rs/espflash"
+shallow_clone = true
+[build]
+template = "cargo"
+cargopackages = [
+    "espflash",
+    "cargo-espflash",
+]
--- a/recipes/wip/hw/esptool/recipe.toml
+++ b/recipes/wip/hw/esptool/recipe.toml
@ -0,0 +1,15 @@
+#TODO add script for installation: https://docs.espressif.com/projects/esptool/en/latest/esp32/installation.html
+[source]
+git = "https://github.com/espressif/esptool"
+rev = "v5.3.0"
+shallow_clone = true
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/home/user/esptool"
+cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/esptool"
+"""
+[package]
+dependencies = [
+    "python312",
+]
--- a/recipes/wip/hw/flashrom/recipe.toml
+++ b/recipes/wip/hw/flashrom/recipe.toml
@ -0,0 +1,14 @@
+#TODO discover minimum dependencies from meson log
+# build instructions: https://www.flashrom.org/dev_guide/building_from_source.html
+[source]
+git = "https://github.com/flashrom/flashrom"
+rev = "v1.7.0"
+shallow_clone = true
+[build]
+template = "meson"
+mesonflags = [
+    "-Dtests=disabled",
+    "-Dbash-completion=disabled",
+    "-Dman-pages=disabled",
+    "-Ddocumentation=disabled",
+]
--- a/recipes/wip/hw/gtkwave/recipe.toml
+++ b/recipes/wip/hw/gtkwave/recipe.toml
@ -0,0 +1,17 @@
+#TODO determine minimum dependencies from meson log
+# build instructions: https://gtkwave.github.io/gtkwave/install/unix_linux.html
+[source]
+tar = "https://gtkwave.sourceforge.net/gtkwave-gtk3-3.3.127.tar.gz"
+[build]
+template = "configure"
+configureflags = [
+    "--enable-gtk3"
+]
+#dependencies = [
+    #"gtk3",
+    #"bzip2",
+    #"xz",
+    #"judy",
+    #"tcl",
+    #"tk",
+#]
--- a/recipes/wip/hw/piper/recipe.toml
+++ b/recipes/wip/hw/piper/recipe.toml
@ -1,16 +0,0 @@
-#TODO not compiled or tested
-[source]
-git = "https://github.com/libratbag/piper"
-rev = "0.8"
-shallow_clone = true
-[build]
-template = "meson"
-mesonflags = [
-    "-Druntime-dependency-checks=false",
-]
-dependencies = [
-    "libratbag",
-    "gtk3",
-    "cairo",
-    "libevdev",
-]
--- a/recipes/wip/hw/simulide/recipe.toml
+++ b/recipes/wip/hw/simulide/recipe.toml
@ -0,0 +1,14 @@
+#TODO add script for gnu make: https://github.com/Arcachofo/SimulIDE-dev#building-simulide
+# probably missing dependencies
+[source]
+git = "https://github.com/Arcachofo/SimulIDE-dev"
+rev = "ed253d6612b1293a320d68d6e27968cd7e6523c4"
+shallow_clone = true
+[build]
+template = "custom"
+dependencies = [
+    "qt5-base",
+    "qt5-svg",
+    "qt5-multimedia",
+    "qt5-serialport",
+]
--- a/recipes/wip/hw/surfer/recipe.toml
+++ b/recipes/wip/hw/surfer/recipe.toml
@ -0,0 +1,8 @@
+#TODO compile and test
+[source]
+git = "https://gitlab.com/surfer-project/surfer"
+shallow_clone = true
+[build]
+template = "cargo"
+cargopackages = ["surfer"]
+cargoflags = ["--no-default-features"]
--- a/recipes/wip/hw/systemc/recipe.toml
+++ b/recipes/wip/hw/systemc/recipe.toml
@ -0,0 +1,9 @@
+#TODO compile and test
+# quickthreads seems to be better than posix threads, does it's worth to port?
+# build instructions: https://github.com/accellera-official/systemc/blob/main/INSTALL.md
+[source]
+git = "https://github.com/accellera-official/systemc"
+rev = "3.0.2"
+shallow_clone = true
+[build]
+template = "cmake"
--- a/recipes/wip/hw/verilator/recipe.toml
+++ b/recipes/wip/hw/verilator/recipe.toml
@ -0,0 +1,8 @@
+#TODO discover minimum dependencies from configure log
+# build instructions: https://verilator.org/guide/latest/install.html
+[source]
+git = "https://github.com/verilator/verilator"
+rev = "v5.048"
+shallow_clone = true
+[build]
+template = "configure"
--- a/recipes/wip/image/editors/inkscape/recipe.toml
+++ b/recipes/wip/image/editors/inkscape/recipe.toml
@ -6,6 +6,21 @@
 tar = "https://inkscape.org/gallery/item/58914/inkscape-1.4.3.tar.xz"
 [build]
 template = "cmake"
+cmakeflags = [
+    "-DWITH_GNU_READLINE=OFF",
+    "-DENABLE_LCMS=OFF",
+    "-DWITH_SVG2=OFF",
+    "-DWITH_POPPLER=OFF",
+    "-DWITH_CAPYPDF=OFF",
+    "-DWITH_IMAGE_MAGICK=OFF",
+    "-DWITH_GRAPHICS_MAGICK=OFF",
+    "-DWITH_LIBCDR=OFF",
+    "-DWITH_LIBVISIO=OFF",
+    "-DWITH_LIBWPG=OFF",
+    "-DWITH_LIBSPELLING=OFF",
+    "-DWITH_GSOURCEVIEW=OFF",
+    "-DWITH_NLS=OFF",
+]
 # dependencies = [
 #     "boost",
 #     "glib",
--- a/recipes/wip/kde/krita/recipe.toml
+++ b/recipes/wip/kde/krita/recipe.toml
@ -10,6 +10,7 @@ template = "cmake"
 cmakeflags = [
    "-DLIMIT_LONG_TESTS=OFF",
    "-DENABLE_UPDATERS=OFF",
+    "-DBUILD_WITH_QT6=ON",
 ]
 # dependencies = [
 #     "gexiv2",
--- a/recipes/wip/libs/archives/libzim/recipe.toml
+++ b/recipes/wip/libs/archives/libzim/recipe.toml
@ -0,0 +1,16 @@
+#TODO compile and test
+[source]
+tar = "https://download.openzim.org/release/libzim/libzim-9.7.0.tar.xz"
+[build]
+template = "meson"
+mesonflags = [
+    "-Dexamples=false",
+    "-Dtests=false",
+    "-Dwith_xapian=false",
+]
+dependencies = [
+    "xz",
+    "libicu",
+    "zstd",
+    #"xapian-core",
+]
--- a/recipes/wip/libs/gui/tk/recipe.toml
+++ b/recipes/wip/libs/gui/tk/recipe.toml
@ -0,0 +1,10 @@
+#TODO discover minimum dependencies from configure log
+[source]
+tar = "https://sourceforge.net/projects/tcl/files/Tcl/8.6.18/tk8.6.18-src.tar.gz"
+[build]
+template = "custom"
+script = """
+DYNAMIC_INIT
+COOKBOOK_CONFIGURE="$COOKBOOK_SOURCE/unix/configure"
+cookbook_configure
+"""
--- a/recipes/wip/libs/hw/libratbag/recipe.toml
+++ b/recipes/wip/libs/hw/libratbag/recipe.toml
@ -1,20 +0,0 @@
-#TODO not compiled or tested
-[source]
-git = "https://github.com/libratbag/libratbag"
-rev = "v0.18"
-shallow_clone = true
-[build]
-template = "meson"
-mesonflags = [
-    "-Dtests=false",
-    "-Dlogind-provider=elogind",
-    "-Dsystemd=false",
-]
-dependencies = [
-    "elogind",
-    "eudev",
-    "libevdev",
-    "libunistring",
-    "json-glib",
-    "glib",
-]
--- a/recipes/wip/libs/other/libkiwix/recipe.toml
+++ b/recipes/wip/libs/other/libkiwix/recipe.toml
@ -0,0 +1,16 @@
+#TODO compile and test
+[source]
+tar = "https://mirror.download.kiwix.org/release/libkiwix/libkiwix-14.2.1.tar.xz"
+[build]
+template = "meson"
+dependencies = [
+    "libzim",
+    "libicu",
+    "pugixml",
+    "mustache",
+    "curl",
+    "microhttpd",
+    "zlib",
+]
+[package]
+dependencies = ["aria2"]
--- a/recipes/wip/libs/text/mustache/recipe.toml
+++ b/recipes/wip/libs/text/mustache/recipe.toml
@ -0,0 +1,11 @@
+#TODO compile and test
+[source]
+git = "https://github.com/kainjow/Mustache"
+rev = "3f654942a70c46a775070d7a09ca7acfa3e205b7"
+shallow_clone = true
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/usr/include"
+cp -rv "${COOKBOOK_SOURCE}"/mustache.hpp "${COOKBOOK_STAGE}/usr/include"
+"""
--- a/recipes/wip/libs/text/rapidjson/recipe.toml
+++ b/recipes/wip/libs/text/rapidjson/recipe.toml
@ -0,0 +1,11 @@
+#TODO compile and test
+[source]
+git = "https://github.com/Tencent/rapidjson"
+rev = "24b5e7a8b27f42fa16b96fc70aade9106cf7102f"
+shallow_clone = true
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/usr/include"
+cp -rv "${COOKBOOK_SOURCE}"/include/rapidjson "${COOKBOOK_STAGE}/usr/include"
+"""
--- a/recipes/wip/libs/text/xapian-core/recipe.toml
+++ b/recipes/wip/libs/text/xapian-core/recipe.toml
@ -0,0 +1,9 @@
+#TODO compile and test
+# build instructions: https://xapian.org/docs/install.html
+[source]
+tar = "https://oligarchy.co.uk/xapian/2.0.0/xapian-core-2.0.0.tar.xz"
+[build]
+template = "configure"
+dependencies = [
+    "zlib"
+]
--- a/recipes/wip/net/analysis/rsyslog/recipe.toml
+++ b/recipes/wip/net/analysis/rsyslog/recipe.toml
@ -0,0 +1,15 @@
+#TODO determine minimum dependencies from configure log
+# build instructions: https://docs.rsyslog.com/doc/installation/install_from_source.html
+[source]
+tar = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2604.0.tar.gz"
+[build]
+template = "configure"
+#dependencies = [
+    #"zlib",
+    #"json-c",
+    #"libgcrypt",
+    #"libuuid",
+    #"libestr",
+    #"liblognorm",
+    #"libfastjson",
+#]
--- a/recipes/wip/recorders/obs-studio/recipe.toml
+++ b/recipes/wip/recorders/obs-studio/recipe.toml
@ -9,6 +9,8 @@ cmakeflags = [
    "-DENABLE_UI=OFF",
    "-DENABLE_SCRIPTING=OFF",
    "-DENABLE_HEVC=OFF",
+    "-DENABLE_PULSEAUDIO=OFF",
+    "-DENABLE_WAYLAND=OFF",
 ]
 # dependencies = [
 #     "boost",
@ -27,7 +29,6 @@ cmakeflags = [
 #     "libva",
 #     "qt5-base",
 #     "qt5-svg",
-#     "eudev",
 #     "pciutils",
 #     "libqrcodegenc",
 #     "librist",
--- a/recipes/wip/services/networkmanager/recipe.toml
+++ b/recipes/wip/services/networkmanager/recipe.toml
@ -1,26 +1,39 @@
 #TODO not compiled or tested
 #TODO discover minimum dependencies from meson log
 # build instructions: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/CONTRIBUTING.md#building-from-source
+# freebsd has a shim to bypass linux dependencies: https://github.com/freebsd/freebsd-ports/blob/main/net-mgmt/networkmanager-shim/Makefile
 [source]
 tar = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.56.0/downloads/NetworkManager-1.56.0.tar.xz"
 [build]
 template = "meson"
 mesonflags = [
    "-Dsession_tracking=no",
-    "-Dsuspend_resume=elogind",
+    #"-Dsuspend_resume=consolekit", # maybe unnecessary
    "-Dpolkit=false",
    "-Dselinux=false",
    "-Dsystemd_journal=false",
+    "-Dsystemdsystemunitdir=disabled",
    "-Dwifi=false",
+    "-Dmodem_manager=false",
+    "-Dnm_cloud_setup=false",
+    "-Dnbft=false",
+    "-Dclat=false",
    "-Dintrospection=false",
    "-Dman=false",
    "-Dtests=no",
    "-Dfirewalld_zone=false",
    "-Dcrypto=gnutls",
    "-Dqt=false",
+    "-Dlibpsl=false",
+    "-Dreadline=none",
+    "-Dconcheck=false",
+    "-Dovs=false",
+    "-Dlibaudit=no",
+    "-Dcrypto=null",
+    "-Dppp=false",
 ]
-dependencies = [
-    "libpsl",
-    "readline",
-    "gnutls3",
-]
+#dependencies = [
+    #"libpsl",
+    #"readline",
+    #"gnutls3",
+#]
--- a/recipes/wip/services/wireguard-rs/recipe.toml
+++ b/recipes/wip/services/wireguard-rs/recipe.toml
--- a/recipes/wip/services/wireguard-tools/recipe.toml
+++ b/recipes/wip/services/wireguard-tools/recipe.toml
--- a/recipes/wip/system/desktop-file-utils/recipe.toml
+++ b/recipes/wip/system/desktop-file-utils/recipe.toml
@ -0,0 +1,10 @@
+#TODO compile and test
+[source]
+git = "https://gitlab.freedesktop.org/xdg/desktop-file-utils"
+rev = "0.28"
+shallow_clone = true
+[build]
+template = "meson"
+dependencies = [
+    "glib",
+]
--- a/recipes/wip/tools/groff/recipe.toml
+++ b/recipes/wip/tools/groff/recipe.toml
@ -14,6 +14,7 @@ dev-dependencies = [
 script = """
 DYNAMIC_INIT
 COOKBOOK_MAKE_FLAGS=()
+export PATH="$PWD:$PATH" # for test-groff
 if [ "$TARGET" != "$COOKBOOK_HOST_TARGET" ]; then
 # todo
 COOKBOOK_MAKE_FLAGS+=( GROFFBIN="$COOKBOOK_TOOLCHAIN/bin/groff" GROFF_BIN_PATH="$COOKBOOK_TOOLCHAIN/bin" V=1 )
--- a/recipes/wip/tools/groff/redox.patch
+++ b/recipes/wip/tools/groff/redox.patch
@ -1,6 +1,6 @@
 diff -ruwN source/lib/fseterr.c source-new/lib/fseterr.c
--- source/lib/fseterr.c	2026-03-08 14:32:36.000000000 +0100
-+++ source-new/lib/fseterr.c	2026-05-22 02:26:26.702378190 +0200
+--- source/lib/fseterr.c	2026-03-08 20:32:36.000000000 +0700
+++ source-new/lib/fseterr.c	2026-06-16 16:02:23.420661088 +0700
@@ -53,7 +53,7 @@
 #elif defined EPLAN9                /* Plan9 */
   if (fp->state != 0 /* CLOSED */)
@ -10,40 +10,12 @@ diff -ruwN source/lib/fseterr.c source-new/lib/fseterr.c
   /* Portable fallback, based on an idea by Rich Felker.
      Wow! 6 system calls for something that is just a bit operation!
      Not activated on any system, because there is no way to repair FP when
-diff -ruwN source/Makefile.in source-new/Makefile.in
--- source/Makefile.in	2026-03-14 08:53:46.000000000 +0100
-+++ source-new/Makefile.in	2026-05-22 02:22:50.090427159 +0200
-@@ -5877,7 +5877,6 @@
- #
- # Use '-K utf8', not '-k', in case 'configure' didn't find uchardet.
- MOMPDFMOM = \
-  GROFF_COMMAND=test-groff \
-   GROFF_COMMAND_PREFIX= \
-   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-   $(PDFMOMBIN) $(FFLAG) $(MFLAG) -M$(mom_srcdir) -K utf8 -p -e -t \
-@@ -6020,7 +6019,6 @@
- @HAVE_URW_FONTS_TRUE@pdfmomoption = -P-W
- @HAVE_URW_FONTS_TRUE@groffmanpagesoption = -P-e
- DOC_PDFMOM = \
-  GROFF_COMMAND=test-groff \
-   GROFF_COMMAND_PREFIX= \
-   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-   $(PDFMOMBIN) $(MFLAG) $(FFLAG) -ww -b $(pdfmomoption) --roff
-@@ -6088,7 +6086,7 @@
- PROCESSEDFILES_DEPS_PS = groff troff grops tmac/ps.tmac \
-   font/devps/stamp
+diff -ruwN source/test-groff.in source-new/test-groff.in
+--- source/test-groff.in	2026-03-14 14:18:16.000000000 +0700
+++ source-new/test-groff.in	2026-06-16 16:01:09.900793444 +0700
+@@ -52,4 +52,4 @@
+ export GROFF_COMMAND_PREFIX
+ export GROFF_BIN_PATH GROFF_FONT_PATH GROFF_TMAC_PATH
 
-PROCESSEDFILES_DEPS_PDF = test-groff groff troff gropdf tmac/pdf.tmac \
-+PROCESSEDFILES_DEPS_PDF = groff troff gropdf tmac/pdf.tmac \
-   font/devpdf/stamp
- 
- PROCESSEDFILES_DEPS_TXT = groff troff grotty tmac/tty.tmac \
-@@ -19229,7 +19227,7 @@
- 	&& LC_ALL=C $(MOMPDFMOM) $< >$@
- 
- $(MOMPROCESSEDEXAMPLEFILES): $(MOMNORMALFILES) \
-  test-groff groff troff gropdf pdfmom penguin.ps penguin.pdf \
-+  groff troff gropdf pdfmom penguin.ps penguin.pdf \
-   font/devpdf/stamp tmac/pdf.tmac
- 
- penguin.ps:
+-exec $builddir/groff "$@"
+#exec $builddir/groff "$@"
--- a/recipes/wip/tui/pinstar/recipe.toml
+++ b/recipes/wip/tui/pinstar/recipe.toml
@ -0,0 +1,6 @@
+#TODO compile and test
+[source]
+git = "https://github.com/reekta92/pinstar"
+shallow_clone = true
+[build]
+template = "cargo"
--- a/recipes/wip/video/editors/shotcut/recipe.toml
+++ b/recipes/wip/video/editors/shotcut/recipe.toml
@ -0,0 +1,16 @@
+#TODO compile and test
+[source]
+tar = "https://github.com/mltframework/shotcut/releases/download/v26.4.30/shotcut-src-26.4.30.txz"
+[build]
+template = "cmake"
+cmakeflags = [
+    "-DEXTERNAL_LAUNCHERS=OFF",
+]
+dependencies = [
+    "mlt",
+    #"qt6-base",
+    "fftw",
+    "ffmpeg6",
+    "frei0r",
+    "sdl2",
+]
--- a/recipes/wip/video/other/frei0r/recipe.toml
+++ b/recipes/wip/video/other/frei0r/recipe.toml
@ -0,0 +1,14 @@
+#TODO compile and test
+# build instructions: https://github.com/dyne/frei0r/blob/master/BUILD.md
+[source]
+git = "https://github.com/dyne/frei0r"
+rev = "v3.2.1"
+shallow_clone = true
+[build]
+template = "cmake"
+cmakeflags = [
+    "-DWITHOUT_OPENCV=ON",
+    "-DWITHOUT_FACERECOGNITION=ON",
+    "-DWITHOUT_CAIRO=ON",
+    "-DWITHOUT_GAVL=ON",
+]
--- a/recipes/wip/web/kiwix-desktop/recipe.toml
+++ b/recipes/wip/web/kiwix-desktop/recipe.toml
@ -0,0 +1,13 @@
+#TODO add script for qmake: https://github.com/kiwix/kiwix-desktop#compilation
+[source]
+tar = "https://mirror.download.kiwix.org/release/kiwix-desktop/kiwix-desktop-2.5.1.tar.gz"
+[build]
+template = "custom"
+dependencies = [
+    "libzim",
+    "libkiwix",
+    "aria2",
+    "qt6-base",
+    "qt6-webengine",
+    "qt6-svg",
+]
--- a/recipes/wip/web/kiwix-tools/recipe.toml
+++ b/recipes/wip/web/kiwix-tools/recipe.toml
@ -0,0 +1,9 @@
+#TODO compile and test
+[source]
+tar = "https://mirror.download.kiwix.org/release/kiwix-tools/kiwix-tools-3.8.2.tar.xz"
+[build]
+template = "meson"
+dependencies = [
+    "libkiwix",
+    "libzim",
+]