Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2026-09-14 16:26:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xemacs" Mon Sep 14 16:26:35 2026 rev:101 rq:1377873 version:21.5.36 Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2025-06-26 11:39:50.391069262 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs.new.1265/xemacs.changes 2026-09-14 16:26:40.214352837 +0200 @@ -1,0 +2,41 @@ +Mon Sep 7 10:40:56 UTC 2026 - Dr. Werner Fink <[email protected]> + +- site-start.el: disable set-language-unicode-precedence-list + +------------------------------------------------------------------- +Thu Sep 3 13:15:55 UTC 2026 - Dr. Werner Fink <[email protected]> + +- Update to beta version XEmacs 21.5.36 "leeks" + * Major Features, Bugfixes, and Backward Incompatible Changes + see CHANGES-beta +- Port patches + * bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch + * bugzilla-301352-fix-wrong-incrementing-in-macros.patch + * do-not-create-backups-in-temp-directories.patch + * fix-defface-custom-modified-face.patch + * menus-always-utf8.patch + * reproducible.patch + * set-locale-to-c-when-not-supported-by-x.patch + * xemacs-21.4.13-ppc64.patch + * xemacs-21.4.8-xevent.patch + * xemacs-21.5.18-movemail.patch + * xemacs-21.5.31-array.patch + * xemacs-21.5.34-custom-fonts.patch + * xemacs-app-defaults.patch + * xemacs-gcc15.patch + * xemacs-level3.patch + * xemacs-libpng15.patch + * xemacs-ptmx.dif + * xemacs-tinfo.dif + * xemacs.patch +- Drop patches which seems to be upstream solved + * xemacs-21.5.34-Xaw3D_I18N.patch + * xemacs-21.5.34-boo1115177.patch + * xemacs-21.5.34-fix2038.patch + * xemacs-21.5.34-gcc5.patch + * xemacs-21.5.34-sbrk.patch + * xemacs-21.5.34-strsignal.patch +- Disable patch set-language-unicode-precedence-list.patch + as it does not apply anymmore and I've no idea if it should + +------------------------------------------------------------------- Old: ---- xemacs-21.5.34-Xaw3D_I18N.patch xemacs-21.5.34-boo1115177.patch xemacs-21.5.34-fix2038.patch xemacs-21.5.34-gcc5.patch xemacs-21.5.34-sbrk.patch xemacs-21.5.34-strsignal.patch xemacs-21.5.34.tar.gz New: ---- xemacs-21.5.36.tar.gz ----------(Old B)---------- Old:- Drop patches which seems to be upstream solved * xemacs-21.5.34-Xaw3D_I18N.patch * xemacs-21.5.34-boo1115177.patch Old: * xemacs-21.5.34-Xaw3D_I18N.patch * xemacs-21.5.34-boo1115177.patch * xemacs-21.5.34-fix2038.patch Old: * xemacs-21.5.34-boo1115177.patch * xemacs-21.5.34-fix2038.patch * xemacs-21.5.34-gcc5.patch Old: * xemacs-21.5.34-fix2038.patch * xemacs-21.5.34-gcc5.patch * xemacs-21.5.34-sbrk.patch Old: * xemacs-21.5.34-gcc5.patch * xemacs-21.5.34-sbrk.patch * xemacs-21.5.34-strsignal.patch Old: * xemacs-21.5.34-sbrk.patch * xemacs-21.5.34-strsignal.patch - Disable patch set-language-unicode-precedence-list.patch ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.558450906 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.560450990 +0200 @@ -1,7 +1,7 @@ # # spec file for package xemacs # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,7 +53,7 @@ %endif %define _id 995257d0c590 %define _hg hg%{_id} -Version: 21.5.34 +Version: 21.5.36 Release: 0 Summary: XEmacs License: GPL-3.0-or-later @@ -89,30 +89,21 @@ Patch32: do-not-create-backups-in-temp-directories.patch Patch33: set-locale-to-c-when-not-supported-by-x.patch Patch39: xemacs-tinfo.dif -Patch43: set-language-unicode-precedence-list.patch +Source43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch Patch53: xemacs-21.5.31-array.patch -Patch54: xemacs-21.5.34-gcc5.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch -# PATCH-FIX-UPSTREAM bsc#930170 -Patch57: xemacs-21.5.34-Xaw3D_I18N.patch # PATCH-FIX-SUSE bsc#932321 Patch58: xemacs-21.5.34-custom-fonts.patch # PATCH-FIX-SUSE do wait on alsa Patch59: xemacs-21.5.34-alsaplay.patch -# PATCH-FIX-SUSE avoid redefinition of sbrk -Patch60: xemacs-21.5.34-sbrk.patch # PATCH-FIX-SUSE fix make build race -Patch61: xemacs-21.5.34-boo1115177.patch Patch62: xemacs-libX11-boo1175028.patch -# PATCH-FIX-SUSE sys_siglist is deprecated -Patch63: xemacs-21.5.34-strsignal.patch -Patch64: xemacs-21.5.34-fix2038.patch # PATCH-FIX-SUSE drop hostname+timestamp from .elc Patch65: reproducible.patch Patch66: xemacs-gcc15.patch @@ -184,7 +175,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar. %endif %setup -q -%patch -P 3 -p1 +%patch -P 3 -p1 -b .adx %patch -P 18 -p0 -b .xevent %patch -P 20 -p1 %patch -P 23 -p1 @@ -192,26 +183,21 @@ %patch -P 28 -p1 -b .movemail %patch -P 32 -p1 %patch -P 33 -p1 -%patch -P 39 -p0 -%patch -P 43 -p1 +%patch -P 39 -p0 -b .p39 +#%%patch -P 43 -p1 %patch -P 45 -p0 -%patch -P 50 -p1 +%patch -P 50 -p1 -b .p50 %if ! %enable_xfs %patch -P 51 -p0 %patch -P 52 -p0 %endif -%patch -P 53 -p0 -%patch -P 54 -p0 -%patch -P 56 -p1 +%patch -P 53 -p0 -b .p53 %patch -P 292811 -p1 %patch -P 301352 -p1 -%patch -P 57 -p0 +%patch -P 56 -p0 -p1 %patch -P 58 -p0 %patch -P 59 -p1 -%patch -P 60 -p0 -%patch -P 61 -p0 %patch -P 62 -p0 -%patch -P 63 -p0 %patch -P 0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f find . -name CVS -type d | xargs rm -rf @@ -230,9 +216,8 @@ %endif %endif %endif -%patch -P 64 -p1 %patch -P 65 -p1 -%patch -P 66 -p1 +%patch -P 66 -p1 -b .p66 %build cflags () @@ -574,12 +559,9 @@ %dir %{_prefix}/lib/xemacs %dir %{_prefix}/lib/xemacs/%{version} %dir %{_prefix}/lib/xemacs/%{version}/*-suse-linux/ -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/DOC +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/DOC* %{_prefix}/lib/xemacs/%{version}/*-suse-linux/add-big-package.sh %{_prefix}/lib/xemacs/%{version}/*-suse-linux/config.values -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/cvtmail -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/digest-doc -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/fakemail %{_prefix}/lib/xemacs/%{version}/*-suse-linux/gnuserv %{_prefix}/lib/xemacs/%{version}/*-suse-linux/gzip-el.sh %{_prefix}/lib/xemacs/%{version}/*-suse-linux/hexl @@ -588,9 +570,7 @@ %dir %{_prefix}/lib/xemacs/%{version}/*-suse-linux/modules/ %{_prefix}/lib/xemacs/%{version}/*-suse-linux/modules/*.ell %{_prefix}/lib/xemacs/%{version}/*-suse-linux/movemail -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/profile %{_prefix}/lib/xemacs/%{version}/*-suse-linux/rcs2log -%{_prefix}/lib/xemacs/%{version}/*-suse-linux/sorted-doc %{_prefix}/lib/xemacs/%{version}/*-suse-linux/vcdiff %dir %{_prefix}/lib/xemacs/site-modules/ %dir %{_docdir}/xemacs/ ++++++ bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.591452287 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.593452370 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/x-faces.el +++ xemacs-21.5.29/lisp/x-faces.el -@@ -198,7 +198,7 @@ If it fails, it returns nil." +@@ -184,7 +184,7 @@ If it fails, it returns nil." (fc-name-parse font)))) (if pattern (let ((size (fc-pattern-get-size pattern 0)) @@ -11,7 +11,7 @@ (fc-pattern-del-weight copy) (fc-pattern-del-style copy) (when copy -@@ -272,7 +272,7 @@ If it fails, it returns nil." +@@ -258,7 +258,7 @@ If it fails, it returns nil." (fc-name-parse font)))) (if pattern (let ((size (fc-pattern-get-size pattern 0)) ++++++ bugzilla-301352-fix-wrong-incrementing-in-macros.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.606452914 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.610453082 +0200 @@ -2,16 +2,16 @@ =================================================================== --- xemacs-21.5.29.orig/src/mule-ccl.c +++ xemacs-21.5.29/src/mule-ccl.c -@@ -1612,7 +1612,7 @@ ccl_driver (struct ccl_program *ccl, +@@ -1622,7 +1622,7 @@ ccl_driver (struct ccl_program *ccl, Lisp_Object map, content, attrib, value; - int point, size, fin_ic; + EMACS_INT point, size, fin_ic; - j = XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* number of maps. */ + j = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* number of maps. */ fin_ic = ic + j; op = reg[rrr]; if ((j > reg[RRR]) && (j >= 0)) -@@ -1630,7 +1630,7 @@ ccl_driver (struct ccl_program *ccl, +@@ -1640,7 +1640,7 @@ ccl_driver (struct ccl_program *ccl, for (;i < j;i++) { size = XVECTOR (Vcode_conversion_map_vector)->size; @@ -20,7 +20,7 @@ if (point >= size) continue; map = XVECTOR (Vcode_conversion_map_vector)->contents[point]; -@@ -1727,7 +1727,7 @@ ccl_driver (struct ccl_program *ccl, +@@ -1737,7 +1737,7 @@ ccl_driver (struct ccl_program *ccl, stack_idx_of_map_multiple = 0; map_set_rest_length = @@ -29,7 +29,7 @@ fin_ic = ic + map_set_rest_length; op = reg[rrr]; -@@ -1914,7 +1914,7 @@ ccl_driver (struct ccl_program *ccl, +@@ -1924,7 +1924,7 @@ ccl_driver (struct ccl_program *ccl, { Lisp_Object map, attrib, value, content; int size, point; ++++++ do-not-create-backups-in-temp-directories.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.631453960 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.633454044 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/files.el +++ xemacs-21.5.29/lisp/files.el -@@ -166,7 +166,9 @@ This variable is relevant only if `backu +@@ -160,7 +160,9 @@ This variable is relevant only if `backu Checks for files in the directory returned by `temp-directory' or specified by `small-temporary-file-directory'." (let ((temporary-file-directory (temp-directory))) ++++++ fix-defface-custom-modified-face.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.644454504 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.646454588 +0200 @@ -2,7 +2,7 @@ =================================================================== --- lisp/cus-edit.el.orig +++ lisp/cus-edit.el -@@ -1395,7 +1395,7 @@ item in another window.\n\n")) +@@ -1383,7 +1383,7 @@ item in another window.\n\n")) (defface custom-modified-face '((((class color)) (:foreground "white" :background "blue")) (t ++++++ menus-always-utf8.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.668455508 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.673455718 +0200 @@ -1,8 +1,25 @@ Index: xemacs-21.5.31/lwlib/xlwmenu.c =================================================================== ---- xemacs-21.5.31/lwlib/xlwmenu.c -+++ xemacs-21.5.31/lwlib/xlwmenu.c -@@ -108,7 +108,7 @@ xlwMenuResources[] = +--- + xemacs-21.5.36/lwlib/lwlib-fonts.c | 2 +- + xemacs-21.5.36/lwlib/xlwmenu.c | 24 ++++++++++++------------ + xemacs-21.5.36/src/faces.c | 2 +- + 3 files changed, 14 insertions(+), 14 deletions(-) + +--- xemacs-21.5.36/lwlib/lwlib-fonts.c ++++ xemacs-21.5.36/lwlib/lwlib-fonts.c 2026-09-03 11:36:28.223551171 +0000 +@@ -117,7 +117,7 @@ x_xft_text_width (Display *dpy, XftFont + { + XGlyphInfo glyphinfo; + +- XftTextExtents8 (dpy, xft_font, (const FcChar8 *) run, len, &glyphinfo); ++ XftTextExtentsUtf8 (dpy, xft_font, (const FcChar8 *) run, len, &glyphinfo); + return glyphinfo.xOff; + } + +--- xemacs-21.5.36/lwlib/xlwmenu.c ++++ xemacs-21.5.36/lwlib/xlwmenu.c 2026-09-03 11:34:49.981300218 +0000 +@@ -104,7 +104,7 @@ xlwMenuResources[] = /* We must use an iso8859-1 font here, or people without $LANG set lose. It's fair to assume that those who do have $LANG set also have the *fontList resource set, or at least know how to deal with this. */ @@ -11,7 +28,7 @@ #else fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font, "XtDefaultFont"), -@@ -343,12 +343,12 @@ string_width (XlwMenuWidget mw, +@@ -324,12 +324,12 @@ string_width (XlwMenuWidget mw, #else # ifdef USE_XFONTSET XRectangle ri, rl; @@ -26,7 +43,7 @@ strlen (s), &glyphinfo); return glyphinfo.xOff; #else -@@ -435,11 +435,11 @@ string_width_u (XlwMenuWidget mw, +@@ -418,11 +418,11 @@ string_width_u (XlwMenuWidget mw, return width; #else # ifdef USE_XFONTSET @@ -40,17 +57,8 @@ j, &glyphinfo); return glyphinfo.xOff; #else -@@ -769,7 +769,7 @@ x_xft_text_width (Display *dpy, XftFont - { - static XGlyphInfo glyphinfo; - -- XftTextExtents8 (dpy, -+ XftTextExtentsUtf8 (dpy, - xft_font, - (FcChar8 *) run, len, &glyphinfo); - return glyphinfo.xOff; -@@ -816,12 +816,12 @@ string_draw (XlwMenuWidget mw, - x_xft_text_width (display, renderFont, string, strlen (string)), +@@ -788,12 +788,12 @@ string_draw (XlwMenuWidget mw, + (int) strlen (string)), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ - XftDrawString8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, @@ -64,7 +72,7 @@ x, y + mw->menu.font_ascent, string, strlen (string)); # else XDrawString (XtDisplay (mw), window, gc, -@@ -877,10 +877,10 @@ string_draw_range ( +@@ -851,10 +851,10 @@ string_draw_range ( if (end <= start) return 0; @@ -77,7 +85,7 @@ mw->menu.font_set, &string[start], end - start, &ri, &rl); return rl.width; # else -@@ -903,12 +903,12 @@ string_draw_range ( +@@ -877,12 +877,12 @@ string_draw_range ( renderFont, &string[start], end - start), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ @@ -93,17 +101,15 @@ /* #### should use parent frame's .xftDraw */ XftDrawDestroy (xftDraw); -Index: xemacs-21.5.31/src/faces.c -=================================================================== ---- xemacs-21.5.31/src/faces.c -+++ xemacs-21.5.31/src/faces.c -@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void) +--- xemacs-21.5.36/src/faces.c ++++ xemacs-21.5.36/src/faces.c 2026-09-03 11:41:35.998063536 +0000 +@@ -2454,7 +2454,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), -- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), +- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-m-*-*-*")), + build_ascstring ("-*-fixed-medium-r-*--*-120-*-*-*-*-*-*")), inst_list); - + #endif /* HAVE_GTK */ #endif /* !HAVE_XFT */ ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.687456303 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.689456387 +0200 @@ -5,20 +5,21 @@ Index: xemacs-21.5.34/lisp/bytecomp.el =================================================================== ---- xemacs-21.5.34.orig/lisp/bytecomp.el -+++ xemacs-21.5.34/lisp/bytecomp.el -@@ -2156,11 +2156,8 @@ docstrings code.") +--- + xemacs-21.5.36/lisp/bytecomp.el | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- xemacs-21.5.36/lisp/bytecomp.el ++++ xemacs-21.5.36/lisp/bytecomp.el 2026-09-03 12:43:45.387465362 +0000 +@@ -2189,9 +2189,7 @@ docstrings code.") finally return res))) (setq comments (with-string-as-buffer-contents "" - (insert "\n;;; compiled by " - (or (and (boundp 'user-mail-address) user-mail-address) - (concat (user-login-name) "@" (system-name))) -- " on " -- (current-time-string) "\n;;; from file " filename "\n") + (insert "\n;;; compiled" -+ "\n;;; from file " filename "\n") + "\n;;; from file " filename "\n") (insert ";;; emacs version " emacs-version ".\n") (insert ";;; bytecomp version " byte-compile-version "\n;;; " - (cond ++++++ set-locale-to-c-when-not-supported-by-x.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.703456973 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.706457098 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xemacs-21.5.29.orig/src/intl.c +++ xemacs-21.5.29/src/intl.c -@@ -84,8 +84,10 @@ Otherwise, returns the locale, or possib +@@ -82,8 +82,10 @@ Otherwise, returns the locale, or possib #ifdef HAVE_X_WINDOWS if (!init_x_locale (locale)) { ++++++ site-start.el ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.733458228 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.737458395 +0200 @@ -72,8 +72,8 @@ (create-variant-language-environment langenv 'utf-8)))) language-info-alist) -(set-language-unicode-precedence-list - (get-language-info current-language-environment 'charset)) +;;(set-language-unicode-precedence-list +;; (get-language-info current-language-environment 'charset)) ;; (when (emacs-version>= 21 5 6) ;; (let ((old-lang (getenv "LANG")) ++++++ xemacs-21.4.13-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.794460780 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.797460906 +0200 @@ -93,7 +93,7 @@ =================================================================== --- xemacs-21.5.29.orig/src/vm-limit.c +++ xemacs-21.5.29/src/vm-limit.c -@@ -61,6 +61,14 @@ check_memory_limits (void) +@@ -58,6 +58,14 @@ check_memory_limits (void) unsigned long data_size; void (*save_warn_fun) (const char *); ++++++ xemacs-21.4.8-xevent.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.812461533 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.815461659 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/event-Xt.c.orig +++ src/event-Xt.c -@@ -1224,8 +1224,11 @@ x_event_to_emacs_event (XEvent *x_event, +@@ -2314,8 +2314,11 @@ x_event_to_emacs_event (XEvent *x_event, if (modifiers & XEMACS_MOD_SHIFT) { ++++++ xemacs-21.5.18-movemail.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.826462119 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.830462286 +0200 @@ -1,7 +1,7 @@ diff -ru xemacs-21.5.20.orig/lib-src/movemail.c xemacs-21.5.20/lib-src/movemail.c --- xemacs-21.5.20.orig/lib-src/movemail.c 2005-02-14 04:40:45.000000000 +0100 +++ xemacs-21.5.20/lib-src/movemail.c 2005-05-12 12:44:12.000000000 +0200 -@@ -135,7 +135,7 @@ +@@ -132,7 +132,7 @@ #undef write #undef close @@ -10,7 +10,7 @@ static void error (char *, char *, char *); static void usage(int); static void pfatal_with_name (char *); -@@ -309,7 +309,7 @@ +@@ -306,7 +306,7 @@ #endif if (*outname == 0) @@ -19,7 +19,7 @@ VERBOSE(("checking access to output file\n")); /* Check access to output file. */ -@@ -551,7 +551,7 @@ +@@ -550,7 +550,7 @@ return LOCKING; #endif else @@ -28,7 +28,7 @@ return 0; /* unreached */ } -@@ -647,10 +647,10 @@ +@@ -646,10 +646,10 @@ /* Print error message and exit. */ static void @@ -41,7 +41,7 @@ exit (1); } -@@ -667,16 +667,15 @@ +@@ -666,16 +666,15 @@ static void pfatal_with_name (char *name) { @@ -61,7 +61,7 @@ } /* Return a newly-allocated string whose contents concatenate those of s1, s2, s3. */ -@@ -702,7 +701,7 @@ +@@ -701,7 +700,7 @@ { long *result = (long *) malloc (size); if (!result) ++++++ xemacs-21.5.31-array.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.843462830 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.846462956 +0200 @@ -1,17 +1,19 @@ +--- + src/events.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + --- src/events.c -+++ src/events.c 2012-05-31 15:13:06.832009873 +0000 -@@ -1611,8 +1611,11 @@ upshift_event (Lisp_Object event) - XSET_EVENT_KEY_KEYSYM (event, make_char (c + 'A' - 'a')); - else - if (!(XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_SHIFT)) ++++ src/events.c 2026-09-03 11:50:27.544559111 +0000 +@@ -1599,8 +1599,9 @@ upshift_event (Lisp_Object event) + + if (!(XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_SHIFT)) + { - XSET_EVENT_KEY_MODIFIERS -- (event, XEVENT_KEY_MODIFIERS (event) |= XEMACS_MOD_SHIFT); -+ { -+ Lisp_Object tmp = XEVENT_KEY_MODIFIERS (event); -+ tmp |= XEMACS_MOD_SHIFT; -+ XSET_EVENT_KEY_MODIFIERS (event, tmp); -+ } +- (event, XEVENT_KEY_MODIFIERS (event) | XEMACS_MOD_SHIFT); ++ Lisp_Object tmp = XEVENT_KEY_MODIFIERS (event); ++ tmp |= XEMACS_MOD_SHIFT; ++ XSET_EVENT_KEY_MODIFIERS (event, tmp); + } } - void ++++++ xemacs-21.5.34-custom-fonts.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.862463625 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.869463918 +0200 @@ -5,9 +5,9 @@ --- lisp/cus-face.el +++ lisp/cus-face.el 2015-07-10 10:52:20.177518702 +0000 -@@ -42,6 +42,9 @@ - (eval-when-compile - (require 'font)) +@@ -41,6 +41,9 @@ + ;; To elude the warnings for font functions. + (eval-when (:compile-toplevel) (or (featurep 'font) (require 'font))) +;; Simply to apply any custom faces +(autoload 'initialize-custom-faces "faces") @@ -15,7 +15,7 @@ ;;; Declaring a face. ;;;###autoload -@@ -336,7 +339,8 @@ and non-nil, FACE will also be created a +@@ -346,7 +349,8 @@ and non-nil, FACE will also be created a COMMENT is a string comment about FACE. See `defface' for the format of SPEC." @@ -27,7 +27,7 @@ (defun custom-theme-set-faces (theme &rest args) --- lisp/startup.el +++ lisp/startup.el 2015-07-13 11:14:12.609518333 +0000 -@@ -1101,7 +1101,7 @@ exact problem." +@@ -1115,7 +1115,7 @@ exact problem." Currently this does nothing but call `load', but it might be redefined in the future to support automatically converting older options files to a new format, when variables have changed, etc." ++++++ xemacs-21.5.34.tar.gz -> xemacs-21.5.36.tar.gz ++++++ /work/SRC/openSUSE:Factory/xemacs/xemacs-21.5.34.tar.gz /work/SRC/openSUSE:Factory/.xemacs.new.1265/xemacs-21.5.36.tar.gz differ: char 5, line 1 ++++++ xemacs-app-defaults.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.898465131 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.901465257 +0200 @@ -15,8 +15,8 @@ + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! FontSet for menus when you use --with-xfs or --with-xim=xlib. -+XEmacs*FontSet -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \ -+ -*-helvetica-bold-r-*--*-120-*-*-*-*-iso10646-1, \ ++XEmacs*FontSet -*-helvetica-bold-r-*--*-120-75-75-*-*-*-*, \ ++ -*-helvetica-bold-r-*--*-120-75-75-*-*-iso10646-1, \ + * + ! Set the menubar colors. This overrides the default foreground and @@ -26,52 +26,52 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! --*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ +-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-75-75-*-*-iso8859-* +-*popup*Font: -*-helvetica-bold-r-*-*-*-120-75-75-*-*-iso8859-* +-*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-75-75-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 --*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ +-*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-75-75-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 -+*menubar*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-* -+*popup*Font: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-* -+*menubar*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \ ++*menubar*Font: -*-helvetica-bold-r-*--*-120-75-75-*-*-*-* ++*popup*Font: -*-helvetica-bold-r-*--*-120-75-75-*-*-*-* ++*menubar*FontSet: -*-helvetica-bold-r-*--*-120-75-75-*-*-*-*, \ + -*-*-*-*-*--*-120-*-iso10646-1, \ + -*-*-*-*-*--*-120-*-jisx0208.1983-0, \ + -*-*-*-*-*--*-120-*-jisx0201.1976-0 -+*popup*FontSet: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-*, \ ++*popup*FontSet: -*-helvetica-bold-r-*--*-120-75-75-*-*-*-*, \ + -*-*-*-*-*--*-120-*-iso10646-1, \ + -*-*-*-*-*--*-120-*-jisx0208.1983-0, \ + -*-*-*-*-*--*-120-*-jisx0201.1976-0 ! Gui elements share this font ! --Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*--*-120-*-*-*-*-*-* +-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-75-75-*-*-iso8859-* ++Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*--*-120-75-75-*-*-*-* ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't ! know why you probably don't want to.) ! --*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+*XmDialogShell*FontList: -*-helvetica-bold-r-*--*-120-*-*-*-*-*-* -+*XmTextField*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-* -+*XmText*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-* -+*XmList*FontList: -*-fixed-medium-r-*--*-120-*-*-*-*-*-* +-*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-75-75-*-*-iso8859-* +-*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-75-75-*-*-iso8859-* +-*XmText*FontList: -*-courier-medium-r-*-*-*-120-75-75-*-*-iso8859-* +-*XmList*FontList: -*-courier-medium-r-*-*-*-120-75-75-*-*-iso8859-* ++*XmDialogShell*FontList: -*-helvetica-bold-r-*--*-120-75-75-*-*-*-* ++*XmTextField*FontList: -*-fixed-medium-r-*--*-120-75-75-*-*-*-* ++*XmText*FontList: -*-fixed-medium-r-*--*-120-75-75-*-*-*-* ++*XmList*FontList: -*-fixed-medium-r-*--*-120-75-75-*-*-*-* ! Font in the Athena dialog boxes. ! I think 14-point looks nicer than 12-point. ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. --*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* -+*Dialog*Font: -*-helvetica-bold-r-*--*-140-*-*-*-*-*-* +-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-75-75-*-*-iso8859-* ++*Dialog*Font: -*-helvetica-bold-r-*--*-140-75-75-*-*-*-* ! Dialog box translations. ! ======================= ++++++ xemacs-gcc15.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.913465759 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.918465968 +0200 @@ -1,21 +1,17 @@ Index: xemacs-21.5.34/lib-src/ootags.c =================================================================== ---- xemacs-21.5.34.orig/lib-src/ootags.c -+++ xemacs-21.5.34/lib-src/ootags.c +--- + xemacs-21.5.36/lib-src/ootags.c | 1 + + 1 file changed, 1 insertion(+) + +--- xemacs-21.5.36/lib-src/ootags.c ++++ xemacs-21.5.36/lib-src/ootags.c 2026-09-03 12:44:27.690711736 +0000 @@ -76,6 +76,7 @@ char pot_etags_version[] = "@(#) pot rev - #if !defined (WIN32_NATIVE) && defined (STDC_HEADERS) + #if !defined (WIN32_NATIVE) #include <stdlib.h> +#include <stdbool.h> #include <string.h> #endif -@@ -181,7 +182,6 @@ void oo_browser_check_and_clear_structty - # define xrnew(op,n,Type) ((Type *) xrealloc ((op), (n) * sizeof (Type))) - #endif - --typedef int bool; - - typedef void Lang_function (FILE *); - ++++++ xemacs-level3.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.931466512 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.938466805 +0200 @@ -1,8 +1,13 @@ Index: xemacs-21.5.29/src/event-Xt.c =================================================================== ---- xemacs-21.5.29.orig/src/event-Xt.c -+++ xemacs-21.5.29/src/event-Xt.c -@@ -515,8 +515,17 @@ x_key_is_modifier_p (KeyCode keycode, st +--- + xemacs-21.5.36/src/event-Xt.c | 39 +++++++++++++++++++++++++++++++++------ + xemacs-21.5.36/src/xintrinsic.h | 1 + + 2 files changed, 34 insertions(+), 6 deletions(-) + +--- xemacs-21.5.36/src/event-Xt.c ++++ xemacs-21.5.36/src/event-Xt.c 2026-09-03 09:21:40.507263185 +0000 +@@ -1614,8 +1614,17 @@ x_key_is_modifier_p (KeyCode keycode, st syms = &xd->x_keysym_map [(keycode - xd->x_keysym_map_min_code) * xd->x_keysym_map_keysyms_per_code]; for (i = 0; i < xd->x_keysym_map_keysyms_per_code; i++) @@ -22,51 +27,49 @@ return 1; return 0; } -@@ -872,8 +881,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve +@@ -1976,8 +1985,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve char dummy[256]; XLookupString (event, dummy, 200, &keysym, 0); *x_keysym_out = keysym; - return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) -- ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); +- ? Qnil : x_keysym_to_emacs_keysym (keysym); + return (IsModifierKey (keysym) +#ifdef XK_Mode_switch -+ || keysym == XK_Mode_switch ++ || keysym == XK_Mode_switch +#endif +#ifdef XK_Num_Lock -+ || keysym == XK_Num_Lock ++ || keysym == XK_Num_Lock +#endif +#if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock -+ || (keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) ++ || (keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) +#endif -+ ) ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); ++ ) ? Qnil : x_keysym_to_emacs_keysym (keysym); } #endif /* ! XIM_MOTIF */ -@@ -932,8 +950,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve +@@ -2037,8 +2055,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve case XLookupKeySym: case XLookupBoth: *x_keysym_out = keysym; - return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) -- ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); +- ? Qnil : x_keysym_to_emacs_keysym (keysym); + return (IsModifierKey (keysym) +#ifdef XK_Mode_switch -+ || keysym == XK_Mode_switch ++ || keysym == XK_Mode_switch +#endif +#ifdef XK_Num_Lock -+ || keysym == XK_Num_Lock ++ || keysym == XK_Num_Lock +#endif -+#if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock -+ || (keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) ++#ifdef XK_Mode_switch ++ || (keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) +#endif -+ ) ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); ++ ) ? Qnil : x_keysym_to_emacs_keysym (keysym); case XLookupChars: { -Index: xemacs-21.5.29/src/xintrinsic.h -=================================================================== ---- xemacs-21.5.29.orig/src/xintrinsic.h -+++ xemacs-21.5.29/src/xintrinsic.h -@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ +--- xemacs-21.5.36/src/xintrinsic.h ++++ xemacs-21.5.36/src/xintrinsic.h 2026-09-03 09:14:39.942748097 +0000 +@@ -20,6 +20,7 @@ along with XEmacs. If not, see <http:// #ifndef INCLUDED_xintrinsic_h_ #define INCLUDED_xintrinsic_h_ ++++++ xemacs-libpng15.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.958467642 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.962467809 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xemacs-21.5.31/src/glyphs-eimage.c +++ xemacs-21.5.31/src/glyphs-eimage.c -@@ -911,7 +911,8 @@ png_instantiate (Lisp_Object image_insta +@@ -992,7 +992,8 @@ png_instantiate (Lisp_Object image_insta Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); struct png_unwind_data unwind; int speccount = specpdl_depth (); ++++++ xemacs-ptmx.dif ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:42.975468353 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:42.979468520 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xemacs-21.5.29.orig/src/process-unix.c +++ xemacs-21.5.29/src/process-unix.c -@@ -236,12 +236,6 @@ allocate_pty (void) +@@ -223,12 +223,6 @@ allocate_pty (void) "/dev/ptmx_bsd" /* Tru64 */ }; @@ -15,7 +15,7 @@ #if defined(HAVE_OPENPTY) /* BSD, Tru64, glibc */ { -@@ -275,6 +269,13 @@ allocate_pty (void) +@@ -262,6 +256,13 @@ allocate_pty (void) goto have_slave_name; #endif /* HAVE__GETPTY */ ++++++ xemacs-tinfo.dif ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:43.002469482 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:43.004469566 +0200 @@ -1,43 +1,76 @@ +--- + configure.ac | 28 +++++++++++++++++++++------- + src/config.h.in | 1 + + 2 files changed, 22 insertions(+), 7 deletions(-) + --- configure.ac -+++ configure.ac 2011-11-22 14:21:37.303146192 +0000 -@@ -4946,15 +4946,30 @@ if test "$with_tty" = "yes" ; then ++++ configure.ac 2026-09-03 09:45:58.681339041 +0000 +@@ -5006,33 +5006,47 @@ if test "$with_tty" = "yes" ; then AC_DEFINE(HAVE_TTY) dnl Autodetect ncurses. + cf_tgetent="" if test -z "$with_ncurses"; then -- AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no) -+ with_ncurses=no; -+ for lib in tinfo ncurses ncursesw ; do -+ AC_CHECK_LIB($lib, tgetent, [with_ncurses=yes; cf_tgetent="$lib"; break]) -+ done +- if $PKG_CONFIG --exists ncurses; then ++ for lib in tinfo ncursesw ncurses ; do ++ if $PKG_CONFIG --exists $lib; then + ac_save_LIBS="$LIBS" + auto_ncurses_libs=yes +- XE_PREPEND(`pkg-config --libs ncurses`, LIBS); +- AC_CHECK_FUNC(tgetent, with_ncurses=yes, with_ncurses=no) ++ XE_PREPEND(`pkg-config --libs $lib`, LIBS); ++ AC_CHECK_FUNC(tgetent, [with_ncurses=yes; cf_tgetent="$lib"; break], with_ncurses=no) + if test "$with_ncurses" = "yes"; then +- XE_PREPEND(`pkg-config --cflags ncurses`, CFLAGS); ++ XE_PREPEND(`pkg-config --cflags $lib`, CFLAGS); + else + LIBS="$ac_save_LIBS" + fi + else +- AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no) ++ AC_CHECK_LIB($lib, tgetent, [with_ncurses=yes; cf_tgetent="$lib"; break], with_ncurses=no) + if test "$with_ncurses" = "yes"; then + auto_ncurses_libs=yes +- XE_PREPEND(-lncurses, LIBS) ++ XE_PREPEND(-l$lib, LIBS) + else + auto_ncurses_libs=no + fi + fi ++ done + else + auto_ncurses_libs=no fi if test "$with_ncurses" = "yes"; then -+ if test x$cf_tgetent = x ; then -+ for lib in tinfo ncurses ncursesw ; do -+ AC_CHECK_LIB($lib, tgetent, [cf_tgetent="$lib"; break]) -+ done -+ fi ++ if test x$cf_tgetent = x ; then ++ for lib in tinfo ncursesw ncurses ; do ++ AC_CHECK_LIB($lib, tgetent, [cf_tgetent="$lib"; break]) ++ done ++ fi ++ if test "$cf_tgetent" = ncursesw; then ++ AC_DEFINE(HAVE_NCURSESW) ++ AC_CHECK_HEADER(ncursesw/curses.h, curses_h_file=ncursesw/curses.h) ++ AC_CHECK_HEADER(ncursesw/term.h, term_h_file=ncursesw/term.h) ++ else AC_DEFINE(HAVE_NCURSES) -- AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) -- AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) -+ if test "$cf_tgetent" = ncursesw; then -+ AC_DEFINE(HAVE_NCURSESW) -+ AC_CHECK_HEADER(ncursesw/curses.h, curses_h_file=ncursesw/curses.h) -+ AC_CHECK_HEADER(ncursesw/term.h, term_h_file=ncursesw/term.h) -+ else -+ AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) -+ AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) -+ fi + AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) + AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) ++ fi XE_ADD_OBJS(terminfo.o) -- XE_PREPEND(-lncurses, LIBS) -+ XE_PREPEND(-l$cf_tgetent, LIBS) - - if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then + if test "$auto_ncurses_libs" = "no"; then + if $PKG_CONFIG --exists ncurses; then +@@ -5041,7 +5055,7 @@ if test "$with_tty" = "yes" ; then + XE_PREPEND(-lncurses, LIBS) + fi + fi +- if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then ++ if test "$ac_cv_header_ncurses_curses_h" != "yes" -a "$ac_cv_header_ncursesw_curses_h" != "yes" ; then dnl Try again, and check for the bogus ncurses/ include bug. + dnl (i.e. ncurses/curses.h bogusly includes <unctrl.h> instead of + dnl <ncurses/unctrl.h>) --- src/config.h.in -+++ src/config.h.in 2011-11-22 14:21:50.939646812 +0000 -@@ -580,6 +580,7 @@ things are arranged in config.h.in. In ++++ src/config.h.in 2026-09-03 09:28:45.695692932 +0000 +@@ -562,6 +562,7 @@ things are arranged in config.h.in. In /* Compile in support for ncurses? */ #undef HAVE_NCURSES ++++++ xemacs.patch ++++++ --- /var/tmp/diff_new_pack.G5bRMn/_old 2026-09-14 16:26:43.038470989 +0200 +++ /var/tmp/diff_new_pack.G5bRMn/_new 2026-09-14 16:26:43.042471156 +0200 @@ -19,7 +19,7 @@ =================================================================== --- xemacs-21.5.29.orig/lib-src/gnuclient.c +++ xemacs-21.5.29/lib-src/gnuclient.c -@@ -226,7 +226,7 @@ filename_expand (char *fullpath, char *f +@@ -269,7 +269,7 @@ filename_expand (char *fullpath, char *f /* Encase the string in quotes, escape all the backslashes and quotes in string. */ static char * @@ -120,7 +120,7 @@ =================================================================== --- xemacs-21.5.29.orig/lib-src/pop.c +++ xemacs-21.5.29/lib-src/pop.c -@@ -129,16 +129,20 @@ static char *find_crlf (char *, int); +@@ -127,16 +127,20 @@ static char *find_crlf (char *, int); #define POP_PORT 110 #define KPOP_PORT 1109 #if defined(WIN32_NATIVE) || defined(CYGWIN) @@ -152,7 +152,7 @@ =================================================================== --- xemacs-21.5.29.orig/lib-src/vcdiff +++ xemacs-21.5.29/lib-src/vcdiff -@@ -75,7 +75,10 @@ case $# in +@@ -81,7 +81,10 @@ case $# in esac @@ -164,7 +164,7 @@ trap 'status=2; exit' 1 2 13 15 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 -@@ -86,14 +89,14 @@ do +@@ -100,14 +103,14 @@ do case $f in s.* | */s.*) if @@ -199,7 +199,7 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/dumped-lisp.el +++ xemacs-21.5.29/lisp/dumped-lisp.el -@@ -42,6 +42,7 @@ in dumped-lisp.el and is not itself list +@@ -43,6 +43,7 @@ in dumped-lisp.el and is not itself list "cl" "cl-extra" ; also loads cl-macs if we're running interpreted. "cl-seq" @@ -207,7 +207,7 @@ "post-gc" "version" "custom" ; Before the world so everything can be customized -@@ -300,6 +301,7 @@ in dumped-lisp.el and is not itself list +@@ -307,6 +308,7 @@ in dumped-lisp.el and is not itself list ;; "sun-eos-debugger-extra" ;; "sun-eos-menubar")) "loaddefs" ; <=== autoloads get loaded here @@ -219,12 +219,12 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/find-paths.el +++ xemacs-21.5.29/lisp/find-paths.el -@@ -338,7 +338,7 @@ DEFAULT is the preferred value." +@@ -337,7 +337,7 @@ DEFAULT is the preferred value." (defun construct-emacs-version-name () "Construct a string from the raw XEmacs version number." -- (concat emacs-program-name "-" emacs-program-version)) -+ (concat emacs-program-name "/" emacs-program-version)) +- (concatenate 'string emacs-program-name "-" emacs-program-version)) ++ (concatenate 'string emacs-program-name "/" emacs-program-version)) (defun paths-directories-which-exist (directories) "Return the directories among DIRECTORIES. @@ -232,16 +232,16 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/mule/cyrillic.el +++ xemacs-21.5.29/lisp/mule/cyrillic.el -@@ -31,6 +31,9 @@ - ;; converted to ISO8859-5 internally. +@@ -29,6 +29,9 @@ + ;; supported. ;;; Code: +(eval-when-compile + (setq max-lisp-eval-depth (+ 800 max-lisp-eval-depth)) + (setq max-specpdl-size (+ 2000 max-specpdl-size))) - ;; Case table: - (loop + (eval-when (:compile-toplevel) (autoload 'setup-case-pairs "general-late")) + Index: xemacs-21.5.29/lisp/site-init.el =================================================================== --- /dev/null @@ -269,7 +269,7 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/x-win-xfree86.el +++ xemacs-21.5.29/lisp/x-win-xfree86.el -@@ -99,6 +99,11 @@ +@@ -106,6 +106,11 @@ ;; define also the control, meta, and meta-control versions. (loop for mods in '(() (control) (meta) (meta control)) do (define-key function-key-map `[(,@mods ,key)] @@ -805,16 +805,7 @@ =================================================================== --- xemacs-21.5.29.orig/src/Makefile.in.in +++ xemacs-21.5.29/src/Makefile.in.in -@@ -574,7 +574,7 @@ $(RAW_EXE): $(link_deps) $(DUMP_ID) - else \ - $(CC) -c $(cflags) -DMAX_SIZE=0 $(SRC)/dump-data.c ;\ - fi -- $(LD) $(start_flags) $(ldflags) -o $@ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) dump-data.o $(LIBES) -+ $(LD) $(start_flags) -Wl,-rpath-link,/usr/X11R6/lib $(ldflags) -o $@ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) dump-data.o $(LIBES) - #endif - - ## (3) Update the .elc's needed for dumping -@@ -604,7 +604,7 @@ $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile +@@ -562,7 +562,7 @@ $(LIB_SRC)/DOC: $(LIB_SRC)/make-docfile $(TEMACS_BATCH) -l $(LISP)/make-docfile.el -- \ -o $(LIB_SRC)/DOC -d $(SRC) -i $(LIB_SRC)/../site-packages \ $(obj_src) $(mallocdocsrc) $(rallocdocsrc) \ @@ -827,29 +818,29 @@ =================================================================== --- xemacs-21.5.29.orig/src/print.c +++ xemacs-21.5.29/src/print.c -@@ -1104,6 +1104,40 @@ float_to_string (char *buf, double data) - Ibyte *cp, c; +@@ -1276,6 +1276,40 @@ float_to_string (char *buf, double data) int width; + Bytecount plen; + /* Check for plus infinity in a way that won't lose + if there is no plus infinity. */ + if (data == data / 2 && data > 1.0) + { + strcpy (buf, "1.0e+INF"); -+ return; ++ return 8; + } + /* Likewise for minus infinity. */ + if (data == data / 2 && data < -1.0) + { + strcpy (buf, "-1.0e+INF"); -+ return; ++ return 9; + } + /* Check for NaN in a way that won't fail if there are no NaNs. */ + if (! (data * 0.0 >= 0.0)) + { + /* Prepend "-" if the NaN's sign bit is negative. + The sign bit of a double is the bit that is 1 in -0.0. */ -+ int i; ++ size_t i; + double zero = 0.0; + union { double d; char c[sizeof (double)]; } u_data, u_minus_zero; + u_data.d = data; @@ -862,7 +853,7 @@ + } + + strcpy (buf, "0.0e+NaN"); -+ return; ++ return 8; + } + if (NILP (Vfloat_output_format) @@ -872,7 +863,7 @@ =================================================================== --- xemacs-21.5.29.orig/src/regex.c +++ xemacs-21.5.29/src/regex.c -@@ -1154,6 +1154,9 @@ print_double_string (re_char *where, re_ +@@ -1232,6 +1232,9 @@ print_double_string (re_char *where, re_ syntax, so it can be changed between regex compilations. */ /* This has no initializer because initialized variables in Emacs become read-only after dumping. */
