From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 772D615808A for ; Mon, 28 Jul 2025 08:00:12 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 5AE14340FD4 for ; Mon, 28 Jul 2025 08:00:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4DB141102A2; Mon, 28 Jul 2025 08:00:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 437411102A2 for ; Mon, 28 Jul 2025 08:00:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8D70340FD4 for ; Mon, 28 Jul 2025 08:00:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 253F63235 for ; Mon, 28 Jul 2025 08:00:09 +0000 (UTC) From: "Mats Lidell" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mats Lidell" Message-ID: <1753689601.a1c5e82972f549ffa8b91249dda893954e56e442.matsl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/xemacs/xemacs-21.5.35-r10.ebuild app-editors/xemacs/xemacs-21.5.36-r1.ebuild app-editors/xemacs/xemacs-21.5.36.ebuild app-editors/xemacs/xemacs-21.5.9999.ebuild X-VCS-Directories: app-editors/xemacs/ X-VCS-Committer: matsl X-VCS-Committer-Name: Mats Lidell X-VCS-Revision: a1c5e82972f549ffa8b91249dda893954e56e442 X-VCS-Branch: master Date: Mon, 28 Jul 2025 08:00:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c65e63d7-31e6-4096-af72-b71086b3abb2 X-Archives-Hash: 0112b98f986685db0c5bdfc77cb3d7ff commit: a1c5e82972f549ffa8b91249dda893954e56e442 Author: Mats Lidell gentoo org> AuthorDate: Mon Jul 28 07:57:32 2025 +0000 Commit: Mats Lidell gentoo 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 gentoo.org> Signed-off-by: Mats Lidell 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 }