commit: a1c5e82972f549ffa8b91249dda893954e56e442 Author: Mats Lidell <matsl <AT> gentoo <DOT> org> AuthorDate: Mon Jul 28 07:57:32 2025 +0000 Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> CommitDate: Mon Jul 28 08:00:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c5e829
app-editors/xemacs: Install xemacs.desktop Reinsert domenu install of xemacs.desktop that was prematurely removed. Suggested-by: Ulrich Müller <ulm <AT> gentoo.org> Signed-off-by: Mats Lidell <matsl <AT> gentoo.org> ...cs-21.5.36.ebuild => xemacs-21.5.35-r10.ebuild} | 28 ++++++++++++++++------ ...acs-21.5.36.ebuild => xemacs-21.5.36-r1.ebuild} | 1 + app-editors/xemacs/xemacs-21.5.9999.ebuild | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app-editors/xemacs/xemacs-21.5.36.ebuild b/app-editors/xemacs/xemacs-21.5.35-r10.ebuild similarity index 87% copy from app-editors/xemacs/xemacs-21.5.36.ebuild copy to app-editors/xemacs/xemacs-21.5.35-r10.ebuild index 119cbb09e950..9a3230a21ce2 100644 --- a/app-editors/xemacs/xemacs-21.5.36.ebuild +++ b/app-editors/xemacs/xemacs-21.5.35-r10.ebuild @@ -12,6 +12,8 @@ DESCRIPTION="highly customizable open source text editor and application develop 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+" @@ -61,10 +63,20 @@ 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}/${PN}-21.5.35-unknown-command-test.patch" - eapply "${FILESDIR}/${P}-failing-tests.patch" - eapply "${FILESDIR}/${P}-failing-tests-2.patch" - eapply "${FILESDIR}/${P}-configure-postgresql.patch" + 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 "${FILESDIR}/${P}-delay-fcinit-until-needed.patch" + eapply "${FILESDIR}/${P}-desktop.patch" + eapply_user eautoconf @@ -129,10 +141,10 @@ src_configure() { if use motif ; then myconf="${myconf} --with-xim=motif" else - myconf="${myconf} --with-xim=xlib" + myconf="${myconf} --with-xim=xlib" fi else - myconf="${myconf} --with-xim=no" + myconf="${myconf} --with-xim=no" fi myconf="${myconf} --without-wnn" @@ -173,6 +185,7 @@ src_configure() { $(use_with ldap ) \ $(use_with pop ) \ --prefix=/usr \ + --with-mule \ --with-unicode-internal \ --without-canna \ --with-ncurses \ @@ -200,7 +213,7 @@ src_install() { # which application installed them and so that conflicting # packages (emacs) can't clobber the actual applications. # Addresses bug #62991. - for i in ctags etags gnuclient gnudoit gnuattach; do + 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 @@ -223,6 +236,7 @@ src_install() { cd "${S}" dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* + domenu "${S}"/etc/${PN}.desktop newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm } diff --git a/app-editors/xemacs/xemacs-21.5.36.ebuild b/app-editors/xemacs/xemacs-21.5.36-r1.ebuild similarity index 99% rename from app-editors/xemacs/xemacs-21.5.36.ebuild rename to app-editors/xemacs/xemacs-21.5.36-r1.ebuild index 119cbb09e950..d566954e4b58 100644 --- a/app-editors/xemacs/xemacs-21.5.36.ebuild +++ b/app-editors/xemacs/xemacs-21.5.36-r1.ebuild @@ -223,6 +223,7 @@ src_install() { cd "${S}" dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* + domenu "${S}"/etc/${PN}.desktop newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm } diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild index a637be29193c..ca2519e9d60a 100644 --- a/app-editors/xemacs/xemacs-21.5.9999.ebuild +++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild @@ -223,6 +223,7 @@ src_install() { cd "${S}" dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* + domenu "${S}"/etc/${PN}.desktop newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm }
