Browse Source

extras: tools: pkgconfig port for gcc15 build

work/string-cache
Khalid Masum 4 months ago
committed by Steve Lhomme
parent
commit
5c3e2c7b1b
  1. 3
      Makefile.am
  2. 29
      extras/tools/pkg-config-stdc23-port.patch
  3. 1
      extras/tools/tools.mak

3
Makefile.am

@ -70,7 +70,8 @@ EXTRA_DIST += \
extras/tools/libtool-2.5.4-embed-bitcode.patch \
extras/tools/ninja-1.11.1-replace-pipes-quote-with-shlex-quote.patch \
extras/tools/0001-CanonicalizePath-Remove-kMaxComponents-limit.patch \
extras/tools/0002-CanonicalizePath-fix-a-b-._foo-a-replacement.patch
extras/tools/0002-CanonicalizePath-fix-a-b-._foo-a-replacement.patch \
extras/tools/pkg-config-stdc23-port.patch
###############################################################################
# Various utilities ( editor syntax files, D-Bus controller ... )

29
extras/tools/pkg-config-stdc23-port.patch

@ -0,0 +1,29 @@
From: Khalid Masum <khalid.masum.92@gmail.com>
Subject: glib-snippet: port to stdc23
stdc=23 has a new keyword "bool" l. Therefore, it cannot
be used as any other symbol name. Therefore, compilers that
default to stdc23 or later, like gcc-15 fail to compile it.
This patch fixes it.
--- b/glib-snippet.c 2025-12-02 09:55:25.595319484 +0600
+++ a/glib-snippet.c 2013-01-27 02:21:06.000000000 +0600
@@ -1187,7 +1187,7 @@
gpointer arg_data;
union
{
- gboolean bool;
+ gboolean boolean;
gint integer;
gchar *str;
gchar **array;
@@ -2454,7 +2454,7 @@
switch (change->arg_type)
{
case G_OPTION_ARG_NONE:
- *(gboolean *)change->arg_data = change->prev.bool;
+ *(gboolean *)change->arg_data = change->prev.boolean;
break;
case G_OPTION_ARG_INT:
*(gint *)change->arg_data = change->prev.integer;

1
extras/tools/tools.mak

@ -268,6 +268,7 @@ pkg-config-$(PKGCFG_VERSION).tar.gz:
pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
$(UNPACK)
mv pkg-config-lite-$(PKGCFG_VERSION) pkg-config-$(PKGCFG_VERSION)
$(APPLY) $(TOOLS)/pkg-config-stdc23-port.patch
$(MOVE)
.buildpkg-config: pkgconfig

Loading…
Cancel
Save