diff options
Diffstat (limited to 'gnome-extra')
-rw-r--r-- | gnome-extra/Manifest.gz | bin | 11542 -> 11551 bytes | |||
-rw-r--r-- | gnome-extra/gnome-shell-extensions/Manifest | 4 | ||||
-rw-r--r-- | gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild | 67 | ||||
-rw-r--r-- | gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild (renamed from gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4.ebuild) | 2 | ||||
-rw-r--r-- | gnome-extra/gnome-user-docs/Manifest | 4 | ||||
-rw-r--r-- | gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild (renamed from gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild) | 2 | ||||
-rw-r--r-- | gnome-extra/libgda/Manifest | 3 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch | 136 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-5.2.9.ebuild | 3 |
9 files changed, 146 insertions, 75 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz Binary files differindex e3fdc8f84b1c..138e05542ff8 100644 --- a/gnome-extra/Manifest.gz +++ b/gnome-extra/Manifest.gz diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest index b588c1f474ce..f99307a2cc18 100644 --- a/gnome-extra/gnome-shell-extensions/Manifest +++ b/gnome-extra/gnome-shell-extensions/Manifest @@ -1,9 +1,7 @@ AUX 40.3-drive-menu-hide-items.patch 1756 BLAKE2B 9eba68c0d09b066ea3f06a59a15df2ea310ce0f4168b6851e0bfd51784e124bdaac40078ba0d7be24f7515dcb09a1ca93eb994fb8f668382e5b27c63d094c0b8 SHA512 39694a61045baf0c1675db62cd2cfa4900c45a6fae483353e519c4b1098d5f9f8292ee1cadcaf9db5d884c42d939b5971bfcb32bc1feed3c5bc9ef40bcf3b1a4 AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fece58e20fc4b01bf08b988592743c7e4c844cc4713cee3df7dfafe8d6ab2bd318d453b039dfeec04511ad81ab1533cd4c8cdae8c6581ec SHA512 fb74eb7796a06e5bbd103d7c0806845364fc35da6b933af287b68efeaec1e5f73699d98f38fca764aab9f44eb23e7e4365dc0f1e1e8514d9d5bbb709a110c478 -DIST gnome-shell-extensions-40.2.tar.xz 218032 BLAKE2B f4b8daf2fcd62eaef0ad0960c930fc9368bd426b867a31351b39a2a628dfe9c0631419a5f067b4ac1eb03d2df931ba3a8ea99d4e72043459463b86eb00f6787b SHA512 f02a02a8410e77e8c8b0a764bb7949727974e9a4c0125ac2b6e68c1b20b663ef2de82ddaaed882dd5ffb3a6fd9898b372b6201d53da33f11677c32e82272d2aa DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737 DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef -EBUILD gnome-shell-extensions-40.2.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69 EBUILD gnome-shell-extensions-40.3-r1.ebuild 1868 BLAKE2B d2b5894c719e76dcc05fef97ef9115058ee80924c2c35125f97614897658f6b11729721c2f7e0e460f26019791b182b6dea8b702774921ab2b91f39a22e28c94 SHA512 adada7db70e8ef7b36d45c257a1b04ef427f63723d64e3788aa0fa907fbb794a1898b9215ba752c37188a780bbc0bf5b4e21d778be80cd0ea08cf1cbced4eb0c -EBUILD gnome-shell-extensions-40.4.ebuild 1749 BLAKE2B b390d4f85164e8329c4f1693747df7ec0e0fb052dfc594e37332019f139f952a82ea7024e7004568ddf9821c1f8ea9ff9c604e024255c93c77ba1b37f5524924 SHA512 e5539db5696a3caf24a980eaf1141a402f2e19d45ab186e47e45083ee195c135779c072de3f4ed0f0165f5b732e330c20e138ae98b67dd9fc20cd2fc23765662 +EBUILD gnome-shell-extensions-40.4-r1.ebuild 1747 BLAKE2B 228b21c4d8549e3c45db83dadcaaa0dad2269f73ea97762bd5f24f1aabf6f1f8f68963049e58734a316e6ddb21b1eb5ca0f9317d39ca6a6a31c220c3ea1a62d0 SHA512 7ca0d1488294056c3123445ddcd434a8997a03e75ac2e5a84afac8ae2f81e27923546be605c577b994ad2dde523be2a53004ed608c72b3ed1be0a8c1064f83b4 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild deleted file mode 100644 index e985b912fe18..000000000000 --- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org readme.gentoo-r1 meson xdg - -DESCRIPTION="JavaScript extensions for GNOME Shell" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" - -DEPEND=" - >=dev-libs/glib-2.26:2 - >=gnome-base/libgtop-2.28.3[introspection] - >=app-eselect/eselect-gnome-shell-extensions-20111211 -" -RDEPEND="${DEPEND} - >=dev-libs/gjs-1.29 - dev-libs/gobject-introspection:= - dev-libs/atk[introspection] - gnome-base/gnome-menus:3[introspection] - =gnome-base/gnome-shell-$(ver_cut 1-2)* - media-libs/clutter:1.0[introspection] - net-libs/telepathy-glib[introspection] - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] - x11-themes/adwaita-icon-theme - >=x11-wm/mutter-3.32[introspection] -" -BDEPEND=" - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="Installed extensions installed are initially disabled by default. -To change the system default and enable some extensions, you can use -# eselect gnome-shell-extensions - -Alternatively, to enable/disable extensions on a per-user basis, -you can use the https://extensions.gnome.org/ web interface, the -gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell -enabled-extensions gsettings key from the command line or a script." - -src_configure() { - meson_src_configure \ - -Dextension_set=all \ - -Dclassic_mode=true -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - - ebegin "Updating list of installed extensions" - eselect gnome-shell-extensions update - eend $? - - readme.gentoo_print_elog -} diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild index f5bc021adcaa..42052c59fd6c 100644 --- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4.ebuild +++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.4-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND} dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] - =gnome-base/gnome-shell-$(ver_cut 1-2)* + =gnome-base/gnome-shell-$(ver_cut 1)* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest index 19977517b3e9..c1abf1723a56 100644 --- a/gnome-extra/gnome-user-docs/Manifest +++ b/gnome-extra/gnome-user-docs/Manifest @@ -1,7 +1,7 @@ -DIST gnome-user-docs-40.1.tar.xz 9264892 BLAKE2B 3c27662d516839d411444b811d2c60da51b055a7200958ee50908092bd135e182c2b359f47b711b276a6a9b6b029b767b23bd88fecc32f2c80fa2652ace40184 SHA512 a5ebd9bfbdf13c6922db2035c740f729dc89a2dfa991e74cb835d1c8e28ec4d0d08aaf7388d00d6df83f53a6261bebc1ea32e5b57287c13b2237221a56a34332 DIST gnome-user-docs-40.3.tar.xz 9141728 BLAKE2B 9634dfa526d7e781400563e0800f25fc8aa520d97fe0e02f3a06a1f82bb0019ff28e9bf0c8a2698c7d081d7b54a1d53be4475db6615d40c3407b632252cc8aae SHA512 e96f4535761c902999b210060f9bbf19384151752315abc7cf20f8b0ef1f599fe132f398db61318ea24eab8e3dc65812fc05a5ed549e4cedabaf809af39f515b DIST gnome-user-docs-40.4.tar.xz 9195696 BLAKE2B 438f52d72a8975125b758acedfbc8c08a36397af6bb0dff01d0c73d517cee67999724e9e29d2731344fbc822309510f36f367052eeff3ba4e1dc36554eb76ffe SHA512 50c8df61a02eaa077ad3faa18d622ead97c7a8926717b2b85d6a9fb86f93e0adb3c9f212f0fbfb4781a35135fc0251d664f793665343b7daaf41a390b10fe868 -EBUILD gnome-user-docs-40.1.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24 +DIST gnome-user-docs-40.5.tar.xz 9210512 BLAKE2B 0fe638636377d1c392d208c55016cdc346fa1ec64d327ab9ded9b58744d115c74d5a03927836138cb2d58c9df735d8bc032da4a7ff3ef3ffa53a1a59b88a3006 SHA512 dbef51c262862b211304158fd9aa7bf75ab20bbf21ed0bebe0a1c547cb53e580d32062a6f362f0750a8fbe1e93e8987593c80fa7fbb758c1a61827256db69d52 EBUILD gnome-user-docs-40.3.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24 EBUILD gnome-user-docs-40.4.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7 +EBUILD gnome-user-docs-40.5.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild index f9a0f49950e9..aef106ecb64f 100644 --- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild +++ b/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs" LICENSE="CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" BDEPEND="test? ( dev-libs/libxml2 )" diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index b831f7ded72a..0eb2b5484461 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,5 +1,6 @@ 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 DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 -EBUILD libgda-5.2.9.ebuild 4491 BLAKE2B 7f839b0338fb7f54389028a7843283981771a299a3e7ba42f6febb27822eab833ef7f8c20d99c63245d7ea5512f8a0628172f2e0cb517e839b6a73f3d8b68d41 SHA512 bc3e067c7bb6d8cd7ee5942a290a25df67e23c0d086219a3b7a26f000b319ae700df3722410a802373e40db8ad810be257ad25ab5e0d2ada832a458d725217da +EBUILD libgda-5.2.9.ebuild 4574 BLAKE2B 3a5acb619176e5f3f860031544f8fa3a172710e1fd0603d1772688af0d534584c977671fc10a399c4db0e6dfaa497c9511f7b271267bbc87c98b626faf658b6e SHA512 1df58c3335f2b3bd67c23ab7e83d5a6d871153dc468d93ce1a46c2e8c0d03b74c37c795b2e569f530f41a698abaa2463bd0095007d1d938271102217e76306b2 MISC metadata.xml 683 BLAKE2B f0a94d1eecbd3715d628dce3f5411f13bc70204beac9204c41a2e0cb68333b391b008b047d97be4a8a5458d318d992766029886d78e21b1e014845f0ee448d5d SHA512 09479faba765f287c36e5eda88c491c7b144260936dddd3fe526cde175f67ed9c3db223d2328eeac150e7648889ef9476f5608a78b3670033a8c284c4ffcae01 diff --git a/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch new file mode 100644 index 000000000000..9e696ef1c4d9 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch @@ -0,0 +1,136 @@ +https://bugs.gentoo.org/692672 + +--- a/providers/mysql/gda-mysql-provider.c ++++ b/providers/mysql/gda-mysql-provider.c +@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provider, GdaConnection *cnc, GdaStatement *stm + return FALSE; + } + +- my_bool update_max_length = 1; ++ _Bool update_max_length = 1; + if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) { + _gda_mysql_make_error (cnc, NULL, mysql_stmt, error); + mysql_stmt_close (mysql_stmt); +@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData *cdata, + return FALSE; + } + +- my_bool update_max_length = 1; ++ _Bool update_max_length = 1; + if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) { + _gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error); + mysql_stmt_close (mysql_stmt); +@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + if (allow_noparam) { + /* bind param to NULL */ + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + empty_rs = TRUE; + continue; + } +@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + if (allow_noparam) { + /* bind param to NULL */ + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + empty_rs = TRUE; + continue; + } +@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + GdaStatement *rstmt; + if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else if (!rstmt) + return NULL; +@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + ts = (GdaTimestamp*) gda_value_get_timestamp (value); + if (!ts) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + gboolean tofree = FALSE; +@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + ts = (GdaTime*) gda_value_get_time (value); + if (!ts) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + gboolean tofree = FALSE; +@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + ts = (GDate*) g_value_get_boxed (value); + if (!ts) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + MYSQL_TIME *mtime; +@@ -2548,7 +2548,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + str = g_value_get_string (value); + if (!str) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING; +@@ -2624,7 +2624,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + bin = ((GdaBinary*) blob); + if (!bin) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + gchar *str = NULL; +@@ -2665,7 +2665,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider, + bin = gda_value_get_binary (value); + if (!bin) { + mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; +- mysql_bind_param[i].is_null = (my_bool*)1; ++ mysql_bind_param[i].is_null = (_Bool *) 1; + } + else { + mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB; +--- a/providers/mysql/gda-mysql-recordset.c ++++ b/providers/mysql/gda-mysql-recordset.c +@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection *cnc, + /* binding results with types */ + mysql_bind_result[i].buffer_type = field->type; + mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE; +- mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool)); ++ mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool)); + + switch (mysql_bind_result[i].buffer_type) { + case MYSQL_TYPE_TINY: +@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G + + gint col; + for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) { +- my_bool truncated; ++ _Bool truncated; + mysql_bind_result[col].error = &truncated; + mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]), + (unsigned int)col, 0); +@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G + + /*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/ + +- my_bool is_null = FALSE; ++ _Bool is_null = FALSE; + unsigned long length; + +- memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool)); ++ memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool)); + if (is_null) { + gda_value_set_null (value); + continue; diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild index ac392e8d05d6..135738d0063e 100644 --- a/gnome-extra/libgda/libgda-5.2.9.ebuild +++ b/gnome-extra/libgda/libgda-5.2.9.ebuild @@ -84,6 +84,9 @@ src_prepare() { -e '/SUBDIRS =/ s/trml2pdf//' \ -i libgda-report/RML/Makefile.{am,in} || die + # replace my_bool with _Bool + eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch" + # Prevent file collisions with libgda:4 eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch" |