Merge branch 'fseterr' into 'master'

remove nano patch, update and fix gzip

See merge request redox-os/redox!2405
This commit is contained in:
Jeremy Soller 2026-10-27 13:11:19 -06:00
commit f97869cd84
4 changed files with 5 additions and 17 deletions

View File

@ -110,6 +110,7 @@ goaccess = {}
gobject-introspection = {}
gitoxide = {}
gstreamer = {}
gzip = {}
harfbuzz = {}
hicolor-icon-theme = {}
helix = {}

View File

@ -1,9 +1,6 @@
[source]
tar = "https://www.nano-editor.org/dist/v9/nano-9.2.tar.xz"
blake3 = "6a4dd380f6ee2bb2d74851c182090774f61eddfc37d9ff4d060b69f2c0fe4646"
patches = [
"redox.patch"
]
[build]
template = "configure"

View File

@ -1,12 +0,0 @@
diff --color -ruwN source/lib/fseterr.c source-new/lib/fseterr.c
--- source/lib/fseterr.c 2026-07-31 13:13:07.000000000 +0700
+++ source-new/lib/fseterr.c 2026-08-19 21:12:05.375336440 +0700
@@ -53,7 +53,7 @@
#elif defined EPLAN9 /* Plan9 */
if (fp->state != 0 /* CLOSED */)
fp->state = 5 /* ERR */;
-#elif 0 /* unknown */
+#elif defined __redox__ /* unknown */
/* 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

View File

@ -1,5 +1,7 @@
#TODO port gnulib fseterr.c
[source]
tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.14.tar.gz"
tar = "https://ftp.gnu.org/gnu/gzip/gzip-1.15.tar.gz"
[build]
template = "configure"
configureflags = [
"ac_cv_have_decl___fseterr=yes"
]