commit: 1fcbadfedce4432586e158dc810bf3a3d922d8c1 Author: Mats Lidell <matsl <AT> gentoo <DOT> org> AuthorDate: Wed Jan 22 15:20:45 2025 +0000 Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> CommitDate: Wed Jan 22 15:56:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fcbadfe
app-editors/xemacs: Fix segfault calling center-to-window-pos Thanks to Ulrich Müller. Closes: https://bugs.gentoo.org/948535 Signed-off-by: Mats Lidell <matsl <AT> gentoo.org> .../files/xemacs-21.5.35-batch-segfault.patch | 191 +++++++++++++++ app-editors/xemacs/xemacs-21.5.35-r7.ebuild | 264 +++++++++++++++++++++ 2 files changed, 455 insertions(+) diff --git a/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch b/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch new file mode 100644 index 000000000000..5341bea1fa56 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch @@ -0,0 +1,191 @@ +Don't segfault when calling #'center-to-window-pos and friends, -batch +Patch backported from master branch +https://foss.heptapod.net/xemacs/xemacs/-/issues/6 + +commit 578daa839db83c84fc7ebbc4bf809ff66fd492f5 +Author: Aidan Kehoe <keh...@parhasard.net> +Date: Tue Jan 21 16:15:47 2025 +0000 + + Don't segfault when calling #'center-to-window-pos and friends, -batch + +--- xemacs-21.5.35/src/indent.c ++++ xemacs-21.5.35/src/indent.c +@@ -642,6 +642,15 @@ Bytebpos + vmotion (struct window *w, Bytebpos orig, Charcount vtarget, + Charcount *ret_vpos) + { ++ if (!redisplayable_window_p (w)) ++ { ++ if (ret_vpos) ++ { ++ *ret_vpos = 0; ++ } ++ return orig; ++ } ++ + return vmotion_1 (w, orig, vtarget, ret_vpos, NULL); + } + +@@ -671,6 +680,11 @@ vertical_motion_1 (Lisp_Object lines, Li + + w = XWINDOW (window); + ++ if (!redisplayable_window_p (w)) ++ { ++ return Qzero; ++ } ++ + orig = selected ? BYTE_BUF_PT (XBUFFER (w->buffer)) + : marker_byte_position (w->pointm[CURRENT_DISP]); + +--- xemacs-21.5.35/src/window.c ++++ xemacs-21.5.35/src/window.c +@@ -402,6 +402,12 @@ allocate_window (void) + return obj; + } + #undef INIT_DISP_VARIABLE ++ ++Boolint ++redisplayable_window_p (struct window *w) ++{ ++ return !FRAME_STREAM_P (XFRAME (WINDOW_FRAME (w))); ++} + + /************************************************************************/ + /* Window mirror structure */ +@@ -1491,11 +1497,19 @@ POS defaults to point in WINDOW's buffer + (pos, window, partially)) + { + struct window *w = decode_window (window); +- Bytebpos top = marker_byte_position (w->start[CURRENT_DISP]); +- struct buffer *buf = XBUFFER (w->buffer); +- Bytebpos posint = get_buffer_pos_byte (buf, pos, +- GB_ALLOW_PAST_ACCESSIBLE | +- GB_ALLOW_NIL | GB_NO_ERROR_IF_BAD); ++ Bytebpos top, posint; ++ struct buffer *buf; ++ ++ if (!redisplayable_window_p (w)) ++ { ++ return Qnil; ++ } ++ ++ top = marker_byte_position (w->start[CURRENT_DISP]); ++ buf = XBUFFER (w->buffer); ++ posint = get_buffer_pos_byte (buf, pos, ++ GB_ALLOW_PAST_ACCESSIBLE | GB_ALLOW_NIL ++ | GB_NO_ERROR_IF_BAD); + + if (posint < top || posint > BYTE_BUF_ZV (buf)) + return Qnil; +@@ -1659,6 +1673,12 @@ is non-nil, do not include space occupie + line_start_cache_dynarr *cache; + + window = wrap_window (w); ++ ++ if (!redisplayable_window_p (w)) ++ { ++ return Qzero; ++ } ++ + start = marker_byte_position (w->start[CURRENT_DISP]); + hlimit = WINDOW_TEXT_HEIGHT (w); + eobuf = BYTE_BUF_ZV (XBUFFER (w->buffer)); +@@ -1903,11 +1923,11 @@ e.g. if the window's current buffer has + struct window *w = decode_window (window); + Bytebpos eoll; + +- if (NILP (guarantee) || in_display) ++ if (NILP (guarantee) || !redisplayable_window_p (w) || in_display) + { + struct buffer *b = window_display_buffer (w); + +- if (in_display || ++ if (in_display || !redisplayable_window_p (w) || + (BUFFER_LIVE_P (b) && EQ (wrap_buffer (b), window_buffer (w)))) + { + return Fmarker_position (w->end_pos[CURRENT_DISP]); +@@ -3341,7 +3361,7 @@ value is reasonable when this function i + window start is outside the visible portion (as might happen when + the display is not current, due to typeahead). */ + if (start_pos >= BYTE_BUF_BEGV (b) && start_pos <= BYTE_BUF_ZV (b) +- && !MINI_WINDOW_P (w)) ++ && !MINI_WINDOW_P (w) && redisplayable_window_p (w)) + { + Bytebpos new_start + = start_with_line_at_pixpos +@@ -4628,6 +4648,11 @@ window_scroll (Lisp_Object window, Lisp_ + struct display_line* dl; + Boolint unchain_point = 0; + struct gcpro gcpro1; ++ ++ if (!redisplayable_window_p (w)) ++ { ++ return; ++ } + + if (selected) + point = b->point_marker; +@@ -5127,6 +5152,11 @@ If WINDOW is nil, the selected window is + Bytebpos opoint = BYTE_BUF_PT (b); + Bytebpos startp; + ++ if (!redisplayable_window_p (w)) ++ { ++ return Qnil; ++ } ++ + if (NILP (n)) + startp = start_with_line_at_pixpos (w, opoint, window_half_pixpos (w)); + else +@@ -5491,14 +5521,20 @@ get_current_pixel_pos (Lisp_Object windo + { + int first_line, i; + Bytebpos point; ++ struct buffer *buf; + + if (NILP (pos)) + { + pos = Fwindow_point (wrap_window (*w)); + } + +- point = get_buffer_pos_byte (window_display_buffer (*w), pos, +- GB_NO_ERROR_IF_BAD); ++ buf = window_display_buffer (*w); ++ if (buf == NULL) ++ { ++ return 0; ++ } ++ ++ point = get_buffer_pos_byte (buf, pos, GB_NO_ERROR_IF_BAD); + + /* If the window has a modeline, ignore it for our purposes, POS can't + be over it. Start examining the display lines from 1. */ +@@ -5552,7 +5588,7 @@ a new frame, use the following instead: + */ + (window, pos)) + { +- struct window* w; ++ struct window *w = decode_window (window); + struct display_line *dl; + struct rune* rb; + +@@ -5575,7 +5611,7 @@ use the following instead: + */ + (window, pos)) + { +- struct window* w; ++ struct window *w = decode_window (window); + struct display_line *dl; + struct rune* rb; + +--- xemacs-21.5.35/src/window.h ++++ xemacs-21.5.35/src/window.h +@@ -152,6 +152,7 @@ int buffer_window_mru (struct window *w) + void check_frame_size (struct frame *frame, int *cols, int *rows); + int frame_pixsize_valid_p (struct frame *frame, int width, int height); + struct window *decode_window (Lisp_Object window); ++Boolint redisplayable_window_p (struct window *w); + struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win); + + void free_window_mirror (struct window_mirror *mir); diff --git a/app-editors/xemacs/xemacs-21.5.35-r7.ebuild b/app-editors/xemacs/xemacs-21.5.35-r7.ebuild new file mode 100644 index 000000000000..e0cc1c23695a --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.35-r7.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2025 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=8 + +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/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz + https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz + https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz + 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 X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum" + +X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" + +RDEPEND=" + berkdb? ( >=sys-libs/db-4:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] ) + >=sys-libs/zlib-1.1.4 + >=dev-libs/openssl-0.9.6:0= + >=media-libs/audiofile-0.2.3 + gpm? ( >=sys-libs/gpm-1.19.6 ) + postgres? ( dev-db/postgresql:= ) + ldap? ( net-nds/openldap:= ) + alsa? ( media-libs/alsa-lib ) + nas? ( media-libs/nas ) + X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) + motif? ( >=x11-libs/motif-2.3:0[xft=] ) + athena? ( x11-libs/libXaw ) + 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:= ) + png? ( >=media-libs/libpng-1.2:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + >=sys-libs/ncurses-5.2:= + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +BDEPEND="sys-apps/texinfo" + +PDEPEND="app-xemacs/xemacs-base + app-xemacs/mule-base" + +src_unpack() { + default_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}-configure.patch" + eapply "${FILESDIR}/${P}-mule-tests.patch" + eapply "${FILESDIR}/${P}-configure-libc-version.patch" + eapply "${FILESDIR}/${P}-which.patch" + eapply "${FILESDIR}/${P}-misalignment.patch" + eapply "${FILESDIR}/${P}-va_args.patch" + eapply "${FILESDIR}/${P}-linker-flags.patch" + eapply "${WORKDIR}/${P}-ootags-boolint.patch" + eapply "${FILESDIR}/${P}-unknown-command-test.patch" + eapply "${WORKDIR}/${P}-info-handle-compress.patch" + eapply "${FILESDIR}/${P}-batch-segfault.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. + sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die + sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die + sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die +} + +src_configure() { + local myconf="" + + # bug #639642 + test-flags -no-pie >/dev/null && append-flags -no-pie + filter-flags -pie + + if use X; then + + myconf="${myconf} --with-widgets=athena" + myconf="${myconf} --with-dialogs=athena" + myconf="${myconf} --with-menubars=lucid" + myconf="${myconf} --with-scrollbars=lucid" + if use motif ; then + myconf="--with-widgets=motif" + myconf="${myconf} --with-dialogs=motif" + myconf="${myconf} --with-scrollbars=motif" + myconf="${myconf} --with-menubars=lucid" + fi + if use athena or use Xaw3d ; then + myconf="--with-scrollbars=athena" + fi + + if use Xaw3d; then + myconf="${myconf} --with-athena=3d" + elif use neXt; then + myconf="${myconf} --with-athena=next" + else + myconf="${myconf} --with-athena=xaw" + fi + + myconf="${myconf} $(use_with tiff )" + myconf="${myconf} $(use_with png )" + myconf="${myconf} $(use_with jpeg )" + myconf="${myconf} $(use_with xface )" + + use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || + myconf="${myconf} --with-xft=no" + + else + myconf="${myconf} + --without-x + --without-xpm + --without-dragndrop + --with-xft=no + --with-gif=no" + fi + + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" + else + myconf="${myconf} --with-xim=xlib" + fi + else + myconf="${myconf} --with-xim=no" + fi + + myconf="${myconf} --without-wnn" + + # This determines the type of sounds we are playing + local soundconf="native" + + # This determines how these sounds should be played + use nas && soundconf="${soundconf},nas" + use alsa && soundconf="${soundconf},alsa" + + myconf="${myconf} --with-sound=${soundconf}" + + if use gdbm || use berkdb ; then + use gdbm && mydb="gdbm" + use berkdb && mydb="${mydb},berkdb" + + myconf="${myconf} --with-database=${mydb}" + else + myconf="${myconf} --without-database" + fi + + 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" + + econf ${myconf} \ + $(use_with gif ) \ + $(use_with gpm ) \ + $(use_with postgres postgresql ) \ + $(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 \ + --enable-option-checking=no \ + --with-last-packages=/usr/lib/xemacs +} + +src_compile() { + emake EMACSLOADPATH="${S}"/lisp +} + +src_install() { + emake prefix="${ED}"/usr \ + mandir="${ED}"/usr/share/man/man1 \ + infodir="${ED}"/usr/share/info \ + libdir="${ED}"/usr/$(get_libdir) \ + datadir="${ED}"/usr/share \ + install + + # Rename some applications installed in bin so that it is clear + # which application installed them and so that conflicting + # packages (emacs) can't clobber the actual applications. + # Addresses bug #62991. + for i in b2m ctags etags gnuclient gnudoit gnuattach; do + mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + done + + # rename man pages + for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do + mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" + done + + # install base packages directories + dodir /usr/lib/xemacs/xemacs-packages/ + dodir /usr/lib/xemacs/site-packages/ + dodir /usr/lib/xemacs/site-modules/ + dodir /usr/lib/xemacs/site-lisp/ + dodir /usr/lib/xemacs/mule-packages + + # remove extraneous info files + cd "${ED}"/usr/share/info + rm -f dir info.info texinfo* termcap* standards* + + cd "${S}" + dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* + + newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm + + domenu "${FILESDIR}"/${PN}.desktop +} + +pkg_postinst() { + eselect emacs update ifunset + eselect gnuclient update ifunset + xdg_desktop_database_update + + einfo "If you are upgrading from XEmacs 21.4 you should note the following" + einfo "incompatibilities:" + einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" + einfo "- The X resource class has changed from Emacs to XEmacs," + einfo " settings in your .Xdefaults file should be updated accordingly." + + if use xft; + then + einfo "You have enabled Xft font support. Xft requires font names to be provided" + einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." + fi +} + +pkg_postrm() { + eselect emacs update ifunset + eselect gnuclient update ifunset + xdg_desktop_database_update +}
