sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ae39424a9a3f67ddf3a848e4fd2cebb010167067)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ae39424a9a3f67ddf3a848e4fd2cebb010167067)
Date: Sat, 19 Sep 2026 02:23:31 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/libiconv/BUILD | 5
libs/libiconv/DETAILS | 3
libs/libiconv/HISTORY | 11
libs/libiconv/PRE_BUILD | 3
libs/libiconv/patches/0001-Add-pkg-config-files.patch | 113
++++++++++
libs/libiconv/patches/0002-Honour-program_transform_name.patch | 71 ++++++
x11-toolkits/motif/BUILD | 1
x11-toolkits/motif/HISTORY | 3
8 files changed, 208 insertions(+), 2 deletions(-)

New commits:
commit ae39424a9a3f67ddf3a848e4fd2cebb010167067
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

motif: Fix build with GCC 16

commit 1af87368702d1c061d9a6d971921dd8bc21ce716
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libiconv: PATCHLEVEL++

commit 8d48abda30a1b7669643a56b4e1c2303cec877c3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libiconv: Fix LICENSE[0]

commit bbb549dfb740bc1d0c0b784540ef649e16c2fee5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libicon: Fix conflicts with libc

diff --git a/libs/libiconv/BUILD b/libs/libiconv/BUILD
new file mode 100755
index 0000000..8540fc0
--- /dev/null
+++ b/libs/libiconv/BUILD
@@ -0,0 +1,5 @@
+# avoid conflicting with the libc implementation
+OPTS+=" --includedir=/usr/include/libiconv" &&
+OPTS+=" --program-prefix=gnu-" &&
+OPTS+=" --htmldir=/usr/share/doc/$SPELL-$VERSION" &&
+default_build
diff --git a/libs/libiconv/DETAILS b/libs/libiconv/DETAILS
index f476b6e..7e16f35 100755
--- a/libs/libiconv/DETAILS
+++ b/libs/libiconv/DETAILS
@@ -1,11 +1,12 @@
SPELL=libiconv
VERSION=1.18
+ PATCHLEVEL=1
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=https://ftp.gnu.org/gnu/$SPELL/$SOURCE

