gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

gnome-extra/libgda: fix build with USE=canvas

Browse Source 
Closes: https://bugs.gentoo.org/818106
Thanks-to: Tee KOBAYASHI <xtkoba@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-11-22 06:51:29 +00:00
parent ee3199cbd0
commit a86d660c0f
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch Normal file
View File

@@ -0,0 +1,38 @@
https://bugs.gentoo.org/818106
--- a/tools/browser/canvas/browser-canvas-text.c
+++ b/tools/browser/canvas/browser-canvas-text.c
@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObjec
const gchar *cstr = NULL;
gchar *str;
gdouble size = 0;
- gboolean bool = FALSE;
+ gboolean bool_var = FALSE;
ct = BROWSER_CANVAS_TEXT (object);
@@ -269,11 +269,11 @@ browser_canvas_text_set_property (GObjec
ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR);
break;
case PROP_UNDERLINE:
- bool = g_value_get_boolean (value);
- ct->priv->underline = bool;
+ bool_var = g_value_get_boolean (value);
+ ct->priv->underline = bool_var;
adjust_text_pango_attributes (ct);
if (ct->priv->text_item) {
- if (bool) {
+ if (bool_var) {
str = g_strdup_printf ("<u>%s</u>", ct->priv->text);
g_object_set (G_OBJECT (ct->priv->text_item),
"text", str,
@@ -286,8 +286,8 @@ browser_canvas_text_set_property (GObjec
"use-markup", FALSE, NULL);
}
case PROP_BOLD:
- bool = g_value_get_boolean (value);
- ct->priv->bold = bool;
+ bool_var = g_value_get_boolean (value);
+ ct->priv->bold = bool_var;
adjust_text_pango_attributes (ct);
break;
default:

2
gnome-extra/libgda/libgda-5.2.9.ebuild
View File

@@ -86,6 +86,8 @@ src_prepare() {
# replace my_bool with _Bool
eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
# ... and stop using bool elsewhere too
eapply "${FILESDIR}/${PN}-5.2.9-redefine-bool-error.patch"
# Prevent file collisions with libgda:4
eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"