gentoo auto-resync : 27:11:2024 - 02:00:00

4 files changed, 35 insertions, 1 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 1f2deed66fb6..4e2850aa31cc 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 6f604527a2f1..4bb3ad9712d1 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -13,6 +13,7 @@ AUX guile-2.2.7-fix-buggy-gnulib.patch 2813 BLAKE2B 9905f91b37fc8262ed508f8dd950
 AUX guile-2.2.7-stack-up.patch 568 BLAKE2B 11f19c9e657b9b23c033e0edac9d06fcaa2f56f69230d526fc42eed6050022395599855015539c32ed83b6e3f5c8a94744ff6ef50b3c9284818d0d8f725f18b6 SHA512 f312e4e5d8d3781efb6fe65f4ec94431d8b19a7ac3e3e9e461748c60643088237e570314e74b5253418a01b129586465ed43107463d8de182e362393f75073bd
 AUX guile-3.0-fix-32bit-BE.patch 779 BLAKE2B 7665d10c97a86c3c269122010821fed6fd83f5a3794d1b15a7c16479f30258f25d7c659257bac4296c0be43ea881c80d0ecd5033ff3a383da9eff4f5e34e884b SHA512 05a6fda0c4d8fb1a5d6da98611f00e430ce03e6ace1cf412290275bd6051ac028b42f8ccd05bba0bbe385f5681df2a26112e0a0f377f911acadb6acedbb15037
 AUX guile-3.0.10-backport-issue72913.patch 17953 BLAKE2B 4fbdbc8ab51d39acadac5b181df43687f9913e60a1431ea8affbd66b1af1d8d55d39d9477086ca520ae455d9a03ec4a073e94b6dabf9cfdb7ced56f9d4ab7879 SHA512 3eac97a35fd6a86fab90c36730935d317e051e11cb20509521ad7e9e74713c7d844b5d23920491d0318ec4d84570cc036847c25a0d3404522b11fc6339af3799
+AUX guile-3.0.10-c23.patch 1013 BLAKE2B b65fc6a6a8d74d08d0f9e1d9a3c66a8b16edc3161d7bdbd04af0653a657b4278a744d36049ef085effccf8911aee7e9b71aa7bc1b21c09c9f6deb7cbed98a04d SHA512 a97870cc87bcc0b9360f66c1b33d50eed701a80521c41068a90f39b59e7b22b0e63790eab7a8ad70d32a7c1e8bd0bf2012fcb75ced1d46ebfe3d918473de94a2
 DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533ea8db15e6d1b759c33edec094a1a4bdc3e09ccae61f1b271d63565063746feea242a90c18cd575775444a42ef SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
 DIST guile-2.2.7.tar.xz 10881984 BLAKE2B e2b1fe7cb010371beaaf32f8f173397c90fd291ed7d5835b9d976f37fd133254841b4179bd1e1cd02e604c7befcab6c25f85d20ba0850f96978f7c32ca1fe6d8 SHA512 6f60b3489e26f5ff32b55c89316cdcdbf3ec1f4344726006e445f24098c922c50becdc748f1b66d2b271dc002e409ee6210bf85da779cee1f68c9111b3b5c543
 DIST guile-3.0.10.tar.xz 5802280 BLAKE2B 2b41f1afb282eb4672f5aca5b044f47a12509745f5580fc4a621e7555c8b884f92dc76bc78fbdf8a64d59cf1de65b230ce03b0a34bbcb77307a7c9453a277ac6 SHA512 8b58e6c70cd48af85a0b346fcdf488fd5ac8d8678181c9c469895bf6ddab909c415e471776fdcda3c234e00fae80bdd4518c17ff16cf8107a36d2990a4face1d
@@ -21,6 +22,6 @@ EBUILD guile-1.8.8-r5.ebuild 3207 BLAKE2B b695c0c7ce46a476750c5dbbfc5d49a270e297
 EBUILD guile-2.2.7-r1.ebuild 2147 BLAKE2B f745559bbd9cc6ea8f489f974351159792478de2fe001533f950098625e67620d750eaff498bb14f56f8854586b030be0936d61a65c94c00de90e5f3c145db33 SHA512 391cc24ba1c3855b7a4bea2bed6820a66e644b2613e0c49587a19fc759fe801b4863f90110f2a244d10945bdb151d86e8e43685282e9bac85db3f1d2fc36e1a4
 EBUILD guile-2.2.7-r102.ebuild 3177 BLAKE2B 8afe7cbad7399b85cac552f641287fcbbabdf97b096c5f37ebfafc27a71b5f6e372a774f8ef5143688a40891034b1fd0f4bfb3a795c265dd482dc303de93a48c SHA512 506ed1070867014aa905f58ccd7aeffd9374c33bc90c2b5cf2f33977f31d8b3829e36b9c9b1b6b9112d6405e5a376fcf578b60c0e4b2d87af6e92bf194ef1cc0
 EBUILD guile-2.2.7-r2.ebuild 2300 BLAKE2B 5b8582730cab705ed219468469550ac73657008f6980752d5813955dbffb0955fbc74ad69da106b1e5d052cc553e3bce4a51a6c21bb9e65616b3b1ad895c54db SHA512 4109d875e65aa81601632f19b76e5bd83a6a34381cc28bb72a2217f3b47a1e81a752e4547ecbea0e4644b1323266067dae9703e0fde59b0a89fcb0133eeecfe2
