diff options
Diffstat (limited to 'dev-scheme/c-wrapper')
| -rw-r--r-- | dev-scheme/c-wrapper/Manifest | 5 | ||||
| -rw-r--r-- | dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 6 | ||||
| -rw-r--r-- | dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch | 34 |
4 files changed, 48 insertions, 7 deletions
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest index 7e7b727c4044..2cf44582edd7 100644 --- a/dev-scheme/c-wrapper/Manifest +++ b/dev-scheme/c-wrapper/Manifest @@ -1,8 +1,9 @@ AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790 -AUX c-wrapper-gcc-5.patch 1883 BLAKE2B 089f5b8427b13ff6ca8d9c9b5181724f691bfbf58cfd84b365a5cdc36efc9ea2582e973887d4da30e2ce52a91e5a1d0a6d9461a7b4d31b886c699e7805827969 SHA512 9c6d588f9246f5e80e1639ecadb0b4e1be1a1fe85ba4163592fa74dfec30dca2c61934d072f880fb031aad506387e463a8d399058ad45934bd4c7b16289bef07 +AUX c-wrapper-gcc-5.patch 2046 BLAKE2B 645b7ee67edd8e6d08fdf7f2dd591c745a420eb001cac6aede3f0393871bc538a96ee438ef8d66d5c49e16e493219a9f2607d242c79398e687b62aca22e7f1ee SHA512 174c8f364c1f9660ebb2034a7edbcd8ed640515c883b7cacd672286f70787df4314de2ad90aeca7c528f2522a8bd61c916b73fb06f4dd23e428c2dd55fb44fdd AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3 AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee AUX c-wrapper-info.patch 1920 BLAKE2B 62c60a2dd8783fc0a56d386e02faa8f04bdd570c7119999e51071414f8084f78d47acda9d916b576bea7ba35c65bd0d4c7519cbe52235a40c49e324139587df8 SHA512 1778eb0183e8f6e19fcb8071bb49e542d98f82b49932aeb5c8dc6638c50ea3b802efb5b92837f90854f47d4400b224e6895b3a6bea042b29a91f855fdf319de8 +AUX c-wrapper-texinfo-6.7.patch 1052 BLAKE2B 6c042ee1a386d611be9bd1155fe930995b026eac5722e2264d8b73dee29b2a0371916f7f087c8b8a2031e34e70a064c8396d1870e0f759898e39eaf97d55a068 SHA512 ca2f1697cb81ba7a0cdcccfdab8fde71e94dd8ef8be570bebf9b4cceda0723c178114fc0c713f3998eb102ad19c17889197a80e8f5410032da96e0788d1fc2c8 DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0 -EBUILD c-wrapper-0.6.1-r1.ebuild 865 BLAKE2B db6d9de7e8eede933e58c1af0b57c0e5d2ec41a37296e6d733c4b3b015d6d7ce2f79db09df3cd82c985892a7a0ea46299ce30ed5d49e08da52fb231b41cd9525 SHA512 29ca63e7a896f2b32e5173fdf412d6fa1b96033a61fabcb216e92840993aac2bdf2b07ad4165b70478ad1c9be8949d750a88538ca80f4d013e82dde2b3611c4f +EBUILD c-wrapper-0.6.1-r1.ebuild 934 BLAKE2B 15453a8ac7702e0fab6bde100a6f1cfcdb7541d487b51d09c156ab84deff9589fc87518b3b14e916c1de6ae55a272aa6ea8d038ec0892f828f99ccd06fba196c SHA512 4d47e63118477a144b854be1761d384e0f82e0e362e4954b29396014af5eaf88b201a5276334c6ce13ffcd7280bb7872a8cdc812075d2ebfb0ca1e48fd060643 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2 diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild index 4bf3c117c0ba..f0b7aece565f 100644 --- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild +++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit autotools @@ -11,12 +11,13 @@ SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ia64 x86" +KEYWORDS="amd64 ~ia64 x86" IUSE="examples" RDEPEND="dev-scheme/gauche:= - virtual/libffi" + dev-libs/libffi:=" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-closure.patch @@ -24,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch "${FILESDIR}"/${PN}-glibc-2.25.patch "${FILESDIR}"/${PN}-info.patch + "${FILESDIR}"/${PN}-texinfo-6.7.patch ) HTML_DOCS=( doc/${PN}-ref{e,j}.html ) diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch index 091b1e2da105..98dfaa2f945c 100644 --- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch +++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch @@ -8,7 +8,7 @@ /* skip the first line '# 1 "<stdin>"' */ Scm_ReadLineUnsafe(SCM_PORT(in)); -@@ -1682,16 +1683,26 @@ +@@ -1682,16 +1683,30 @@ } } @@ -28,7 +28,11 @@ - parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str); } + while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in))) ++#ifdef SCM_REGEXP_MULTI_LINE ++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) { ++#else + && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) { ++#endif + if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) { + Scm_Error("[bug] unexpected EOF while parsing macro body"); + } diff --git a/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch new file mode 100644 index 000000000000..97acd86470eb --- /dev/null +++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch @@ -0,0 +1,34 @@ +--- a/doc/c-wrapper-ref.texi ++++ b/doc/c-wrapper-ref.texi +@@ -14,7 +14,7 @@ + @direntry + * c-wrapper reference: (c-wrapper-refj.info). A generic wrapper for C libraries. + @end direntry +-@documentencoding euc-jp ++@documentencoding UTF-8 + @c COMMON + @comment %**end of header + +--- a/doc/extract ++++ b/doc/extract +@@ -138,8 +138,6 @@ + ((en) (filter #/^@c EN$/ #/^@c JP$/)) + ((jp) (filter #/^@c JP$/ #/^@c EN$/)))) + +- (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8)) +- + (unless (= (length a) 1) (usage)) + + (when (eq? *lang* 'jp) +@@ -148,9 +146,9 @@ + (with-input-from-file (car a) + (lambda () + (if *outfile* +- (with-output-to-file *outfile* do-it :encoding outenc) ++ (with-output-to-file *outfile* do-it :encoding 'utf8) + (let1 out (open-output-conversion-port +- (current-output-port) outenc) ++ (current-output-port) 'utf8) + (with-output-to-port out do-it) + (close-output-port out)))) + :encoding 'euc-jp) |