diff options
Diffstat (limited to 'dev-lang/xsb')
| -rw-r--r-- | dev-lang/xsb/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-4.0.0-gcc14-build-fix.patch | 11 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-4.0.0-gcc14-sql.patch | 16 | ||||
| -rw-r--r-- | dev-lang/xsb/xsb-4.0.0-r2.ebuild (renamed from dev-lang/xsb/xsb-4.0.0-r1.ebuild) | 4 |
4 files changed, 33 insertions, 2 deletions
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest index eb75f247e006..f9a3b6282cbb 100644 --- a/dev-lang/xsb/Manifest +++ b/dev-lang/xsb/Manifest @@ -1,5 +1,7 @@ AUX 0001-modern-C-fix-for-implicit-int.patch 998 BLAKE2B 4a9212fc68098914ac12593e2007c7444eb6d7b8f9461640ecc50c8c8c30631475c9e0663808df450b168d8156c346807454eb8795b11e43ac7f4abfa08475e0 SHA512 cb857bdd2bd496531c96a30fb2f4b84f894614adcaed7b6b4f809c3e9e256366e06218e0553c7c15af2b718653f2be3d2a45393849392650550c8d61a7b6bf60 +AUX xsb-4.0.0-gcc14-build-fix.patch 556 BLAKE2B bb50d8c4a64373314d5d58ffaa66bc84f076a6adbc048c610471b783628f98e12fdd71b09200327ea6fd9c1163fb03171cf3a38c00d44e33e046e247bac1b160 SHA512 7f173f93f723ff1112cbed7956e9fe741ef498dec4bbda193ee4f8f11119cfeacd4646fd8cadbe423b309eff86be3bfbdfab05a97db222f3c97031b34546f4ac +AUX xsb-4.0.0-gcc14-sql.patch 808 BLAKE2B 52afa9e8b8b9c28540e1b880724776358342550d46e597c2a327dd02e48665fa8dc9b38f1450847f3053b377a4e78336d5a1d4fef0f11412d79f7da7022eb607 SHA512 10fe40d09f5896d80237e39c2cc022efba94fae618145659b1c2e22b9ebb9e6db299e94860adb62322162b26847754e4a4c989ce8dc5913ae959e97d9b2febcb DIST XSB-4-0-0.tar.gz 15340635 BLAKE2B 4832185a64c6c5786ae78e111c25cd3a5ffc2f80aec9c0c83f030ead482868c77b0d7abbfdf0d113b56fea395eb7e69ca2970a82ea70004fb78c0bf4de258a9d SHA512 fed1e0db4874db2508e0c1e716be20cbfbc4f7ed4c16e0b220750cfb3dfceb78bbdce0f8564b68c400af1bc2b8f9e3b35014e8849bba1705bddfab824f41e816 DIST xsb-4.0.0-gentoo-patchset-3.tar.gz 10487 BLAKE2B 37253b8e5bfd36cdf51f231e75215ea31d50f121e3c8b1126adfbc8998622f2a4ebdb976b3c67c13738095fd4b23b35e166a895c4ee038b1cae7ad962684ce86 SHA512 51738e5dd64711f42e5c8d831c955c533dbe900a129cc0e7eb5d393ef13d7b6206e5e9fc0e90b1422adb2d8c00ec870a50164d420a02da23770ba0ad3350b10b -EBUILD xsb-4.0.0-r1.ebuild 4514 BLAKE2B 1fb92d957672821e9a205fbd6d93c6b9e95f87c1f5cc2ff485cd414a1ca1fc590dbcf262db4d66192bbb262f571b0d5fbdfaa8befb5127d6ebead4e40d24100b SHA512 237b9a1ec204c788eb40a4825f96d91c9859e4747235d214bc7de3c8c7fd9d8ff08b8996800425eaec73295ca64a10f6910399172fe398b249095308b155fb7f +EBUILD xsb-4.0.0-r2.ebuild 4602 BLAKE2B 3f0d5f5984ee7c511a371af7e0355cdd3661d9579a912d9661a2d78ca7e2f5d9342daa4997d444bab64057da1768bb7f1190e8be58f4be1de1aeb4a803ad4fca SHA512 437fd589284b8676d9d5a51a7d93c19f15a9880bc7bde25d7490d31ba49aa8fa998b628bedfc3906ef6f335709c1ed0d35212f2d7f581d08df4722784dc6e0f7 MISC metadata.xml 407 BLAKE2B bf2a1312d435a5b31fcc0536849ded569d7512ec8e2e7471c253586bc866e7ffb915311725efeef8f2c7d227a82ba615a5fa69380454efb654e719177e35a67e SHA512 87aa031c2a64c878f24be293a3e4cdf391b696a7ef96faa4f209fcfeb56db74f29a1e3de7ad845f84eca86d8b81944ecae6e4ea1119699b72bfcf125735a0c03 diff --git a/dev-lang/xsb/files/xsb-4.0.0-gcc14-build-fix.patch b/dev-lang/xsb/files/xsb-4.0.0-gcc14-build-fix.patch new file mode 100644 index 000000000000..86439ff99ef1 --- /dev/null +++ b/dev-lang/xsb/files/xsb-4.0.0-gcc14-build-fix.patch @@ -0,0 +1,11 @@ +--- a/emu/timer_xsb.c ++++ b/emu/timer_xsb.c +@@ -264,7 +264,7 @@ int make_timed_call(CTXTdeclc xsbTimeout *pptr, void (*fptr)(xsbTimeout *)) + pptr->timeout_info.th=th; + // below, fptr is pointer to start routine, pptr is pointer to arg-array. + // TIMED_THREAD_CREATE_ARG is a cell of timeout_info. +- if (pthread_create(TIMED_THREAD_CREATE_ARG, NULL, fptr, pptr)) { ++ if (pthread_create(TIMED_THREAD_CREATE_ARG, NULL, (void *)fptr, pptr)) { + xsb_error("SOCKET_REQUEST: Can't create concurrent timer thread\n"); + return TIMER_SETUP_ERR; + } diff --git a/dev-lang/xsb/files/xsb-4.0.0-gcc14-sql.patch b/dev-lang/xsb/files/xsb-4.0.0-gcc14-sql.patch new file mode 100644 index 000000000000..d100bdbb0cce --- /dev/null +++ b/dev-lang/xsb/files/xsb-4.0.0-gcc14-sql.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/949632 +--- a/emu/odbc_xsb.c 2021-03-06 18:46:16.000000000 -0500 ++++ b/emu/odbc_xsb.c 2025-02-11 15:49:47.204779582 -0500 +@@ -411,10 +411,10 @@ + cberrormsgmax=SQL_MAX_MESSAGE_LENGTH-1; + if (cur != NULL) + rc = SQLError(SQL_NULL_HENV, cur->hdbc, cur->hstmt, szsqlstate, +- pfnativeerror, szerrormsg,cberrormsgmax,pcberrormsg); ++ (void *)pfnativeerror, szerrormsg,cberrormsgmax,pcberrormsg); + else + rc = SQLError(SQL_NULL_HENV, NULL, SQL_NULL_HSTMT, szsqlstate, +- pfnativeerror, szerrormsg,cberrormsgmax,pcberrormsg); ++ (void *)pfnativeerror, szerrormsg,cberrormsgmax,pcberrormsg); + if ((rc == SQL_SUCCESS) || (rc == SQL_SUCCESS_WITH_INFO)) { + term = makecs(hreg); + bld_functor(hreg, pair_psc(insert("odbc_error",2,(Psc)flags[CURRENT_MODULE],&isnew))); diff --git a/dev-lang/xsb/xsb-4.0.0-r1.ebuild b/dev-lang/xsb/xsb-4.0.0-r2.ebuild index 7e053d1e83ff..5f86c637e7b6 100644 --- a/dev-lang/xsb/xsb-4.0.0-r1.ebuild +++ b/dev-lang/xsb/xsb-4.0.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,8 @@ PATCHES=( # https://bugs.gentoo.org/870970 # https://sourceforge.net/p/xsb/bugs/265/ "${FILESDIR}"/0001-modern-C-fix-for-implicit-int.patch + "${FILESDIR}"/xsb-4.0.0-gcc14-build-fix.patch + "${FILESDIR}"/xsb-4.0.0-gcc14-sql.patch ) src_prepare() { |