Updates to m4 and libiconv

bootstrap.d/dev-libs.y4.yml

@@ -1596,8 +1596,8 @@ packages:
     source:
       subdir: 'ports'
       git: 'https://https.git.savannah.gnu.org/git/libiconv.git'
-      tag: 'v1.17'
-      version: '1.17'
+      tag: 'v1.19'
+      version: '1.19'
       sources_required:
         - gnulib
       tools_required:
@@ -1642,7 +1642,7 @@ packages:
       - host-libtool
     pkgs_required:
       - mlibc
-    revision: 14
+    revision: 1
     configure:
       - args:
         - '@THIS_SOURCE_DIR@/configure'

bootstrap.d/sys-devel.y4.yml

@@ -250,9 +250,8 @@ packages:
     source:
       subdir: 'ports'
       git: 'https://https.git.savannah.gnu.org/git/m4.git'
-      branch: 'branch-1.4'
-      commit: '817edf1a766b10e132ffe595bf66606cf2ceee22'
-      version: '1.4.19'
+      tag: 'v1.4.21'
+      version: '1.4.21'
       sources_required:
         - gnulib
       tools_required:
@@ -269,15 +268,15 @@ packages:
       - system-gcc
     pkgs_required:
       - mlibc
-    revision: 16
+    revision: 1
     configure:
       - args:
         - '@THIS_SOURCE_DIR@/configure'
         - '--host=@OPTION:arch-triple@'
         - '--prefix=/usr'
       - args: 'sed -i s/-Werror//g @THIS_BUILD_DIR@/src/Makefile'
       # This sed disables the building of the documentation
-      - args: 'sed -i s/"SUBDIRS = . examples lib src doc checks po tests"/"SUBDIRS = . examples lib src checks po tests"/ @THIS_BUILD_DIR@/Makefile'
+      - args: 'sed -i -e "s|^SUBDIRS = \. examples lib src doc checks po tests$|SUBDIRS = . examples lib src checks po tests|" -e "s| doc/m4\.1||" @THIS_BUILD_DIR@/Makefile'
     build:
       - args: ['make', '-j@PARALLELISM@']
       - args: ['make', 'install']

patches/libiconv/0001-Remove-calls-to-versioned-binaries.patch

@@ -1,42 +1,41 @@
-From 858ee78090f83b5323e8665ed12316fe0f04f546 Mon Sep 17 00:00:00 2001
+From 5587e5a534dbed6c8287c3ed8ee29490091587b1 Mon Sep 17 00:00:00 2001
 From: Dennis Bonke <admin@dennisbonke.com>
-Date: Mon, 29 Aug 2022 00:54:41 +0200
+Date: Mon, 21 Sep 2026 16:55:18 +0200
 Subject: [PATCH] Remove calls to versioned binaries
 
-Signed-off-by: Dennis Bonke <admin@dennisbonke.com>
 ---
  Makefile.devel            | 4 ++--
  libcharset/Makefile.devel | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.devel b/Makefile.devel
-index 3102ad2..d49e74a 100644
+index efcf358..d43157a 100644
 --- a/Makefile.devel
 +++ b/Makefile.devel
-@@ -6,8 +6,8 @@ SHELL = /bin/sh
+@@ -13,8 +13,8 @@ SHELL = /bin/sh
  MAKE = make
  AUTOCONF = autoconf
  AUTOHEADER = autoheader
--AUTOMAKE = automake-1.16
--ACLOCAL = aclocal-1.16
+-AUTOMAKE = automake-1.18
+-ACLOCAL = aclocal-1.18
 +AUTOMAKE = automake
 +ACLOCAL = aclocal
  GPERF = gperf
- CC = gcc -Wall
- CFLAGS = -O
+
+ # Ignore the built-in default for CC. Also ignore $(CC) if it is empty.
 diff --git a/libcharset/Makefile.devel b/libcharset/Makefile.devel
-index 7a991cd..3e0e2ca 100644
+index e1f5cba..506421a 100644
 --- a/libcharset/Makefile.devel
 +++ b/libcharset/Makefile.devel
 @@ -5,7 +5,7 @@ SHELL = /bin/sh
  MAKE = make
  AUTOCONF = autoconf
  AUTOHEADER = autoheader
--ACLOCAL = aclocal-1.16
+-ACLOCAL = aclocal-1.18
 +ACLOCAL = aclocal
  CP = cp
  RM = rm -f
 
 -- 
-2.37.2
+2.55.0