~ruther/guix-local

0a07d26b21d3908cc49a0c37135744eb4e1a0090 — VnPower 11 months ago a97236a
gnu: libeb: Fix build with gcc-14.

* gnu/packages/education.scm (libeb): Apply patch.
* gnu/local.mk (dist_patch_DATA): Add reference to patch.
* gnu/packages/patches/libeb-gcc-14.patch: Add patch.

Change-Id: I6ee07e8ae93646e70c531f1ebe7c9ae8e9f4692d
Signed-off-by: Andreas Enge <andreas@enge.fr>
3 files changed, 36 insertions(+), 1 deletions(-)

M gnu/local.mk
M gnu/packages/education.scm
A gnu/packages/patches/libeb-gcc-14.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1678,6 1678,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch	\
  %D%/packages/patches/libconfuse-CVE-2022-40320.patch		\
  %D%/packages/patches/libcss-check-format.patch		\
  %D%/packages/patches/libeb-gcc-14.patch			\
  %D%/packages/patches/libextractor-tidy-support.patch		\
  %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
  %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\

M gnu/packages/education.scm => gnu/packages/education.scm +3 -1
@@ 1018,7 1018,9 @@ floating through space.")
        (string-append "ftp://ftp.sra.co.jp/pub/misc/eb/eb-" version ".tar.bz2"))
       (sha256
        (base32
         "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"))))
         "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"))
       (patches
        (search-patches "libeb-gcc-14.patch"))))
    (build-system gnu-build-system)
    (native-inputs ; Required for building docs
     (list perl))

A gnu/packages/patches/libeb-gcc-14.patch => gnu/packages/patches/libeb-gcc-14.patch +32 -0
@@ 0,0 1,32 @@
From: Boyuan Yang <byang@debian.org>
Date: Tue, 30 Jul 2024 13:59:56 -0400
Subject: gcc14 fix

Bug-Debian: https://bugs.debian.org/1074929
---
 libebutils/puts_eucjp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libebutils/puts_eucjp.c b/libebutils/puts_eucjp.c
index 678b296..fb21920 100644
--- a/libebutils/puts_eucjp.c
+++ b/libebutils/puts_eucjp.c
@@ -59,7 +59,7 @@ fputs_eucjp_to_locale(const char *string, FILE *stream)
     char *buffer = NULL;
     size_t buffer_size;
     iconv_t cd = (iconv_t)-1;
-    const char *in_p;
+    char *in_p;
     char *out_p;
     size_t in_left;
     size_t out_left;
@@ -89,7 +89,7 @@ fputs_eucjp_to_locale(const char *string, FILE *stream)
 	if (buffer == NULL)
 	    goto failed;
 
-	in_p = string;
+	in_p = (char *) string;
 	in_left = string_length + 1;
 	out_p = buffer;
 	out_left = buffer_size;