diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-scheme/gauche/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-scheme/gauche/files')
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9.10-info.patch | 95 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9.10-srfi-134.patch | 56 |
2 files changed, 0 insertions, 151 deletions
diff --git a/dev-scheme/gauche/files/gauche-0.9.10-info.patch b/dev-scheme/gauche/files/gauche-0.9.10-info.patch deleted file mode 100644 index f60f1f8a87d8..000000000000 --- a/dev-scheme/gauche/files/gauche-0.9.10-info.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -417,7 +417,6 @@ - AC_CHECK_PROGS(AR, ar gar) - AC_CHECK_PROGS(AS, as gas) - AC_CHECK_PROGS(MAKEINFO, makeinfo) --AC_CHECK_PROGS(GZIP_PROGRAM, gzip) - - dnl for cross build - AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc) ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -16,7 +16,6 @@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTDIR = $(top_srcdir)/mkinstalldirs - MAKEINFO = @MAKEINFO@ --GZIP_PROGRAM = @GZIP_PROGRAM@ - VERSION_INFO = @PACKAGE_STRING@ - - MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm -@@ -58,7 +57,7 @@ - texi html htmls dvi pdf info \ - clean distclean maintainer-clean - --.SUFFIXES: .texi .html .info.gz .pdf .dvi -+.SUFFIXES: .texi .html .info .pdf .dvi - - all: info - -@@ -66,7 +65,7 @@ - if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi - $(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1" - if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi -- if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \ -+ if test -f gauche-refe.info -o -f gauche-refj.info; then \ - for info in *.info*; do \ - $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \ - done; \ -@@ -94,8 +93,8 @@ - %/index.html : %.texi - $(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)" - --%.info.gz : %.texi -- $(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)" -+%.info : %.texi -+ $(MAKEDOC) info $< "$(MAKEINFO)" - - %.pdf : %.texi - $(MAKEDOC) pdf $< "$(MAKEINFO)" -@@ -113,7 +112,7 @@ - htmls : gauche-refe/index.html gauche-refj/index.html - dvi : gauche-refe.dvi gauche-refj.dvi - pdf : gauche-refe.pdf gauche-refj.pdf --info : gauche-refe.info.gz gauche-refj.info.gz -+info : gauche-refe.info gauche-refj.info - - gauche-refe.texi : $(TEXIS) extract.scm - $(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi ---- a/doc/makedoc.scm -+++ b/doc/makedoc.scm -@@ -16,7 +16,7 @@ - [gauche.sys.setenv (sys-putenv "LANG=C")] - [else]) - (if (match (cdr args) -- [("info" input makeinfo gzip) (do-info input makeinfo gzip)] -+ [("info" input makeinfo) (do-info input makeinfo)] - [("html" input makeinfo) (do-html input makeinfo)] - [("htmls" input makeinfo version) (do-htmls input makeinfo version)] - [("pdf" input makeinfo) (do-pdf input makeinfo)] -@@ -27,7 +27,7 @@ - (define (usage) - (print "Usage: gosh makedoc.scm command args ...") - (print "Valid commands (and args):") -- (print " info input MAKEINFO GZIP - generate info doc") -+ (print " info input MAKEINFO - generate info doc") - (print " html input MAKEINFO - generate single html") - (print " htmls input MAKEINFO VERSION-STRING - generate html files in subdir") - (print " pdf input MAKEINFO - generate pdf") -@@ -55,14 +55,11 @@ - (warn "makeinfo version ~a or greater is required, but ~a's \ - version is ~a. Skipping.\n" min-version makeinfo vers))))) - --(define (do-info input makeinfo gzip) -+(define (do-info input makeinfo) - (define info (path-swap-extension input "info")) - (or (string-null? makeinfo) -- (string-null? gzip) - (not (check-makeinfo-version makeinfo "5.0")) -- (and (do-process (make-cmd `(,makeinfo ,input))) -- (begin (remove-files (glob #"~|info|*.gz")) -- (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*")))))))) -+ (and (do-process (make-cmd `(,makeinfo ,input)))))) - - (define (do-html input makeinfo) - (or (string-null? makeinfo) diff --git a/dev-scheme/gauche/files/gauche-0.9.10-srfi-134.patch b/dev-scheme/gauche/files/gauche-0.9.10-srfi-134.patch deleted file mode 100644 index 1e9da832083e..000000000000 --- a/dev-scheme/gauche/files/gauche-0.9.10-srfi-134.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 8582c68d127b0127f15e1a7f74265e3c0e9f3d87 -Author: Shiro Kawai <shiro@acm.org> -Date: Tue Dec 22 10:34:09 2020 -1000 - - Incorporate upstream fixes - - https://github.com/scheme-requests-for-implementation/srfi-134/commit/2bfd4b585c8140c25f4fdd9adef84ab3ceca67b3 - -diff --git a/lib/data/ideque.scm b/lib/data/ideque.scm -index 484ca52b4..e4894e2d0 100644 ---- a/lib/data/ideque.scm -+++ b/lib/data/ideque.scm -@@ -231,12 +231,12 @@ - (define (%ideque-drop dq n) ; n is within the range - (match-let1 ($ <ideque> lenf f lenr r) dq - (if (<= n lenf) -- (check n (drop f n) lenr r) -+ (check (- lenf n) (drop f n) lenr r) - (let1 lenr. (- lenr (- n lenf)) - (check 0 '() lenr. (take r lenr.)))))) - - (define (%check-length dq n) -- (unless (<= 0 n (- (ideque-length dq) 1)) -+ (unless (<= 0 n (ideque-length dq)) - (error "argument is out of range:" n))) - - ;; API [srfi-134] -diff --git a/test/include/ideque-tests.scm b/test/include/ideque-tests.scm -index 63f3f73a0..5e4c9e023 100644 ---- a/test/include/ideque-tests.scm -+++ b/test/include/ideque-tests.scm -@@ -50,6 +50,12 @@ - (test-assert (ideque-empty? (ideque-remove-back (ideque 1)))) - (test 0 (ideque-front (ideque-add-front (ideque 1 2 3) 0))) - (test 0 (ideque-back (ideque-add-back (ideque 1 2 3) 0))) -+ ;; loss of front ideque -+ (let ((id (ideque #f #f #f #f #f #f #f #f #f #f #f #f #f #f #f #f #f #f))) -+ (set! id (ideque-remove-front (ideque-add-back id 1))) -+ (set! id (ideque-remove-front (ideque-add-back id 1))) -+ (set! id (ideque-remove-front (ideque-add-back id 1))) -+ (test #f (ideque-front (ideque-take-right id 12)))) - ) - - (test-group "ideque/other-accessors" -@@ -63,7 +69,11 @@ - (map ideque->list xs)))) - lis))) - (check 'ideque-take ideque-take take 7) -+ (test '(1 2 3 4) (ideque->list (ideque-take (ideque 1 2 3 4) 4))) -+ (test '(1 2 3 4) (ideque->list (ideque-take-right (ideque 1 2 3 4) 4))) - (check 'ideque-drop ideque-drop drop 6) -+ (test '() (ideque->list (ideque-drop (ideque 1 2 3 4) 4))) -+ (test '() (ideque->list (ideque-drop-right (ideque 1 2 3 4) 4))) - (check 'ideque-split-at ideque-split-at split-at 8) - ;; out-of-range conditions - (test-error (ideque->list (ideque-take (ideque 1 2 3 4 5 6 7) 10))) |