Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 utils/bluez5/HISTORY                                             |    8 +-
 utils/bluez5/patches/0001-gdbus-define-MAX_INPUT-for-musl.patch  |   33 
++++++++
 utils/bluez5/patches/0001-shared-define-MAX_INPUT-for-musl.patch |   37 
++++++++++
 utils/bluez5/patches/max-input.patch                             |   13 ---
 xorg-lib/pixman/DEPENDS                                          |    6 -
 xorg-lib/pixman/DETAILS                                          |    1 
 xorg-lib/pixman/HISTORY                                          |    4 +
 7 files changed, 84 insertions(+), 18 deletions(-)

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

    pixman: Remove libpng dependency

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

    bluez5: Fix build against musl

diff --git a/utils/bluez5/HISTORY b/utils/bluez5/HISTORY
index 4ef7924..6f5ed82 100644
--- a/utils/bluez5/HISTORY
+++ b/utils/bluez5/HISTORY
@@ -1,8 +1,14 @@
+2024-12-23 Ismael Luceno <ismael AT sourcemage.org>
+       * patches/0001-gdbus-define-MAX_INPUT-for-musl.patch,
+         patches/0001-shared-define-MAX_INPUT-for-musl.patch:
+         fixed build against musl
+       * patches/max-input.patch: removed, replaced
+
 2024-11-02 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 5.79
        * patches/0001-Fix-missing-inclusion-of-limits.h.patch,
          patches/0001-Replace-usage-of-GNU-basename.patch:
-         removed, no longer apply
+         removed, no longer needed
 
 2024-09-09 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 5.78
diff --git a/utils/bluez5/patches/0001-gdbus-define-MAX_INPUT-for-musl.patch 
b/utils/bluez5/patches/0001-gdbus-define-MAX_INPUT-for-musl.patch
new file mode 100644
index 0000000..8c16940
--- /dev/null
+++ b/utils/bluez5/patches/0001-gdbus-define-MAX_INPUT-for-musl.patch
@@ -0,0 +1,33 @@
+From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g AT gmail.com>
+Date: Sat, 2 Nov 2024 16:10:18 +0000
+Subject: [PATCH] gdbus: define MAX_INPUT for musl
+
+This is the same solution as was done in src/shared/util.c
+
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ gdbus/object.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gdbus/object.c b/gdbus/object.c
+index 84f116bf1a05..7b0476f1adb9 100644
+--- a/gdbus/object.c
++++ b/gdbus/object.c
+@@ -20,6 +20,12 @@
+ #include <dbus/dbus.h>
+ 
+ #include "gdbus.h"
++
++/* define MAX_INPUT for musl */
++#ifndef MAX_INPUT
++#define MAX_INPUT _POSIX_MAX_INPUT
++#endif
++
+ #include "src/shared/util.h"
+ 
+ #define info(fmt...)
+-- 
+2.47.0
+
diff --git a/utils/bluez5/patches/0001-shared-define-MAX_INPUT-for-musl.patch 
b/utils/bluez5/patches/0001-shared-define-MAX_INPUT-for-musl.patch
new file mode 100644
index 0000000..c49c43c
--- /dev/null
+++ b/utils/bluez5/patches/0001-shared-define-MAX_INPUT-for-musl.patch
@@ -0,0 +1,37 @@
+From ca6546fe521360fcf905bc115b893f322e706cb2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam AT gentoo.org>
+Date: Tue, 31 Jan 2023 05:52:58 +0000
+Subject: [PATCH] shared: define MAX_INPUT for musl
+
+musl systems don't have MAX_INPUT. Just define it to _POSIX_MAX_INPUT
+which musl does have if it's not already defined.
+
+Note that on glibc, the values match anyway (as of glibc-2.36), and
+indeed POSIX_MAX_INPUT has the same value on musl too.
+
+Bug: https://bugs.gentoo.org/888467
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/shared/util.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 2f0ae0e86452..b466fb001336 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -28,6 +28,11 @@
+ #include <sys/random.h>
+ #endif
+ 
++/* define MAX_INPUT for musl */
++#ifndef MAX_INPUT
++#define MAX_INPUT _POSIX_MAX_INPUT
++#endif
++
+ #include "src/shared/util.h"
+ 
+ void *util_malloc(size_t size)
+-- 
+2.47.0
+
diff --git a/utils/bluez5/patches/max-input.patch 
b/utils/bluez5/patches/max-input.patch
deleted file mode 100644
index 887befe..0000000
--- a/utils/bluez5/patches/max-input.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 0a0308c..a2b8c23 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -65,7 +65,7 @@ void *util_memdup(const void *src, size_t size)
- void util_debug_va(util_debug_func_t function, void *user_data,
-                               const char *format, va_list va)
- {
--      char str[MAX_INPUT];
-+      char str[_POSIX_MAX_INPUT];
- 
-       if (!function || !format)
-               return;
diff --git a/xorg-lib/pixman/DEPENDS b/xorg-lib/pixman/DEPENDS
index 7e21408..d89cae3 100755
--- a/xorg-lib/pixman/DEPENDS
+++ b/xorg-lib/pixman/DEPENDS
@@ -5,7 +5,5 @@
 # someplace.
 OPTS+=" gtk=disabled" &&
 
-optional_depends libpng \
-                 "libpng=enabled" \
-                 "libpng=disabled" \
-                 "for PNG support"
+# Libpng is only used for tests
+OPTS+=" libpng=disabled"
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 23980fb..78edeb3 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,6 +1,7 @@
 source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=pixman
          VERSION=0.44.2
+      PATCHLEVEL=1
   SECURITY_PATCH=1
      
SOURCE_HASH=sha512:b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4
           SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index 63a4c57..0cd7a63 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,7 @@
+2024-12-23 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: removed libpng
+       * DETAILS: PATCHLEVEL++
+
 2024-12-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.44.2