commit: 247ce4067451b82b642c53823231f8ebfe32a879 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sun Feb 14 14:18:48 2021 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sun Feb 14 14:18:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247ce406
dev-scheme/gauche: fix build Closes: https://bugs.gentoo.org/767310 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> dev-scheme/gauche/Manifest | 1 + .../gauche/files/gauche-0.9.10-sys-ctermid.patch | 27 ---------------------- dev-scheme/gauche/gauche-0.9.10.ebuild | 5 ++-- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest index 2e14732c353..dfbf6674e9a 100644 --- a/dev-scheme/gauche/Manifest +++ b/dev-scheme/gauche/Manifest @@ -1,2 +1,3 @@ DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0 DIST Gauche-0.9.9.tgz 7244347 BLAKE2B 843fe0c7341c7020ad9130edfc41f02eeda0bc2e1f8983f83faf443f69073e132a9a2f37e6a6260334ab9aacc3e976a2df68d4c43f17f6ea07531c14e783efec SHA512 ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210 +DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed diff --git a/dev-scheme/gauche/files/gauche-0.9.10-sys-ctermid.patch b/dev-scheme/gauche/files/gauche-0.9.10-sys-ctermid.patch deleted file mode 100644 index 18e4d5d2295..00000000000 --- a/dev-scheme/gauche/files/gauche-0.9.10-sys-ctermid.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit f3b4beb18f256e733a4c699e96118d47a2191b74 -Author: Shiro Kawai <[email protected]> -Date: Wed Dec 23 16:22:10 2020 -1000 - - Fix sys-ctermid out-of-extent memory access bug - - https://github.com/shirok/Gauche/issues/740 - -diff --git a/src/libsys.scm b/src/libsys.scm -index f253c08a4..7f433c184 100644 ---- a/src/libsys.scm -+++ b/src/libsys.scm -@@ -460,11 +460,11 @@ - (define-cproc sys-mkdtemp (template::<string>) Scm_SysMkdtemp) - - ;; ctermid --(define-cproc sys-ctermid () ::<const-cstring> -+(define-cproc sys-ctermid () - (.if "defined(GAUCHE_WINDOWS)" -- (return "CON") -+ (return '"CON") - (let* ([buf::(.array char [(+ L_ctermid 1)])]) -- (return (ctermid buf))))) -+ (return (SCM_MAKE_STR_COPYING (ctermid buf)))))) - - ;;--------------------------------------------------------------------- - ;; stdlib.h diff --git a/dev-scheme/gauche/gauche-0.9.10.ebuild b/dev-scheme/gauche/gauche-0.9.10.ebuild index a5c71f6e454..1e2b95e5bc2 100644 --- a/dev-scheme/gauche/gauche-0.9.10.ebuild +++ b/dev-scheme/gauche/gauche-0.9.10.ebuild @@ -9,7 +9,8 @@ MY_P="${P^g}" DESCRIPTION="A Unix system friendly Scheme Interpreter" HOMEPAGE="http://practical-scheme.net/gauche/"; -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz + https://dev.gentoo.org/~hattya/distfiles/${P}-sys-ctermid.patch.xz"; LICENSE="BSD" SLOT="0/$(ver_cut 1-2)7" @@ -33,7 +34,7 @@ PATCHES=( "${FILESDIR}"/${PN}-rfc.tls.patch "${FILESDIR}"/${PN}-xz-info.patch "${FILESDIR}"/${P}-srfi-134.patch - "${FILESDIR}"/${P}-sys-ctermid.patch + "${WORKDIR}"/${P}-sys-ctermid.patch ) DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
