From 9a75c302ada94c9fd9a81e3e0652784f84c59b38 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Dec 26 2023 16:11:13 +0000 Subject: Version 4.5b Drop upstreamed configure-c99 and emacs29 patches --- diff --git a/bigloo-configure-c99.patch b/bigloo-configure-c99.patch deleted file mode 100644 index a0a8a75..0000000 --- a/bigloo-configure-c99.patch +++ /dev/null @@ -1,411 +0,0 @@ -commit 85aed0c60431104446bb904d44066be0bae225d1 -Author: Jerry James -Date: Tue Nov 22 08:56:51 2022 -0700 - - Migrate K&R C in the config scripts to ANSI C - ---- api/libbacktrace/src/Clib/bglbacktrace.c.orig 2022-12-29 23:55:22.000000000 -0700 -+++ api/libbacktrace/src/Clib/bglbacktrace.c 2023-12-01 10:05:41.064729924 -0700 -@@ -191,7 +191,6 @@ bgl_backtrace_foreach(void *proc) { - if (env) { - struct backtrace_state *bt_state = libbacktrace_get_state(env); - backtrace_full(bt_state, 0, backtrace_foreach_cb, cbe, proc); -- return BUNSPEC; - } - } - ---- api/ssl/src/C/bglssl.c.orig 2022-12-29 23:55:22.000000000 -0700 -+++ api/ssl/src/C/bglssl.c 2023-12-01 09:51:44.236639443 -0700 -@@ -52,6 +52,11 @@ - # include - #endif - -+// Avoid GCC 14 errors -+extern int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); -+extern void HMAC_CTX_init(HMAC_CTX *ctx); -+extern void HMAC_CTX_cleanup(HMAC_CTX *ctx); -+ - #if( !defined( OPENSSL_NPN_UNSUPPORTED ) ) - # define OPENSSL_NPN_UNSUPPORTED 0 - #endif -@@ -1743,7 +1748,7 @@ bgl_ssl_connection_clear_pending( ssl_co - /* bgl_get_session_callback ... */ - /*---------------------------------------------------------------------*/ - static SSL_SESSION * --bgl_get_session_callback( SSL *ssl, unsigned char *key, int len, int *copy ) { -+bgl_get_session_callback( SSL *ssl, const unsigned char *key, int len, int *copy ) { - ssl_connection c = (ssl_connection)(SSL_get_app_data( ssl )); - SSL_SESSION *sess = CCON( c )->BgL_z42nextzd2sessionz90; - -@@ -2310,7 +2315,7 @@ bgl_ssl_connection_get_peer_certificate( - } - - STACK_OF(ASN1_OBJECT) *eku = -- (ASN1_OBJECT *)X509_get_ext_d2i( peer_cert, NID_ext_key_usage, NULL, NULL ); -+ (STACK_OF(ASN1_OBJECT) *)X509_get_ext_d2i( peer_cert, NID_ext_key_usage, NULL, NULL ); - if( eku != NULL ) { - char buf[ 256 ]; - int len = sk_ASN1_OBJECT_num( eku ); -diff --git autoconf/alsa autoconf/alsa -index 028a1979..3d354afb 100755 ---- autoconf/alsa -+++ autoconf/alsa -@@ -72,6 +72,7 @@ cat > $file.c < - #include - - static char *device = "default"; /* playback device */ -diff --git autoconf/ccoptim autoconf/ccoptim -index 297fafdc..117bbb39 100755 ---- autoconf/ccoptim -+++ autoconf/ccoptim -@@ -85,6 +85,8 @@ fi - #* allocations. We try to detect this in the Bigloo configuration. */ - #*---------------------------------------------------------------------*/ - cat > $file2.c < $file.c < - --main( argc, argv ) --int argc; --char *argv[]; -+int main( int argc, char *argv[] ) - { - extern char **environ; - return (environ != 0) && (&execv != 0); -diff --git autoconf/gccattrs autoconf/gccattrs -index 592b525d..1b2a56d0 100755 ---- autoconf/gccattrs -+++ autoconf/gccattrs -@@ -73,7 +73,7 @@ __malloc void *foo() { - return malloc( 10 ); - } - --__noreturn stop() { -+__noreturn void stop() { - exit( 0 ); - } - -diff --git autoconf/gchavedoblocking autoconf/gchavedoblocking -index 111ff9c7..6374a0fe 100755 ---- autoconf/gchavedoblocking -+++ autoconf/gchavedoblocking -@@ -74,7 +74,7 @@ int check_addr( long a1, long a2 ) { - return a1 > a2; - } - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - GC_init(); - if( check_addr( &GC_do_blocking, &main ) ) puts( "yes" ); else puts( "yes" ); - return 0; -diff --git autoconf/gchavestartblocking autoconf/gchavestartblocking -index f85f16c8..1c9bc0b0 100755 ---- autoconf/gchavestartblocking -+++ autoconf/gchavestartblocking -@@ -70,7 +70,7 @@ cat > $file.c < - extern GC_start_blocking(); - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - GC_init(); - if( GC_start_blocking() ) puts( "yes" ); else puts( "yes" ); - return 0; -diff --git autoconf/getaddrinfo autoconf/getaddrinfo -index bf035e71..130e0c29 100755 ---- autoconf/getaddrinfo -+++ autoconf/getaddrinfo -@@ -75,8 +75,9 @@ cat > $file.c < - #endif -+#include - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - int status; - struct addrinfo hints; - struct addrinfo *res, *rp; -diff --git autoconf/gethwaddrs autoconf/gethwaddrs -index 7ecd0330..94f8fa11 100755 ---- autoconf/gethwaddrs -+++ autoconf/gethwaddrs -@@ -58,6 +58,8 @@ fi - #*---------------------------------------------------------------------*/ - cat > $file.c < -+#include -+#include - #include - #include - #include -diff --git autoconf/inet_aton autoconf/inet_aton -index 6b4abb92..d9758957 100755 ---- autoconf/inet_aton -+++ autoconf/inet_aton -@@ -72,8 +72,9 @@ cat > $file.c < - #include -+#include - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - return (inet_aton( "127.0.0.1", (void *)argv ) > 0); - } - EOF -diff --git autoconf/inet_pton autoconf/inet_pton -index 47d71f3c..a101968b 100755 ---- autoconf/inet_pton -+++ autoconf/inet_pton -@@ -81,8 +81,9 @@ cat > $file.c < - #include -+#include - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - return (inet_pton( AF_INET, "127.0.0.1", (void *)argv ) > 0); - } - EOF -diff --git autoconf/jartest autoconf/jartest -index 2ba133ca..ec8469c0 100755 ---- autoconf/jartest -+++ autoconf/jartest -@@ -61,9 +61,8 @@ fi - #* Test */ - #*---------------------------------------------------------------------*/ - cat > $file.txt < -+int main( int argc, char *argv[] ) - { - exit( 0 ); - } ---- autoconf/openssl-getter.orig -+++ autoconf/openssl-getter -@@ -73,7 +73,7 @@ int main( int argc, char *argv[] ) { - DH *dh; - const BIGNUM *key; - DH_get0_key( dh, &key, 0 ); -- return SSL_CTX_get_ssl_method( ctx ); -+ return (SSL_CTX_get_ssl_method( ctx ) == NULL) ? 1 : 0; - } - EOF - -diff --git autoconf/openssl-tls13 autoconf/openssl-tls13 -index 0981d682..c3a781ea 100755 ---- autoconf/openssl-tls13 -+++ autoconf/openssl-tls13 -@@ -68,6 +68,7 @@ cat > $file.c < - - static SSL_CTX *ctx; -+extern const SSL_METHOD *TLSv1_3_client_method(void); - - int main( int argc, char *argv[] ) { - BIO *sbio; -diff --git autoconf/openssl-v2 autoconf/openssl-v2 -index 5e065cc3..9dbaa243 100755 ---- autoconf/openssl-v2 -+++ autoconf/openssl-v2 -@@ -68,6 +68,7 @@ cat > $file.c < - - static SSL_CTX *ctx; -+const SSL_METHOD *SSLv2_server_method(void); - - int main( int argc, char *argv[] ) { - BIO *sbio; -diff --git autoconf/openssl-v3 autoconf/openssl-v3 -index ab4a6a34..bb6f1678 100755 ---- autoconf/openssl-v3 -+++ autoconf/openssl-v3 -@@ -68,6 +68,7 @@ cat > $file.c < - - static SSL_CTX *ctx; -+const SSL_METHOD *SSLv3_server_method(void); - - int main( int argc, char *argv[] ) { - BIO *sbio; -diff --git autoconf/ptrsize autoconf/ptrsize -index da2ff8c2..06354f4b 100755 ---- autoconf/ptrsize -+++ autoconf/ptrsize -@@ -50,7 +50,8 @@ fi - #* Test */ - #*---------------------------------------------------------------------*/ - cat > $file.c < -+int main () { printf( "%zu\n", sizeof( int * ) ); } - EOF - - #*---------------------------------------------------------------------*/ -diff --git autoconf/sendfile autoconf/sendfile -index 5ab5e0ca..11209262 100755 ---- autoconf/sendfile -+++ autoconf/sendfile -@@ -104,9 +104,7 @@ cat > $file.c < - #include - --main( argc, argv ) --int argc; --char *argv[]; -+int main( int argc, char *argv[] ) - { - char buffer [50]; - FILE *fd = fopen( "/etc/hosts", "r" ); -diff --git autoconf/setsockopt autoconf/setsockopt -index 7c48286f..4cc152b1 100755 ---- autoconf/setsockopt -+++ autoconf/setsockopt -@@ -77,7 +77,7 @@ cat > $file.c < - #include - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - int s = socket( AF_INET, SOCK_STREAM, 0 ); - int sock_opt = 1; - -diff --git autoconf/socket autoconf/socket -index 5bf55d71..8eb188aa 100755 ---- autoconf/socket -+++ autoconf/socket -@@ -68,10 +68,12 @@ cat > $file.c < - #endif -+#include -+extern int gethostbyname(const char *); -+extern int getsockname(long, long, long); -+extern int accept(long, long, long); - --main( argc, argv ) --int argc; --char *argv[]; -+int main( int argc, char *argv[] ) - { - printf( "%d\n", gethostbyname( "toto" ) ); - printf( "%8x\n", getsockname( 0L, 0L, 0L ) ); -diff --git autoconf/socklen autoconf/socklen -index 775b11b5..bec90627 100755 ---- autoconf/socklen -+++ autoconf/socklen -@@ -72,7 +72,7 @@ cat > $file.c < - #endif - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - printf( "%d\n", (socklen_t)argc ); - return 0; - } -diff --git autoconf/unixsocket autoconf/unixsocket -index 231dc5bf..973409c6 100755 ---- autoconf/unixsocket -+++ autoconf/unixsocket -@@ -77,7 +77,7 @@ cat > $file.c < - #include - --main( int argc, char *argv[] ) { -+int main( int argc, char *argv[] ) { - int s; - struct sockaddr_un saddr; - -@@ -85,6 +85,7 @@ main( int argc, char *argv[] ) { - - strcpy( saddr.sun_path, "/tmp/foo" ); - connect( s, (struct sockaddr *)&saddr, sizeof( saddr ) ); -+ return 0; - } - EOF - -diff --git autoconf/ziptest autoconf/ziptest -index 02cc1893..bd7af72d 100755 ---- autoconf/ziptest -+++ autoconf/ziptest -@@ -61,9 +61,8 @@ fi - #* Test */ - #*---------------------------------------------------------------------*/ - cat > $file.txt < -+int main( int argc, char *argv[] ) - { - exit( 0 ); - } ---- gc/gc-8.2.2.patch.orig 2022-12-29 23:55:22.000000000 -0700 -+++ gc/gc-8.2.2.patch 2023-11-30 15:36:16.039764489 -0700 -@@ -189,3 +189,48 @@ diff -Naur gc-8.2.2.orig/Makefile.in gc- - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backgraph.Plo@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blacklst.Plo@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksums.Plo@am__quote@ # am--include-marker -+diff -Naur gc-8.2.2.orig/configure.ac gc-8.2.2/configure.ac -+--- gc-8.2.2.orig/configure.ac 2022-08-26 12:44:49.000000000 -0600 -++++ gc-8.2.2/configure.ac 2023-11-30 15:32:49.187695181 -0700 -+@@ -833,13 +833,15 @@ -+ AS_IF([test "$THREADS" = posix], -+ [AC_MSG_CHECKING(for pthread_setname_np) -+ old_CFLAGS="$CFLAGS" -+- CFLAGS="$CFLAGS $CFLAGS_EXTRA -Werror" -+- AC_TRY_COMPILE([#include ], -++ CFLAGS="$CFLAGS $CFLAGS_EXTRA -Werror -pthread" -++ AC_TRY_COMPILE([#define _GNU_SOURCE -++ #include ], -+ [pthread_setname_np("thread-name")], -+ [AC_MSG_RESULT([yes (w/o tid)]) -+ AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID], [1], -+ [Define to use 'pthread_setname_np(const char*)' function.])], -+- [AC_TRY_COMPILE([#include ], -++ [AC_TRY_COMPILE([#define _GNU_SOURCE -++ #include ], -+ [pthread_setname_np(pthread_self(), "thread-name-%u", 0)], -+ [AC_MSG_RESULT([yes (with tid and arg)]) -+ AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_WITH_TID_AND_ARG], [1], -+diff -Naur gc-8.2.2.orig/configure.ac gc-8.2.2/configure.ac -+--- gc-8.2.2.orig/configure 2022-08-26 12:45:05.000000000 -0600 -++++ gc-8.2.2/configure 2023-11-30 15:34:02.851651485 -0700 -+@@ -17565,9 +17565,10 @@ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np" >&5 -+ $as_echo_n "checking for pthread_setname_np... " >&6; } -+ old_CFLAGS="$CFLAGS" -+- CFLAGS="$CFLAGS $CFLAGS_EXTRA -Werror" -++ CFLAGS="$CFLAGS $CFLAGS_EXTRA -Werror -pthread" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ /* end confdefs.h. */ -++#define _GNU_SOURCE -+ #include -+ int -+ main () -+@@ -17586,6 +17587,7 @@ -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ /* end confdefs.h. */ -++#define _GNU_SOURCE -+ #include -+ int -+ main () diff --git a/bigloo-emacs.patch b/bigloo-emacs.patch index 4490472..493d1de 100644 --- a/bigloo-emacs.patch +++ b/bigloo-emacs.patch @@ -1,5 +1,5 @@ ---- bmacs/bee/bee-browse.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-browse.el 2020-10-19 13:55:40.598346930 -0600 +--- bmacs/bee/bee-browse.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-browse.el 2023-12-25 11:10:39.398318866 -0700 @@ -144,14 +144,16 @@ (select-frame frame) (select-window win) @@ -19,11 +19,11 @@ (recenter))))) t) ((and (consp command) ---- bmacs/bee/bee-config.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-config.el 2020-10-19 14:18:24.817708323 -0600 -@@ -252,7 +252,8 @@ Setting that variable must change the bu - 1 - 'ude-font-lock-face-12)) +--- bmacs/bee/bee-config.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-config.el 2023-12-25 11:10:39.398318866 -0700 +@@ -244,7 +244,8 @@ Setting that variable must change the bu + (cons "#;" + 'font-lock-comment-face)) "The Bee font-lock specification." - :group 'bee) + :group 'bee @@ -31,7 +31,7 @@ ;; bee menu (defcustom bee-imenu-generic-expression -@@ -263,7 +264,8 @@ Setting that variable must change the bu +@@ -255,7 +256,8 @@ Setting that variable must change the bu ("Macros" "^(\\(define-expander\\|define-macro\\|define-syntax\\)\\s-+(?\\(\\sw+\\)" 2)) "Imenu generic expression for Scheme mode. See `imenu-generic-expression'." @@ -41,7 +41,7 @@ ;; compile configuration (defcustom bee-compilation-font-lock-keywords -@@ -275,7 +277,8 @@ Setting that variable must change the bu +@@ -267,7 +269,8 @@ Setting that variable must change the bu ("[*][*][*] WARNING.*$" . font-lock-comment-face) ("Compilation finished.*$" . ude-ok-face)) "The regular expressions for compilation font lock errors." @@ -51,7 +51,7 @@ (defcustom bee-error-regexp "^File \"\\([^\"]+\\)\", line \\([0-9]+\\)" "*The expression that matches Bigloo errors." -@@ -284,7 +287,8 @@ Setting that variable must change the bu +@@ -276,7 +279,8 @@ Setting that variable must change the bu (defcustom bee-compilation-error-regexp-alist (list bee-error-regexp 1 2) "The expression for compilation errors." @@ -61,8 +61,8 @@ ;; afile (defcustom bee-afile-name ".afile" ---- bmacs/bee/bee-expand.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-expand.el 2020-10-19 13:55:40.598346930 -0600 +--- bmacs/bee/bee-expand.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-expand.el 2023-12-25 11:10:39.398318866 -0700 @@ -79,9 +79,10 @@ (defun bee-set-expand-temporary-buffer () (if (and (bufferp bee-expand-temporary-buffer) @@ -95,8 +95,8 @@ (write-file fname nil) (bee-expand-buffer-internal))) ---- bmacs/bee/bee-indent.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-indent.el 2020-10-19 14:19:19.025554089 -0600 +--- bmacs/bee/bee-indent.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-indent.el 2023-12-25 11:10:39.398318866 -0700 @@ -157,7 +157,7 @@ of the start of the containing expressio (defun bee-calculate-forced-indent () (when (> (count-lines 1 (point)) 1) @@ -115,8 +115,8 @@ (let ((op (car (nthcdr 9 state)))) (and (consp op) (let ((po (reverse op)) ---- bmacs/bee/bee-mode.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-mode.el 2020-10-19 14:20:04.705424126 -0600 +--- bmacs/bee/bee-mode.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-mode.el 2023-12-25 11:10:39.398318866 -0700 @@ -85,8 +85,8 @@ ;; These characters are delimiters but otherwise undefined. @@ -128,8 +128,8 @@ (modify-syntax-entry ?{ "(} " local-syntax-table) (modify-syntax-entry ?} "){ " local-syntax-table) ---- bmacs/bee/bee-module.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-module.el 2020-10-19 13:55:40.600346929 -0600 +--- bmacs/bee/bee-module.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-module.el 2023-12-25 11:10:39.399318853 -0700 @@ -359,8 +359,7 @@ ;* bee-get-module-name ... */ ;*---------------------------------------------------------------------*/ @@ -140,8 +140,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 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-tags.el 2020-10-19 14:47:13.671672938 -0600 +--- bmacs/bee/bee-tags.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-tags.el 2023-12-25 11:10:39.399318853 -0700 @@ -165,8 +165,7 @@ (let ((old-buffer (find-buffer-visiting (concat ude-root-directory ude-afile-name)))) @@ -152,8 +152,8 @@ (goto-char (point-min)) (sort (mapcar #'(lambda (x) (symbol-name (car x))) (read old-buffer)) ---- bmacs/bee/bee-usage.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bee/bee-usage.el 2020-10-19 13:55:40.600346929 -0600 +--- bmacs/bee/bee-usage.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bee/bee-usage.el 2023-12-25 11:10:39.399318853 -0700 @@ -33,9 +33,7 @@ (goto-char pos) (beginning-of-line) @@ -174,8 +174,8 @@ (ude-error "Can't find buffer for %S" file)))))))) ;*---------------------------------------------------------------------*/ ---- bmacs/bug/bug-class.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-class.el 2020-10-19 13:55:40.600346929 -0600 +--- bmacs/bug/bug-class.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-class.el 2023-12-25 11:10:39.399318853 -0700 @@ -36,15 +36,13 @@ ;* bug-file-to-string ... */ ;*---------------------------------------------------------------------*/ @@ -209,8 +209,8 @@ (if bug-buffer-class bug-buffer-class (progn ---- bmacs/bug/bug-connect.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-connect.el 2020-10-19 13:55:40.600346929 -0600 +--- bmacs/bug/bug-connect.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-connect.el 2023-12-25 11:10:39.399318853 -0700 @@ -74,8 +74,7 @@ ;* This function returns the point line number. */ ;*---------------------------------------------------------------------*/ @@ -221,8 +221,8 @@ (let (start) (save-excursion (save-restriction ---- bmacs/bug/bug.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug.el 2020-10-19 13:55:40.600346929 -0600 +--- bmacs/bug/bug.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug.el 2023-12-25 11:10:39.400318839 -0700 @@ -71,7 +71,10 @@ and source-file directory for your debug `(,bugname ,binary ,nil ,@(bug-string->list bug-emacs-option) ,a.out)) @@ -245,8 +245,8 @@ (condition-case () (comint-kill-subjob) (error ---- bmacs/bug/bug-filter.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-filter.el 2020-10-19 14:48:51.943594453 -0600 +--- bmacs/bug/bug-filter.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-filter.el 2023-12-25 11:10:39.400318839 -0700 @@ -19,6 +19,7 @@ (require 'bug-config) (require 'bug-images) @@ -292,8 +292,8 @@ ;*---------------------------------------------------------------------*/ ;* bug-filter-ident-map ... */ ---- bmacs/bug/bug-gnu-emacs.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-gnu-emacs.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/bug/bug-gnu-emacs.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-gnu-emacs.el 2023-12-25 11:10:39.400318839 -0700 @@ -14,6 +14,7 @@ ;*---------------------------------------------------------------------*/ (provide 'bug-gnu-emacs) @@ -341,8 +341,8 @@ (setq pos (point)) (move-overlay bug-gnu-emacs-source-line-overlay (line-beginning-position) ---- bmacs/bug/bug-hooking.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-hooking.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/bug/bug-hooking.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-hooking.el 2023-12-25 11:10:39.400318839 -0700 @@ -48,7 +48,7 @@ (redisplay-frame) (sit-for 0.2) @@ -372,8 +372,8 @@ (goto-char (point-max)) (insert str)))) (setq bug-prompt-hook ---- bmacs/bug/bug-process.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-process.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/bug/bug-process.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-process.el 2023-12-25 11:10:39.400318839 -0700 @@ -63,8 +63,7 @@ (let ((proc (get-buffer-process bug-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -472,8 +472,8 @@ + (setq bug-waiting nil) + (or (not (numberp timeout)) + (< count timeout)))))))) ---- bmacs/bug/bug-source.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-source.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/bug/bug-source.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-source.el 2023-12-25 11:10:39.400318839 -0700 @@ -80,7 +80,8 @@ (display-buffer buffer)))) (set-buffer buffer) @@ -484,8 +484,8 @@ (set-window-point window (point)) (if bug-raise-active-source-frame-p (let ((frame (window-frame window))) ---- bmacs/bug/bug-xemacs.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/bug/bug-xemacs.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/bug/bug-xemacs.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/bug/bug-xemacs.el 2023-12-25 11:10:39.401318826 -0700 @@ -143,7 +143,8 @@ static char *arrow[] = { (save-excursion (save-restriction @@ -519,8 +519,8 @@ (goto-char char) (let ((o (make-extent (line-beginning-position) (1+ (line-beginning-position)) ---- bmacs/cee/cee-config.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/cee/cee-config.el 2020-10-19 14:51:44.559491234 -0600 +--- bmacs/cee/cee-config.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/cee/cee-config.el 2023-12-25 11:10:39.401318826 -0700 @@ -31,12 +31,14 @@ ;; online documentation preferred format (defcustom cee-docline-preferred-format '((java-mode . html) (t . info)) @@ -548,8 +548,8 @@ ;*---------------------------------------------------------------------*/ ;* cee-customize ... */ ---- bmacs/cee/cee-kbdb.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/cee/cee-kbdb.el 2020-10-19 13:55:40.601346929 -0600 +--- bmacs/cee/cee-kbdb.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/cee/cee-kbdb.el 2023-12-25 11:10:39.401318826 -0700 @@ -389,7 +389,8 @@ (select-frame frame) (select-window win) @@ -570,8 +570,8 @@ (beginning-of-line) t)))) (t ---- bmacs/dbg/dbg-args.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-args.el 2020-10-19 13:55:40.602346928 -0600 +--- bmacs/dbg/dbg-args.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-args.el 2023-12-25 11:10:39.401318826 -0700 @@ -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")) @@ -617,8 +617,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg-breakpoint.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-breakpoint.el 2020-10-19 13:55:40.602346928 -0600 +--- bmacs/dbg/dbg-breakpoint.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-breakpoint.el 2023-12-25 11:10:39.401318826 -0700 @@ -304,8 +304,7 @@ static char *footprint[] = { (let ((proc (get-buffer-process dbg-comint-buffer))) (or proc (ude-error "Current buffer has no process")) @@ -649,8 +649,8 @@ (beginning-of-line) (set-extent-endpoints extent (point) (point)) bp))))) ---- bmacs/dbg/dbg-connect.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-connect.el 2020-10-19 13:55:40.602346928 -0600 +--- bmacs/dbg/dbg-connect.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-connect.el 2023-12-25 11:10:39.401318826 -0700 @@ -157,6 +157,6 @@ ;* Disconnect all currently connected buffers. */ ;*---------------------------------------------------------------------*/ @@ -659,8 +659,8 @@ + (mapc 'dbg-disconnect-buffer dbg-connected-buffers) (setq dbg-connected-buffers '())) ---- bmacs/dbg/dbg-display.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-display.el 2020-10-19 13:55:40.602346928 -0600 +--- bmacs/dbg/dbg-display.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-display.el 2023-12-25 11:10:39.402318813 -0700 @@ -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")) @@ -706,8 +706,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg.el 2020-10-19 13:55:40.602346928 -0600 +--- bmacs/dbg/dbg.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg.el 2023-12-25 11:10:39.402318813 -0700 @@ -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) @@ -860,8 +860,8 @@ (let (start) (save-excursion (save-restriction ---- bmacs/dbg/dbg-filter.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-filter.el 2020-10-19 13:55:40.603346928 -0600 +--- bmacs/dbg/dbg-filter.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-filter.el 2023-12-25 11:10:39.402318813 -0700 @@ -30,10 +30,12 @@ It is saved for when this flag is not se (defvar dbg-delete-prompt-marker nil) @@ -899,8 +899,8 @@ ;; If we deferred text that arrived during this processing, ;; handle it now. (if dbg-filter-pending-text ---- bmacs/dbg/dbg-locals.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-locals.el 2020-10-19 13:55:40.603346928 -0600 +--- bmacs/dbg/dbg-locals.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-locals.el 2023-12-25 11:10:39.402318813 -0700 @@ -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")) @@ -946,8 +946,8 @@ (save-excursion (goto-char (event-closest-point event)) (message "point: %S" (point)) ---- bmacs/dbg/dbg-mode.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-mode.el 2020-10-19 13:55:40.603346928 -0600 +--- bmacs/dbg/dbg-mode.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-mode.el 2023-12-25 11:10:39.402318813 -0700 @@ -98,10 +98,7 @@ The following command are available: (make-local-variable 'dbg-delete-prompt-marker) (setq dbg-delete-prompt-marker (make-marker)) @@ -959,8 +959,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 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-source.el 2020-10-19 13:55:40.603346928 -0600 +--- bmacs/dbg/dbg-source.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-source.el 2023-12-25 11:10:39.402318813 -0700 @@ -152,11 +152,11 @@ static char *arrow[] = { (set-extent-begin-glyph extent dbg-arrow-glyph) (set-extent-begin-glyph-layout extent 'outside-margin) @@ -976,8 +976,8 @@ (set-window-point window (point)) (setq pos (progn (beginning-of-line) ---- bmacs/dbg/dbg-stack.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/dbg/dbg-stack.el 2020-10-19 13:55:40.603346928 -0600 +--- bmacs/dbg/dbg-stack.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/dbg/dbg-stack.el 2023-12-25 11:10:39.403318799 -0700 @@ -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")) @@ -1023,8 +1023,8 @@ (save-excursion (goto-char (event-closest-point event)) (setq selection (dbg-get-frame-number)))) ---- bmacs/ude/id-select.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/id-select.el 2020-10-19 14:08:10.331732736 -0600 +--- bmacs/ude/id-select.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/id-select.el 2023-12-25 11:10:39.403318799 -0700 @@ -248,6 +248,72 @@ (defvar id-select-prior-buffer 'nil) @@ -1221,8 +1221,8 @@ - (provide 'id-select) ---- bmacs/ude/plugin.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/plugin.el 2020-10-19 13:55:40.604346927 -0600 +--- bmacs/ude/plugin.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/plugin.el 2023-12-25 11:10:39.403318799 -0700 @@ -371,14 +371,16 @@ process structure hosting the plugin. (select-frame frame) (select-window win) @@ -1242,8 +1242,8 @@ (recenter)))))) ((and (consp command) (memq (car command) '(HELP help))) (let ((prgm (let ((p (cadr command))) ---- bmacs/ude/ude-about.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-about.el 2020-10-19 13:55:40.604346927 -0600 +--- bmacs/ude/ude-about.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-about.el 2023-12-25 11:10:39.403318799 -0700 @@ -27,8 +27,7 @@ (if (featurep 'xemacs) (let ((window-min-height 1) @@ -1278,8 +1278,8 @@ (ude-about-insert-xpm (current-buffer) xpm) (insert "\n") (insert msg) ---- bmacs/ude/ude-autoload.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-autoload.el 2020-10-19 13:55:40.604346927 -0600 +--- bmacs/ude/ude-autoload.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-autoload.el 2023-12-25 11:10:39.403318799 -0700 @@ -17,6 +17,7 @@ (autoload 'ude-customize "ude-custom" "Ude customization." t) ;; config @@ -1297,8 +1297,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 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-compile.el 2020-10-19 14:06:13.250832868 -0600 +--- bmacs/ude/ude-compile.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-compile.el 2023-12-25 11:10:39.404318786 -0700 @@ -316,7 +316,7 @@ Executed hooks are removed from that lis (if ude-compile-p (progn @@ -1318,8 +1318,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 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-docline.el 2020-10-19 14:10:57.161590112 -0600 +--- bmacs/ude/ude-docline.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-docline.el 2023-12-25 11:10:39.404318786 -0700 @@ -106,13 +106,10 @@ (ude-error "Can't find documentation for `%S'" var) (progn @@ -1364,8 +1364,8 @@ (goto-char (point-min)) (let* ((path-regexp "@path[ \t]+\\([^@]+\\)@") (anchor-regexp "@ref[ \t]+\\([^@:]+\\):\\([^@]+\\)@") ---- bmacs/ude/ude-error.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-error.el 2020-10-19 14:01:56.402052659 -0600 +--- bmacs/ude/ude-error.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-error.el 2023-12-25 11:10:39.404318786 -0700 @@ -14,6 +14,7 @@ (provide 'ude-error) (require 'ude-custom) @@ -1374,8 +1374,8 @@ ;*---------------------------------------------------------------------*/ ;* ude-error ... */ ---- bmacs/ude/ude-icon.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-icon.el 2020-10-19 13:55:40.605346927 -0600 +--- bmacs/ude/ude-icon.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-icon.el 2023-12-25 11:10:39.404318786 -0700 @@ -19,6 +19,7 @@ (require 'ude-custom) @@ -1384,8 +1384,8 @@ (add-to-list 'image-load-path (concat bmacs-lispdir "/" ude-toolbar-image-directory)) ---- bmacs/ude/ude-ident.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-ident.el 2020-10-19 13:55:40.605346927 -0600 +--- bmacs/ude/ude-ident.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-ident.el 2023-12-25 11:10:39.404318786 -0700 @@ -36,8 +36,8 @@ (save-excursion (goto-char pos) @@ -1441,8 +1441,8 @@ (setq ude-tags-balloon-region nil)))) ;*---------------------------------------------------------------------*/ ---- bmacs/ude/ude-info.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-info.el 2020-10-19 14:06:59.154793603 -0600 +--- bmacs/ude/ude-info.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-info.el 2023-12-25 11:10:39.404318786 -0700 @@ -131,7 +131,7 @@ (add-hook 'Info-select-hook #'(lambda () @@ -1452,8 +1452,8 @@ (add-hook 'Info-startup-hook #'(lambda () (let ((kwd ude-info-font-lock-keywords)) ---- bmacs/ude/ude-makefile.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-makefile.el 2020-10-19 13:55:40.605346927 -0600 +--- bmacs/ude/ude-makefile.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-makefile.el 2023-12-25 11:10:39.405318772 -0700 @@ -209,14 +209,12 @@ (interactive) (let ((default-directory ude-root-directory)) @@ -1525,8 +1525,8 @@ (let* ((cmd (format "%s -o %s -project %s" ude-makemake ude-makefile ---- bmacs/ude/ude-repl.el.orig 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/ude/ude-repl.el 2020-10-19 13:55:40.605346927 -0600 +--- bmacs/ude/ude-repl.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/ude/ude-repl.el 2023-12-25 11:10:39.405318772 -0700 @@ -43,8 +43,7 @@ 'ude-repl-sentinel) (set-process-filter ude-repl-comint-process @@ -1537,8 +1537,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 2020-05-12 00:35:36.000000000 -0600 -+++ bmacs/xemacs-etags.el 2020-10-19 13:55:40.606346926 -0600 +--- bmacs/xemacs-etags.el.orig 2023-12-22 09:18:46.000000000 -0700 ++++ bmacs/xemacs-etags.el 2023-12-25 11:10:39.405318772 -0700 @@ -236,8 +236,7 @@ file the tag was in." ;; it is initialized as a tag table buffer. (save-excursion diff --git a/bigloo-emacs29.patch b/bigloo-emacs29.patch deleted file mode 100644 index 422f05a..0000000 --- a/bigloo-emacs29.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- autoconf/emacsbrand.orig 2022-12-29 23:55:22.000000000 -0700 -+++ autoconf/emacsbrand 2023-12-01 10:31:24.531044114 -0700 -@@ -35,6 +35,7 @@ done - #* The autodetection ELisp expression */ - #*---------------------------------------------------------------------*/ - expr="(cond \ -+ ((string-match \"GNU Emacs 29\" (emacs-version)) (kill-emacs 29)) \ - ((string-match \"GNU Emacs 28\" (emacs-version)) (kill-emacs 28)) \ - ((string-match \"GNU Emacs 27\" (emacs-version)) (kill-emacs 27)) \ - ((string-match \"GNU Emacs 26\" (emacs-version)) (kill-emacs 26)) \ -@@ -78,6 +79,10 @@ else - else - if [ "$version" = "28" ]; then - echo "emacs28" -+ else -+ if [ "$version" = "29" ]; then -+ echo "emacs29" -+ fi - fi - fi - fi ---- bmacs/Makefile.orig 2022-12-29 23:55:22.000000000 -0700 -+++ bmacs/Makefile 2023-12-01 10:32:09.803412470 -0700 -@@ -116,7 +116,7 @@ POPULATION = Makefile README $(EMACS_SOU - #*---------------------------------------------------------------------*/ - all: $(EMACSBRAND) - --emacs22 emacs23 emacs24 emacs25 emacs26 emacs27 emacs28: -+emacs22 emacs23 emacs24 emacs25 emacs26 emacs27 emacs28 emacs29: - (expr=load-path; \ - for p in . $(LOADPATH); do \ - expr="(cons \"../$$p\" (cons \"$$p\" $$expr))"; \ -@@ -184,6 +184,7 @@ install.emacs25: doinstall - install.emacs26: doinstall - install.emacs27: doinstall - install.emacs28: doinstall -+install.emacs29: doinstall - install.xemacs: doinstall - - install.generic: diff --git a/bigloo-lto-type.patch b/bigloo-lto-type.patch index 1dc2711..000a898 100644 --- a/bigloo-lto-type.patch +++ b/bigloo-lto-type.patch @@ -1,5 +1,40 @@ ---- runtime/Include/bigloo_pair.h.orig 2022-12-29 23:55:22.000000000 -0700 -+++ runtime/Include/bigloo_pair.h 2023-01-10 10:19:59.989979958 -0700 +--- api/libuv/src/Clib/bgluv.c.orig 2023-12-22 09:18:46.000000000 -0700 ++++ api/libuv/src/Clib/bgluv.c 2023-12-25 14:09:43.234920017 -0700 +@@ -2978,7 +2978,7 @@ uv_listen_cb(uv_stream_t *handle, int st + /* bgl_uv_listen ... */ + /*---------------------------------------------------------------------*/ + int +-bgl_uv_listen(obj_t obj, int backlog, obj_t proc, bgl_uv_loop_t bloop) { ++bgl_uv_listen(obj_t obj, int backlog, obj_t proc) { + if (!(PROCEDUREP(proc) && (PROCEDURE_CORRECT_ARITYP(proc, 2)))) { + C_SYSTEM_FAILURE(BGL_TYPE_ERROR, "uv-tcp-listen", + "wrong callback", proc); +--- runtime/Clib/csystem.c.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Clib/csystem.c 2023-12-25 11:46:58.136516120 -0700 +@@ -837,17 +837,17 @@ bgl_getrlimit(long resource) { + /* obj_t */ + /* bgl_setrlimit ... */ + /*---------------------------------------------------------------------*/ +-obj_t ++bool_t + bgl_setrlimit(long resource, long soft, long hard) { + #if BGL_HAVE_GETRLIMIT + struct rlimit lim = { .rlim_cur = soft, .rlim_max = hard }; + if (!setrlimit(resource, &lim)) { +- return BTRUE; ++ return 1; + } else { +- return BFALSE; ++ return 0; + } + #else +- return BFALSE; ++ return 0; + #endif + } + +--- runtime/Include/bigloo_pair.h.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Include/bigloo_pair.h 2023-12-25 11:44:51.923177225 -0700 @@ -60,7 +60,7 @@ struct bgl_epair { obj_t car; obj_t cdr; diff --git a/bigloo-memread.patch b/bigloo-memread.patch index abf0952..435ee3c 100644 --- a/bigloo-memread.patch +++ b/bigloo-memread.patch @@ -1,6 +1,6 @@ ---- 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 +--- runtime/Clib/csocket.c.orig 2023-12-25 11:15:19.184826296 -0700 ++++ runtime/Clib/csocket.c 2023-12-25 11:16:07.937221378 -0700 +@@ -2906,7 +2906,7 @@ bgl_make_datagram_server_socket(int port int s; struct addrinfo hints, *servinfo, *p; int rv; @@ -8,4 +8,4 @@ + char service[ 12 ]; obj_t sock, buf, inb, iport; FILE *fs; - + int fam = bgl_symbol_to_family(family); diff --git a/bigloo-noreturn.patch b/bigloo-noreturn.patch index 2435e7c..982aca7 100644 --- a/bigloo-noreturn.patch +++ b/bigloo-noreturn.patch @@ -1,5 +1,5 @@ ---- api/alsa/src/Clib/bglalsa.h.orig 2022-12-29 23:55:22.000000000 -0700 -+++ api/alsa/src/Clib/bglalsa.h 2023-01-10 10:18:25.967752123 -0700 +--- api/alsa/src/Clib/bglalsa.h.orig 2023-12-22 09:18:46.000000000 -0700 ++++ api/alsa/src/Clib/bglalsa.h 2023-12-25 11:13:52.417825236 -0700 @@ -13,7 +13,7 @@ #include @@ -9,19 +9,19 @@ extern int bgl_snd_pcm_close( obj_t ); extern int bgl_snd_pcm_open( obj_t, char *, snd_pcm_stream_t, int ); ---- runtime/Clib/capply.c.orig 2022-12-29 23:55:22.000000000 -0700 -+++ runtime/Clib/capply.c 2023-01-10 10:18:25.967752123 -0700 +--- runtime/Clib/capply.c.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Clib/capply.c 2023-12-25 11:44:29.827467488 -0700 @@ -13,7 +13,7 @@ /*---------------------------------------------------------------------*/ /* Les recuperations externes */ /*---------------------------------------------------------------------*/ -extern void c_error(); +extern void c_error( char *, char *, int ) __attribute__((noreturn)); - extern long bgl_list_length( obj_t ); + extern long bgl_list_length(obj_t); /*---------------------------------------------------------------------*/ ---- runtime/Clib/cmain.c.orig 2022-12-29 23:55:22.000000000 -0700 -+++ runtime/Clib/cmain.c 2023-01-10 10:18:25.967752123 -0700 +--- runtime/Clib/cmain.c.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Clib/cmain.c 2023-12-25 11:13:52.418825226 -0700 @@ -40,7 +40,7 @@ extern obj_t cref( obj_t ); extern void memshow( char *, char *, long ); extern void bgl_init_eval_cnst(); @@ -31,29 +31,29 @@ 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 2022-12-29 23:55:22.000000000 -0700 -+++ runtime/Clib/csocket.c 2023-01-10 10:18:25.968752103 -0700 -@@ -253,7 +253,7 @@ bgl_init_socket() { +--- runtime/Clib/csocket.c.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Clib/csocket.c 2023-12-25 11:44:29.828467475 -0700 +@@ -273,7 +273,7 @@ bgl_init_socket() { /* static void */ /* socket_error ... */ /*---------------------------------------------------------------------*/ -static void +static void __attribute__((noreturn)) - socket_error( const char *who, const char *message, obj_t object ) { - C_SYSTEM_FAILURE( BGL_IO_ERROR, (char *)who, (char *)message, object ); + socket_error(const char *who, const char *message, obj_t object) { + C_SYSTEM_FAILURE(BGL_IO_ERROR, (char *)who, (char *)message, object); } -@@ -262,7 +262,7 @@ socket_error( const char *who, const cha +@@ -282,7 +282,7 @@ socket_error(const char *who, const char /* static void */ /* socket_timeout_error ... */ /*---------------------------------------------------------------------*/ -static void +static void __attribute__((noreturn)) - socket_timeout_error( obj_t hostname, int port ) { + socket_timeout_error(obj_t hostname, int port) { char buffer[ 512 ]; ---- runtime/Include/bigloo.h.orig 2023-01-10 10:18:25.968752103 -0700 -+++ runtime/Include/bigloo.h 2023-01-10 10:19:08.221955698 -0700 -@@ -2427,7 +2427,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread +--- runtime/Include/bigloo.h.orig 2023-12-22 09:18:46.000000000 -0700 ++++ runtime/Include/bigloo.h 2023-12-25 11:13:52.419825214 -0700 +@@ -2646,7 +2646,7 @@ BGL_RUNTIME_DECL obj_t (*bgl_multithread /*---------------------------------------------------------------------*/ /* The external declarations */ /*---------------------------------------------------------------------*/ diff --git a/bigloo-return.patch b/bigloo-return.patch index ac6791c..4d3d00b 100644 --- a/bigloo-return.patch +++ b/bigloo-return.patch @@ -1,20 +1,29 @@ ---- api/libuv/src/Clib/bgluv.c.orig 2023-01-10 10:32:48.219572578 -0700 -+++ api/libuv/src/Clib/bgluv.c 2023-01-10 10:33:50.946398610 -0700 -@@ -1074,7 +1074,7 @@ bgl_uv_fs_write(obj_t obj, obj_t buffer, - req->data = proc; - gc_mark(proc); +--- api/libuv/src/Clib/bgluv.c.orig 2023-12-25 11:20:44.173721366 -0700 ++++ api/libuv/src/Clib/bgluv.c 2023-12-25 11:22:58.370989651 -0700 +@@ -2090,7 +2090,7 @@ bgl_uv_fs_write(obj_t obj, obj_t buffer, + data->proc = proc; + TRACECA(trw); - uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw_cb); + return uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw_cb); } else { uv_fs_t req; int r; -@@ -1111,7 +1111,7 @@ bgl_uv_fs_read(obj_t obj, obj_t buffer, - req->data = proc; - gc_mark(proc); +@@ -2130,7 +2130,7 @@ bgl_uv_fs_write2(obj_t obj, obj_t buffer + data->arg[1] = arg1; -- uv_fs_read(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw_cb); -+ return uv_fs_read(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw_cb); + TRACECA(trw2); +- uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw2_cb); ++ return uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw2_cb); + } else { + uv_fs_t req; + int r; +@@ -2171,7 +2171,7 @@ bgl_uv_fs_write3(obj_t obj, obj_t buffer + data->arg[2] = arg2; + + TRACECA(trw3); +- uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw3_cb); ++ return uv_fs_write(loop, req, fd, &iov, 1, position, &bgl_uv_fs_rw3_cb); } else { uv_fs_t req; int r; diff --git a/bigloo.spec b/bigloo.spec index 90f6ab0..ae88930 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -6,12 +6,8 @@ # 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 1 -%global patch_suffix %{?patch_ver:-%{patch_ver}} - -# prerelease -#%%global prerel 20151208beta -#%%global ver_suffix -beta08Dec15 +#%%global patch_ver 1 +#%%global patch_suffix %%{?patch_ver:-%%{patch_ver}} # For Emacs subpackages %global pkg %{name} @@ -26,8 +22,8 @@ %global bundlelbt 1.0.20210529 Name: bigloo -Version: 4.5a -Release: 4%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} +Version: 4.5b%{?patch_ver:.%{patch_ver}} +Release: 1%{?dist} Summary: A compiler for the Scheme programming language # The compiler and tools are GPL-2.0-or-later. @@ -40,7 +36,7 @@ Summary: A compiler for the Scheme programming language # - api/text/src/Llib/levenshtein.scm is LGPL-3.0-or-later License: GPL-2.0-or-later URL: https://www-sop.inria.fr/mimosa/fp/Bigloo -Source0: ftp://ftp-sop.inria.fr/indes/fp/Bigloo/%{name}-%{version}%{?patch_suffix}%{?ver_suffix}.tar.gz +Source0: ftp://ftp-sop.inria.fr/indes/fp/Bigloo/%{name}-%{version}%{?patch_suffix}.tar.gz # Not yet sent upstream: fix some bugs in the Emacs interface, and also # modernizes the code somewhat. Patch0: %{name}-emacs.patch @@ -62,15 +58,9 @@ Patch7: %{name}-javac.patch Patch8: %{name}-return.patch # Fix signal numbers in the Java code Patch9: %{name}-java-signum.patch -# Migrate K&R C in the config scripts to ANSI C -# https://github.com/manuel-serrano/bigloo/pull/104 -Patch10: %{name}-configure-c99.patch -# Support Emacs 29 -Patch11: %{name}-emacs29.patch -# See https://bugzilla.redhat.com/show_bug.cgi?id=2160579 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: ppc64le %{ix86} +ExcludeArch: %{ix86} BuildRequires: emacs BuildRequires: gcc @@ -226,16 +216,8 @@ export LDFLAGS="-Wl,-z,relro -Wl,--as-needed" --jvm=no \ %endif --bee=full \ -%if %{with customgc} - --customgc=yes \ -%else - --customgc=no \ -%endif -%if %{with customlbt} - --customlibbacktrace=yes \ -%else - --customlibbacktrace=no \ -%endif + --customgc=%{?with_customgc:yes}%{!?with_customgc:no} \ + --customlibbacktrace=%{?with_customlbt:yes}%{!?with_customlbt:no} \ --coflags="$CFLAGS" \ --cpicflags="-fPIC" \ --sharedbde=yes \ @@ -320,6 +302,8 @@ rm -f bmacs-xemacs.el xemacs-etags.el %{_emacs_bytecompile} bmacs.el bmacs-config.el bmacs-gnu-emacs.el popd +# FIXME: Unexplained segfaults when running tests on ppc64le +%ifnarch %{power64} %check ulimit -s unlimited export TZ=$(date +%%Z) @@ -338,6 +322,7 @@ cd - if [ "$JVMBACKEND" = yes ]; then make jvm-test fi +%endif %files @@ -369,6 +354,10 @@ fi %changelog +* Tue Dec 26 2023 Jerry James - 4.5b-1 +- Version 4.5b +- Drop upstreamed configure-c99 and emacs29 patches + * Fri Dec 1 2023 Jerry James - 4.5a-4.1 - Fix potential GCC 14 errors - Support Emacs 29 diff --git a/sources b/sources index ba27ebd..a916590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bigloo-4.5a-1.tar.gz) = 7ed17b18db9ef83492cab010e3c4b5a9cddad99892ac60e0e5dc2897e3c7d242ea65383aacc55fc58d329e3c36a2177832e1d8b76a5540dcbae4f8397676a8ae +SHA512 (bigloo-4.5b.tar.gz) = 7810f9895ea373f716cd2c93a7b1072d289e2b333632b5b4f293a6317f31a56d2b098790763e96c2d15ce212dafb45c70ec6a7941a344fb8c53a3ef3c6b67feb