diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-22 06:51:29 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-22 06:52:11 +0000 |
| commit | a86d660c0f1ffcef7ba19ef801f1248504994541 (patch) | |
| tree | 206be0faa82527214ab9745d52dfe8bc22499507 /gnome-extra/libgda | |
| parent | dev-ruby/web-console: add 4.2.0 (diff) | |
| download | gentoo-a86d660c0f1ffcef7ba19ef801f1248504994541.tar.gz gentoo-a86d660c0f1ffcef7ba19ef801f1248504994541.tar.bz2 gentoo-a86d660c0f1ffcef7ba19ef801f1248504994541.zip | |
gnome-extra/libgda: fix build with USE=canvas
Closes: https://bugs.gentoo.org/818106
Thanks-to: Tee KOBAYASHI <xtkoba@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra/libgda')
| -rw-r--r-- | gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch | 38 | ||||
| -rw-r--r-- | gnome-extra/libgda/libgda-5.2.9.ebuild | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch b/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch new file mode 100644 index 000000000000..0ef845bd7a4d --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch @@ -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: diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild index 135738d0063e..9a3fb0517f99 100644 --- a/gnome-extra/libgda/libgda-5.2.9.ebuild +++ b/gnome-extra/libgda/libgda-5.2.9.ebuild @@ -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" |