| 1 |
commit: a86d660c0f1ffcef7ba19ef801f1248504994541 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 22 06:51:29 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 22 06:52:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86d660c |
| 7 |
|
| 8 |
gnome-extra/libgda: fix build with USE=canvas |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/818106 |
| 11 |
Thanks-to: Tee KOBAYASHI <xtkoba <AT> gmail.com> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/libgda-5.2.9-redefine-bool-error.patch | 38 ++++++++++++++++++++++ |
| 15 |
gnome-extra/libgda/libgda-5.2.9.ebuild | 2 ++ |
| 16 |
2 files changed, 40 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..0ef845bd7a4d |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-extra/libgda/files/libgda-5.2.9-redefine-bool-error.patch |
| 23 |
@@ -0,0 +1,38 @@ |
| 24 |
+https://bugs.gentoo.org/818106 |
| 25 |
+--- a/tools/browser/canvas/browser-canvas-text.c |
| 26 |
++++ b/tools/browser/canvas/browser-canvas-text.c |
| 27 |
+@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObjec |
| 28 |
+ const gchar *cstr = NULL; |
| 29 |
+ gchar *str; |
| 30 |
+ gdouble size = 0; |
| 31 |
+- gboolean bool = FALSE; |
| 32 |
++ gboolean bool_var = FALSE; |
| 33 |
+ |
| 34 |
+ ct = BROWSER_CANVAS_TEXT (object); |
| 35 |
+ |
| 36 |
+@@ -269,11 +269,11 @@ browser_canvas_text_set_property (GObjec |
| 37 |
+ ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR); |
| 38 |
+ break; |
| 39 |
+ case PROP_UNDERLINE: |
| 40 |
+- bool = g_value_get_boolean (value); |
| 41 |
+- ct->priv->underline = bool; |
| 42 |
++ bool_var = g_value_get_boolean (value); |
| 43 |
++ ct->priv->underline = bool_var; |
| 44 |
+ adjust_text_pango_attributes (ct); |
| 45 |
+ if (ct->priv->text_item) { |
| 46 |
+- if (bool) { |
| 47 |
++ if (bool_var) { |
| 48 |
+ str = g_strdup_printf ("<u>%s</u>", ct->priv->text); |
| 49 |
+ g_object_set (G_OBJECT (ct->priv->text_item), |
| 50 |
+ "text", str, |
| 51 |
+@@ -286,8 +286,8 @@ browser_canvas_text_set_property (GObjec |
| 52 |
+ "use-markup", FALSE, NULL); |
| 53 |
+ } |
| 54 |
+ case PROP_BOLD: |
| 55 |
+- bool = g_value_get_boolean (value); |
| 56 |
+- ct->priv->bold = bool; |
| 57 |
++ bool_var = g_value_get_boolean (value); |
| 58 |
++ ct->priv->bold = bool_var; |
| 59 |
+ adjust_text_pango_attributes (ct); |
| 60 |
+ break; |
| 61 |
+ default: |
| 62 |
|
| 63 |
diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild |
| 64 |
index 135738d0063e..9a3fb0517f99 100644 |
| 65 |
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild |
| 66 |
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild |
| 67 |
@@ -86,6 +86,8 @@ src_prepare() { |
| 68 |
|
| 69 |
# replace my_bool with _Bool |
| 70 |
eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch" |
| 71 |
+ # ... and stop using bool elsewhere too |
| 72 |
+ eapply "${FILESDIR}/${PN}-5.2.9-redefine-bool-error.patch" |
| 73 |
|
| 74 |
# Prevent file collisions with libgda:4 |
| 75 |
eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" |
Archives