sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f6708a9b1be2e56117491f5e27966eb2bdd2dfb5)
- 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 (f6708a9b1be2e56117491f5e27966eb2bdd2dfb5)
- Date: Mon, 24 Nov 2025 02:56:53 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
devel/nasm/HISTORY
| 5
devel/nasm/PRE_BUILD
| 3
devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
| 77 ++++++++++
devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
| 26 +++
net/ifupdown-ng/DETAILS
| 1
wm-addons/wlroots/DETAILS
| 2
wm-addons/wlroots/HISTORY
| 6
x11-libs/fontconfig/DETAILS
| 6
x11-libs/fontconfig/HISTORY
| 4
9 files changed, 116 insertions(+), 14 deletions(-)
New commits:
commit f6708a9b1be2e56117491f5e27966eb2bdd2dfb5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
Revert "fontconfig: => 2.17.1"
Font matching code changes seem to cause mismatches:
$ sudo resurrect fontconfig -v 2.16.0
...
$ fc-match Spleen
spleen-6x12.otb: "Spleen" "Regular"
$ sudo resurrect fontconfig -v 2.17.1
...
$ fc-match Spleen
Vera.ttf: "Bitstream Vera Sans" "Roman"
This reverts commit 371d8914d4b17dc354a26b4fbe93179283096682.
commit 90c04b621973f28297725c63b404b2d9372250b3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
ifupdown-ng: Add Watch line
commit c2d28a53d4f374d68cec5cb3d31888ee683d3c89
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
Revert "wlroots: => 0.19.1" & "wlroots: => 0.19.0"
Non-functional, configuration options aren't recognised.
Reverts: 715057e81746 ("wlroots: => 0.19.1", 2025-09-22)
Reverts: 3c3afd00f93b ("wlroots: => 0.19.0", 2025-08-28)
Ref: ce1f2eb63742 ("Revert "wlroots: => 0.19.0"", 2025-06-02)
commit 01d6a1d48f39b6c7f7dc9050c907cad4cd097698
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
nasm: Fix build against musl
diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index 6fed024..a8d3417 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,8 @@
+2025-11-23 Ismael Luceno <ismael AT sourcemage.org>
+ *
patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch,
+
patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch,
+ PRE_BUILD: fixed build issue on some non-glibc systems
+
2025-10-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.01
diff --git a/devel/nasm/PRE_BUILD b/devel/nasm/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/devel/nasm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
b/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
new file mode 100644
index 0000000..fa43537
--- /dev/null
+++
b/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
@@ -0,0 +1,77 @@
+From 44e89ba9b650b5e1533bca43682e167f51a3511f Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin (Intel)" <hpa AT zytor.com>
+Date: Sun, 12 Oct 2025 12:48:32 -0700
+Subject: [PATCH 1/2] compiler.h: drop the stupid C++-style cast-to-bool hack
+
+The C++-style cast-to-bool hack was broken in concept that it doesn't help
the
+fundamental problem -- implicit conversions are broken for the
+backwards compatibility enum definition -- as well as in
+implementation, as it misspelled __STDC_VERSION__ as __STDC_VERSION.
+
+The #ifdef bool test *should* have prevented this problem, but
+apparently several compilers do define "bool" in <stdbool.h> even when
+it is a keyword, in violation of the C23 spec.
+
+Signed-off-by: H. Peter Anvin (Intel) <hpa AT zytor.com>
+---
+ include/compiler.h | 27 +++++++--------------------
+ 1 file changed, 7 insertions(+), 20 deletions(-)
+
+diff --git a/include/compiler.h b/include/compiler.h
+index 0ecd4e8d..53a9b5c1 100644
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -181,19 +181,10 @@ size_t strlcpy(char *, const char *, size_t);
+ char * pure_func strrchrnul(const char *, int);
+ #endif
+
+-#if !defined(__cplusplus) || (__STDC_VERSION >= 202311L)
+ /* C++ and C23 have bool, false, and true as proper keywords */
++#if !defined(__cplusplus) || (__STDC_VERSION__ >= 202311L)
+ # ifdef HAVE_STDBOOL_H
+-/* If <stdbool.h> exists, include it explicitly to prevent it from
+- begin included later, causing the "bool" macro to be defined. */
+ # include <stdbool.h>
+-# ifdef bool
+-/* Force bool to be a typedef instead of a macro. What a "clever" hack
+- this is... */
+- typedef bool /* The macro definition of bool */
+-# undef bool
+- bool; /* No longer the macro definition */
+-# endif
+ # elif defined(HAVE___BOOL)
+ typedef _Bool bool;
+ # define false 0
+@@ -201,14 +192,10 @@ char * pure_func strrchrnul(const char *, int);
+ # else
+ /* This is a bit dangerous, because casting to this ersatz bool
+ will not produce the same result as the standard (bool) cast.
+- Instead, use the bool() constructor-style macro defined below. */
++ Instead, use the explicit construct !!x instead of relying on
++ implicit conversions or casts. */
+ typedef enum bool { false, true } bool;
+ # endif
+-/* This amounts to a C++-style conversion cast to bool. This works
+- because C ignores an argument-taking macro when used without an
+- argument and because bool was redefined as a typedef if it previously
+- was defined as a macro (see above.) */
+-# define bool(x) ((bool)!!(x))
+ #endif
+
+ /* Create a NULL pointer of the same type as the address of
+@@ -321,11 +308,11 @@ static inline void *mempset(void *dst, int c, size_t n)
+ * less likely to be taken.
+ */
+ #ifdef HAVE___BUILTIN_EXPECT
+-# define likely(x) __builtin_expect(bool(x), true)
+-# define unlikely(x) __builtin_expect(bool(x), false)
++# define likely(x) __builtin_expect(!!(x), true)
++# define unlikely(x) __builtin_expect(!!(x), false)
+ #else
+-# define likely(x) bool(x)
+-# define unlikely(x) bool(x)
++# define likely(x) (!!(x))
++# define unlikely(x) (!!(x))
+ #endif
+
+ #ifdef HAVE___BUILTIN_PREFETCH
diff --git
a/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
b/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
new file mode 100644
index 0000000..b410643c
--- /dev/null
+++
b/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
@@ -0,0 +1,26 @@
+From 746e7c9efa37cec9a44d84a1e96b8c38f385cc1f Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin (Intel)" <hpa AT zytor.com>
+Date: Sun, 12 Oct 2025 13:05:55 -0700
+Subject: [PATCH 2/2] compiler.h: the test for "neither C++ nor C23" still
wrong
+
+The test needs to test for neither nor; as it was it tested "(not C++)
+or C23" which was not at all what was intended...
+
+Signed-off-by: H. Peter Anvin (Intel) <hpa AT zytor.com>
+---
+ include/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/compiler.h b/include/compiler.h
+index 53a9b5c1..d4cb7161 100644
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -182,7 +182,7 @@ char * pure_func strrchrnul(const char *, int);
+ #endif
+
+ /* C++ and C23 have bool, false, and true as proper keywords */
+-#if !defined(__cplusplus) || (__STDC_VERSION__ >= 202311L)
++#if !defined(__cplusplus) && (__STDC_VERSION__ < 202311L)
+ # ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ # elif defined(HAVE___BOOL)
diff --git a/net/ifupdown-ng/DETAILS b/net/ifupdown-ng/DETAILS
index 142ab80..2440a53 100755
--- a/net/ifupdown-ng/DETAILS
+++ b/net/ifupdown-ng/DETAILS
@@ -1,3 +1,4 @@
+# Watch: https://github.com/ifupdown-ng/ifupdown-ng/tags
SPELL=ifupdown-ng
VERSION=0.12.1
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/wm-addons/wlroots/DETAILS b/wm-addons/wlroots/DETAILS
index a91c6a8..e266106 100755
--- a/wm-addons/wlroots/DETAILS
+++ b/wm-addons/wlroots/DETAILS
@@ -18,7 +18,7 @@ case "${WLROOTS_BRANCH}" in
SOURCE_URL[0]="https://gitlab.freedesktop.org/${SPELL}/${SPELL}/-/archive/${WLROOTS_COMMIT}/${SOURCE}.tar.gz"
;;
(*)
- VERSION=0.19.1
+ VERSION=0.18.2
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$VERSION/downloads/$SOURCE"
SOURCE2=$SOURCE.sig
diff --git a/wm-addons/wlroots/HISTORY b/wm-addons/wlroots/HISTORY
index f076253..287d090 100644
--- a/wm-addons/wlroots/HISTORY
+++ b/wm-addons/wlroots/HISTORY
@@ -1,9 +1,3 @@
-2025-09-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.19.1
-
-2025-08-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.19.0
-
2024-12-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.18.2
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index 58f0910..19edf2e 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -1,9 +1,9 @@
SPELL=fontconfig
- VERSION=2.17.1
-
SOURCE_HASH=sha512:c09c1f041f61ee0d220ff906a86b5c4b329106dc96f8c04b23f8fdeb480df626717fe3613bccb41cb39e86334078139322710377f5ddaa3abe48569e798161c9
+ VERSION=2.16.0
+
SOURCE_HASH=sha512:90b5c39e5eadc56a9fbddd69b2a6eaa6bf9ee5cda003091b0896e66f87f3c1be8ab4442f54d20fca7232d72f60d9578f5e5ba3f376e39b64b8a2aa7b8f13b062
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-
SOURCE_URL[0]=https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$VERSION/$SOURCE
+ SOURCE_URL[0]=https://www.fontconfig.org/release/$SOURCE
# Watch: https://www.freedesktop.org/software/fontconfig/release/
WEB_SITE=https://www.fontconfig.org/
LICENSE[0]=X11
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index 6d4ee28..21077df 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,7 +1,3 @@
-2025-08-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.17.1
- download from gitlab
-
2025-02-19 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: added Watch line,, quoting++
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f6708a9b1be2e56117491f5e27966eb2bdd2dfb5), Ismael Luceno, 11/23/2025
Archive powered by MHonArc 2.6.24.