summaryrefslogtreecommitdiff
path: root/gnome-extra
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/Manifest.gzbin11253 -> 11254 bytes
-rw-r--r--gnome-extra/evolution-data-server/Manifest3
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.54.3.ebuild1
-rw-r--r--gnome-extra/evolution-data-server/files/3.54.3-c23.patch169
4 files changed, 172 insertions, 1 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ec59eb8f359f..9ed76404ca87 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
Binary files differ
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index df69d511bbc1..23140ae38e2d 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,7 +1,8 @@
AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
+AUX 3.54.3-c23.patch 5169 BLAKE2B c4fa5487ca041c78623696886a4f4b00f1fc21e19f928d72ce0ced49fa9ccb6ceb8cba05845adf107cad886cceb05a9af672ae6d55ac61473ac87df1952a8231 SHA512 5611363c09742284a24a1ecedeb81157663970bd9e5820a60dd639d202b87321f1b5f444f4d4d28a3410783f9af1bd69b485ddd7bb0469cb0667fb0c7ce77223
AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef
DIST evolution-data-server-3.54.3.tar.xz 5099688 BLAKE2B 4dd96cd75adbcb1703c4506ae01be4728f90bc1d8ec201f4aea9a44fb46b2f748db82343ea368c2ecd7a87f55b4e46c6ffdcd085b5329683d00828a23f5aedb6 SHA512 071f4f8185d74712ac57532adb15ecd68feb99f780f36d4751730d16cd57e44bcfd8ecf2ed6995326775ee049bba0da9971f5f42fba43e2d76f9c26865d7f014
EBUILD evolution-data-server-3.52.4-r2.ebuild 5052 BLAKE2B 0429809e103fdbe8a9ac4a866b12d8ca7be2910b23721355c69b706630e63d7607f82bdce079048db341b368f180db1822a059d0ad25f018715aab65eb489994 SHA512 d11153db44d8a7da15a15bb40d7e6e421140425a46d582c35b083e7fef9d87717d0014615656be2197b5fda46508182130647bebd30d75123c5a5ffcf2eab93a
-EBUILD evolution-data-server-3.54.3.ebuild 4950 BLAKE2B 79c106e791287970f1c9ae033f83c1e14ac280c6a9aa63920be7657565e13c3d4ba6fd5a7d58f556b685601aebf00b2961f8132e62ea8283f96e62ddb0ddef5d SHA512 ec3fcda82040710440c823a3bb531b3cc631c22a8cfe7917f605a9da4ef3fd3566f97cf9955d1c71fb82d660597c1570ad21a3ffcd3b1971e35322c2d088d3ed
+EBUILD evolution-data-server-3.54.3.ebuild 4989 BLAKE2B 71adb534f98630180565c1181d03d48067de304dd62be894611f6319a9deb6274fd453fc2165d0bede738d35fa4dfdd7abe1515cf8f9e6c7dd8987e856ff5e17 SHA512 9a11313f131a130680aa0ae9db41b0abb8987b6f02a6c4106351b73b8a62e0560837a1317c5a9106b9d134421ff23d0f5406b486ccb0497b7e502bc60a80fdeb
MISC metadata.xml 1450 BLAKE2B 3f34062ee06dfc126f4f5afb1a2fd93c7170927032d78ce80b11b7080b54cdc9bcbdf694bef2e5b2494133fe632c644f07bfc78b1b7c4e0c5cbe10b772af1a96 SHA512 7ad9c66eab962373e0776d131216c964bedb67174ecd090c834a0cea0951ebb381465ff8575353b62661da3d0ce0152a7dedf371803713a40c775bf21ad6dced
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.54.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.54.3.ebuild
index 7fdfb2d39060..39911df46106 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.54.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.54.3.ebuild
@@ -101,6 +101,7 @@ src_prepare() {
gnome2_src_prepare
eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+ eapply "${FILESDIR}"/3.54.3-c23.patch
# Make CMakeLists versioned vala enabled
sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
diff --git a/gnome-extra/evolution-data-server/files/3.54.3-c23.patch b/gnome-extra/evolution-data-server/files/3.54.3-c23.patch
new file mode 100644
index 000000000000..c478081a4b91
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.54.3-c23.patch
@@ -0,0 +1,169 @@
+https://bugs.gentoo.org/948952
+https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/557e2b2a7cc04836c64abd7340092f2395897d57
+
+From 557e2b2a7cc04836c64abd7340092f2395897d57 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 22 Jan 2025 12:06:33 +0100
+Subject: [PATCH] Do not use variable named 'bool' in the code
+
+The C23 adds `bool` as a keyword, which breaks the build when this
+standard is enabled.
+---
+ src/camel/camel-sexp.c | 16 ++++++++--------
+ src/libedataserver/e-sexp.c | 16 ++++++++--------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/camel/camel-sexp.c b/src/camel/camel-sexp.c
+index c59bc41eb1..66eedae9d0 100644
+--- a/src/camel/camel-sexp.c
++++ b/src/camel/camel-sexp.c
+@@ -330,7 +330,7 @@ term_eval_and (CamelSExp *sexp,
+ GHashTable *ht = g_hash_table_new (g_str_hash, g_str_equal);
+ struct IterData lambdafoo;
+ gint type=-1;
+- gint bool = TRUE;
++ gint val = TRUE;
+ gint i;
+ const gchar *oper;
+
+@@ -341,7 +341,7 @@ term_eval_and (CamelSExp *sexp,
+ oper = "AND";
+ sexp->priv->operators = g_slist_prepend (sexp->priv->operators, (gpointer) oper);
+
+- for (i = 0; bool && i < argc; i++) {
++ for (i = 0; val && i < argc; i++) {
+ r1 = camel_sexp_term_eval (sexp, argv[i]);
+ if (type == -1)
+ type = r1->type;
+@@ -364,7 +364,7 @@ term_eval_and (CamelSExp *sexp,
+ g_hash_table_insert (ht, a1[j], GINT_TO_POINTER (n + 1));
+ }
+ } else if (r1->type == CAMEL_SEXP_RES_BOOL) {
+- bool = bool && r1->value.boolean;
++ val = val && r1->value.boolean;
+ }
+ camel_sexp_result_free (sexp, r1);
+ }
+@@ -377,7 +377,7 @@ term_eval_and (CamelSExp *sexp,
+ result->value.ptrarray = lambdafoo.uids;
+ } else if (type == CAMEL_SEXP_RES_BOOL) {
+ result->type = CAMEL_SEXP_RES_BOOL;
+- result->value.boolean = bool;
++ result->value.boolean = val;
+ }
+
+ g_hash_table_destroy (ht);
+@@ -396,7 +396,7 @@ term_eval_or (CamelSExp *sexp,
+ GHashTable *ht = g_hash_table_new (g_str_hash, g_str_equal);
+ struct IterData lambdafoo;
+ gint type = -1;
+- gint bool = FALSE;
++ gint val = FALSE;
+ gint i;
+ const gchar *oper;
+
+@@ -407,7 +407,7 @@ term_eval_or (CamelSExp *sexp,
+
+ result = camel_sexp_result_new (sexp, CAMEL_SEXP_RES_UNDEFINED);
+
+- for (i = 0; !bool && i < argc; i++) {
++ for (i = 0; !val && i < argc; i++) {
+ r1 = camel_sexp_term_eval (sexp, argv[i]);
+ if (type == -1)
+ type = r1->type;
+@@ -426,7 +426,7 @@ term_eval_or (CamelSExp *sexp,
+ g_hash_table_insert (ht, a1[j], (gpointer) 1);
+ }
+ } else if (r1->type == CAMEL_SEXP_RES_BOOL) {
+- bool |= r1->value.boolean;
++ val |= r1->value.boolean;
+ }
+ camel_sexp_result_free (sexp, r1);
+ }
+@@ -439,7 +439,7 @@ term_eval_or (CamelSExp *sexp,
+ result->value.ptrarray = lambdafoo.uids;
+ } else if (type == CAMEL_SEXP_RES_BOOL) {
+ result->type = CAMEL_SEXP_RES_BOOL;
+- result->value.boolean = bool;
++ result->value.boolean = val;
+ }
+ g_hash_table_destroy (ht);
+
+diff --git a/src/libedataserver/e-sexp.c b/src/libedataserver/e-sexp.c
+index 3adc85196a..ccdabb12cd 100644
+--- a/src/libedataserver/e-sexp.c
++++ b/src/libedataserver/e-sexp.c
+@@ -291,7 +291,7 @@ term_eval_and (ESExp *sexp,
+ GHashTable *ht = g_hash_table_new (g_str_hash, g_str_equal);
+ struct IterData lambdafoo;
+ gint type=-1;
+- gint bool = TRUE;
++ gint val = TRUE;
+ gint i;
+ const gchar *oper;
+
+@@ -302,7 +302,7 @@ term_eval_and (ESExp *sexp,
+ oper = "AND";
+ sexp->priv->operators = g_slist_prepend (sexp->priv->operators, (gpointer) oper);
+
+- for (i = 0; bool && i < argc; i++) {
++ for (i = 0; val && i < argc; i++) {
+ r1 = e_sexp_term_eval (sexp, argv[i]);
+ if (type == -1)
+ type = r1->type;
+@@ -325,7 +325,7 @@ term_eval_and (ESExp *sexp,
+ g_hash_table_insert (ht, a1[j], GINT_TO_POINTER (n + 1));
+ }
+ } else if (r1->type == ESEXP_RES_BOOL) {
+- bool = bool && r1->value.boolean;
++ val = val && r1->value.boolean;
+ }
+ e_sexp_result_free (sexp, r1);
+ }
+@@ -338,7 +338,7 @@ term_eval_and (ESExp *sexp,
+ r->value.ptrarray = lambdafoo.uids;
+ } else if (type == ESEXP_RES_BOOL) {
+ r->type = ESEXP_RES_BOOL;
+- r->value.boolean = bool;
++ r->value.boolean = val;
+ }
+
+ g_hash_table_destroy (ht);
+@@ -357,7 +357,7 @@ term_eval_or (ESExp *sexp,
+ GHashTable *ht = g_hash_table_new (g_str_hash, g_str_equal);
+ struct IterData lambdafoo;
+ gint type = -1;
+- gint bool = FALSE;
++ gint val = FALSE;
+ gint i;
+ const gchar *oper;
+
+@@ -368,7 +368,7 @@ term_eval_or (ESExp *sexp,
+
+ r = e_sexp_result_new (sexp, ESEXP_RES_UNDEFINED);
+
+- for (i = 0; !bool && i < argc; i++) {
++ for (i = 0; !val && i < argc; i++) {
+ r1 = e_sexp_term_eval (sexp, argv[i]);
+ if (type == -1)
+ type = r1->type;
+@@ -387,7 +387,7 @@ term_eval_or (ESExp *sexp,
+ g_hash_table_insert (ht, a1[j], (gpointer) 1);
+ }
+ } else if (r1->type == ESEXP_RES_BOOL) {
+- bool |= r1->value.boolean;
++ val |= r1->value.boolean;
+ }
+ e_sexp_result_free (sexp, r1);
+ }
+@@ -400,7 +400,7 @@ term_eval_or (ESExp *sexp,
+ r->value.ptrarray = lambdafoo.uids;
+ } else if (type == ESEXP_RES_BOOL) {
+ r->type = ESEXP_RES_BOOL;
+- r->value.boolean = bool;
++ r->value.boolean = val;
+ }
+ g_hash_table_destroy (ht);
+
+--
+GitLab
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-14 10:20:03 +0000