From b66ecfb4dc09ba76e37787df2f7df1a78c3c1cc9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Sep 2024 12:11:35 +0100 Subject: gentoo auto-resync : 16:09:2024 - 12:11:35 --- x11-libs/gtksourceview/Manifest | 5 +- .../files/2.10.5-G_CONST_RETURN.patch | 139 +++++++++++++++++++++ x11-libs/gtksourceview/files/2.10.5-gcc14.patch | 21 ++++ .../gtksourceview-2.10.5-G_CONST_RETURN.patch | 139 --------------------- .../gtksourceview/gtksourceview-2.10.5-r3.ebuild | 5 +- 5 files changed, 167 insertions(+), 142 deletions(-) create mode 100644 x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch create mode 100644 x11-libs/gtksourceview/files/2.10.5-gcc14.patch delete mode 100644 x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch (limited to 'x11-libs/gtksourceview') diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest index 04251528944e..f7a4aacade55 100644 --- a/x11-libs/gtksourceview/Manifest +++ b/x11-libs/gtksourceview/Manifest @@ -1,11 +1,12 @@ AUX 2.0/gentoo.lang 3901 BLAKE2B 774a8c7c01e8188339d1ae4b10df39b58ef78015cc2eb7cd3a723d025c1ae9ff2567dd84e56a2d9f2fd47d78b9ef26517dd76cb6e114aaab8eca452c8097712c SHA512 62c3257663eb684c1eeddb8393d8529e63c2535aa2c2839c76cac2a75f0c059025aa22db5e1bb569242526f1f2ee53708c7339e81eb37843f876be498762f9fc +AUX 2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 +AUX 2.10.5-gcc14.patch 749 BLAKE2B 90b929f90459ce6f75c72675e0f5923e61c06aefc1611fc753c04ea88ff079a00a188428aa49d4569026c73d62a3649c05f3e867979373fc1f290f9102e1ad7d SHA512 d2133c47beea420c357abb4e9a98ae5388b3760a39cfd6361c24758a016ee725ee0a8f860259369c907cd19061aa82c1b1a4f200b88512bc2513d4f085d758b6 AUX 3.24.11-gcc14.patch 2157 BLAKE2B 3ad0dbafb78355160353893e1026e8e19f07ff172b6689d6314efc1a444bcd503677a3ca9a7310ecca811c4f8dd8b88aba4c7a213cb3f35dd12d63fa016ee52b SHA512 88e7b6c90977d7a799e24f1d83b8d9de183bc318bf6a313c3f5e808851e1102311a77469bc33994ff67f7c16bc7273b580fbb7c9bd29f6147efdbcb65e43f4ea AUX 4.6-gentoo.lang 3889 BLAKE2B 1797c9e3ef615b36f3098104295fbadee18b8434d299bbab9603c5a00abdfb51c3a7db2f937885d8aa191067fd6e2ffbc1cf278b0d9333c67bcb07e24be5a7ba SHA512 a4ca3f24df56556c5d42aac19d36608d20466287b9e364154b1877c2a5aeab82a374fdf7dc64afbabbf9269d5a8fa88e1dd59d8a24a52fab219db09ec29a3d98 -AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2 DIST gtksourceview-4.8.4.tar.xz 1159636 BLAKE2B 0fb649522ff904993b7673c380b8ffb6458c0727b6af906e5328d972fb5385a2a668c2ca45b7dd3533f9f00b2ed9eaade55ee7b20a0b75fb1c031b917c27af2d SHA512 9e4262e52a92b3a052f33b799622d4fd4dcc7cc5355df12f160d0e60a6d6c135bc52f07eb40c06b357d5d74bec7228d4ec545a69ee5af69429d4170cc1e2243d -EBUILD gtksourceview-2.10.5-r3.ebuild 1299 BLAKE2B cff4f72047d2b153fb2e3002a10f026f91f9b1d51294bfdc05b180c350a66747c9ec1cb7fd67074f21e332b671500c50232c30ea9cf8d28a056bcf5e07f2eedd SHA512 96741acefea93a529b6c036347b7e284e7c78969ccd9a2d8a17d212132f3bac3475ab133279b0e60c7ff5c7a35745bfc60f3d204532b99dbd2bfb399dc5d9ec1 +EBUILD gtksourceview-2.10.5-r3.ebuild 1336 BLAKE2B fa12ff8b5d0b42ecdaa45493993cf3d5aed45ad25f982a7d619bfc159f5989fb8b91faa4f00de54d12e677eb849b1df709869bf8a3118c4cb4d7c8bff44c8e3a SHA512 4031a0cb28d268e3bdb82aa29f987b343fe203739c7ba30017fded4ee1643b1f2d4dfed1c4e0c0b92ea1d34d5f9922a919cc282312ac2d33bddd1872d1091e1c EBUILD gtksourceview-3.24.11-r1.ebuild 1203 BLAKE2B d2d5319a02673cf8ad0ff01056f0865f377bd5716539fab0a26ce8fc1c30ef8be643625673bb6ae7b5fdec1b842e6f1c6252cae4e57eeaff31a703f2a270c705 SHA512 b08dd2c1ad24dc99bb5435013aa2d9a76a7e3cdcb39c32332ee5ba52db5e3d5c42ea93144cc452134c71565ea822144f3fefd260f0a1039037883c71d4eca08e EBUILD gtksourceview-3.24.11-r2.ebuild 1257 BLAKE2B 1fa0fc29d64add7127ef4a34ea6e3de4d510ca3a47f97240c03c731339c4330bb4221aebce4bd71b5cb0ac6a9217312571f0eba68c3216b072b0e918d962ccaa SHA512 e435c5648d566fb980fb7f7e1d473df9fc87cf4bc75e04cf361c345de342084277fccd80828ebc6c2aa84bd2bacb1c75ddd092e2e39b76fb4b81f98b1b0c707f EBUILD gtksourceview-4.8.4.ebuild 1739 BLAKE2B 7cd651e679ceb4ed1acf25a88b70bf236c1ab834b066db55a0162cc46d22b0549f5c3839903e58f1943eaccbb964db32e943fe6c80c573dfe46488385ad9ea3f SHA512 c811661428d086f6bbb1fc2bf7abb17753366152172b2165714a943ea23f89382c50bd3653b40f328fcb357e23b06bce7fb933155f94a057380f93eec0b90736 diff --git a/x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch b/x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch new file mode 100644 index 000000000000..d42feacd3e3f --- /dev/null +++ b/x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch @@ -0,0 +1,139 @@ +From d27fec22c3f50bcd3c384256b8ad75d662033c7f Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Sun, 13 Mar 2011 11:01:37 +0100 +Subject: [PATCH] Do not use G_CONST_RETURN anymore. This macro is going to be + deprecated. + +--- + gtksourceview/gtksourcelanguagemanager.c | 4 ++-- + gtksourceview/gtksourcelanguagemanager.h | 6 ++---- + gtksourceview/gtksourcestylescheme.c | 4 ++-- + gtksourceview/gtksourcestylescheme.h | 3 +-- + gtksourceview/gtksourcestyleschememanager.c | 4 ++-- + gtksourceview/gtksourcestyleschememanager.h | 6 ++---- + 6 files changed, 11 insertions(+), 16 deletions(-) + +diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c +index b431e1f..31deba7 100644 +--- a/gtksourceview/gtksourcelanguagemanager.c ++++ b/gtksourceview/gtksourcelanguagemanager.c +@@ -275,7 +275,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, + * containg a list of language files directories. + * The array is owned by @lm and must not be modified. + */ +-G_CONST_RETURN gchar* G_CONST_RETURN * ++const gchar * const * + gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm) + { + g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL); +@@ -394,7 +394,7 @@ ensure_languages (GtkSourceLanguageManager *lm) + * no language is available. + * The array is owned by @lm and must not be modified. + */ +-G_CONST_RETURN gchar* G_CONST_RETURN * ++const gchar * const * + gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm) + { + g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL); +diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h +index ce234f5..de7a3aa 100644 +--- a/gtksourceview/gtksourcelanguagemanager.h ++++ b/gtksourceview/gtksourcelanguagemanager.h +@@ -63,14 +63,12 @@ GtkSourceLanguageManager *gtk_source_language_manager_new (void); + + GtkSourceLanguageManager *gtk_source_language_manager_get_default (void); + +-G_CONST_RETURN gchar* G_CONST_RETURN * +- gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); ++const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); + + void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, + gchar **dirs); + +-G_CONST_RETURN gchar* G_CONST_RETURN * +- gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); ++const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); + + GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, + const gchar *id); +diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c +index 6b470e8..d9d41a3 100644 +--- a/gtksourceview/gtksourcestylescheme.c ++++ b/gtksourceview/gtksourcestylescheme.c +@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme) + * + * Since: 2.0 + */ +-G_CONST_RETURN gchar* G_CONST_RETURN * ++const gchar * const * + gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme) + { + g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL); +@@ -326,7 +326,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme) + if (scheme->priv->authors == NULL) + return NULL; + +- return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata; ++ return (const gchar * const *)scheme->priv->authors->pdata; + } + + /** +diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h +index 501163c..fe74bd2 100644 +--- a/gtksourceview/gtksourcestylescheme.h ++++ b/gtksourceview/gtksourcestylescheme.h +@@ -62,8 +62,7 @@ const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleS + const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); + const gchar *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme); + +-G_CONST_RETURN gchar* G_CONST_RETURN * +- gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); ++const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); + + const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme); + +diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c +index cba042f..eec5d45 100644 +--- a/gtksourceview/gtksourcestyleschememanager.c ++++ b/gtksourceview/gtksourcestyleschememanager.c +@@ -516,7 +516,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager + * of string containing the search path. + * The array is owned by the @manager and must not be modified. + */ +-G_CONST_RETURN gchar* G_CONST_RETURN * ++const gchar * const * + gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager) + { + g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL); +@@ -555,7 +555,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag + * of string containing the ids of the available style schemes or %NULL if no + * style scheme is available. The array is owned by the @manager and must not be modified. + */ +-G_CONST_RETURN gchar* G_CONST_RETURN * ++const gchar * const * + gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager) + { + g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL); +diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h +index 6effc1c..456e8bf 100644 +--- a/gtksourceview/gtksourcestyleschememanager.h ++++ b/gtksourceview/gtksourcestyleschememanager.h +@@ -74,13 +74,11 @@ void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSc + void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, + const gchar *path); + +-G_CONST_RETURN gchar* G_CONST_RETURN * +- gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); ++const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); + + void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager); + +-G_CONST_RETURN gchar* G_CONST_RETURN * +- gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); ++const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); + + GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, + const gchar *scheme_id); +-- +1.7.8 + diff --git a/x11-libs/gtksourceview/files/2.10.5-gcc14.patch b/x11-libs/gtksourceview/files/2.10.5-gcc14.patch new file mode 100644 index 000000000000..e86cfbc7d60f --- /dev/null +++ b/x11-libs/gtksourceview/files/2.10.5-gcc14.patch @@ -0,0 +1,21 @@ + +Fix build with gcc-14. + +Backported version of patch from: +https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/b25e71c57fc934a7ce36e51826af9fa7c2cf9a80 + +Bug: https://bugs.gentoo.org/937626 + +Signed-off-by: Holger Hoffstätte + +--- gtksourceview-2.10.5/gtksourceview/gtksourceview.c 2010-08-22 13:45:05.000000000 +0200 ++++ gtksourceview-2.10.5-gcc14/gtksourceview/gtksourceview.c 2024-08-09 16:11:37.319493797 +0200 +@@ -1766,7 +1766,7 @@ set_source_buffer (GtkSourceView *view, + + if (buffer && GTK_IS_SOURCE_BUFFER (buffer)) + { +- view->priv->source_buffer = g_object_ref (buffer); ++ view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer)); + + g_signal_connect (buffer, + "highlight_updated", diff --git a/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch b/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch deleted file mode 100644 index d42feacd3e3f..000000000000 --- a/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch +++ /dev/null @@ -1,139 +0,0 @@ -From d27fec22c3f50bcd3c384256b8ad75d662033c7f Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 13 Mar 2011 11:01:37 +0100 -Subject: [PATCH] Do not use G_CONST_RETURN anymore. This macro is going to be - deprecated. - ---- - gtksourceview/gtksourcelanguagemanager.c | 4 ++-- - gtksourceview/gtksourcelanguagemanager.h | 6 ++---- - gtksourceview/gtksourcestylescheme.c | 4 ++-- - gtksourceview/gtksourcestylescheme.h | 3 +-- - gtksourceview/gtksourcestyleschememanager.c | 4 ++-- - gtksourceview/gtksourcestyleschememanager.h | 6 ++---- - 6 files changed, 11 insertions(+), 16 deletions(-) - -diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c -index b431e1f..31deba7 100644 ---- a/gtksourceview/gtksourcelanguagemanager.c -+++ b/gtksourceview/gtksourcelanguagemanager.c -@@ -275,7 +275,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, - * containg a list of language files directories. - * The array is owned by @lm and must not be modified. - */ --G_CONST_RETURN gchar* G_CONST_RETURN * -+const gchar * const * - gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm) - { - g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL); -@@ -394,7 +394,7 @@ ensure_languages (GtkSourceLanguageManager *lm) - * no language is available. - * The array is owned by @lm and must not be modified. - */ --G_CONST_RETURN gchar* G_CONST_RETURN * -+const gchar * const * - gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm) - { - g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL); -diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h -index ce234f5..de7a3aa 100644 ---- a/gtksourceview/gtksourcelanguagemanager.h -+++ b/gtksourceview/gtksourcelanguagemanager.h -@@ -63,14 +63,12 @@ GtkSourceLanguageManager *gtk_source_language_manager_new (void); - - GtkSourceLanguageManager *gtk_source_language_manager_get_default (void); - --G_CONST_RETURN gchar* G_CONST_RETURN * -- gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); -+const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); - - void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, - gchar **dirs); - --G_CONST_RETURN gchar* G_CONST_RETURN * -- gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); -+const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); - - GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, - const gchar *id); -diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c -index 6b470e8..d9d41a3 100644 ---- a/gtksourceview/gtksourcestylescheme.c -+++ b/gtksourceview/gtksourcestylescheme.c -@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme) - * - * Since: 2.0 - */ --G_CONST_RETURN gchar* G_CONST_RETURN * -+const gchar * const * - gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme) - { - g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL); -@@ -326,7 +326,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme) - if (scheme->priv->authors == NULL) - return NULL; - -- return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata; -+ return (const gchar * const *)scheme->priv->authors->pdata; - } - - /** -diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h -index 501163c..fe74bd2 100644 ---- a/gtksourceview/gtksourcestylescheme.h -+++ b/gtksourceview/gtksourcestylescheme.h -@@ -62,8 +62,7 @@ const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleS - const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); - const gchar *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme); - --G_CONST_RETURN gchar* G_CONST_RETURN * -- gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); -+const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); - - const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme); - -diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c -index cba042f..eec5d45 100644 ---- a/gtksourceview/gtksourcestyleschememanager.c -+++ b/gtksourceview/gtksourcestyleschememanager.c -@@ -516,7 +516,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager - * of string containing the search path. - * The array is owned by the @manager and must not be modified. - */ --G_CONST_RETURN gchar* G_CONST_RETURN * -+const gchar * const * - gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager) - { - g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL); -@@ -555,7 +555,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag - * of string containing the ids of the available style schemes or %NULL if no - * style scheme is available. The array is owned by the @manager and must not be modified. - */ --G_CONST_RETURN gchar* G_CONST_RETURN * -+const gchar * const * - gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager) - { - g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL); -diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h -index 6effc1c..456e8bf 100644 ---- a/gtksourceview/gtksourcestyleschememanager.h -+++ b/gtksourceview/gtksourcestyleschememanager.h -@@ -74,13 +74,11 @@ void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSc - void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path); - --G_CONST_RETURN gchar* G_CONST_RETURN * -- gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); -+const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); - - void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager); - --G_CONST_RETURN gchar* G_CONST_RETURN * -- gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); -+const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); - - GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, - const gchar *scheme_id); --- -1.7.8 - diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild index c238975c90d7..5dc42f20caa8 100644 --- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild @@ -31,7 +31,10 @@ BDEPEND=" DOCS=( AUTHORS ChangeLog HACKING MAINTAINERS NEWS README ) # Patch from 3.x for bug #394925 -PATCHES=( "${FILESDIR}/${P}-G_CONST_RETURN.patch" ) +PATCHES=( + "${FILESDIR}/2.10.5-G_CONST_RETURN.patch" + "${FILESDIR}/2.10.5-gcc14.patch" +) src_prepare() { gnome2_src_prepare -- cgit v1.2.3