diff options
Diffstat (limited to 'app-editors/xemacs')
21 files changed, 360 insertions, 830 deletions
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 793589c73091..d30897871d36 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -1,3 +1,3 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 -DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a +DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019 diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch deleted file mode 100644 index fff6f5578733..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Sun Apr 19 18:46:45 2020 +0200 -@@ -778,6 +778,5 @@ - INSTALL_SCRIPT - INSTALL_PROGRAM - RANLIB --AR - lib_gcc - ld -@@ -10296,47 +10307,6 @@ - fi - - --# Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_AR+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="ar" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found" --fi --fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 --$as_echo "$AR" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --if test "$AR" = "not_found"; then -- { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; } --fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200 -@@ -2557,12 +2557,6 @@ - dnl should make an entry in src/config.h, do not forget to add an - dnl #undef clause to src/config.h.in for autoconf to modify. - --dnl Sun likes to hide these utilities. Steve Baur asked that we make --dnl the failure occur at configure time, not at use time. --AC_CHECK_PROG(AR,ar,ar,not_found) --if test "$AR" = "not_found"; then -- XE_DIE(["ar not found -- is PATH set correctly?"]) --fi - dnl These tests don't necessarily check that the program exists. - AC_PROG_RANLIB - AC_PROG_INSTALL diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch deleted file mode 100644 index 542ce14c36af..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -r 30910ee1cf8c configure ---- a/configure Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure Mon Jul 08 20:38:49 2019 +0200 -@@ -16668,7 +16668,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-l$athena_variant $LIBS" -+LIBS="-l$athena_variant $libs_x $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -diff -r 30910ee1cf8c configure.ac ---- a/configure.ac Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure.ac Mon Jul 08 20:38:49 2019 +0200 -@@ -4068,7 +4068,8 @@ - athena_lib=Xaw; - AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); - ], -- [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) -+ [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]), -+ $libs_x) - fi - - dnl Now we locate the Athena headers that we need. diff --git a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch deleted file mode 100644 index 9a86046be992..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch +++ /dev/null @@ -1,184 +0,0 @@ ---- a/lisp/update-elc-2.el.orig 2022-06-16 21:58:48.748641021 +0200 -+++ b/lisp/update-elc-2.el 2022-06-16 21:58:48.748641021 +0200 -@@ -137,37 +137,10 @@ - (let ((dir (car command-line-args-left))) - ;; don't depend on being able to autoload `update-autoload-files'! - (load "autoload") -- (autoload 'cl-compile-time-init "cl-macs") - (load "bytecomp") - (load "byte-optimize") -- ;; #### the API used here is deprecated, convert to one with explicit -- ;; arguments when it is available -- ;; update-elc.el signals us to rebuild the autoloads when necessary. -- ;; in some cases it will rebuild the autoloads itself, but doing it this -- ;; way is slow, so we avoid it when possible. -- (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS" -- invocation-directory)) -- ;; if we were instructed to rebuild the autoloads, force the file -- ;; to be touched even w/o changes; otherwise, we won't ever stop -- ;; being told to rebuild them. -- (update-autoload-files dir "auto" nil t) -- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0) -- (when (featurep 'mule) -- (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir)))) -- ;; force here just like above. -- (update-autoload-files muledir "mule" nil t) -- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)))) -- (when (featurep 'modules) -- (let* ((moddir (expand-file-name "../modules" (file-truename dir))) -- (autofile (expand-file-name "auto-autoloads.el" moddir))) -- (update-autoload-files -- (delete (concat (file-name-as-directory moddir) ".") -- (delete (concat (file-name-as-directory moddir) "..") -- (directory-files moddir t nil nil 0))) -- "modules" autofile) -- (byte-recompile-file autofile 0))) -- ;; now load the (perhaps newly rebuilt) autoloads; we were called with -- ;; -no-autoloads so they're not already loaded. -+ ;; now load the autoloads; we were called with -no-autoloads so they're not -+ ;; already loaded. - (load (expand-file-name "auto-autoloads" lisp-directory)) - (when (featurep 'mule) - (load (expand-file-name "mule/auto-autoloads" lisp-directory))) -@@ -175,6 +148,8 @@ - ;; there may be dependencies between one .el and another (even across - ;; directories), and we don't want to load an out-of-date .elc while - ;; byte-compiling a file. -+ (when (featurep 'modules) -+ (load (expand-file-name "auto-autoloads" module-directory))) - (message "Removing old or spurious .elcs in directory tree `%s'..." dir) - (do-update-elc-2 dir nil nil) - (message "Removing old or spurious .elcs in directory tree `%s'...done" ---- a/lisp/update-elc.el.orig 2022-06-16 21:58:48.748641021 +0200 -+++ b/lisp/update-elc.el 2022-06-16 21:58:48.748641021 +0200 -@@ -54,8 +54,11 @@ - (defvar update-elc-files-to-compile nil) - (defvar need-to-rebuild-autoloads nil) - (defvar need-to-rebuild-mule-autoloads nil) -+(defvar need-to-rebuild-module-autoloads nil) - (defvar need-to-recompile-autoloads nil) - (defvar need-to-recompile-mule-autoloads nil) -+(defvar need-to-recompile-module-autoloads nil) -+ - (defvar exe-target nil) - (defvar dump-target nil) - (defvar dump-target-out-of-date-wrt-dump-files nil) -@@ -84,10 +87,14 @@ - - (defvar source-lisp-mule (expand-file-name "mule" source-lisp)) - (defvar source-directory (expand-file-name ".." source-lisp)) -+(defconst module-directory (expand-file-name "modules" source-directory)) -+ - (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp)) - (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp)) - (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule)) - (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule)) -+(defvar aa-modules (expand-file-name "auto-autoloads.el" module-directory)) -+(defvar aac-modules (expand-file-name "auto-autoloads.elc" module-directory)) - - (setq load-path (list source-lisp)) - -@@ -130,7 +137,8 @@ - - (defvar lisp-files-ignored-when-checking-for-autoload-updating - '("custom-load.el" -- "auto-autoloads.el") -+ "auto-autoloads.el" -+ "finder-inf.el") - "Lisp files that should not trigger auto-autoloads rebuilding.") - - (defun update-elc-chop-extension (file) -@@ -270,6 +278,18 @@ - (setq all-files-in-dir (cdr all-files-in-dir)))) - (setq dirs-to-check (cdr dirs-to-check)))) - -+ ;; Check for the module autoloads separately, given the need to run -+ ;; directory-files on subdirectories. -+ (let ((autoload-file -+ (expand-file-name "auto-autoloads.el" module-directory))) -+ (mapc -+ #'(lambda (full-dir) -+ (mapc #'(lambda (full-arg) -+ (when (file-newer-than-file-p full-arg autoload-file) -+ (setq need-to-rebuild-module-autoloads t))) -+ (directory-files full-dir t "\\.c$" nil t))) -+ (directory-files module-directory t nil t 'subdirs))) -+ - (if dump-target-out-of-date-wrt-dump-files - (condition-case nil - (write-region-internal -@@ -297,6 +317,14 @@ - (file-newer-than-file-p aa-lisp-mule aac-lisp-mule)) - (setq need-to-recompile-mule-autoloads t)) - -+(when (or need-to-rebuild-module-autoloads -+ ;; not necessary but ... see comment above. -+ (eq (file-exists-p aa-modules) nil) -+ ;; no need to check for file-exists of .elc due to definition -+ ;; of file-newer-than-file-p -+ (file-newer-than-file-p aa-modules aac-modules)) -+ (setq need-to-recompile-module-autoloads t)) -+ - (when (not (featurep 'mule)) - ;; sorry charlie. - (setq need-to-rebuild-mule-autoloads nil -@@ -318,15 +346,18 @@ - (if need-to-rebuild-mule-autoloads - (list "-f" "batch-update-directory-autoloads" - "mule" source-lisp-mule)) -+ (if need-to-rebuild-module-autoloads -+ (list "-f" "batch-update-directory-autoloads" -+ "auto" module-directory)) - (if need-to-recompile-autoloads - (list "-f" "batch-byte-compile-one-file" - aa-lisp)) - (if need-to-recompile-mule-autoloads - (list "-f" "batch-byte-compile-one-file" -- aa-lisp-mule))))) -- (condition-case nil -- (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory)) -- (file-error nil)) -+ aa-lisp-mule)) -+ (if need-to-recompile-module-autoloads -+ (list "-f" "batch-byte-compile-one-file" -+ aa-modules))))) - (cond ((and (not update-elc-files-to-compile) - (not need-to-rebuild-autoloads) - (not need-to-rebuild-mule-autoloads) -@@ -335,17 +366,25 @@ - ;; (1) Nothing to do at all. - ) - ((not update-elc-files-to-compile) -- ;; (2) We have no files to byte-compile, but we do need to -- ;; regenerate and compile the auto-autoloads file, so signal -- ;; update-elc-2 to do it. This is much faster than loading -- ;; all the .el's and doing it here. (We only need to rebuild -- ;; the autoloads here when we have files to compile, since -- ;; they may depend on the updated autoloads.) -- (condition-case nil -- (write-region-internal -- "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory)) -- (file-error nil)) -- ) -+ ;; (2) We have no files to byte-compile, but we do need to regenerate -+ ;; and compile the auto-autoloads file. Don't pass this on to -+ ;; update-elc-2.el to do, since that gives dependency problems -+ ;; with parallel builds (make -j and friends). Completely fine to -+ ;; use the compiled Lisp infrastructure for this, though, since we -+ ;; know it's up to date. -+ (setq command-line-args -+ (append -+ '("-l" "loadup-el.el" "run-temacs" -+ "-batch" "-no-packages" "-no-autoloads" -+ "-eval" "(setq stack-trace-on-error t)" -+ "-eval" "(setq load-always-display-messages t)" -+ "-l" "bytecomp.elc" "-l" "autoload.elc") -+ do-autoload-commands)) -+ (write-sequence "\nNeed to regenerate auto-autoload files... " -+ 'external-debugging-output) -+ (let ((load-ignore-elc-files nil) -+ (purify-flag nil)) -+ (load "loadup.el"))) - (t - (let ((bc-bootstrap - (mapcar #'(lambda (arg) diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch deleted file mode 100644 index fdea052fba19..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Fri Mar 06 21:27:48 2020 +0100 -@@ -9987,7 +9987,7 @@ - libc_version="GNU libc $libc_version (Debian)" - fi - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Fri Mar 06 21:27:48 2020 +0100 -@@ -2347,7 +2347,7 @@ - fi - dnl #### Tested on Debian, does this actually work elsewhere? ;-) - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch deleted file mode 100644 index 025a390f3335..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/lisp.h b/src/lisp.h ---- a/src/lisp.h -+++ b/src/lisp.h -@@ -1154,6 +1154,8 @@ - - /* ------------------------ alignment definitions ------------------- */ - -+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \ -+ (!defined (__cplusplus) || __cplusplus < 201103L) - /* No type has a greater alignment requirement than max_align_t. - (except perhaps for types we don't use, like long double) */ - typedef union -@@ -1163,6 +1165,7 @@ - struct { void (*f)(void); } f; - struct { double d; } d; - } max_align_t; -+#endif - - /* ALIGNOF returns the required alignment of a type -- i.e. a value such - that data of this type must begin at a memory address which is a -@@ -1170,7 +1173,11 @@ - as the type itself. */ - - #ifndef ALIGNOF --# if defined (__GNUC__) && (__GNUC__ >= 2) -+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L -+# define ALIGNOF(type) _Alignof(type) -+# elif defined (__cplusplus) && __cplusplus >= 201103L -+# define ALIGNOF(type) alignof(type) -+# elif defined (__GNUC__) && (__GNUC__ >= 2) - /* gcc has an extension that gives us exactly what we want. */ - # define ALIGNOF(type) __alignof__ (type) - # elif ! defined (__cplusplus) - - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch deleted file mode 100644 index b611b15fd8b1..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r f412e9f093d4 configure ---- a/configure Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure Sun Jan 29 19:32:47 2017 +0100 -@@ -13507,7 +13507,10 @@ - -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;; - * ) val=1 ;; - esac -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then cat >>confdefs.h <<_ACEOF - #define $sym 1 -diff -r f412e9f093d4 configure.ac ---- a/configure.ac Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100 -@@ -3136,7 +3136,12 @@ - * ) val=1 ;; - esac - dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf -+dnl likes us to define; ignore them if appropriate. -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then AC_DEFINE_UNQUOTED($sym) - else AC_DEFINE_UNQUOTED($sym,$val) diff --git a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch deleted file mode 100644 index 8b5443dfcb10..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el ---- b/lisp/update-elc-2.el Mon Jun 27 22:14:53 2022 +0900 -+++ b/lisp/update-elc-2.el Thu Jun 30 16:36:19 2022 +0100 -@@ -144,12 +144,12 @@ - (load (expand-file-name "auto-autoloads" lisp-directory)) - (when (featurep 'mule) - (load (expand-file-name "mule/auto-autoloads" lisp-directory))) -+ (when (featurep 'modules) -+ (load (expand-file-name "auto-autoloads" module-directory))) - ;; We remove all the bad .elcs before any byte-compilation, because - ;; there may be dependencies between one .el and another (even across - ;; directories), and we don't want to load an out-of-date .elc while - ;; byte-compiling a file. -- (when (featurep 'modules) -- (load (expand-file-name "auto-autoloads" module-directory))) - (message "Removing old or spurious .elcs in directory tree `%s'..." dir) - (do-update-elc-2 dir nil nil) - (message "Removing old or spurious .elcs in directory tree `%s'...done" -unchanged: ---- a/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100 -+++ b/src/Makefile.in.in Mon Jun 27 22:14:53 2022 +0900 -@@ -95,7 +95,12 @@ - SHELL=/bin/sh - RM = rm -f - --LISP = $(SRC)/../lisp -+## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a -+## link to $(SRC)/../lisp in out-of-source builds. $(SRC)/../lisp breaks -+## the modules build because the autoloads end up in $(SRCMODULES), but -+## update-elc-2.el looks for them in $(BLDMODULES). -+LISP = ../lisp -+ - ETC = $(SRC)/../etc - SRCMODULES = $(SRC)/../modules - LIB_SRC = ../lib-src -@@ -944,10 +949,14 @@ - -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC - ## Remove the generated load files here; they cause lots of problems - ## when they don't work right. -+## Some older versions tried to put module load files in the SRC tree, -+## but that breaks module builds, which expect them in the BLD tree, -+## and that's where they belong anyway. Clean both. - clean: mostlyclean versionclean - -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \ - $(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \ -- $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* -+ $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \ -+ $(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el* - ## This is used in making a distribution. - ## Do not use it on development directories! - distclean-noconfig: clean -only in patch2: -unchanged: ---- a/lisp/update-elc.el -+++ b/lisp/update-elc.el -@@ -87,8 +87,8 @@ - - (defvar source-lisp-mule (expand-file-name "mule" source-lisp)) - (defvar source-directory (expand-file-name ".." source-lisp)) --(defconst module-directory (expand-file-name "modules" source-directory)) -- -+(defvar source-modules (expand-file-name "../modules" (file-truename source-lisp))) -+(defconst module-directory (expand-file-name "modules" build-directory)) - (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp)) - (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp)) - (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule)) -@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.") - - ;; Check for the module autoloads separately, given the need to run - ;; directory-files on subdirectories. -- (let ((autoload-file -- (expand-file-name "auto-autoloads.el" module-directory))) -- (mapc -- #'(lambda (full-dir) -- (mapc #'(lambda (full-arg) -- (when (file-newer-than-file-p full-arg autoload-file) -- (setq need-to-rebuild-module-autoloads t))) -- (directory-files full-dir t "\\.c$" nil t))) -- (directory-files module-directory t nil t 'subdirs))) -+ (mapc -+ #'(lambda (full-dir) -+ (mapc #'(lambda (full-arg) -+ (when (file-newer-than-file-p full-arg aa-modules) -+ (setq need-to-rebuild-module-autoloads t))) -+ (directory-files full-dir t "\\.c$" nil t))) -+ (directory-files source-modules t nil t 'subdirs)) - - (if dump-target-out-of-date-wrt-dump-files - (condition-case nil -@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.") - (if need-to-rebuild-mule-autoloads - (list "-f" "batch-update-directory-autoloads" - "mule" source-lisp-mule)) -- (if need-to-rebuild-module-autoloads -- (list "-f" "batch-update-directory-autoloads" -- "auto" module-directory)) -+ (if need-to-rebuild-module-autoloads -+ (list "-eval" -+ (concat -+ "(update-autoload-files '(" -+ (mapconcat #'prin1-to-string -+ (mapcan -+ #'(lambda (full-dir) -+ (unless (member* -+ (file-name-nondirectory full-dir) -+ '("." "..") :test #'equal) -+ (directory-files full-dir -+ t "\\.c$" nil t))) -+ (directory-files source-modules -+ t nil t 'subdirs)) -+ " ") -+ ") \"modules\" " (prin1-to-string aa-modules) ")"))) - (if need-to-recompile-autoloads - (list "-f" "batch-byte-compile-one-file" - aa-lisp)) diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch deleted file mode 100644 index a08eda3c8a83..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r 6355de501637 configure ---- a/configure Thu Jan 23 15:03:16 2014 +0000 -+++ b/configure Fri Jan 31 23:55:12 2014 +0100 -@@ -19699,7 +19699,8 @@ - extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then - echo " xemacs will be linked with \"terminfo.o\"" - fi -- LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi -+ ncurses_libs=$(pkg-config ncurses --libs) -+ LIBS="$ncurses_libs $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$ncurses_libs\" to \$LIBS"; fi - - if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then - save_c_switch_site="$c_switch_site" diff --git a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch deleted file mode 100644 index a37fc5e95fe0..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch +++ /dev/null @@ -1,99 +0,0 @@ -# HG changeset patch -# User Aidan Kehoe <kehoea@parhasard.net> -# Date 1656333099 -3600 -# Mon Jun 27 13:31:39 2022 +0100 -# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e -# Parent 16e37125d7ea85048e89197ce8fe83f44b00ccc5 -Don't create a lock file when generating finder-inf.el - -lisp/ChangeLog addition: - -2022-06-27 Aidan Kehoe <kehoea@parhasard.net> - - * finder.el (finder-compile-keywords): - Don't use the save-buffer infrastructure when generating - finder-inf.el, since that leads to lock files, making parallel - builds less likely to work. Thank you Mats Lidell and the Gentoo - users! - -src/ChangeLog addition: - -2022-06-27 Aidan Kehoe <kehoea@parhasard.net> - - * Makefile.in.in ($(LISP)/finder-inf.el): - Don't remove finder-inf.el before regenerating it, Lisp will - overwrite it. - -diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el ---- a/lisp/finder.el Sun Jun 26 19:14:02 2022 +0300 -+++ b/lisp/finder.el Mon Jun 27 13:31:39 2022 +0100 -@@ -151,7 +151,7 @@ - arguments compiles from `load-path'." - (save-excursion - ;; XEmacs change -- (find-file (expand-file-name "finder-inf.el" lisp-directory)) -+ (set-buffer (generate-new-buffer "finder-inf.el")) - (let ((processed nil) - (directory-abbrev-alist - (append -@@ -160,11 +160,12 @@ - ""))) - finder-abbreviate-directory-list) - directory-abbrev-alist)) -- (using-load-path)) -+ using-load-path second-line-marker finder-scratch) - (or dirs (setq dirs load-path)) - (setq using-load-path (equal dirs load-path)) - (erase-buffer) - (insert ";;; finder-inf.el --- keyword-to-package mapping\n") -+ (setq second-line-marker (point-marker)) - (insert ";; Keywords: help\n") - (insert ";;; Commentary:\n") - (insert ";; Don't edit this file. It's generated by finder.el\n\n") -@@ -180,7 +181,8 @@ - (if (not finder-compile-keywords-quiet) - (message "Processing %s ..." f)) - (save-excursion -- (set-buffer (get-buffer-create "*finder-scratch*")) -+ (set-buffer (setq finder-scratch -+ (get-buffer-create "*finder-scratch*"))) - (buffer-disable-undo (current-buffer)) - (erase-buffer) - (insert-file-contents (expand-file-name f d)) -@@ -210,10 +212,23 @@ - (directory-files d nil "^[^=].*\\.el$")))) - dirs) - (insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n") -- (kill-buffer "*finder-scratch*") -+ (if finder-scratch (kill-buffer finder-scratch)) - (unless noninteractive - (eval-current-buffer)) ; So we get the new keyword list immediately -- (basic-save-buffer)))) -+ (goto-char (point-min)) -+ (if (re-search-forward "[^\x00-\x7f]" nil t) -+ (progn -+ (goto-char (point-min)) -+ (if (re-search-forward "[^\x00-\xff]" nil t) -+ (progn (goto-char second-line-marker) -+ (insert ";;; -*- coding: escape-quoted -*-\n") -+ (setq buffer-file-coding-system 'iso-8859-1-unix)) -+ (goto-char second-line-marker) -+ (insert ";;; -*- coding: iso-8859-1 -*-\n") -+ (setq buffer-file-coding-system 'escape-quoted-unix))) -+ (setq buffer-file-coding-system 'no-conversion-unix)) -+ (write-region (point-min) (point-max) -+ (expand-file-name "finder-inf.el" lisp-directory))))) - - (defun finder-compile-keywords-make-dist () - "Regenerate `finder-inf.el' for the Emacs distribution." -diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in ---- a/src/Makefile.in.in Sun Jun 26 19:14:02 2022 +0300 -+++ b/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100 -@@ -590,7 +590,6 @@ - - $(LISP)/finder-inf.el: update-elc-2 - @echo "Building finder database ..." -- $(RM) $(LISP)/finder-inf.el - $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ - -eval "(setq lisp-directory \"$(LISP)\")" \ - -l finder -f finder-compile-keywords diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch deleted file mode 100644 index ff17f6b62411..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100 -+++ b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100 -@@ -49,7 +49,7 @@ - (goto-char (point-min)) - (Assert (looking-at "foo"))): - -- (Assert (= 127 (shell-command "unknown_command"))) -+ (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1"))) - (Assert (= 2 (shell-command "exit 2"))) - (Assert (equal "(Shell command failed with code 2 and no output)" (message-displayed-p t))) - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch deleted file mode 100644 index 464c6a542e8c..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Thu Aug 27 00:15:50 2020 +0200 -@@ -18090,7 +18090,7 @@ - esac - - --for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen -+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Thu Aug 27 00:15:50 2020 +0200 -@@ -4563,7 +4563,7 @@ - dnl Check for POSIX functions. - dnl ---------------------------------------------------------------- - --AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) -+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - - dnl getaddrinfo() is borked under hpux11 - if test "$ac_cv_func_getaddrinfo" != "no" ; then -diff -r 3ca291c0f7e3 src/config.h.in ---- a/src/config.h.in Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/config.h.in Thu Aug 27 00:15:50 2020 +0200 -@@ -417,6 +417,7 @@ - #undef HAVE_SNPRINTF - #undef HAVE_STRERROR - #undef HAVE_STRLWR -+#undef HAVE_STRSIGNAL - #undef HAVE_STRUPR - #undef HAVE_SYMLINK - #undef HAVE_TZSET -diff -r 3ca291c0f7e3 src/process.c ---- a/src/process.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/process.c Thu Aug 27 00:15:50 2020 +0200 -@@ -1646,7 +1646,11 @@ - signal_name (int signum) - { - if (signum >= 0 && signum < NSIG) -+#ifdef HAVE_STRSIGNAL -+ return strsignal (signum); -+#else - return (const char *) sys_siglist[signum]; -+#endif - - return (const char *) GETTEXT ("unknown signal"); - } -diff -r 3ca291c0f7e3 src/s/linux.h ---- a/src/s/linux.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/s/linux.h Thu Aug 27 00:15:50 2020 +0200 -@@ -36,10 +36,6 @@ - - /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ - --/* This is needed for sysdep.c */ -- --#define HAVE_SYS_SIGLIST -- - /* #define POSIX -- not used in XEmacs */ - - /* Deleted TERM stuff -- probably hugely obsolete */ -diff -r 3ca291c0f7e3 src/sysdep.c ---- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200 -@@ -3520,7 +3520,7 @@ - /* Strings corresponding to defined signals */ - /************************************************************************/ - --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - - #if defined(WIN32_NATIVE) || defined(CYGWIN) - const char *sys_siglist[] = -diff -r 3ca291c0f7e3 src/syssignal.h ---- a/src/syssignal.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/syssignal.h Thu Aug 27 00:15:50 2020 +0200 -@@ -263,10 +263,8 @@ - # endif - #endif - --/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, -- configure incorrectly fails to find it, so s/linux.h defines -- HAVE_SYS_SIGLIST. */ --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+/* Systems that have sys_siglist but do not declare it. */ -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - extern const char *sys_siglist[]; - #endif - diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch new file mode 100644 index 000000000000..e744d3952b10 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch @@ -0,0 +1,73 @@ +diff -r 3761ed745bc6 configure.ac +--- a/configure.ac Sat Mar 02 17:26:00 2024 +0100 ++++ b/configure.ac Fri Mar 08 22:25:23 2024 +0100 +@@ -2192,7 +2192,6 @@ + + compiler_version="" + gcc_compiler_specs="" +-libc_version="" + + AC_MSG_CHECKING([for compiler version information]) + +@@ -2255,53 +2254,6 @@ + fi + AC_MSG_RESULT([$compiler_version]) + +-AC_MSG_CHECKING(for standard C library version information) +- +-case "$ac_cv_build" in +- *-*-linux*) +- dnl #### who would ever _not_ be running the distro's libc? +- dnl Maybe it would be better to get/augment this info with ldd? +- if test -f /etc/redhat-release ; then +- libc_version=`rpm -q glibc` +- elif test -f /etc/debian_version ; then +- libc_version=`dpkg-query --showformat='${version}' --show libc6` +- libc_version="GNU libc $libc_version (Debian)" +- dnl need SuSE et al checks here... +- fi +- dnl #### Tested on Debian, does this actually work elsewhere? ;-) +- if test -z "$libc_version"; then +- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` +- fi +- ;; +- +- *-*-aix*) +- libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" +- ;; +- +- *-*-solaris*) +- libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'` +- libc_version="SUNWcsl $libc" +- +- ;; +- +- mips-sgi-irix*) +- libc_version="IRIX libc `uname -sRm`" +- ;; +- +- alpha*-dec-osf*) +- dnl Another ugly case +- (cd /usr/.smdb.; +- libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','` +- ) +- ;; +-esac +- +-dnl Awww, shucks. +-if test -z "libc_version"; then +- libc_version="detection failed (please report this)" +-fi +-AC_MSG_RESULT([$libc_version]) +- + dnl --------------------------------------------------------- + dnl These directories are used to search for include subdirs. + dnl --------------------------------------------------------- +@@ -6122,7 +6074,6 @@ + echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully." + fi + fi +-echo " libc version: $libc_version" + echo " Relocating allocator for buffers: $with_rel_alloc" + echo " + Package Search (a 'root' contains '{xemacs,mule,site}-packages'):" diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch new file mode 100644 index 000000000000..5648e0a38fcf --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch @@ -0,0 +1,42 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -3792,8 +3792,7 @@ + XE_PREPEND("$libpath_xpm", LDFLAGS) + AC_MSG_CHECKING(for Xpm - no older than 3.4f) + xe_check_libs="$libname_xpm" +- AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS +-#include <X11/xpm.h> ++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/xpm.h> + int main(int c, char **v) { + return c == 1 ? 0 : + XpmIncludeVersion != XpmLibraryVersion() ? 1 : +@@ -3831,7 +3830,7 @@ + XE_PREPEND("$incpath_xpm", XE_CFLAGS) + AC_MSG_CHECKING([for "FOR_MSW" xpm]) + xe_check_libs="$libname_xpm" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/xpm.h>],[XpmCreatePixmapFromData(0, 0, 0, 0, 0, 0);])], + [xpm_for_msw=no], + [xpm_for_msw=yes]) + xe_check_libs= +@@ -4620,9 +4619,7 @@ + AC_CACHE_VAL(emacs_cv_localtime_cache, + [if test "$ac_cv_func_tzset" = "yes"; then + AC_RUN_IFELSE([AC_LANG_SOURCE([#include <time.h> +-#if STDC_HEADERS +-# include <stdlib.h> +-#endif ++#include <stdlib.h> + extern char **environ; + unset_TZ () + { +@@ -4733,6 +4730,8 @@ + void *alloca (); + #endif /* C_ALLOCA */ + #endif /* !defined (alloca) */ ++#include <string.h> ++#include <stdlib.h> + + void + f1 (double a, void *ptr, int b) diff --git a/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch new file mode 100644 index 000000000000..d650d86e6944 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch @@ -0,0 +1,124 @@ +diff --git a/tests/automated/mule-tests.el b/tests/automated/mule-tests.el +--- a/tests/automated/mule-tests.el ++++ b/tests/automated/mule-tests.el +@@ -85,14 +85,15 @@ + (insert string) + (assert (equal (buffer-string) string)))))) + +-(when (compiled-function-p (symbol-function 'test-chars)) +- ;; Run #'test-chars in byte-compiled mode only. +- (test-chars t +- ;; unicode-internal has a value of #x40000000, (expt 2 30), for +- ;; char-code-limit and even re-writing the above to avoid +- ;; allocating the list and the string means I run out of memory +- ;; when I attempt to run this. +- (min char-code-limit #x200000))) ++;; Crashes XEmacs ... ++;; (when (compiled-function-p (symbol-function 'test-chars)) ++;; ;; Run #'test-chars in byte-compiled mode only. ++;; (test-chars t ++;; ;; unicode-internal has a value of #x40000000, (expt 2 30), for ++;; ;; char-code-limit and even re-writing the above to avoid ++;; ;; allocating the list and the string means I run out of memory ++;; ;; when I attempt to run this. ++;; (min char-code-limit #x200000))) + + (defun unicode-code-point-to-utf-8-string (code-point) + "Convert a Unicode code point to the equivalent UTF-8 string. +@@ -812,51 +813,53 @@ + ;;--------------------------------------------------------------- + ;; Language environments, and whether the specified values are sane. + ;;--------------------------------------------------------------- +- (loop +- for language in (mapcar #'car language-info-alist) +- with language-input-method = nil +- with native-coding-system = nil +- with original-language-environment = current-language-environment +- do +- ;; s-l-e can call #'require, which says "Loading ..." +- (Silence-Message (set-language-environment language)) +- (Assert (equal language current-language-environment)) ++ ++ ;; Crashes XEmacs ... ++ ;; (loop ++ ;; for language in (mapcar #'car language-info-alist) ++ ;; with language-input-method = nil ++ ;; with native-coding-system = nil ++ ;; with original-language-environment = current-language-environment ++ ;; do ++ ;; ;; s-l-e can call #'require, which says "Loading ..." ++ ;; (Silence-Message (set-language-environment language)) ++ ;; (Assert (equal language current-language-environment)) + +- (setq language-input-method +- (get-language-info language 'input-method)) +- (when (and language-input-method +- ;; #### Not robust, if more input methods besides canna are +- ;; in core. The intention of this is that if *any* of the +- ;; packages' input methods are available, we check that *all* +- ;; of the language environments' input methods actually +- ;; exist, which goes against the spirit of non-monolithic +- ;; packages. But I don't have a better approach to this. +- (> (length input-method-alist) 1)) +- (Assert (assoc language-input-method input-method-alist)) +- (Skip-Test-Unless +- (assoc language-input-method input-method-alist) +- "input method unavailable" +- (format "check that IM %s can be activated" language-input-method) +- ;; s-i-m can load files. +- (Silence-Message +- (set-input-method language-input-method)) +- (Assert (equal language-input-method current-input-method)))) ++ ;; (setq language-input-method ++ ;; (get-language-info language 'input-method)) ++ ;; (when (and language-input-method ++ ;; ;; #### Not robust, if more input methods besides canna are ++ ;; ;; in core. The intention of this is that if *any* of the ++ ;; ;; packages' input methods are available, we check that *all* ++ ;; ;; of the language environments' input methods actually ++ ;; ;; exist, which goes against the spirit of non-monolithic ++ ;; ;; packages. But I don't have a better approach to this. ++ ;; (> (length input-method-alist) 1)) ++ ;; (Assert (assoc language-input-method input-method-alist)) ++ ;; (Skip-Test-Unless ++ ;; (assoc language-input-method input-method-alist) ++ ;; "input method unavailable" ++ ;; (format "check that IM %s can be activated" language-input-method) ++ ;; ;; s-i-m can load files. ++ ;; (Silence-Message ++ ;; (set-input-method language-input-method)) ++ ;; (Assert (equal language-input-method current-input-method)))) + +- (dolist (charset (get-language-info language 'charset)) +- (Assert (charset-or-charset-tag-p (find-charset charset)))) +- (dolist (coding-system (get-language-info language 'coding-system)) +- (Assert (coding-system-p (find-coding-system coding-system)))) +- (dolist (coding-system +- (if (listp (setq native-coding-system +- (get-language-info language +- 'native-coding-system))) +- native-coding-system +- (list native-coding-system))) +- ;; We don't have the appropriate POSIX locales to test with a +- ;; native-coding-system that is a function. +- (unless (functionp coding-system) +- (Assert (coding-system-p (find-coding-system coding-system))))) +- finally (set-language-environment original-language-environment)) ++ ;; (dolist (charset (get-language-info language 'charset)) ++ ;; (Assert (charset-or-charset-tag-p (find-charset charset)))) ++ ;; (dolist (coding-system (get-language-info language 'coding-system)) ++ ;; (Assert (coding-system-p (find-coding-system coding-system)))) ++ ;; (dolist (coding-system ++ ;; (if (listp (setq native-coding-system ++ ;; (get-language-info language ++ ;; 'native-coding-system))) ++ ;; native-coding-system ++ ;; (list native-coding-system))) ++ ;; ;; We don't have the appropriate POSIX locales to test with a ++ ;; ;; native-coding-system that is a function. ++ ;; (unless (functionp coding-system) ++ ;; (Assert (coding-system-p (find-coding-system coding-system))))) ++ ;; finally (set-language-environment original-language-environment)) + + (with-temp-buffer + (labels diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml index ae715cbedf7b..b96ffa800d92 100644 --- a/app-editors/xemacs/metadata.xml +++ b/app-editors/xemacs/metadata.xml @@ -13,5 +13,6 @@ <flag name="mule">Add multi-language support to XEmacs</flag> <flag name="pop">Support POP for mail retrieval</flag> <flag name="xim">Enable X11 XiM input method</flag> + <flag name="bignum">Support for OpenSSL bignum implementation</flag> </use> </pkgmetadata> diff --git a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild index fe5170beba18..7d1252abe2f3 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -35,12 +35,12 @@ RDEPEND=" dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d[unicode] ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" @@ -175,6 +175,8 @@ src_configure() { # see bug 576512 append-cflags -fgnu89-inline + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" + # Don't use econf because it uses options which this configure # script does not understand (like --host). ./configure ${myconf} ${EXTRA_ECONF} \ diff --git a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild index 9f4b8ce418b4..ce257c1934e4 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild @@ -38,9 +38,9 @@ RDEPEND=" Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild index e6c5da2b2155..505fb03625a3 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild +++ b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -6,17 +6,18 @@ EAPI=8 -inherit flag-o-matic xdg-utils desktop +inherit flag-o-matic xdg-utils desktop autotools DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="https://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz + +SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" @@ -35,22 +36,23 @@ RDEPEND=" dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d[unicode] ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" + app-xemacs/mule-base" src_unpack() { default_src_unpack @@ -59,20 +61,14 @@ src_unpack() { src_prepare() { use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - eapply "${FILESDIR}/${P}-ncurses-tinfo.patch" - eapply "${FILESDIR}/${P}-gcc5.patch" - eapply "${FILESDIR}/${P}-glibc-macro.patch" - eapply "${FILESDIR}/${P}-as-needed.patch" + eapply "${FILESDIR}/${P}-configure.patch" + eapply "${FILESDIR}/${P}-mule-tests.patch" eapply "${FILESDIR}/${P}-configure-libc-version.patch" - eapply "${FILESDIR}/${P}-ar.patch" - eapply "${FILESDIR}/${P}-strsignal.patch" - eapply "${FILESDIR}/${P}-process-test-qa.patch" - eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch" - eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch" - eapply "${FILESDIR}/${P}-module-autoloads.patch" eapply_user + eautoconf + # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). # Fix internal filename references. @@ -131,22 +127,18 @@ src_configure() { --with-gif=no" fi - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" else - myconf="${myconf} --with-xim=no" + myconf="${myconf} --with-xim=xlib" fi - - myconf="${myconf} $(use_with freewnn wnn )" + else + myconf="${myconf} --with-xim=no" fi + myconf="${myconf} $(use_with freewnn wnn )" + # This determines the type of sounds we are playing local soundconf="native" @@ -165,8 +157,18 @@ src_configure() { myconf="${myconf} --without-database" fi - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else + myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" econf ${myconf} \ $(use_with gif ) \ @@ -175,13 +177,14 @@ src_configure() { $(use_with ldap ) \ $(use_with pop ) \ --prefix=/usr \ + --with-mule \ + --with-unicode-internal \ --without-canna \ --with-ncurses \ --with-msw=no \ --with-mail-locking=flock \ --with-site-lisp=yes \ --with-site-modules=yes \ - --with-system-malloc \ --enable-option-checking=no \ --with-last-packages=/usr/lib/xemacs } @@ -216,11 +219,7 @@ src_install() { dodir /usr/lib/xemacs/site-packages/ dodir /usr/lib/xemacs/site-modules/ dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi + dodir /usr/lib/xemacs/mule-packages # remove extraneous info files cd "${ED}"/usr/share/info diff --git a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild b/app-editors/xemacs/xemacs-21.5.35.ebuild index 61aff25cd403..81c8ab501cb5 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild +++ b/app-editors/xemacs/xemacs-21.5.35.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code # so the build forces the use of the -no-pie option -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic xdg-utils desktop +inherit flag-o-matic xdg-utils desktop autotools DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="https://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" + +SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz + neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb" +KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" @@ -35,43 +36,38 @@ RDEPEND=" dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" + app-xemacs/mule-base" src_unpack() { default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz } src_prepare() { use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - eapply "${FILESDIR}/${P}-ncurses-tinfo.patch" - eapply "${FILESDIR}/${P}-gcc5.patch" - eapply "${FILESDIR}/${P}-glibc-macro.patch" - eapply "${FILESDIR}/${P}-as-needed.patch" - eapply "${FILESDIR}/${P}-configure-libc-version.patch" - eapply "${FILESDIR}/${P}-ar.patch" - eapply "${FILESDIR}/${P}-strsignal.patch" - eapply "${FILESDIR}/${P}-process-test-qa.patch" + eapply "${FILESDIR}/${P}-configure.patch" + eapply "${FILESDIR}/${P}-mule-tests.patch" eapply_user + eautoconf + # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). # Fix internal filename references. @@ -111,7 +107,7 @@ src_configure() { myconf="${myconf} --with-athena=xaw" fi - use dnd && myconf="${myconf} --with-dragndrop --with-offix" + use dnd && myconf="${myconf} --with-dragndrop" myconf="${myconf} $(use_with tiff )" myconf="${myconf} $(use_with png )" @@ -130,22 +126,18 @@ src_configure() { --with-gif=no" fi - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" else - myconf="${myconf} --with-xim=no" + myconf="${myconf} --with-xim=xlib" fi - - myconf="${myconf} $(use_with freewnn wnn )" + else + myconf="${myconf} --with-xim=no" fi + myconf="${myconf} $(use_with freewnn wnn )" + # This determines the type of sounds we are playing local soundconf="native" @@ -165,24 +157,28 @@ src_configure() { fi use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" + myconf="${myconf} --with-optimization --with-cflags-debugging=" + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" econf ${myconf} \ $(use_with gif ) \ $(use_with gpm ) \ $(use_with postgres postgresql ) \ $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ $(use_with pop ) \ --prefix=/usr \ + --with-mule \ + --with-unicode-internal \ --without-canna \ --with-ncurses \ --with-msw=no \ --with-mail-locking=flock \ --with-site-lisp=yes \ --with-site-modules=yes \ - --with-newgc \ - --with-system-malloc \ --enable-option-checking=no \ --with-last-packages=/usr/lib/xemacs } @@ -217,11 +213,7 @@ src_install() { dodir /usr/lib/xemacs/site-packages/ dodir /usr/lib/xemacs/site-modules/ dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi + dodir /usr/lib/xemacs/mule-packages # remove extraneous info files cd "${ED}"/usr/share/info diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild index 646022402db0..172643503b1d 100644 --- a/app-editors/xemacs/xemacs-21.5.9999.ebuild +++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code # so the build forces the use of the -no-pie option -EAPI=7 +EAPI=8 -inherit flag-o-matic xdg-utils desktop +inherit flag-o-matic xdg-utils desktop autotools DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="https://www.xemacs.org/" @@ -17,7 +17,7 @@ EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs" LICENSE="GPL-3+" SLOT="0" -IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" @@ -36,22 +36,23 @@ RDEPEND=" dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d[unicode] ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" + app-xemacs/mule-base" src_unpack() { mercurial_src_unpack @@ -62,17 +63,13 @@ src_unpack() { src_prepare() { use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - # eapply "${FILESDIR}/${P}-ncurses-tinfo.patch" - # eapply "${FILESDIR}/${P}-gcc5.patch" - # eapply "${FILESDIR}/${P}-glibc-macro.patch" - # eapply "${FILESDIR}/${P}-as-needed.patch" - # eapply "${FILESDIR}/${P}-configure-libc-version.patch" - # eapply "${FILESDIR}/${P}-ar.patch" - # eapply "${FILESDIR}/${P}-strsignal.patch" - # eapply "${FILESDIR}/${P}-process-test-qa.patch" + eapply "${FILESDIR}/${PN}-21.5.35-mule-tests.patch" + eapply "${FILESDIR}/${PN}-21.5.35-configure-libc-version.patch" eapply_user + eautoconf + # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). # Fix internal filename references. @@ -131,22 +128,18 @@ src_configure() { --with-gif=no" fi - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" else - myconf="${myconf} --with-xim=no" + myconf="${myconf} --with-xim=xlib" fi - - myconf="${myconf} $(use_with freewnn wnn )" + else + myconf="${myconf} --with-xim=no" fi + myconf="${myconf} $(use_with freewnn wnn )" + # This determines the type of sounds we are playing local soundconf="native" @@ -165,8 +158,18 @@ src_configure() { myconf="${myconf} --without-database" fi - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else + myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" econf ${myconf} \ $(use_with gif ) \ @@ -175,6 +178,8 @@ src_configure() { $(use_with ldap ) \ $(use_with pop ) \ --prefix=/usr \ + --with-mule \ + --with-unicode-internal \ --without-canna \ --with-ncurses \ --with-msw=no \ @@ -215,11 +220,7 @@ src_install() { dodir /usr/lib/xemacs/site-packages/ dodir /usr/lib/xemacs/site-modules/ dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi + dodir /usr/lib/xemacs/mule-packages # remove extraneous info files cd "${ED}"/usr/share/info |