From dedaf221133de81f211668d97b7fbf94f0793682 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Oct 28 2015 19:56:07 +0000 Subject: Update to 4.2b (bz 1264055). --- diff --git a/.gitignore b/.gitignore index f4abc97..623b347 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /bigloo4.1a-2.tar.gz +/bigloo4.2b.tar.gz diff --git a/bigloo-emacs.patch b/bigloo-emacs.patch index 115a018..452a69d 100644 --- a/bigloo-emacs.patch +++ b/bigloo-emacs.patch @@ -1,5 +1,5 @@ ---- ./bmacs/bee/bee-browse.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bee/bee-browse.el 2013-08-02 10:50:11.743239615 -0600 +--- ./bmacs/bee/bee-browse.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bee/bee-browse.el 2015-09-17 19:05:29.065422073 -0600 @@ -144,14 +144,16 @@ (select-frame frame) (select-window win) @@ -19,8 +19,8 @@ (recenter))))) t) ((and (consp command) ---- ./bmacs/bee/bee-expand.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bee/bee-expand.el 2013-08-02 10:50:11.741239617 -0600 +--- ./bmacs/bee/bee-expand.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bee/bee-expand.el 2015-09-17 19:05:29.076421204 -0600 @@ -79,9 +79,10 @@ (defun bee-set-expand-temporary-buffer () (if (and (bufferp bee-expand-temporary-buffer) @@ -53,28 +53,19 @@ (write-file fname nil) (bee-expand-buffer-internal))) ---- ./bmacs/bee/bee-indent.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/bee/bee-indent.el 2013-08-02 10:50:11.742239616 -0600 -@@ -156,7 +156,7 @@ of the start of the containing expressio - ;*---------------------------------------------------------------------*/ - (defun bee-calculate-forced-indent () - (save-excursion -- (previous-line 1) -+ (forward-line -1) - (beginning-of-line) - (skip-chars-forward " \t") - (let ((s (current-column))) -@@ -338,7 +338,7 @@ of the start of the containing expressio - ;*---------------------------------------------------------------------*/ - ;* bee-module-indent-hook ... */ - ;*---------------------------------------------------------------------*/ --(defun bee-module-indent-hook (indent-state point) -+(defun bee-module-indent-hook (state point) - (if (in-modulep state) +--- ./bmacs/bee/bee-indent.el.orig 2015-09-17 19:05:29.078421046 -0600 ++++ ./bmacs/bee/bee-indent.el 2015-09-17 19:06:48.373135957 -0600 +@@ -158,7 +158,7 @@ of the start of the containing expressio + (if (= (count-lines 1 (point)) 1) + 0 (save-excursion - (if (= (1+ (cadr state)) (cadr (cdr state))) ---- ./bmacs/bee/bee-module.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bee/bee-module.el 2013-08-02 10:50:11.742239616 -0600 +- (previous-line 1) ++ (forward-line 1) + (beginning-of-line) + (skip-chars-forward " \t") + (let ((s (current-column))) +--- ./bmacs/bee/bee-module.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bee/bee-module.el 2015-09-17 19:05:29.078421046 -0600 @@ -359,8 +359,7 @@ ;* bee-get-module-name ... */ ;*---------------------------------------------------------------------*/ @@ -85,40 +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-tags.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/bee/bee-tags.el 2013-08-02 10:50:11.742239616 -0600 -@@ -66,7 +66,7 @@ - (defun bee-safe-read (port) - (condition-case err - (read port) -- (error f))) -+ (error port))) - - ;*---------------------------------------------------------------------*/ - ;* bee-find-afile-module ... */ -@@ -165,8 +165,7 @@ - (let ((old-buffer (find-buffer-visiting (concat ude-root-directory - ude-afile-name)))) - (if (bufferp old-buffer) -- (save-excursion -- (set-buffer old-buffer) -+ (with-current-buffer old-buffer - (goto-char (point-min)) - (sort (mapcar #'(lambda (x) (symbol-name (car x))) - (read old-buffer)) ---- ./bmacs/bee/bee-toolbar.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bee/bee-toolbar.el 2013-08-02 10:50:11.741239617 -0600 -@@ -31,7 +31,7 @@ - ;; either the find or the ibuilder button - ,@(if (bee-interface-builder-ready-p) - ;; the ibuilder button -- `(,(ude-ibuilder-icon bee-interface-builder-start "Interface builder")) -+ `((,ude-ibuilder-icon bee-interface-builder-start "Interface builder")) - ;; the find button - `((,ude-edit-icon bee-tags-find "Find definition"))) - ---- ./bmacs/bee/bee-usage.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bee/bee-usage.el 2013-08-02 10:50:11.741239617 -0600 +--- ./bmacs/bee/bee-usage.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bee/bee-usage.el 2015-09-17 19:05:37.777734017 -0600 @@ -33,9 +33,7 @@ (goto-char pos) (beginning-of-line) @@ -139,45 +98,8 @@ (ude-error "Can't find buffer for %S" file)))))))) ;*---------------------------------------------------------------------*/ ---- ./bmacs/bmacs-xemacs.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/bmacs-xemacs.el 2013-08-02 10:50:11.740239619 -0600 -@@ -308,8 +308,8 @@ If PATHS is omitted, `load-path' is used - ;*---------------------------------------------------------------------*/ - ;* set-default-toolbar-visible ... */ - ;*---------------------------------------------------------------------*/ --(defun set-default-toolbar-visible (t) -- (set-specifier default-toolbar-visible-p t (selected-frame))) -+(defun set-default-toolbar-visible (b) -+ (set-specifier default-toolbar-visible-p b (selected-frame))) - - ;*---------------------------------------------------------------------*/ - ;* ude-set-nontext-pointer ... */ ---- ./bmacs/bug/bug.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug.el 2013-08-02 10:50:11.745239612 -0600 -@@ -71,7 +71,10 @@ and source-file directory for your debug - `(,bugname ,binary ,nil ,@(bug-string->list bug-emacs-option) - ,a.out)) - ;; the process filter and sentinel -- (process-kill-without-query (get-buffer-process bug-comint-buffer)) -+ (if (featurep 'xemacs) -+ (process-kill-without-query (get-buffer-process bug-comint-buffer)) -+ (set-process-query-on-exit-flag (get-buffer-process bug-comint-buffer) -+ nil)) - (set-process-filter (get-buffer-process bug-comint-buffer) - 'bug-filter)) - ;; we start the bug-mode -@@ -130,8 +133,7 @@ and source-file directory for your debug - (defun bugloo-quit () - (interactive) - (if (bufferp bug-comint-buffer) -- (save-excursion -- (set-buffer bug-comint-buffer) -+ (with-current-buffer bug-comint-buffer - (condition-case () - (comint-kill-subjob) - (error ---- ./bmacs/bug/bug-class.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-class.el 2013-08-02 10:50:11.744239614 -0600 +--- ./bmacs/bug/bug-class.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-class.el 2015-09-17 19:05:39.402605692 -0600 @@ -36,15 +36,13 @@ ;* bug-file-to-string ... */ ;*---------------------------------------------------------------------*/ @@ -211,8 +133,8 @@ (if bug-buffer-class bug-buffer-class (progn ---- ./bmacs/bug/bug-connect.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-connect.el 2013-08-02 10:50:11.745239612 -0600 +--- ./bmacs/bug/bug-connect.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-connect.el 2015-09-17 19:05:39.402605692 -0600 @@ -74,8 +74,7 @@ ;* This function returns the point line number. */ ;*---------------------------------------------------------------------*/ @@ -223,8 +145,32 @@ (let (start) (save-excursion (save-restriction ---- ./bmacs/bug/bug-filter.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-filter.el 2013-08-02 10:50:11.743239615 -0600 +--- ./bmacs/bug/bug.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug.el 2015-09-17 19:05:39.401605771 -0600 +@@ -71,7 +71,10 @@ and source-file directory for your debug + `(,bugname ,binary ,nil ,@(bug-string->list bug-emacs-option) + ,a.out)) + ;; the process filter and sentinel +- (process-kill-without-query (get-buffer-process bug-comint-buffer)) ++ (if (featurep 'xemacs) ++ (process-kill-without-query (get-buffer-process bug-comint-buffer)) ++ (set-process-query-on-exit-flag (get-buffer-process bug-comint-buffer) ++ nil)) + (set-process-filter (get-buffer-process bug-comint-buffer) + 'bug-filter)) + ;; we start the bug-mode +@@ -130,8 +133,7 @@ and source-file directory for your debug + (defun bugloo-quit () + (interactive) + (if (bufferp bug-comint-buffer) +- (save-excursion +- (set-buffer bug-comint-buffer) ++ (with-current-buffer bug-comint-buffer + (condition-case () + (comint-kill-subjob) + (error +--- ./bmacs/bug/bug-filter.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-filter.el 2015-09-17 19:05:39.403605614 -0600 @@ -51,9 +51,7 @@ ;* bug-buffer-text-properties-at ... */ ;*---------------------------------------------------------------------*/ @@ -262,8 +208,8 @@ ;*---------------------------------------------------------------------*/ ;* bug-filter-ident-map ... */ ---- ./bmacs/bug/bug-gnu-emacs.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-gnu-emacs.el 2013-08-02 10:50:11.743239615 -0600 +--- ./bmacs/bug/bug-gnu-emacs.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-gnu-emacs.el 2015-09-17 19:05:39.404605535 -0600 @@ -14,6 +14,7 @@ ;*---------------------------------------------------------------------*/ (provide 'bug-gnu-emacs) @@ -311,8 +257,8 @@ (setq pos (point)) (move-overlay bug-gnu-emacs-source-line-overlay (line-beginning-position) ---- ./bmacs/bug/bug-hooking.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-hooking.el 2013-08-02 10:50:11.744239614 -0600 +--- ./bmacs/bug/bug-hooking.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-hooking.el 2015-09-17 19:05:39.404605535 -0600 @@ -48,7 +48,7 @@ (redisplay-frame) (sit-for 0.2) @@ -342,8 +288,8 @@ (goto-char (point-max)) (insert str)))) (setq bug-prompt-hook ---- ./bmacs/bug/bug-process.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-process.el 2013-08-02 10:50:11.746239611 -0600 +--- ./bmacs/bug/bug-process.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-process.el 2015-09-17 19:05:39.405605456 -0600 @@ -63,8 +63,7 @@ (let ((proc (get-buffer-process bug-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -442,8 +388,8 @@ + (setq bug-waiting nil) + (or (not (numberp timeout)) + (< count timeout)))))))) ---- ./bmacs/bug/bug-source.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-source.el 2013-08-02 10:50:11.743239615 -0600 +--- ./bmacs/bug/bug-source.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-source.el 2015-09-17 19:05:39.406605377 -0600 @@ -80,7 +80,8 @@ (display-buffer buffer)))) (set-buffer buffer) @@ -454,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 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/bug/bug-xemacs.el 2013-08-02 10:50:11.745239612 -0600 +--- ./bmacs/bug/bug-xemacs.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/bug/bug-xemacs.el 2015-09-17 19:05:39.406605377 -0600 @@ -143,7 +143,8 @@ static char *arrow[] = { (save-excursion (save-restriction @@ -489,8 +435,8 @@ (goto-char char) (let ((o (make-extent (line-beginning-position) (1+ (line-beginning-position)) ---- ./bmacs/cee/cee-kbdb.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/cee/cee-kbdb.el 2013-08-02 10:50:11.750239605 -0600 +--- ./bmacs/cee/cee-kbdb.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/cee/cee-kbdb.el 2015-09-17 19:05:39.407605298 -0600 @@ -389,7 +389,8 @@ (select-frame frame) (select-window win) @@ -511,8 +457,144 @@ (beginning-of-line) t)))) (t ---- ./bmacs/dbg/dbg.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg.el 2013-08-02 10:50:11.748239608 -0600 +--- ./bmacs/dbg/dbg-args.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-args.el 2015-09-17 19:05:39.409605140 -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")) + ;; Arrange for the current prompt to get deleted. +- (save-excursion +- (set-buffer dbg-comint-buffer) ++ (with-current-buffer dbg-comint-buffer + (goto-char (process-mark proc)) + (while (not (looking-at comint-prompt-regexp)) + (goto-char (process-mark proc)) +@@ -140,8 +139,7 @@ This is implemented using the DBG `args' + ;* Args a new args in a separate buffer. */ + ;*---------------------------------------------------------------------*/ + (defun dbg-args-args (buffer args) +- (save-excursion +- (set-buffer buffer) ++ (with-current-buffer buffer + (let ((buffer-read-only nil)) + (erase-buffer) + (insert args) +@@ -164,12 +162,12 @@ This is implemented using the DBG `args' + 'mouse-face 'highlight + 'keymap dbg-args-mouse-map) + (if (< end (point-max)) +- (next-line 1) ++ (forward-line 1) + (setq keep nil))) + (progn + (end-of-line) + (if (< (point) (point-max)) +- (next-line 1) ++ (forward-line 1) + (setq keep nil))))))))))) + + ;*---------------------------------------------------------------------*/ +@@ -243,8 +241,7 @@ This is implemented using the DBG `args' + (defun dbg-args-menu (event) + (interactive "e") + (let (selection) +- (save-excursion +- (set-buffer (event-buffer event)) ++ (with-current-buffer (event-buffer event) + (save-excursion + (goto-char (event-closest-point event)) + (message "point: %S" (point)) +--- ./bmacs/dbg/dbg-breakpoint.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-breakpoint.el 2015-09-17 19:05:39.410605061 -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")) + ;; Arrange for the current prompt to get deleted. +- (save-excursion +- (set-buffer dbg-comint-buffer) ++ (with-current-buffer dbg-comint-buffer + (goto-char (process-mark proc)) + (process-send-string proc dbg-info-break-command) + (process-send-string proc "\n")))) +@@ -323,8 +322,7 @@ static char *footprint[] = { + (proc (get-buffer-process dbg-comint-buffer))) + (or proc (ude-error "Current buffer has no process")) + ;; Arrange for the current prompt to get deleted. +- (save-excursion +- (set-buffer dbg-comint-buffer) ++ (with-current-buffer dbg-comint-buffer + (goto-char (process-mark proc)) + (process-send-string proc command))))) + +@@ -533,7 +531,8 @@ static char *footprint[] = { + (set-extent-property extent 'mouse-face 'highlight) + (set-extent-property extent 'dbg-breakpoint bp) + (set-buffer buffer) +- (goto-line line) ++ (goto-char (point-min)) ++ (forward-line (1- line)) + (beginning-of-line) + (set-extent-endpoints extent (point) (point)) + bp))))) +--- ./bmacs/dbg/dbg-connect.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-connect.el 2015-09-17 19:05:39.410605061 -0600 +@@ -157,6 +157,6 @@ + ;* Disconnect all currently connected buffers. */ + ;*---------------------------------------------------------------------*/ + (defun dbg-disconnect-all-buffers () +- (mapcar 'dbg-disconnect-buffer dbg-connected-buffers) ++ (mapc 'dbg-disconnect-buffer dbg-connected-buffers) + (setq dbg-connected-buffers '())) + +--- ./bmacs/dbg/dbg-display.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-display.el 2015-09-17 19:05:39.411604982 -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")) + ;; Arrange for the current prompt to get deleted. +- (save-excursion +- (set-buffer dbg-comint-buffer) ++ (with-current-buffer dbg-comint-buffer + (goto-char (process-mark proc)) + (while (not (looking-at comint-prompt-regexp)) + (goto-char (process-mark proc)) +@@ -140,8 +139,7 @@ This is implemented using the DBG `displ + ;* Display a new display in a separate buffer. */ + ;*---------------------------------------------------------------------*/ + (defun dbg-display-display (buffer display) +- (save-excursion +- (set-buffer buffer) ++ (with-current-buffer buffer + (let ((buffer-read-only nil)) + (erase-buffer) + (insert display) +@@ -164,12 +162,12 @@ This is implemented using the DBG `displ + 'mouse-face 'highlight + 'keymap dbg-display-mouse-map) + (if (< end (point-max)) +- (next-line 1) ++ (forward-line 1) + (setq keep nil))) + (progn + (end-of-line) + (if (< (point) (point-max)) +- (next-line 1) ++ (forward-line 1) + (setq keep nil))))))))))) + + ;*---------------------------------------------------------------------*/ +@@ -248,8 +246,7 @@ This is implemented using the DBG `displ + (defun dbg-display-menu (event) + (interactive "e") + (let (selection) +- (save-excursion +- (set-buffer (event-buffer event)) ++ (with-current-buffer (event-buffer event) + (save-excursion + (goto-char (event-closest-point event)) + (message "point: %S" (point)) +--- ./bmacs/dbg/dbg.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg.el 2015-09-17 19:05:39.408605219 -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) @@ -665,144 +747,8 @@ (let (start) (save-excursion (save-restriction ---- ./bmacs/dbg/dbg-args.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-args.el 2013-08-02 10:50:11.748239608 -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")) - ;; Arrange for the current prompt to get deleted. -- (save-excursion -- (set-buffer dbg-comint-buffer) -+ (with-current-buffer dbg-comint-buffer - (goto-char (process-mark proc)) - (while (not (looking-at comint-prompt-regexp)) - (goto-char (process-mark proc)) -@@ -140,8 +139,7 @@ This is implemented using the DBG `args' - ;* Args a new args in a separate buffer. */ - ;*---------------------------------------------------------------------*/ - (defun dbg-args-args (buffer args) -- (save-excursion -- (set-buffer buffer) -+ (with-current-buffer buffer - (let ((buffer-read-only nil)) - (erase-buffer) - (insert args) -@@ -164,12 +162,12 @@ This is implemented using the DBG `args' - 'mouse-face 'highlight - 'keymap dbg-args-mouse-map) - (if (< end (point-max)) -- (next-line 1) -+ (forward-line 1) - (setq keep nil))) - (progn - (end-of-line) - (if (< (point) (point-max)) -- (next-line 1) -+ (forward-line 1) - (setq keep nil))))))))))) - - ;*---------------------------------------------------------------------*/ -@@ -243,8 +241,7 @@ This is implemented using the DBG `args' - (defun dbg-args-menu (event) - (interactive "e") - (let (selection) -- (save-excursion -- (set-buffer (event-buffer event)) -+ (with-current-buffer (event-buffer event) - (save-excursion - (goto-char (event-closest-point event)) - (message "point: %S" (point)) ---- ./bmacs/dbg/dbg-breakpoint.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-breakpoint.el 2013-08-02 10:50:11.750239605 -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")) - ;; Arrange for the current prompt to get deleted. -- (save-excursion -- (set-buffer dbg-comint-buffer) -+ (with-current-buffer dbg-comint-buffer - (goto-char (process-mark proc)) - (process-send-string proc dbg-info-break-command) - (process-send-string proc "\n")))) -@@ -323,8 +322,7 @@ static char *footprint[] = { - (proc (get-buffer-process dbg-comint-buffer))) - (or proc (ude-error "Current buffer has no process")) - ;; Arrange for the current prompt to get deleted. -- (save-excursion -- (set-buffer dbg-comint-buffer) -+ (with-current-buffer dbg-comint-buffer - (goto-char (process-mark proc)) - (process-send-string proc command))))) - -@@ -533,7 +531,8 @@ static char *footprint[] = { - (set-extent-property extent 'mouse-face 'highlight) - (set-extent-property extent 'dbg-breakpoint bp) - (set-buffer buffer) -- (goto-line line) -+ (goto-char (point-min)) -+ (forward-line (1- line)) - (beginning-of-line) - (set-extent-endpoints extent (point) (point)) - bp))))) ---- ./bmacs/dbg/dbg-connect.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-connect.el 2013-08-02 10:50:11.750239605 -0600 -@@ -157,6 +157,6 @@ - ;* Disconnect all currently connected buffers. */ - ;*---------------------------------------------------------------------*/ - (defun dbg-disconnect-all-buffers () -- (mapcar 'dbg-disconnect-buffer dbg-connected-buffers) -+ (mapc 'dbg-disconnect-buffer dbg-connected-buffers) - (setq dbg-connected-buffers '())) - ---- ./bmacs/dbg/dbg-display.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-display.el 2013-08-02 10:50:11.749239607 -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")) - ;; Arrange for the current prompt to get deleted. -- (save-excursion -- (set-buffer dbg-comint-buffer) -+ (with-current-buffer dbg-comint-buffer - (goto-char (process-mark proc)) - (while (not (looking-at comint-prompt-regexp)) - (goto-char (process-mark proc)) -@@ -140,8 +139,7 @@ This is implemented using the DBG `displ - ;* Display a new display in a separate buffer. */ - ;*---------------------------------------------------------------------*/ - (defun dbg-display-display (buffer display) -- (save-excursion -- (set-buffer buffer) -+ (with-current-buffer buffer - (let ((buffer-read-only nil)) - (erase-buffer) - (insert display) -@@ -164,12 +162,12 @@ This is implemented using the DBG `displ - 'mouse-face 'highlight - 'keymap dbg-display-mouse-map) - (if (< end (point-max)) -- (next-line 1) -+ (forward-line 1) - (setq keep nil))) - (progn - (end-of-line) - (if (< (point) (point-max)) -- (next-line 1) -+ (forward-line 1) - (setq keep nil))))))))))) - - ;*---------------------------------------------------------------------*/ -@@ -248,8 +246,7 @@ This is implemented using the DBG `displ - (defun dbg-display-menu (event) - (interactive "e") - (let (selection) -- (save-excursion -- (set-buffer (event-buffer event)) -+ (with-current-buffer (event-buffer event) - (save-excursion - (goto-char (event-closest-point event)) - (message "point: %S" (point)) ---- ./bmacs/dbg/dbg-filter.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-filter.el 2013-08-02 10:50:11.748239608 -0600 +--- ./bmacs/dbg/dbg-filter.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-filter.el 2015-09-17 19:05:39.412604903 -0600 @@ -30,10 +30,12 @@ It is saved for when this flag is not se (defvar dbg-delete-prompt-marker nil) @@ -840,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 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-locals.el 2013-08-02 10:50:11.747239609 -0600 +--- ./bmacs/dbg/dbg-locals.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-locals.el 2015-09-17 19:05:39.413604824 -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")) @@ -887,8 +833,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- ./bmacs/dbg/dbg-mode.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-mode.el 2013-08-02 10:50:11.749239607 -0600 +--- ./bmacs/dbg/dbg-mode.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-mode.el 2015-09-17 19:05:39.414604745 -0600 @@ -98,10 +98,7 @@ The following command are available: (make-local-variable 'dbg-delete-prompt-marker) (setq dbg-delete-prompt-marker (make-marker)) @@ -900,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 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-source.el 2013-08-02 10:50:11.746239611 -0600 +--- ./bmacs/dbg/dbg-source.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-source.el 2015-09-17 19:05:39.414604745 -0600 @@ -152,11 +152,11 @@ static char *arrow[] = { (set-extent-begin-glyph extent dbg-arrow-glyph) (set-extent-begin-glyph-layout extent 'outside-margin) @@ -917,8 +863,8 @@ (set-window-point window (point)) (setq pos (progn (beginning-of-line) ---- ./bmacs/dbg/dbg-stack.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/dbg/dbg-stack.el 2013-08-02 10:50:11.747239609 -0600 +--- ./bmacs/dbg/dbg-stack.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/dbg/dbg-stack.el 2015-09-17 19:05:39.415604666 -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")) @@ -964,8 +910,8 @@ (save-excursion (goto-char (event-closest-point event)) (setq selection (dbg-get-frame-number)))) ---- ./bmacs/ude/id-select.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/id-select.el 2013-08-02 10:50:11.739239620 -0600 +--- ./bmacs/ude/id-select.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/id-select.el 2015-09-17 19:05:39.417604508 -0600 @@ -248,6 +248,72 @@ (defvar id-select-prior-buffer 'nil) @@ -1153,8 +1099,8 @@ - (provide 'id-select) ---- ./bmacs/ude/plugin.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/plugin.el 2013-08-02 10:50:11.740239619 -0600 +--- ./bmacs/ude/plugin.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/plugin.el 2015-09-17 19:05:39.418604429 -0600 @@ -371,14 +371,16 @@ process structure hosting the plugin. (select-frame frame) (select-window win) @@ -1174,8 +1120,8 @@ (recenter)))))) ((and (consp command) (memq (car command) '(HELP help))) (let ((prgm (let ((p (cadr command))) ---- ./bmacs/ude/ude-about.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/ude-about.el 2013-08-02 10:50:11.738239622 -0600 +--- ./bmacs/ude/ude-about.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-about.el 2015-09-17 19:05:39.418604429 -0600 @@ -27,8 +27,7 @@ (if (featurep 'xemacs) (let ((window-min-height 1) @@ -1210,8 +1156,8 @@ (ude-about-insert-xpm (current-buffer) xpm) (insert "\n") (insert msg) ---- ./bmacs/ude/ude-autoload.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/ude-autoload.el 2013-08-02 10:50:11.738239622 -0600 +--- ./bmacs/ude/ude-autoload.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-autoload.el 2015-09-17 19:05:39.418604429 -0600 @@ -17,6 +17,7 @@ (autoload 'ude-customize "ude-custom" "Ude customization." t) ;; config @@ -1229,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 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/ude/ude-compile.el 2013-08-02 10:50:11.740239619 -0600 +--- ./bmacs/ude/ude-compile.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-compile.el 2015-09-17 19:05:39.418604429 -0600 @@ -351,8 +351,7 @@ Executed hooks are removed from that lis (ude-pop-compilation-frame-on-error ;; we have to pop up a frame @@ -1241,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 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/ude-docline.el 2013-08-02 10:50:11.737239623 -0600 +--- ./bmacs/ude/ude-docline.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-docline.el 2015-09-17 19:05:39.419604350 -0600 @@ -106,13 +106,10 @@ (ude-error "Can't find documentation for `%S'" var) (progn @@ -1287,8 +1233,8 @@ (goto-char (point-min)) (let* ((path-regexp "@path[ \t]+\\([^@]+\\)@") (anchor-regexp "@ref[ \t]+\\([^@:]+\\):\\([^@]+\\)@") ---- bmacs/ude/ude-icon.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ bmacs/ude/ude-icon.el 2013-08-02 12:24:31.895596070 -0600 +--- ./bmacs/ude/ude-icon.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-icon.el 2015-09-17 19:05:39.419604350 -0600 @@ -19,6 +19,7 @@ (require 'ude-custom) @@ -1297,8 +1243,8 @@ (add-to-list 'image-load-path (concat bmacs-lispdir "/" ude-toolbar-image-directory)) ---- ./bmacs/ude/ude-ident.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/ude/ude-ident.el 2013-08-02 10:50:11.738239622 -0600 +--- ./bmacs/ude/ude-ident.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-ident.el 2015-09-17 19:05:39.419604350 -0600 @@ -36,8 +36,8 @@ (save-excursion (goto-char pos) @@ -1354,8 +1300,8 @@ (setq ude-tags-balloon-region nil)))) ;*---------------------------------------------------------------------*/ ---- ./bmacs/ude/ude-makefile.el.orig 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/ude/ude-makefile.el 2013-08-02 10:50:11.737239623 -0600 +--- ./bmacs/ude/ude-makefile.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-makefile.el 2015-09-17 19:05:39.419604350 -0600 @@ -209,14 +209,12 @@ (interactive) (let ((default-directory ude-root-directory)) @@ -1427,8 +1373,8 @@ (let* ((cmd (format "%s -o %s -project %s" ude-makemake ude-makefile ---- ./bmacs/ude/ude-repl.el.orig 2013-08-01 00:50:44.000000000 -0600 -+++ ./bmacs/ude/ude-repl.el 2013-08-02 10:50:11.739239620 -0600 +--- ./bmacs/ude/ude-repl.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/ude/ude-repl.el 2015-09-17 19:05:39.419604350 -0600 @@ -43,8 +43,7 @@ 'ude-repl-sentinel) (set-process-filter ude-repl-comint-process @@ -1439,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 2013-08-01 00:50:43.000000000 -0600 -+++ ./bmacs/xemacs-etags.el 2013-08-02 10:50:11.737239623 -0600 +--- ./bmacs/xemacs-etags.el.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./bmacs/xemacs-etags.el 2015-09-17 19:05:39.420604271 -0600 @@ -236,8 +236,7 @@ file the tag was in." ;; it is initialized as a tag table buffer. (save-excursion diff --git a/bigloo-stat64.patch b/bigloo-stat64.patch index d7f84e5..c3a5b2e 100644 --- a/bigloo-stat64.patch +++ b/bigloo-stat64.patch @@ -1,17 +1,36 @@ ---- ./runtime/Clib/cports.c.orig 2014-02-18 11:37:02.000000000 -0700 -+++ ./runtime/Clib/cports.c 2014-02-20 08:04:35.438035870 -0700 -@@ -2195,8 +2195,8 @@ bgl_file_to_string( char *path ) { - strerror( errno ), +--- ./runtime/Clib/cports.c.orig 2015-09-15 23:48:40.000000000 -0600 ++++ ./runtime/Clib/cports.c 2015-09-17 19:13:23.845676921 -0600 +@@ -158,7 +158,7 @@ static int posix_close( FILE *f ) { + } + + static ssize_t posix_read( FILE *f, void *buf, size_t count ) { +- int n = fread( buf, 1, count, f ); ++ size_t n = fread( buf, 1, count, f ); + + if( n != 0 ) + return n; +@@ -174,9 +174,9 @@ static ssize_t posix_read( FILE *f, void + /* BSD compatibility kit */ + /*---------------------------------------------------------------------*/ + #if( BGL_HAVE_SENDFILE && ( BGL_SENDFILE_BRAND == BGL_SENDFILE_BSD ) ) +-static int bsd_sendfile(int out_fd, int in_fd, off_t *offset, size_t count) { ++static ssize_t bsd_sendfile(int out_fd, int in_fd, off_t *offset, size_t count) { + off_t sz = count; +- int n = sendfile( in_fd, out_fd, offset ? *offset : 0, &sz, 0, 0 ); ++ ssize_t n = sendfile( in_fd, out_fd, offset ? *offset : 0, &sz, 0, 0 ); + + return n ? n : sz; + } +@@ -2247,7 +2247,7 @@ bgl_file_to_string( char *path ) { string_to_bstring( path ) ); } else { -- obj_t res = make_string_sans_fill( sin.st_size ); + obj_t res = make_string_sans_fill( sin.st_size ); - int n = read( fd, BSTRING_TO_STRING( res ), sin.st_size ); -+ obj_t res = make_string_sans_fill( (int)sin.st_size ); + ssize_t n = read( fd, BSTRING_TO_STRING( res ), sin.st_size ); close( fd ); -@@ -2463,7 +2463,7 @@ bgl_sendchars( obj_t ip, obj_t op, long +@@ -2526,7 +2526,7 @@ bgl_sendchars( obj_t ip, obj_t op, long } #if( BGL_HAVE_SENDFILE ) } else { @@ -20,7 +39,7 @@ if( sz != 0 ) { #if( BGL_GC_HAVE_BLOCKING ) -@@ -2564,7 +2564,7 @@ bgl_sendfile( obj_t name, obj_t op, long +@@ -2636,7 +2636,7 @@ bgl_sendfile( obj_t name, obj_t op, long C_SYSTEM_FAILURE( BGL_IO_PORT_ERROR, "send-file", strerror( errno ), name ); } diff --git a/bigloo.spec b/bigloo.spec index 4f9dd75..4ad1b33 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -1,12 +1,12 @@ -# Use of FORTIFY_SOURCE leads to corrupt code. -%global __global_cflags %(printf %%s '%__global_cflags' | sed -r 's/ -Wp,-D_FORTIFY_SOURCE=[[:digit:]]//') +# The hardened build breaks bigloo's plugin architecture. +%undefine _hardened_build # Bigloo uses the terminology "release" for what Fedora calls version, # and "version" for a sub-version revision. # patch_suffix is defined to be empty when patch_ver is not defined, # so that when updating, the Source and %%setup lines do not have to be # changed, only the Version and patch_ver -%global patch_ver 2 +#%%global patch_ver 2 %global patch_suffix %{?patch_ver:-%{patch_ver}} # prerelease @@ -18,8 +18,8 @@ %global pkgname Bigloo Name: bigloo -Version: 4.1a -Release: 9%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} +Version: 4.2b +Release: 1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} Summary: A compiler for the Scheme programming language Group: Development/Languages @@ -36,7 +36,7 @@ BuildRequires: emacs BuildRequires: xemacs BuildRequires: xemacs-packages-extra BuildRequires: indent -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: pkgconfig BuildRequires: zip @@ -50,6 +50,7 @@ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: libphidget-devel BuildRequires: libunistring-devel +BuildRequires: libuv-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: sqlite-devel @@ -66,6 +67,7 @@ Requires: gcc Requires: glibc-devel%{?_isa} Requires: libgcc%{?_isa} Requires: libunistring-devel%{?_isa} +Requires: libuv-devel%{?_isa} Requires(post): info Requires(postun): info @@ -125,11 +127,12 @@ done # libraries need an SONAME of the form .so.0, not .so sed -i 's/sharedsuffix=so/sharedsuffix=so.0/g' configure -mkdir -p lib/%{version} -(cd lib/%{version} +mkdir -p lib/bigloo/%{version} +pushd lib/bigloo/%{version} # need these links, so that the linker finds the libraries ln -sf libbigloo_u-%{version}.so.0 libbigloo_u-%{version}.so -ln -sf libbigloo_s-%{version}.so.0 libbigloo_s-%{version}.so) +ln -sf libbigloo_s-%{version}.so.0 libbigloo_s-%{version}.so +popd # correct examples Makefiles for installation find examples -name Makefile -print0 | xargs -0 \ @@ -140,7 +143,13 @@ sed -i 's/^extralibs="-lm"/extralibs="-lgc -lm"/' configure sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc # Defeat attempts at inserting unnecessary rpaths -sed -ri 's/ ?-Wl,-rpath=[^"]+"/"/' configure +sed -ri 's/ ?-Wl,-rpath=[^"]+(")/\1/' configure + +# Fix Makefile typos in 4.2b +sed -i 's/\(runtime boot-jvm\));$/\1;/;s/higloo/jigloo/' Makefile + +# Fix Java versioning problem in 4.2b +sed -i 's/1\.7/1.8/' runtime/Makefile api/ssl/src/Makefile %build %define inplace $PWD/inplace @@ -168,16 +177,17 @@ sed -i -e "s/^jcflags=-O$/jcflags=-deprecation/" configure --sharedcompiler=yes \ --native-default-backend \ --customgmp=no \ + --customlibuv=no \ --strip=no \ --configureinfo=yes # _smp_mflags breaks the build -env LD_LIBRARY_PATH=`pwd`/lib/%{version} make -env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ +env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} make +env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make DESTDIR=%{inplace} install -env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ - PATH=`pwd`/bin:$PATH \ +env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \ + PATH=$PWD/bin:$PATH \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee @@ -185,9 +195,9 @@ env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ %install mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/bigloo mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/bigloo -env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ +env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \ make DESTDIR=$RPM_BUILD_ROOT INSTALL="cp -a" install -env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ +env LD_LIBRARY_PATH=$PWD/lib/bigloo/%{version} \ make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=%{_emacs_sitelispdir}/bigloo install-bee make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee @@ -212,8 +222,14 @@ ln -sf ../../*.so.0 . ln -sf ../../*.so.0.0.0 . popd -sed -e 's|^BOOTBINDIR.*|BOOTBINDIR=%{_bindir}|g' \ - -e 's|^BOOTLIBDIR.*|BOOTLIBDIR=%{_libdir}/bigloo/%{version}|g' \ +# Remove references to the build root +sed -e 's|^BOOTDIR=.*|BOOTDIR=%{_prefix}|g' \ + -e 's|^BOOTBINDIR=.*|BOOTBINDIR=%{_bindir}|g' \ + -e 's|^BOOTLIBDIR=.*|BOOTLIBDIR=%{_libdir}/bigloo/%{version}|g' \ + -e 's|^BGLBUILDBINDIR=.*|BGLBUILDBINDIR=%{_bindir}|g' \ + -e 's|^BGLBUILDLIBDIR=.*|BGLBUILDLIBDIR=%{_libdir}/bigloo/%{version}|g' \ + -e 's|^\(BIGLOO=.*\)\.sh|\1|' \ + -e 's|^\(BGL.*=.*\)\.sh|\1|' \ -i $RPM_BUILD_ROOT%{_libdir}/bigloo/%{version}/Makefile.config rm -fr $RPM_BUILD_ROOT%{_infodir}/dir @@ -269,6 +285,7 @@ fi %check +export LD_LIBRARY_PATH=$PWD/inplace/%{_libdir}/bigloo/%{version} make test @@ -297,6 +314,9 @@ make test %changelog +* Tue Oct 27 2015 Jerry James - 4.2b-1 +- Update to 4.2b (bz 1264055) + * Wed Jun 17 2015 Fedora Release Engineering - 4.1a-9.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 86d2796..b692ebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64f17f126691baf1eb2c22a4f26edc1b bigloo4.1a-2.tar.gz +c9662c11b5d9f85f7b6ff7299e81c215 bigloo4.2b.tar.gz