-EBUILD guile-3.0.10-r102.ebuild 3251 BLAKE2B 1802e3a40f7b728c32a357b95297b60b1dbdc32c80026dbc41aaba78ce9432f64b33fe2a6af70469f5f5dd69c466b0882d3fe15f90af4b9643b5892bfc2ac0cc SHA512 3ef394051cd84513553477a8849a1f3b7a6183fc57e353c5f14972572f53f2ea43d411ad7cf29586ba0e26bcbdceb0dd1ab2e422810a189a637ea5a78a254496
+EBUILD guile-3.0.10-r102.ebuild 3289 BLAKE2B ac31214485d677a40d8c0a979c7a14e475ec96a4b527eb623f404b0ff788dd3fcb1f22508cea05ae12ee40190eca72b0b86588cdd5e31dc55d21015d8abccf32 SHA512 0795642aa7a9d1c4c8ba10903e64923bfdeaf1fad4bcfe2aa52018924c58ddbba1595428f26140f7acba23682312d02709e9d0f38153e052053d488bf07d08e7
 EBUILD guile-3.0.10.ebuild 2153 BLAKE2B 03c876db0a07d574bb0576129c366db97bff78eb3bd98e94d4e889c347109f61680eac1a4627847ba7954cae4acd5be96755a272b8f6463d6ad3f35477d8eeb6 SHA512 2dc8ca60d39c8839b4ebc5a7af7a92fe17423e8b2897415adc5089afc6646c5240f5cae2626907bb9ef8eae8c407c825560c429142c288db83f1ad45a24e5e8c
 MISC metadata.xml 1423 BLAKE2B 1e1d2bc292338c5cab820a087f22fd4bd9517b85a6a1d52175cc666f329a2ce1f9cfcea6da01a02328395e15b0dbcb91e755fa8dde6709d1bbc47a0b34bb1e22 SHA512 013db66fb8ed106d739faad36c5b2014917526791839ea1e9bb9d4f588de666eb9a662dd5550be7f781a3346314d885742586ce9382d6745b3f7a9c1e9c37cc7
diff --git a/dev-scheme/guile/files/guile-3.0.10-c23.patch b/dev-scheme/guile/files/guile-3.0.10-c23.patch
new file mode 100644
index 000000000000..058a8bf35106
--- /dev/null
+++ b/dev-scheme/guile/files/guile-3.0.10-c23.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/943712
+https://git.savannah.gnu.org/cgit/guile.git/commit/?id=c2e7d834c26dca39e0a2dc6784fc47814969817a
+
+From c2e7d834c26dca39e0a2dc6784fc47814969817a Mon Sep 17 00:00:00 2001
+From: Andy Wingo <wingo@pobox.com>
+Date: Tue, 25 Jun 2024 09:30:21 +0200
+Subject: Fix compilation with C23
+
+* libguile/jit.c (is_unreachable): Rename from "unreachable", which is
+apparently a new reserved word in C23.
+--- a/libguile/jit.c
++++ b/libguile/jit.c
+@@ -370,7 +370,7 @@ set_register_state (scm_jit_state *j, uint32_t state)
+ }
+ 
+ static uint32_t
+-unreachable (scm_jit_state *j)
++is_unreachable (scm_jit_state *j)
+ {
+   return j->register_state & UNREACHABLE;
+ }
+@@ -382,7 +382,7 @@ has_register_state (scm_jit_state *j, uint32_t state)
+ }
+ 
+ #define ASSERT_HAS_REGISTER_STATE(state) \
+-  ASSERT (unreachable (j) || has_register_state (j, state));
++  ASSERT (is_unreachable (j) || has_register_state (j, state));
+ 
+ static void
+ record_gpr_clobber (scm_jit_state *j, jit_gpr_t r)
+-- 
+cgit v1.2.3-70-g09d2
diff --git a/dev-scheme/guile/guile-3.0.10-r102.ebuild b/dev-scheme/guile/guile-3.0.10-r102.ebuild
index 07938f74b4ba..479ed6113c66 100644
--- a/dev-scheme/guile/guile-3.0.10-r102.ebuild
+++ b/dev-scheme/guile/guile-3.0.10-r102.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.3-gentoo-sandbox.patch
 	"${FILESDIR}/${PN}-3.0-fix-32bit-BE.patch"
 	"${FILESDIR}/${PN}-3.0.10-backport-issue72913.patch"
+	"${FILESDIR}/${PN}-3.0.10-c23.patch"
 )
 
 # Where to install data files.