commit: 74e3551154ca1bc26422d41727aabf1ca66d30a6 Author: Mats Lidell <matsl <AT> gentoo <DOT> org> AuthorDate: Mon Apr 28 17:14:51 2025 +0000 Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 17:30:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e35511
app-editors/xemacs: use upstream desktop file Signed-off-by: Mats Lidell <matsl <AT> gentoo.org> .../xemacs/files/xemacs-21.5.35-desktop.patch | 17 +++++++++++ ...s-21.5.9999.ebuild => xemacs-21.5.35-r9.ebuild} | 35 ++++++++++++++-------- app-editors/xemacs/xemacs-21.5.9999.ebuild | 4 +-- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/app-editors/xemacs/files/xemacs-21.5.35-desktop.patch b/app-editors/xemacs/files/xemacs-21.5.35-desktop.patch new file mode 100644 index 000000000000..9b4ed2e2211e --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-desktop.patch @@ -0,0 +1,17 @@ +changeset: 7634:770d869450ea +parent: 7632:c35cdc528fff +user: Mats Lidell <[email protected]> +date: Sat Mar 22 23:19:55 2025 +0100 +summary: Make xemacs.desktop Category consistent with GNU Emacs + +diff -r c35cdc528fff -r 770d869450ea etc/xemacs.desktop +--- a/etc/xemacs.desktop Thu Mar 20 09:40:30 2025 +0000 ++++ b/etc/xemacs.desktop Sat Mar 22 23:19:55 2025 +0100 +@@ -30,5 +30,5 @@ + Icon=xemacs + Type=Application + Terminal=false +-Categories=Application;Utility;TextEditor; ++Categories=Development;TextEditor; + StartupWMClass=XEmacs + diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.35-r9.ebuild similarity index 85% copy from app-editors/xemacs/xemacs-21.5.9999.ebuild copy to app-editors/xemacs/xemacs-21.5.35-r9.ebuild index 5d3a54e297da..c33657773e1f 100644 --- a/app-editors/xemacs/xemacs-21.5.9999.ebuild +++ b/app-editors/xemacs/xemacs-21.5.35-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 @@ -10,13 +10,15 @@ 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="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" -inherit mercurial -EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs"; +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" @@ -55,16 +57,25 @@ PDEPEND="app-xemacs/xemacs-base app-xemacs/mule-base" src_unpack() { - mercurial_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz + 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}/${PN}-21.5.35-mule-tests.patch" - eapply "${FILESDIR}/${PN}-21.5.35-unknown-command-test.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 @@ -130,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" @@ -226,8 +237,6 @@ src_install() { dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop } pkg_postinst() { diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild index 5d3a54e297da..a593df40a19b 100644 --- a/app-editors/xemacs/xemacs-21.5.9999.ebuild +++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 @@ -226,8 +226,6 @@ src_install() { dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop } pkg_postinst() {
