From 616325ad1374e34c918ba9f2faab230130d05979 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 12 Jul 2025 21:36:37 -0700 Subject: [PATCH] xmlrpc-c: update to 1.60.5 Use OpenEmbedded patch to fix compilation with GCC 15. Signed-off-by: Rosen Penev --- libs/xmlrpc-c/Makefile | 6 +-- .../patches/001-fix-pkg-config-files.patch | 2 +- libs/xmlrpc-c/patches/010-gcc15.patch | 48 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 libs/xmlrpc-c/patches/010-gcc15.patch diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile index cd3c4204cb..4042f4ce4f 100644 --- a/libs/xmlrpc-c/Makefile +++ b/libs/xmlrpc-c/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xmlrpc-c -PKG_VERSION:=1.59.03 -PKG_RELEASE:=2 +PKG_VERSION:=1.60.05 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(PKG_VERSION) -PKG_HASH:=bdb71db42ab0be51591555885d11682b044c1034d4a3296401bf921ec0b233fe +PKG_HASH:=67d860062459ea2784c07b4d7913319d9539fa729f534378e8e41c8918f2adf6 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=VARIOUS diff --git a/libs/xmlrpc-c/patches/001-fix-pkg-config-files.patch b/libs/xmlrpc-c/patches/001-fix-pkg-config-files.patch index e52d11e480..a977620afd 100644 --- a/libs/xmlrpc-c/patches/001-fix-pkg-config-files.patch +++ b/libs/xmlrpc-c/patches/001-fix-pkg-config-files.patch @@ -1,6 +1,6 @@ --- a/lib/abyss/src/Makefile +++ b/lib/abyss/src/Makefile -@@ -131,13 +131,15 @@ SOCKLIB=$(SOCKETLIBOPT) +@@ -133,13 +133,15 @@ SOCKLIB=$(SOCKETLIBOPT) xmlrpc_abyss.pc: rm -f $@ @echo "Echoes to '$@' suppressed here ..." diff --git a/libs/xmlrpc-c/patches/010-gcc15.patch b/libs/xmlrpc-c/patches/010-gcc15.patch new file mode 100644 index 0000000000..24fb831377 --- /dev/null +++ b/libs/xmlrpc-c/patches/010-gcc15.patch @@ -0,0 +1,48 @@ +From a811ea6af5296b89ee7c2a358dd4ffd2584429f4 Mon Sep 17 00:00:00 2001 +From: "mark.yang" +Date: Wed, 2 Apr 2025 11:00:27 +0900 +Subject: [PATCH] fix bool reserved word error in gcc 15 + +* Fix build error with gcc-15.0.1 + http://errors.yoctoproject.org/Errors/Details/850147/ + srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant + 13 | false = 0, + | ^~~~~ + srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards + srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool' + 15 | } bool; + | ^~~~ + srcdir/lib/util/include/bool.h:15:3: warning: useless type name in empty declaration + In file included from sleep.c:2: + srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant + 13 | false = 0, + | ^~~~~ + srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards + srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool' + 15 | } bool; + | ^~~~ + + gcc-15 switched to -std=c23 by default. + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlrpc-c/discussion/131628/thread/70e626d73a] +Signed-off-by: mark.yang +--- + stable/lib/util/include/bool.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/lib/util/include/bool.h ++++ b/lib/util/include/bool.h +@@ -9,10 +9,12 @@ + /* At least the GNU compiler defines __bool_true_false_are_defined */ + #ifndef __bool_true_false_are_defined + #define __bool_true_false_are_defined ++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L + typedef enum { + false = 0, + true = 1 + } bool; + #endif + #endif ++#endif +