SOURCE_HASH=sha512:a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://www.gnu.org/software/libiconv/";
- LICENSE[0]="LGPLv3"
+ LICENSE[0]="LGPL-3.0-or-later"
ENTERED=20190525
KEYWORDS=""
SHORT="GNU iconv implementation"
diff --git a/libs/libiconv/HISTORY b/libs/libiconv/HISTORY
index ac39194..cc32938 100644
--- a/libs/libiconv/HISTORY
+++ b/libs/libiconv/HISTORY
@@ -1,3 +1,14 @@
+2026-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed conflicts with the libc
+ * patches/0002-Honour-program_transform_name.patch: added to honour
+ --program-prefix
+ * patches/0003-Add-pkg-config-files.patch: added to aid buildsystems
+ to find the headers.
+ * PRE_BUILD: drop the man pages that conflict with the man-pages
+ spell.
+ * DETAILS: fixed LICENSE[0]
+ PATCHLEVEL++
+
2025-01-15 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.18
* DEPENDS: added slibtool; build libiconv.a too (for bash.static)
diff --git a/libs/libiconv/PRE_BUILD b/libs/libiconv/PRE_BUILD
index a838159..0d01ba1 100755
--- a/libs/libiconv/PRE_BUILD
+++ b/libs/libiconv/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch_configure_libtool_override libcharset/configure &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+rm -f man/iconv.3 man/iconv_open.3 man/iconv_close.3
diff --git a/libs/libiconv/patches/0001-Add-pkg-config-files.patch
b/libs/libiconv/patches/0001-Add-pkg-config-files.patch
new file mode 100644
index 0000000..d7fbac6
--- /dev/null
+++ b/libs/libiconv/patches/0001-Add-pkg-config-files.patch
@@ -0,0 +1,113 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Thu, 18 Sep 2026 01:00:00 +0200
+Subject: [PATCH] Add pkg-config files
+
+Upstream-Status: Pending
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+--- a/libiconv.pc.in
++++ b/libiconv.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: GNU libiconv
++Description: GNU character set conversion library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -liconv
++Cflags: -I${includedir}
+--- a/libcharset.pc.in
++++ b/libcharset.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libcharset
++Description: Character set name lookup, from GNU libiconv
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lcharset
++Cflags: -I${includedir}
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,4 +211,6 @@
+ fi
+ AC_CONFIG_FILES([include/iconv.h:include/iconv.h.build.in])
+ AC_CONFIG_FILES([include/iconv.h.inst:include/iconv.h.in])
++AC_CONFIG_FILES([libiconv.pc])
++AC_CONFIG_FILES([libcharset.pc])
+ AC_OUTPUT
+--- a/configure
++++ b/configure
+@@ -33701,6 +33701,10 @@
+
+ ac_config_files="$ac_config_files include/iconv.h.inst:include/iconv.h.in"
+
++ac_config_files="$ac_config_files libiconv.pc"
++
++ac_config_files="$ac_config_files libcharset.pc"
++
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -34890,6 +34894,8 @@
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "include/iconv.h") CONFIG_FILES="$CONFIG_FILES
include/iconv.h:include/iconv.h.build.in" ;;
+ "include/iconv.h.inst") CONFIG_FILES="$CONFIG_FILES
include/iconv.h.inst:include/iconv.h.in" ;;
++ "libiconv.pc") CONFIG_FILES="$CONFIG_FILES libiconv.pc" ;;
++ "libcharset.pc") CONFIG_FILES="$CONFIG_FILES libcharset.pc" ;;
+
+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+ esac
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,6 +14,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ mandir = @mandir@
++pkgconfigdir = $(libdir)/pkgconfig
+
+ # Programs used by "make":
+ RM = rm -f
+@@ -56,6 +57,9 @@
+ $(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
+ cd po && $(MAKE) install prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) install prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)'
datadir='$(datadir)' mandir='$(mandir)'
++ if [ ! -d $(DESTDIR)$(pkgconfigdir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(pkgconfigdir) ; fi
++ $(INSTALL_DATA) libiconv.pc $(DESTDIR)$(pkgconfigdir)/libiconv.pc
++ $(INSTALL_DATA) libcharset.pc $(DESTDIR)$(pkgconfigdir)/libcharset.pc
+
+ install-strip : lib/localcharset.h force
+ cd libcharset && $(MAKE) install-strip prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+@@ -66,6 +70,9 @@
+ $(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
+ cd po && $(MAKE) install-strip prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) install-strip prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)'
datadir='$(datadir)' mandir='$(mandir)'
++ if [ ! -d $(DESTDIR)$(pkgconfigdir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(pkgconfigdir) ; fi
++ $(INSTALL_DATA) libiconv.pc $(DESTDIR)$(pkgconfigdir)/libiconv.pc
++ $(INSTALL_DATA) libcharset.pc $(DESTDIR)$(pkgconfigdir)/libcharset.pc
+
+ installdirs : force
+ cd libcharset && $(MAKE) installdirs prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+@@ -75,6 +82,7 @@
+ if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(includedir) ; fi
+ cd po && $(MAKE) installdirs prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) installdirs prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)'
datadir='$(datadir)' mandir='$(mandir)'
++ if [ ! -d $(DESTDIR)$(pkgconfigdir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(pkgconfigdir) ; fi
+
+ uninstall : force
+ cd libcharset && $(MAKE) uninstall prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+@@ -82,6 +90,8 @@
+ cd srclib && $(MAKE) uninstall prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ cd src && $(MAKE) uninstall prefix='$(prefix)'
exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ $(RM) $(DESTDIR)$(includedir)/iconv.h
++ $(RM) $(DESTDIR)$(pkgconfigdir)/libiconv.pc
++ $(RM) $(DESTDIR)$(pkgconfigdir)/libcharset.pc
+ cd po && $(MAKE) uninstall prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) uninstall prefix='$(prefix)'
exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)'
datadir='$(datadir)' mandir='$(mandir)'
+
diff --git a/libs/libiconv/patches/0002-Honour-program_transform_name.patch
b/libs/libiconv/patches/0002-Honour-program_transform_name.patch
new file mode 100644
index 0000000..623b2bc
--- /dev/null
+++ b/libs/libiconv/patches/0002-Honour-program_transform_name.patch
@@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Thu, 18 Sep 2026 00:30:00 +0200
+Subject: [PATCH] Honour program_transform_name
+
+configure accepts --program-prefix/--program-suffix and computes
+program_transform_name, but the hand-written makefiles ignore it, so
+the option is silently dropped. Distributions that need GNU iconv to
+coexist with a libc that has its own (musl, uClibc) have to rename
+bin/iconv after the fact.
+
+Upstream-Status: Pending
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -40,6 +40,7 @@
+ # Programs used by "make install-strip":
+ STRIP = @STRIP@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++transform = @program_transform_name@
+ install_sh = @install_sh@
+
+ #### End of system configuration section. ####
+@@ -114,7 +115,7 @@
+ # ../lib/libiconv.la entirely.
+ install : all force
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM)
iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM)
iconv$(EXEEXT) $(DESTDIR)$(bindir)/`echo iconv | sed '$(transform)'`$(EXEEXT)
+
+ install-strip : force
+ case '$(INSTALL_PROGRAM)' in \
+@@ -128,7 +129,7 @@
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
+
+ uninstall : force
+- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
++ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/`echo iconv | sed
'$(transform)'`$(EXEEXT)
+
+ check : all
+
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -23,6 +23,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++transform = @program_transform_name@
+ mkinstalldirs = $(SHELL) @top_srcdir@/build-aux/mkinstalldirs
+
+ #### End of system configuration section. ####
+@@ -36,7 +37,7 @@
+
+ install : force
+ if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(mkinstalldirs)
$(DESTDIR)$(mandir)/man1 ; fi
+- builddir="`pwd`"; cd $(srcdir) && for f in *.1 ; do (cd "$$builddir";
echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f ;
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$f) ; done
++ builddir="`pwd`"; cd $(srcdir) && for f in *.1 ; do (cd "$$builddir";
t=`echo $$f | sed -e 's/\.1$$//' -e '$(transform)'`.1; echo $(INSTALL_DATA)
$(srcdir)/$$f $(DESTDIR)$(mandir)/man1/$$t ; $(INSTALL_DATA) $(srcdir)/$$f
$(DESTDIR)$(mandir)/man1/$$t) ; done
+ if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then $(mkinstalldirs)
$(DESTDIR)$(mandir)/man3 ; fi
+ builddir="`pwd`"; cd $(srcdir) && for f in *.3 ; do (cd "$$builddir";
echo $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f ;
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(mandir)/man3/$$f) ; done
+ if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(htmldir) ; fi
+@@ -50,7 +51,7 @@
+ if [ ! -d $(DESTDIR)$(htmldir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(htmldir) ; fi
+
+ uninstall : force
+- cd $(srcdir) && for f in *.1 ; do echo $(RM)
$(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done
++ cd $(srcdir) && for f in *.1 ; do t=`echo $$f | sed -e 's/\.1$$//' -e
'$(transform)'`.1; echo $(RM) $(DESTDIR)$(mandir)/man1/$$t ; $(RM)
$(DESTDIR)$(mandir)/man1/$$t ; done
+ cd $(srcdir) && for f in *.3 ; do echo $(RM)
$(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done
+ cd $(srcdir) && for f in *.html ; do echo $(RM)
$(DESTDIR)$(htmldir)/$$f ; $(RM) $(DESTDIR)$(htmldir)/$$f ; done
+
diff --git a/x11-toolkits/motif/BUILD b/x11-toolkits/motif/BUILD
index 1bb99e1..d495973 100755
--- a/x11-toolkits/motif/BUILD
+++ b/x11-toolkits/motif/BUILD
@@ -1,2 +1,3 @@
+force_dialect gnu89 &&
OPTS+=" --disable-demos $MOTIF_OPTS" &&
default_build
diff --git a/x11-toolkits/motif/HISTORY b/x11-toolkits/motif/HISTORY
index 23f1e6d..d8652b2 100644
--- a/x11-toolkits/motif/HISTORY
+++ b/x11-toolkits/motif/HISTORY
@@ -1,3 +1,6 @@
+2026-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed build with GCC 16
+
2021-09-15 Ismael Luceno <ismael AT sourcemage.org>
* patches/0002-Fix-unsafe-uses-of-fprintf-and-sprintf.patch:
added security fix

[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (ae39424a9a3f67ddf3a848e4fd2cebb010167067), Ismael Luceno, 09/18/2026