diff -pruN 1.24.0+dfsg-1/debian/changelog 1.24.0+dfsg-2/debian/changelog --- 1.24.0+dfsg-1/debian/changelog 2025-02-22 18:05:32.000000000 +0000 +++ 1.24.0+dfsg-2/debian/changelog 2025-09-17 18:10:10.000000000 +0000 @@ -1,3 +1,10 @@ +libtcod (1.24.0+dfsg-2) unstable; urgency=medium + + * Fix glibc 2.42 build. (Closes: #1115225); + * Fix some lintian warnings. + + -- Nikolay Shaplov Wed, 17 Sep 2025 21:10:10 +0300 + libtcod (1.24.0+dfsg-1) unstable; urgency=medium * New upstream release; diff -pruN 1.24.0+dfsg-1/debian/control 1.24.0+dfsg-2/debian/control --- 1.24.0+dfsg-1/debian/control 2025-02-22 18:05:32.000000000 +0000 +++ 1.24.0+dfsg-2/debian/control 2025-09-17 18:10:10.000000000 +0000 @@ -3,11 +3,11 @@ Maintainer: Nikolay Shaplov = 1.22.5), debhelper-compat (= 13), - pkg-config, + pkgconf, libsdl2-dev, zlib1g-dev, python3 -Standards-Version: 4.6.0 +Standards-Version: 4.7.2 Homepage: https://github.com/libtcod/libtcod Vcs-Git: https://salsa.debian.org/debian/libtcod.git Vcs-Browser: https://salsa.debian.org/debian/libtcod diff -pruN 1.24.0+dfsg-1/debian/copyright 1.24.0+dfsg-2/debian/copyright --- 1.24.0+dfsg-1/debian/copyright 2025-02-22 18:05:32.000000000 +0000 +++ 1.24.0+dfsg-2/debian/copyright 2025-09-17 18:10:10.000000000 +0000 @@ -36,18 +36,6 @@ Copyright: 2016-2021 Fabian Wolff License: Expat -Files: tests/catch.hpp -Copyright: 2018 Two Blue Cubes Ltd. -License: BSL-1.0 - -Files: tests/catch_reporter_automake.hpp -Copyright: 2017 Justin R. Wilson -License: BSL-1.0 - -Files: tests/catch_reporter_tap.hpp -Copyright: 2015 Martin Moene -License: BSL-1.0 - Files: src/vendor/khrplatform.h Copyright: 2008-2018 The Khronos Group Inc. License: Expat @@ -57,9 +45,10 @@ Copyright: 2015 Steven G. Johnson, Jiaha 2009 Public Software Group e. V., Berlin, Germany License: Expat -Files: build/autotools/m4/ax_pthread.m4 +Files: buildsys/autotools/m4/ax_pthread.m4 Copyright: 2008 Steven G. Johnson 2011 Daniel Richard G. + 2019 Marc Stevens License: GPL-3+ with Autoconf exception License: GPL-3+ with Autoconf exception diff -pruN 1.24.0+dfsg-1/debian/patches/02-fix-glibc-2.42-build.patch 1.24.0+dfsg-2/debian/patches/02-fix-glibc-2.42-build.patch --- 1.24.0+dfsg-1/debian/patches/02-fix-glibc-2.42-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.24.0+dfsg-2/debian/patches/02-fix-glibc-2.42-build.patch 2025-09-17 18:10:10.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Fix glibc 2.42 build +Author: Nikolay Shaplov +Forwarded: not-needed +Last-Update: 2025-09-17 +--- +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1115225 for more info +--- +diff --git a/src/libtcod/renderer_xterm.c b/src/libtcod/renderer_xterm.c +index a2cdce01..249d0fd4 100644 +--- a/src/libtcod/renderer_xterm.c ++++ b/src/libtcod/renderer_xterm.c +@@ -93,10 +93,10 @@ struct TCOD_RendererXterm { + }; + + static char* ucs4_to_utf8(int ucs4, char out[5]) { +- static const unsigned char B10000000 = 128; +- static const unsigned char B11000000 = 192; +- static const unsigned char B11100000 = 224; +- static const unsigned char B11110000 = 240; ++ static const unsigned char BYTE_10000000 = 128; ++ static const unsigned char BYTE_11000000 = 192; ++ static const unsigned char BYTE_11100000 = 224; ++ static const unsigned char BYTE_11110000 = 240; + static const int B000_000000_000000_111111 = 63; + static const int B000_000000_011111_000000 = 1984; + static const int B000_000000_111111_000000 = 4032; +@@ -109,21 +109,21 @@ static char* ucs4_to_utf8(int ucs4, char out[5]) { + out[1] = '\0'; + return out; + } else if (ucs4 <= 0x07FF) { +- out[0] = B11000000 | (unsigned char)((ucs4 & B000_000000_011111_000000) >> 6); +- out[1] = B10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); ++ out[0] = BYTE_11000000 | (unsigned char)((ucs4 & B000_000000_011111_000000) >> 6); ++ out[1] = BYTE_10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); + out[2] = '\0'; + return out; + } else if (ucs4 <= 0xFFFF) { +- out[0] = B11100000 | (unsigned char)((ucs4 & B000_001111_000000_000000) >> 12); +- out[1] = B10000000 | (unsigned char)((ucs4 & B000_000000_111111_000000) >> 6); +- out[2] = B10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); ++ out[0] = BYTE_11100000 | (unsigned char)((ucs4 & B000_001111_000000_000000) >> 12); ++ out[1] = BYTE_10000000 | (unsigned char)((ucs4 & B000_000000_111111_000000) >> 6); ++ out[2] = BYTE_10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); + out[3] = '\0'; + return out; + } else if (ucs4 <= 0x10FFFF) { +- out[0] = B11110000 | (unsigned char)((ucs4 & B111_000000_000000_000000) >> 18); +- out[1] = B10000000 | (unsigned char)((ucs4 & B000_111111_000000_000000) >> 12); +- out[2] = B10000000 | (unsigned char)((ucs4 & B000_000000_111111_000000) >> 6); +- out[3] = B10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); ++ out[0] = BYTE_11110000 | (unsigned char)((ucs4 & B111_000000_000000_000000) >> 18); ++ out[1] = BYTE_10000000 | (unsigned char)((ucs4 & B000_111111_000000_000000) >> 12); ++ out[2] = BYTE_10000000 | (unsigned char)((ucs4 & B000_000000_111111_000000) >> 6); ++ out[3] = BYTE_10000000 | (unsigned char)((ucs4 & B000_000000_000000_111111) >> 0); + out[4] = '\0'; + return out; + } diff -pruN 1.24.0+dfsg-1/debian/patches/series 1.24.0+dfsg-2/debian/patches/series --- 1.24.0+dfsg-1/debian/patches/series 2025-02-22 18:05:32.000000000 +0000 +++ 1.24.0+dfsg-2/debian/patches/series 2025-09-17 18:10:10.000000000 +0000 @@ -1,2 +1,3 @@ 00-fix-makefile.patch 01-fix-conversion-error.patch +02-fix-glibc-2.42-build.patch