diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
| commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
| tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /gnome-extra/libgda | |
| parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) | |
gentoo resync : 05.12.2021
Diffstat (limited to 'gnome-extra/libgda')
| -rw-r--r-- | gnome-extra/libgda/Manifest | 3 | ||||
| -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 |
3 files changed, 42 insertions, 1 deletions
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 0eb2b5484461..7c0eb482535e 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,6 +1,7 @@ AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 AUX libgda-5.2-my_bool-error.patch 5804 BLAKE2B 85068c8d3164bb9fd6d5c26bd144cc389f3e7df28c56163dd3294fed2a1e709674031e0bb903aa8f111010d6682c7aef26692b1e16821f2a9002106eb8a250db SHA512 33a734e4f21364d4657db1347022129eef48b9b7cebd3743445963c74fb2d1b1043927c52a2e165db966df595a1b69dfcc8d9f3b2cddf328291bc7976273ecef +AUX libgda-5.2.9-redefine-bool-error.patch 1223 BLAKE2B eafc8884016c98d673d4da347452a82e558a11d20143d19ce1a40926a8348af507a839010c342dad37f345efb6c7770d6ad2429ca26a310af67dd65e0166af25 SHA512 7ec9d88f7b0de2980c8e2f8a17f00eff26b279c46f938bff8dc3ba5c8e3c106bc778e65bdb078a30b9615bcf2497d4974bef4205cb51347fb50ceb6ac6ceb43c DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 -EBUILD libgda-5.2.9.ebuild 4574 BLAKE2B 3a5acb619176e5f3f860031544f8fa3a172710e1fd0603d1772688af0d534584c977671fc10a399c4db0e6dfaa497c9511f7b271267bbc87c98b626faf658b6e SHA512 1df58c3335f2b3bd67c23ab7e83d5a6d871153dc468d93ce1a46c2e8c0d03b74c37c795b2e569f530f41a698abaa2463bd0095007d1d938271102217e76306b2 +EBUILD libgda-5.2.9.ebuild 4675 BLAKE2B a491354c7e8dd81dc510b2458ee0a7ffe8cbfdd7744465108ea72402ad2ff9ae65b7784f30d1182294d48bdfe30843565413025db687379bf84b1a1551a4b6f7 SHA512 5e62421272b0e495e2396e5d6f0cd8da3c02837fd0e70422f7826de5439d199616f8a9f21be767e446e40e4d97d5616a044e272d14c1cb94e27859c91d81445b MISC metadata.xml 683 BLAKE2B f0a94d1eecbd3715d628dce3f5411f13bc70204beac9204c41a2e0cb68333b391b008b047d97be4a8a5458d318d992766029886d78e21b1e014845f0ee448d5d SHA512 09479faba765f287c36e5eda88c491c7b144260936dddd3fe526cde175f67ed9c3db223d2328eeac150e7648889ef9476f5608a78b3670033a8c284c4ffcae01 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" |