From 4f9ceaa788dd405e6516dac1a1c2c38c04860475 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 10 Aug 2025 22:30:04 +0200 Subject: [PATCH] - fix building with GCC 15 --- gcc15.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ poldek.spec | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 gcc15.patch diff --git a/gcc15.patch b/gcc15.patch new file mode 100644 index 0000000..205f933 --- /dev/null +++ b/gcc15.patch @@ -0,0 +1,45 @@ +diff -ur poldek-0.44.0.orig/conf.c poldek-0.44.0/conf.c +--- poldek-0.44.0.orig/conf.c 2025-02-26 12:40:22.000000000 +0100 ++++ poldek-0.44.0/conf.c 2025-08-10 22:26:33.098247697 +0200 +@@ -1458,33 +1458,33 @@ + int poldek_conf_get_bool(const tn_hash *htconf, const char *name, int default_v) + { + const char *v; +- int bool; ++ int bit; + + if ((v = poldek_conf_get(htconf, name, NULL)) == NULL) + return default_v; + +- if ((bool = poldek_util_parse_bool(v)) < 0) { ++ if ((bit = poldek_util_parse_bool(v)) < 0) { + logn(LOGERR, _("invalid value ('%s') of boolean option '%s'"), v, name); +- bool = default_v; ++ bit = default_v; + } + +- return bool; ++ return bit; + } + + int poldek_conf_get_bool3(const tn_hash *htconf, const char *name, int default_v) + { + const char *v; +- int bool; ++ int bit; + + if ((v = poldek_conf_get(htconf, name, NULL)) == NULL) + return default_v; + +- if ((bool = poldek_util_parse_bool3(v)) < 0) { ++ if ((bit = poldek_util_parse_bool3(v)) < 0) { + logn(LOGERR, _("invalid value ('%s') of option '%s'"), v, name); +- bool = default_v; ++ bit = default_v; + } + +- return bool; ++ return bit; + } + + diff --git a/poldek.spec b/poldek.spec index 9500091..90da7d1 100644 --- a/poldek.spec +++ b/poldek.spec @@ -40,6 +40,7 @@ Patch5: proxy-fix.patch Patch6: verify-fix.patch Patch7: linguas.patch Patch8: pkgiter-preun-req-skip.patch +Patch9: gcc15.patch URL: http://poldek.pld-linux.org/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.11 @@ -215,6 +216,7 @@ Moduły języka Python dla poldka. %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 %{__rm} doc/poldek.info %{__rm} m4/libtool.m4 m4/lt*.m4 -- 2.49.0