From f4c6c68e919132a533b15930b9d02ff6964100d1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jul 05 2019 22:14:26 +0000 Subject: Update to 4.3f. Drop dbus-devel BR; the dbus module is not yet buildable. --- diff --git a/bigloo-callcc.patch b/bigloo-callcc.patch index fe1e62b..21c1074 100644 --- a/bigloo-callcc.patch +++ b/bigloo-callcc.patch @@ -1,6 +1,6 @@ --- runtime/Clib/callcc.c.orig 2018-12-18 16:52:51.177402754 -0700 +++ runtime/Clib/callcc.c 2019-01-19 09:18:23.532808135 -0700 -@@ -264,7 +264,7 @@ call_cc( obj_t proc ) { +@@ -283,7 +283,7 @@ call_cc( obj_t proc ) { flush_regs_in_stack(); /* on recupere l'adresse du sommet de pile */ diff --git a/bigloo-emacs.patch b/bigloo-emacs.patch index 1af3037..f680976 100644 --- a/bigloo-emacs.patch +++ b/bigloo-emacs.patch @@ -1,30 +1,5 @@ ---- autoconf/emacsbrand.orig 2018-02-04 23:59:28.000000000 -0700 -+++ autoconf/emacsbrand 2018-06-17 15:34:30.642359854 -0600 -@@ -35,7 +35,8 @@ done - #* The autodetection ELisp expression */ - #*---------------------------------------------------------------------*/ - expr="(cond \ -- ((string-match \"GNU Emacs 25\" (emacs-version)) (kill-emacs 25)) -+ ((string-match \"GNU Emacs 26\" (emacs-version)) (kill-emacs 26)) \ -+ ((string-match \"GNU Emacs 25\" (emacs-version)) (kill-emacs 25)) \ - ((string-match \"GNU Emacs 24\" (emacs-version)) (kill-emacs 24)) \ - ((string-match \"GNU Emacs 23\" (emacs-version)) (kill-emacs 23)) \ - ((string-match \"GNU Emacs 22\" (emacs-version)) (kill-emacs 22)) \ -@@ -67,7 +68,11 @@ else - if [ "$version" = "25" ]; then - echo "emacs25" - else -- echo "generic"; -+ if [ "$version" = "26" ]; then -+ echo "emacs26" -+ else -+ echo "generic"; -+ fi - fi - fi - fi ---- bmacs/bee/bee-browse.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bee/bee-browse.el 2018-06-17 15:32:42.037634520 -0600 +--- bmacs/bee/bee-browse.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bee/bee-browse.el 2019-07-04 11:54:22.999226121 -0600 @@ -144,14 +144,16 @@ (select-frame frame) (select-window win) @@ -44,8 +19,8 @@ (recenter))))) t) ((and (consp command) ---- bmacs/bee/bee-expand.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bee/bee-expand.el 2018-06-17 15:32:42.043634505 -0600 +--- bmacs/bee/bee-expand.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bee/bee-expand.el 2019-07-04 11:54:23.011226115 -0600 @@ -79,9 +79,10 @@ (defun bee-set-expand-temporary-buffer () (if (and (bufferp bee-expand-temporary-buffer) @@ -78,8 +53,8 @@ (write-file fname nil) (bee-expand-buffer-internal))) ---- bmacs/bee/bee-indent.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bee/bee-indent.el 2018-06-17 15:32:42.044634502 -0600 +--- bmacs/bee/bee-indent.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bee/bee-indent.el 2019-07-04 11:54:23.011226115 -0600 @@ -157,7 +157,7 @@ of the start of the containing expressio (defun bee-calculate-forced-indent () (when (> (count-lines 1 (point)) 1) @@ -89,8 +64,8 @@ (beginning-of-line) (skip-chars-forward " \t") (let ((s (current-column))) ---- bmacs/bee/bee-module.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bee/bee-module.el 2018-06-17 15:32:42.045634500 -0600 +--- bmacs/bee/bee-module.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bee/bee-module.el 2019-07-04 11:54:23.012226114 -0600 @@ -359,8 +359,7 @@ ;* bee-get-module-name ... */ ;*---------------------------------------------------------------------*/ @@ -101,8 +76,8 @@ (goto-char (point-min)) ;; first we search for the module declaration (if (re-search-forward (concat "(module[ \n\t]\\(" (ude-ident-regexp) ---- bmacs/bee/bee-usage.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bee/bee-usage.el 2018-06-17 15:32:42.046634497 -0600 +--- bmacs/bee/bee-usage.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bee/bee-usage.el 2019-07-04 11:54:23.012226114 -0600 @@ -33,9 +33,7 @@ (goto-char pos) (beginning-of-line) @@ -123,8 +98,8 @@ (ude-error "Can't find buffer for %S" file)))))))) ;*---------------------------------------------------------------------*/ ---- bmacs/bug/bug-class.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-class.el 2018-06-17 15:32:42.046634497 -0600 +--- bmacs/bug/bug-class.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-class.el 2019-07-04 11:54:23.013226114 -0600 @@ -36,15 +36,13 @@ ;* bug-file-to-string ... */ ;*---------------------------------------------------------------------*/ @@ -158,8 +133,8 @@ (if bug-buffer-class bug-buffer-class (progn ---- bmacs/bug/bug-connect.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-connect.el 2018-06-17 15:32:42.047634495 -0600 +--- bmacs/bug/bug-connect.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-connect.el 2019-07-04 11:54:23.014226113 -0600 @@ -74,8 +74,7 @@ ;* This function returns the point line number. */ ;*---------------------------------------------------------------------*/ @@ -170,8 +145,8 @@ (let (start) (save-excursion (save-restriction ---- bmacs/bug/bug.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug.el 2018-06-17 15:32:42.048634492 -0600 +--- bmacs/bug/bug.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug.el 2019-07-04 11:54:23.014226113 -0600 @@ -71,7 +71,10 @@ and source-file directory for your debug `(,bugname ,binary ,nil ,@(bug-string->list bug-emacs-option) ,a.out)) @@ -194,8 +169,8 @@ (condition-case () (comint-kill-subjob) (error ---- bmacs/bug/bug-filter.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-filter.el 2018-06-17 15:32:42.048634492 -0600 +--- bmacs/bug/bug-filter.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-filter.el 2019-07-04 11:54:23.015226113 -0600 @@ -51,9 +51,7 @@ ;* bug-buffer-text-properties-at ... */ ;*---------------------------------------------------------------------*/ @@ -233,8 +208,8 @@ ;*---------------------------------------------------------------------*/ ;* bug-filter-ident-map ... */ ---- bmacs/bug/bug-gnu-emacs.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-gnu-emacs.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/bug/bug-gnu-emacs.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-gnu-emacs.el 2019-07-04 11:54:23.015226113 -0600 @@ -14,6 +14,7 @@ ;*---------------------------------------------------------------------*/ (provide 'bug-gnu-emacs) @@ -282,8 +257,8 @@ (setq pos (point)) (move-overlay bug-gnu-emacs-source-line-overlay (line-beginning-position) ---- bmacs/bug/bug-hooking.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-hooking.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/bug/bug-hooking.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-hooking.el 2019-07-04 11:54:23.016226112 -0600 @@ -48,7 +48,7 @@ (redisplay-frame) (sit-for 0.2) @@ -313,8 +288,8 @@ (goto-char (point-max)) (insert str)))) (setq bug-prompt-hook ---- bmacs/bug/bug-process.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-process.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/bug/bug-process.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-process.el 2019-07-04 11:54:23.016226112 -0600 @@ -63,8 +63,7 @@ (let ((proc (get-buffer-process bug-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -413,8 +388,8 @@ + (setq bug-waiting nil) + (or (not (numberp timeout)) + (< count timeout)))))))) ---- bmacs/bug/bug-source.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-source.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/bug/bug-source.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-source.el 2019-07-04 11:54:23.016226112 -0600 @@ -80,7 +80,8 @@ (display-buffer buffer)))) (set-buffer buffer) @@ -425,8 +400,8 @@ (set-window-point window (point)) (if bug-raise-active-source-frame-p (let ((frame (window-frame window))) ---- bmacs/bug/bug-xemacs.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/bug/bug-xemacs.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/bug/bug-xemacs.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/bug/bug-xemacs.el 2019-07-04 11:54:23.016226112 -0600 @@ -143,7 +143,8 @@ static char *arrow[] = { (save-excursion (save-restriction @@ -460,8 +435,8 @@ (goto-char char) (let ((o (make-extent (line-beginning-position) (1+ (line-beginning-position)) ---- bmacs/cee/cee-kbdb.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/cee/cee-kbdb.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/cee/cee-kbdb.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/cee/cee-kbdb.el 2019-07-04 11:54:23.016226112 -0600 @@ -389,7 +389,8 @@ (select-frame frame) (select-window win) @@ -482,8 +457,8 @@ (beginning-of-line) t)))) (t ---- bmacs/dbg/dbg-args.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-args.el 2018-06-17 15:32:42.049634490 -0600 +--- bmacs/dbg/dbg-args.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-args.el 2019-07-04 11:54:23.017226112 -0600 @@ -100,8 +100,7 @@ This is implemented using the DBG `args' (let ((proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -529,8 +504,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg-breakpoint.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-breakpoint.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg-breakpoint.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-breakpoint.el 2019-07-04 11:54:23.017226112 -0600 @@ -304,8 +304,7 @@ static char *footprint[] = { (let ((proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -561,8 +536,8 @@ (beginning-of-line) (set-extent-endpoints extent (point) (point)) bp))))) ---- bmacs/dbg/dbg-connect.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-connect.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg-connect.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-connect.el 2019-07-04 11:54:23.017226112 -0600 @@ -157,6 +157,6 @@ ;* Disconnect all currently connected buffers. */ ;*---------------------------------------------------------------------*/ @@ -571,8 +546,8 @@ + (mapc 'dbg-disconnect-buffer dbg-connected-buffers) (setq dbg-connected-buffers '())) ---- bmacs/dbg/dbg-display.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-display.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg-display.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-display.el 2019-07-04 11:54:23.017226112 -0600 @@ -100,8 +100,7 @@ This is implemented using the DBG `displ (let ((proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -618,8 +593,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg.el 2019-07-04 11:54:23.017226112 -0600 @@ -80,7 +80,12 @@ and source-file directory for your debug (setq dbg-marker-filter 'dbg-default-marker-filter) (make-comint dbgname binary nil dbg-emacs-option a.out) @@ -772,8 +747,8 @@ (let (start) (save-excursion (save-restriction ---- bmacs/dbg/dbg-filter.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-filter.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg-filter.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-filter.el 2019-07-04 11:54:23.017226112 -0600 @@ -30,10 +30,12 @@ It is saved for when this flag is not se (defvar dbg-delete-prompt-marker nil) @@ -811,8 +786,8 @@ ;; If we deferred text that arrived during this processing, ;; handle it now. (if dbg-filter-pending-text ---- bmacs/dbg/dbg-locals.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-locals.el 2018-06-17 15:32:42.050634487 -0600 +--- bmacs/dbg/dbg-locals.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-locals.el 2019-07-04 11:54:23.018226111 -0600 @@ -100,8 +100,7 @@ This is implemented using the DBG `local (let ((proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -858,8 +833,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg-mode.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-mode.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/dbg/dbg-mode.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-mode.el 2019-07-04 11:54:23.018226111 -0600 @@ -98,10 +98,7 @@ The following command are available: (make-local-variable 'dbg-delete-prompt-marker) (setq dbg-delete-prompt-marker (make-marker)) @@ -871,8 +846,8 @@ ;; the mouse shape when flying over non text (ude-set-nontext-pointer "left_ptr") ;; we set up kill buffer hook ---- bmacs/dbg/dbg-source.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-source.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/dbg/dbg-source.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-source.el 2019-07-04 11:54:23.018226111 -0600 @@ -152,11 +152,11 @@ static char *arrow[] = { (set-extent-begin-glyph extent dbg-arrow-glyph) (set-extent-begin-glyph-layout extent 'outside-margin) @@ -888,8 +863,8 @@ (set-window-point window (point)) (setq pos (progn (beginning-of-line) ---- bmacs/dbg/dbg-stack.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/dbg/dbg-stack.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/dbg/dbg-stack.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/dbg/dbg-stack.el 2019-07-04 11:54:23.018226111 -0600 @@ -110,8 +110,7 @@ This is implemented using the DBG `stack (proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -935,27 +910,8 @@ (save-excursion (goto-char (event-closest-point event)) (setq selection (dbg-get-frame-number)))) ---- bmacs/Makefile.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/Makefile 2018-06-17 15:35:03.809275972 -0600 -@@ -116,7 +116,7 @@ POPULATION = Makefile README $(EMACS_SOU - #*---------------------------------------------------------------------*/ - all: $(EMACSBRAND) - --emacs22 emacs23 emacs24 emacs25: -+emacs22 emacs23 emacs24 emacs25 emacs26: - (expr=load-path; \ - for p in . $(LOADPATH); do \ - expr="(cons \"../$$p\" (cons \"$$p\" $$expr))"; \ -@@ -181,6 +181,7 @@ install.emacs22: doinstall - install.emacs23: doinstall - install.emacs24: doinstall - install.emacs25: doinstall -+install.emacs26: doinstall - install.xemacs: doinstall - - install.generic: ---- bmacs/ude/id-select.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/id-select.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/ude/id-select.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/id-select.el 2019-07-04 11:54:25.919224674 -0600 @@ -248,6 +248,72 @@ (defvar id-select-prior-buffer 'nil) @@ -1143,8 +1099,8 @@ - (provide 'id-select) ---- bmacs/ude/plugin.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/plugin.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/ude/plugin.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/plugin.el 2019-07-04 11:54:25.920224673 -0600 @@ -371,14 +371,16 @@ process structure hosting the plugin. (select-frame frame) (select-window win) @@ -1164,8 +1120,8 @@ (recenter)))))) ((and (consp command) (memq (car command) '(HELP help))) (let ((prgm (let ((p (cadr command))) ---- bmacs/ude/ude-about.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-about.el 2018-06-17 15:32:42.051634485 -0600 +--- bmacs/ude/ude-about.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-about.el 2019-07-04 11:54:25.920224673 -0600 @@ -27,8 +27,7 @@ (if (featurep 'xemacs) (let ((window-min-height 1) @@ -1200,8 +1156,8 @@ (ude-about-insert-xpm (current-buffer) xpm) (insert "\n") (insert msg) ---- bmacs/ude/ude-autoload.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-autoload.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-autoload.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-autoload.el 2019-07-04 11:54:25.921224673 -0600 @@ -17,6 +17,7 @@ (autoload 'ude-customize "ude-custom" "Ude customization." t) ;; config @@ -1219,8 +1175,8 @@ (autoload 'ude-balloon-start "ude-balloon" "Bdb balloon system." t) (autoload 'ude-balloon-stop "ude-balloon" "Bdb balloon system." t) (autoload 'ude-balloon-get-buffer "ude-balloon" "Bdb balloon system." t) ---- bmacs/ude/ude-compile.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-compile.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-compile.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-compile.el 2019-07-04 11:54:25.921224673 -0600 @@ -344,8 +344,7 @@ Executed hooks are removed from that lis (ude-pop-compilation-frame-on-error ;; we have to pop up a frame @@ -1231,8 +1187,8 @@ (+ 2 (count-lines (point-min) (point-max))))) (cur-height (frame-height (selected-frame))) (err-height (if (> height cur-height) cur-height height)) ---- bmacs/ude/ude-docline.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-docline.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-docline.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-docline.el 2019-07-04 11:54:25.922224672 -0600 @@ -106,13 +106,10 @@ (ude-error "Can't find documentation for `%S'" var) (progn @@ -1277,8 +1233,8 @@ (goto-char (point-min)) (let* ((path-regexp "@path[ \t]+\\([^@]+\\)@") (anchor-regexp "@ref[ \t]+\\([^@:]+\\):\\([^@]+\\)@") ---- bmacs/ude/ude-icon.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-icon.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-icon.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-icon.el 2019-07-04 11:54:25.922224672 -0600 @@ -19,6 +19,7 @@ (require 'ude-custom) @@ -1287,8 +1243,8 @@ (add-to-list 'image-load-path (concat bmacs-lispdir "/" ude-toolbar-image-directory)) ---- bmacs/ude/ude-ident.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-ident.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-ident.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-ident.el 2019-07-04 11:54:25.923224672 -0600 @@ -36,8 +36,8 @@ (save-excursion (goto-char pos) @@ -1344,8 +1300,8 @@ (setq ude-tags-balloon-region nil)))) ;*---------------------------------------------------------------------*/ ---- bmacs/ude/ude-makefile.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-makefile.el 2018-06-17 15:32:42.052634482 -0600 +--- bmacs/ude/ude-makefile.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-makefile.el 2019-07-04 11:54:25.923224672 -0600 @@ -209,14 +209,12 @@ (interactive) (let ((default-directory ude-root-directory)) @@ -1417,8 +1373,8 @@ (let* ((cmd (format "%s -o %s -project %s" ude-makemake ude-makefile ---- bmacs/ude/ude-repl.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/ude/ude-repl.el 2018-06-17 15:32:42.053634480 -0600 +--- bmacs/ude/ude-repl.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/ude/ude-repl.el 2019-07-04 11:54:25.924224671 -0600 @@ -43,8 +43,7 @@ 'ude-repl-sentinel) (set-process-filter ude-repl-comint-process @@ -1429,8 +1385,8 @@ (setq comint-prompt-regexp ude-repl-prompt-regexp) (setq comint-scroll-show-maximum-output 0.4) (setq comint-scroll-to-bottom-on-output t) ---- bmacs/xemacs-etags.el.orig 2018-02-04 23:59:28.000000000 -0700 -+++ bmacs/xemacs-etags.el 2018-06-17 15:32:42.053634480 -0600 +--- bmacs/xemacs-etags.el.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bmacs/xemacs-etags.el 2019-07-04 11:54:25.924224671 -0600 @@ -236,8 +236,7 @@ file the tag was in." ;; it is initialized as a tag table buffer. (save-excursion diff --git a/bigloo-format.patch b/bigloo-format.patch index 8362471..0be8b35 100644 --- a/bigloo-format.patch +++ b/bigloo-format.patch @@ -1,5 +1,5 @@ ---- api/avahi/src/Clib/bglavahi.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ api/avahi/src/Clib/bglavahi.c 2018-12-18 16:51:27.563649530 -0700 +--- api/avahi/src/Clib/bglavahi.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ api/avahi/src/Clib/bglavahi.c 2019-07-04 11:56:22.826166771 -0600 @@ -482,7 +482,7 @@ AvahiStringList * bgl_avahi_list_to_string_list( obj_t p ) { // MS: 28 feb 2017 @@ -9,14 +9,30 @@ while( PAIRP( p ) ) { l = avahi_string_list_add( l, BSTRING_TO_STRING( CAR( p ) ) ); ---- comptime/Cc/exec.c.orig 2018-12-18 06:26:34.000000000 -0700 -+++ comptime/Cc/exec.c 2018-12-18 16:51:27.564649527 -0700 +--- bde/bmem/lib/alloc.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ bde/bmem/lib/alloc.c 2019-07-04 13:49:40.481341508 -0600 +@@ -33,11 +33,11 @@ unsigned long ante_bgl_init_dsz = 0; + { long __idx = bmem_thread ? \ + (long)____pthread_getspecific( bmem_key3 ) \ + : alloc_index; \ +- ((__idx < 0 || __idx >= 5) ? (fprintf( stderr, "*** bmem: stack overflow/underflow \"%s\" [%d]\n", name, __idx ), exit( -2 )) : 0) ++ ((__idx < 0 || __idx >= 5) ? (fprintf( stderr, "*** bmem: stack overflow/underflow \"%s\" [%ld]\n", name, __idx ), exit( -2 )) : 0) + + #define DBG_INDEX_STOP( name ) \ + (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index) != (__idx -1) \ +- ? fprintf( stderr, "*** bmem: illegal stack after \"%s\" [%d/%d]\n", name, (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index), __idx - 1), exit( -1 ) : 0; } 0 ++ ? fprintf( stderr, "*** bmem: illegal stack after \"%s\" [%ld/%ld]\n", name, (bmem_thread ? (long)____pthread_getspecific( bmem_key3 ) : alloc_index), __idx - 1), exit( -1 ) : 0; } 0 + + /*---------------------------------------------------------------------*/ + /* char * */ +--- comptime/Cc/exec.c.orig 2019-07-04 00:10:26.000000000 -0600 ++++ comptime/Cc/exec.c 2019-07-04 11:56:22.827166770 -0600 @@ -342,7 +342,7 @@ extern "C" BSTRING_TO_STRING(BGl_za2shellza2z00zzengine_paramz00); - BgL_arg1030z00_37 = + BgL_arg1031z00_37 = execl(BgL_tmpz00_118, BgL_auxz00_120, BgL_auxz00_122, - BgL_auxz00_124, 0L); + BgL_auxz00_124, NULL); } - bgl_display_obj(BINT(BgL_arg1030z00_37), BgL_port1016z00_36); + bgl_display_obj(BINT(BgL_arg1031z00_37), BgL_port1017z00_36); } diff --git a/bigloo-memread.patch b/bigloo-memread.patch index 4aab67d..abf0952 100644 --- a/bigloo-memread.patch +++ b/bigloo-memread.patch @@ -1,34 +1,6 @@ ---- runtime/Clib/csocket.c.orig 2018-12-18 16:52:09.914524595 -0700 -+++ runtime/Clib/csocket.c 2018-12-18 16:52:39.254438046 -0700 -@@ -1703,8 +1703,8 @@ bgl_socket_localp( obj_t sock ) { - if( SOCKET( sock ).stype == BGL_SOCKET_SERVER ) { - return 0; - } else { -- struct sockaddr_in sin; -- int len = sizeof( sin ); -+ struct sockaddr_storage sstor; -+ int len = sizeof( sstor ); - - if( getsockname( SOCKET( sock ).fd, - (struct sockaddr *)&sin, -@@ -1718,12 +1718,14 @@ bgl_socket_localp( obj_t sock ) { - socket_error( "socket-localp", buffer, sock ); - } else if( SOCKET( sock ).family == AF_INET ) { - /* ipv4 addr */ -- return sin.sin_addr.s_addr == SOCKET( sock ).address.in_addr.s_addr; -+ struct sockaddr_in *sin = (struct sockaddr_in *)(void *)&sstor; -+ return sin->sin_addr.s_addr == SOCKET( sock ).address.in_addr.s_addr; - } else { - /* ipv6 addr */ - /* MS: 17nov2014 don't know how to implement this */ -+ struct sockaddr_in6 *sin = (struct sockaddr_in6 *)(void *)&sstor; - fprintf( stderr, "(%s:%d) IPV6 UNTESTED\n", __FILE__, __LINE__ ); -- return memcmp( (char *)&(((struct sockaddr_in6 *)( &sin ))->sin6_addr), -+ return memcmp( (char *)&(sin->sin6_addr), - (char *)&(SOCKET( sock ).address.in6_addr), - sizeof( (SOCKET( sock ).address.in6_addr) ) ); - } -@@ -2632,7 +2634,7 @@ bgl_make_datagram_server_socket( int por +--- runtime/Clib/csocket.c.orig 2019-07-04 11:57:18.460139217 -0600 ++++ runtime/Clib/csocket.c 2019-07-04 11:57:38.044129214 -0600 +@@ -2642,7 +2642,7 @@ bgl_make_datagram_server_socket( int por int s; struct addrinfo hints, *servinfo, *p; int rv; diff --git a/bigloo-noreturn.patch b/bigloo-noreturn.patch index ed640ad..c5b8ff4 100644 --- a/bigloo-noreturn.patch +++ b/bigloo-noreturn.patch @@ -1,5 +1,5 @@ ---- runtime/Clib/capply.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/capply.c 2018-12-18 16:52:09.912524601 -0700 +--- runtime/Clib/capply.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/capply.c 2019-07-04 11:57:18.458139218 -0600 @@ -13,7 +13,7 @@ /*---------------------------------------------------------------------*/ /* Les recuperations externes */ @@ -9,8 +9,8 @@ extern long bgl_list_length( obj_t ); /*---------------------------------------------------------------------*/ ---- runtime/Clib/cmain.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/cmain.c 2018-12-18 16:52:09.913524598 -0700 +--- runtime/Clib/cmain.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/cmain.c 2019-07-04 11:57:18.459139217 -0600 @@ -40,7 +40,7 @@ extern void cref(); extern void memshow(); extern void bgl_init_eval_cnst(); @@ -20,8 +20,8 @@ extern void bgl_init_objects(); extern obj_t bigloo_exit_apply( obj_t ); extern void *bgl_callcc_get_top_of_stack( void * ); ---- runtime/Clib/csocket.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/csocket.c 2018-12-18 16:52:09.914524595 -0700 +--- runtime/Clib/csocket.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/csocket.c 2019-07-04 11:57:18.460139217 -0600 @@ -254,7 +254,7 @@ bgl_init_socket() { /* static void */ /* socket_error ... */ @@ -40,9 +40,9 @@ socket_timeout_error( obj_t hostname, int port ) { char buffer[ 512 ]; ---- runtime/Include/bigloo.h.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Include/bigloo.h 2018-12-18 16:52:09.915524592 -0700 -@@ -2277,7 +2277,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread +--- runtime/Include/bigloo.h.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Include/bigloo.h 2019-07-04 11:57:18.460139217 -0600 +@@ -2282,7 +2282,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread /*---------------------------------------------------------------------*/ /* The external declarations */ /*---------------------------------------------------------------------*/ diff --git a/bigloo-params.patch b/bigloo-params.patch index 97f15da..ff1488b 100644 --- a/bigloo-params.patch +++ b/bigloo-params.patch @@ -1,16 +1,16 @@ ---- runtime/Clib/callcc.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/callcc.c 2018-12-18 16:52:51.177402754 -0700 +--- runtime/Clib/callcc.c.orig 2019-07-04 12:00:22.002011080 -0600 ++++ runtime/Clib/callcc.c 2019-07-04 12:01:21.294968359 -0600 @@ -27,7 +27,7 @@ extern long glob_dummy; extern obj_t make_fx_procedure( obj_t (*)(), int, int ); extern obj_t c_constant_string_to_string( char * ); -static obj_t callcc_restore_stack(); +static obj_t callcc_restore_stack( obj_t, obj_t, char ** ); - extern obj_t unwind_stack_until( struct exitd *, obj_t, obj_t, obj_t ); + extern obj_t unwind_stack_until( obj_t, obj_t, obj_t, obj_t ); extern bool_t unwind_stack_value_p( obj_t ); extern void *bgl_get_top_of_stack(); ---- runtime/Clib/cerror.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/cerror.c 2018-12-18 16:52:51.178402751 -0700 +--- runtime/Clib/cerror.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/cerror.c 2019-07-04 12:00:22.003011079 -0600 @@ -23,9 +23,8 @@ extern int errno; /* Les recuperations externes */ /*---------------------------------------------------------------------*/ @@ -23,8 +23,8 @@ #endif extern obj_t bgl_typeof( obj_t ); ---- runtime/Clib/cinit_obj.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/cinit_obj.c 2018-12-18 16:52:51.179402747 -0700 +--- runtime/Clib/cinit_obj.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/cinit_obj.c 2019-07-04 12:00:22.003011079 -0600 @@ -43,7 +43,7 @@ BGL_RUNTIME_DEF union nanobj bigloo_nan, /*---------------------------------------------------------------------*/ /* Importations */ @@ -34,8 +34,8 @@ extern void bgl_init_dynamic_env(); extern void bgl_init_symbol_table(); extern void bgl_init_socket(); ---- runtime/Clib/cmain.c.orig 2018-12-18 16:52:25.221479441 -0700 -+++ runtime/Clib/cmain.c 2018-12-18 16:52:51.179402747 -0700 +--- runtime/Clib/cmain.c.orig 2019-07-04 11:57:31.858132579 -0600 ++++ runtime/Clib/cmain.c 2019-07-04 12:00:22.004011078 -0600 @@ -36,8 +36,8 @@ BGL_RUNTIME_DEF long heap_size = DEFAULT /*---------------------------------------------------------------------*/ /* Des recuperations externes */ @@ -56,8 +56,8 @@ #endif /*---------------------------------------------------------------------*/ ---- runtime/Clib/cports.c.orig 2018-12-18 16:52:25.222479438 -0700 -+++ runtime/Clib/cports.c 2018-12-18 16:52:51.179402747 -0700 +--- runtime/Clib/cports.c.orig 2019-07-04 11:57:31.859132578 -0600 ++++ runtime/Clib/cports.c 2019-07-04 12:00:22.004011078 -0600 @@ -113,7 +113,7 @@ /*---------------------------------------------------------------------*/ #if( BGL_HAVE_SENDFILE ) @@ -67,8 +67,8 @@ # define BGL_SENDFILE sendfile # else # if( BGL_SENDFILE_BRAND == BGL_SENDFILE_BSD ) ---- runtime/Clib/cprocess.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/cprocess.c 2018-12-18 16:52:51.180402745 -0700 +--- runtime/Clib/cprocess.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/cprocess.c 2019-07-04 12:00:22.004011078 -0600 @@ -57,7 +57,7 @@ extern obj_t bgl_close_input_port( obj_t extern long bgl_list_length( obj_t ); extern char *bgl_string_to_gc_cstring( obj_t ); @@ -78,8 +78,8 @@ extern obj_t make_string_sans_fill( long ); /*---------------------------------------------------------------------*/ ---- runtime/Clib/csocket.c.orig 2018-12-18 16:52:39.254438046 -0700 -+++ runtime/Clib/csocket.c 2018-12-18 16:52:51.180402745 -0700 +--- runtime/Clib/csocket.c.orig 2019-07-04 11:57:38.044129214 -0600 ++++ runtime/Clib/csocket.c 2019-07-04 12:00:22.005011078 -0600 @@ -149,12 +149,11 @@ extern unsigned char bgl_get_hash_number extern bool_t bigloo_strcmp( obj_t o1, obj_t o2 ); extern bool_t bgl_dns_enable_cache(); @@ -95,8 +95,8 @@ #endif /*---------------------------------------------------------------------*/ ---- runtime/Clib/inline_alloc.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/inline_alloc.c 2018-12-18 16:52:51.180402745 -0700 +--- runtime/Clib/inline_alloc.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/inline_alloc.c 2019-07-04 12:00:22.005011078 -0600 @@ -38,7 +38,7 @@ gcollect_verbose( unsigned long heapsz, GC_API void bgl_gc_verbose_set( bool_t verbose ) { diff --git a/bigloo-return.patch b/bigloo-return.patch index fda7ee4..4ec3ea1 100644 --- a/bigloo-return.patch +++ b/bigloo-return.patch @@ -1,5 +1,54 @@ ---- runtime/Clib/cmain.c.orig 2018-12-18 16:52:09.913524598 -0700 -+++ runtime/Clib/cmain.c 2018-12-18 16:52:25.221479441 -0700 +--- api/flac/src/Clib/bglflac.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ api/flac/src/Clib/bglflac.c 2019-07-04 14:03:36.608479002 -0600 +@@ -122,6 +122,7 @@ int bgl_flac_dump( char *l, unsigned cha + + fprintf( stderr, "\n" ); + fflush( stderr ); ++ return 0; + } + + /*---------------------------------------------------------------------*/ +--- api/libuv/src/Clib/bgluv.c.orig 2019-07-04 14:01:31.496607770 -0600 ++++ api/libuv/src/Clib/bgluv.c 2019-07-04 14:32:57.822811957 -0600 +@@ -2020,6 +2020,8 @@ string_array_to_vector( char *array[] ) + for( i = 0, runner = array; i < len; i++, runner++ ) { + VECTOR_SET( res, i, string_to_bstring( *runner ) ); + } ++ ++ return res; + } + + /*---------------------------------------------------------------------*/ +--- api/phidget/src/Clib/bglphidget.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ api/phidget/src/Clib/bglphidget.c 2019-07-04 14:02:52.921523965 -0600 +@@ -1647,6 +1647,7 @@ bgl_phidget_encoder_add_event_listener( + return CPhidgetEncoder_set_OnIndex_Handler( + id, &bgl_encoderindex_handler, hdl ); + } ++ return -1; + } + + /*---------------------------------------------------------------------*/ +--- api/ssl/src/C/bglssl.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ api/ssl/src/C/bglssl.c 2019-07-04 13:59:34.256728457 -0600 +@@ -1508,6 +1508,7 @@ bgl_ssl_connection_close( ssl_connection + SSL *_ssl = CCON( ssl )->BgL_z42nativez42; + + SSL_free( _ssl ); ++ return 0; + } + + /*---------------------------------------------------------------------*/ +@@ -2493,6 +2494,7 @@ unsupported: + BGL_RUNTIME_DEF obj_t + bgl_ssl_ctx_close( secure_context sc ) { + SSL_CTX_free( CSC( sc )->BgL_z42nativez42 ); ++ return BNIL; + } + + /*---------------------------------------------------------------------*/ +--- runtime/Clib/cmain.c.orig 2019-07-04 11:57:18.459139217 -0600 ++++ runtime/Clib/cmain.c 2019-07-04 13:57:22.882863809 -0600 @@ -116,10 +116,6 @@ bigloo_exit( obj_t val ) { n = (long)INTEGERP( val ) ? (long)CINT( val ) : 0; @@ -11,8 +60,8 @@ } /*---------------------------------------------------------------------*/ ---- runtime/Clib/cports.c.orig 2018-12-18 16:51:21.828666449 -0700 -+++ runtime/Clib/cports.c 2018-12-18 16:52:25.222479438 -0700 +--- runtime/Clib/cports.c.orig 2019-07-04 14:32:03.912846716 -0600 ++++ runtime/Clib/cports.c 2019-07-04 14:32:14.827836833 -0600 @@ -1823,6 +1823,7 @@ bgl_input_port_seek( obj_t port, long po "input-port does not support seeking", port ); @@ -21,8 +70,8 @@ } /*---------------------------------------------------------------------*/ ---- runtime/Clib/crgc.c.orig 2018-12-18 06:25:53.000000000 -0700 -+++ runtime/Clib/crgc.c 2018-12-18 16:52:25.223479435 -0700 +--- runtime/Clib/crgc.c.orig 2019-07-04 00:09:45.000000000 -0600 ++++ runtime/Clib/crgc.c 2019-07-04 13:57:22.884863807 -0600 @@ -859,6 +859,7 @@ int rgc_debug_port( obj_t port, char *ms port, BSTRING_TO_STRING( INPUT_PORT_NAME( port ) ), matchstart, matchstop, forward, bufpos, bufsiz, diff --git a/bigloo.spec b/bigloo.spec index 096373b..344949f 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -19,11 +19,11 @@ # Bigloo has a customized copy of gc %bcond_without customgc -%global bundledgc 7.6.2 +%global bundledgc 8.0.2 Name: bigloo -Version: 4.3e -Release: 2%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} +Version: 4.3f +Release: 1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} Summary: A compiler for the Scheme programming language License: GPLv2+ @@ -61,7 +61,6 @@ BuildRequires: pkgconfig BuildRequires: zip BuildRequires: alsa-lib-devel BuildRequires: avahi-devel -BuildRequires: dbus-devel BuildRequires: flac-devel %if %{without customgc} BuildRequires: gc-devel @@ -163,7 +162,7 @@ sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc # Defeat attempts at inserting unnecessary rpaths sed -ri 's/ ?-Wl,-rpath=[^"]+(")/\1/' configure -# Work around division by zero issue in 4.3c - 4.3e +# Work around division by zero issue in 4.3c - 4.3f %ifarch aarch64 ppc64 ppc64le sed -i 's/a \. b/+inf.0 . +inf.0/' recette/error.scm %endif @@ -332,6 +331,10 @@ make test %changelog +* Fri Jul 5 2019 Jerry James - 4.3f-1 +- Update to 4.3f +- Drop dbus-devel BR; the dbus module is not yet buildable + * Thu Jan 31 2019 Fedora Release Engineering - 4.3e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1600c1c..12b6aaa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bigloo4.3e.tar.gz) = e1b8a5b937dae570420a7b79c5a8bb1ced57fb4aa611494d24c5ec300aa4f3314d91d74b3072c09ef23fc4f18cbc8dd312bd62aa16adcf8ef5704c824d90cd15 +SHA512 (bigloo4.3f.tar.gz) = cbe281480dc3a65e295aa2a032a20fc0b4df5e03ba4c8b52a056a65c694d1a5e7c08ab1599cfa94abe3b7a48b38d1a3646591938cef436f970a17c66ea26e2cf