From 0a07d26b21d3908cc49a0c37135744eb4e1a0090 Mon Sep 17 00:00:00 2001 From: VnPower Date: Fri, 25 Jul 2025 17:49:30 +0700 Subject: [PATCH] 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 --- gnu/local.mk | 1 + gnu/packages/education.scm | 4 +++- gnu/packages/patches/libeb-gcc-14.patch | 32 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libeb-gcc-14.patch diff --git a/gnu/local.mk b/gnu/local.mk index b01d24070d32737715d2acce323cb2347da62d7b..ded4e763da8edd1e1c090e562d0ea1cfc4980f48 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0807bbca0110e4e31dcc6b0a64de5b35742bc3a3..c27ca88c73ab2316b6f81e97ef216ac4a9e21741 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -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)) diff --git a/gnu/packages/patches/libeb-gcc-14.patch b/gnu/packages/patches/libeb-gcc-14.patch new file mode 100644 index 0000000000000000000000000000000000000000..5d7ab5430872a2cd9c89499a49dfa43c676d55f9 --- /dev/null +++ b/gnu/packages/patches/libeb-gcc-14.patch @@ -0,0 +1,32 @@ +From: Boyuan Yang +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; +