gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

app-misc/gentoo: Fix build w/ GCC-15, switch make_desktop_entry to --eapi9

Browse Source 
Closes: https://bugs.gentoo.org/944382
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-12-08 21:04:42 +01:00
parent 8316017585
commit 5986f2a2da
2 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app-misc/gentoo/files/gentoo-0.20.7-gcc15.patch Normal file
View File

@@ -0,0 +1,49 @@
Author: Andreas Tille <tille@debian.org>
Last-Update: 2025-09-02
Bug-Debian: https://bugs.debian.org/1096693
Description: Fix build with gcc-15
--- a/src/xmlutil.c
+++ b/src/xmlutil.c
@@ -70,7 +70,7 @@ typedef union {
XVInt integer;
XVUInt uinteger;
XVReal real;
- XVBool bool;
+ XVBool bool_val;
XVColor color;
} XmlData;
@@ -334,7 +334,7 @@ gboolean xml_get_boolean(const XmlNode *
if((data = get_node(node, name, XVT_BOOL)) != NULL)
{
if(x != NULL)
- *x = data->data.bool.value;
+ *x = data->data.bool_val.value;
return TRUE;
}
return FALSE;
@@ -677,12 +677,12 @@ static gint get_data(XmlNode *node, cons
node->data.type = XVT_INTEGER;
else if(is_word(str, XML_TRUE))
{
- node->data.bool.value = TRUE;
+ node->data.bool_val.value = TRUE;
node->data.type = XVT_BOOL;
}
else if(is_word(str, XML_FALSE))
{
- node->data.bool.value = FALSE;
+ node->data.bool_val.value = FALSE;
node->data.type = XVT_BOOL;
}
else
@@ -822,7 +822,7 @@ void xml_tree_print(const XmlNode *root,
printf(" = %f", root->data.real.value);
break;
case XVT_BOOL:
- printf(" = %s", root->data.bool.value ? XML_TRUE : XML_FALSE);
+ printf(" = %s", root->data.bool_val.value ? XML_TRUE : XML_FALSE);
break;
case XVT_COLOR:
printf(" = [%04X,%04X,%04X]", root->data.color.value.red, root->data.color.value.green, root->data.color.value.blue);

12
app-misc/gentoo/gentoo-0.20.7-r1.ebuild
View File

@@ -15,10 +15,10 @@ KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
IUSE="nls"
RDEPEND="
>x11-libs/gtk+-3.12:3
dev-libs/glib:2
x11-libs/cairo
x11-libs/gdk-pixbuf
>x11-libs/gtk+-3.12-r0:3
x11-libs/pango
"
DEPEND="${RDEPEND}"
@@ -28,6 +28,8 @@ DOCS=(
AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
)
PATCHES=( "${FILESDIR}/${P}-gcc15.patch" ) # bug 944382
src_prepare() {
sed -i \
-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
@@ -38,7 +40,7 @@ src_prepare() {
-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
configure.ac || die #357343
eapply_user
default
eautoreconf
}
@@ -59,7 +61,7 @@ src_install() {
docinto scratch
dodoc docs/scratch/*
make_desktop_entry ${PN} Gentoo \
/usr/share/${PN}/icons/${PN}.png \
"System;FileTools;FileManager"
make_desktop_entry --eapi9 ${PN} -n Gentoo \
-i /usr/share/${PN}/icons/${PN}.png \
-c "System;FileTools;FileManager"
}