public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sven Wegener" <swegener@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
Date: Sat, 19 Feb 2022 06:31:47 +0000 (UTC)	[thread overview]
Message-ID: <1645252301.7b99f401634d79ffe8cd4f0d1f49afa6cc136801.swegener@gentoo> (raw)

commit:     7b99f401634d79ffe8cd4f0d1f49afa6cc136801
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 06:23:32 2022 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 06:31:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b99f401

app-misc/screen: Revert changes to live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 app-misc/screen/files/screen-9999-no-utempter.patch | 15 +++++++++++++++
 app-misc/screen/screen-9999.ebuild                  | 17 ++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app-misc/screen/files/screen-9999-no-utempter.patch b/app-misc/screen/files/screen-9999-no-utempter.patch
new file mode 100644
index 000000000000..7eccc30c04c5
--- /dev/null
+++ b/app-misc/screen/files/screen-9999-no-utempter.patch
@@ -0,0 +1,15 @@
+--- i/configure.ac
++++ w/configure.ac
+@@ -151,12 +151,6 @@ AS_IF([test "x$enable_utmp" = "xyes"], [
+ 	AS_IF([test "x$have_utmpx" != "xyes"],
+ 	      AC_ERROR(Missing utmpx.h))
+ 
+-	AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-	AS_IF([test "x$have_utempter" = "xyes"], [
+-		AC_DEFINE(HAVE_UTEMPTER)
+-		LIBS="$LIBS -lutempter"
+-	])
+-
+ 	AC_MSG_CHECKING(if utmpx struct has ut_host field)
+ 	AC_TRY_COMPILE([#include <utmpx.h>], [
+ 		struct utmpx u;

diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 18779966236e..abdf2c2458a2 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -32,8 +32,7 @@ BDEPEND="sys-apps/texinfo"
 
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+	"${FILESDIR}"/${P}-no-utempter.patch
 )
 
 src_prepare() {
@@ -41,7 +40,9 @@ src_prepare() {
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+	sed -i '/include/ s:sched\.h:_sched.h:' \
+		screen.h winmsg.c window.h sched.c canvas.h || die
+	sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
 
 	# Fix manpage
 	sed -i \
@@ -76,13 +77,12 @@ src_configure() {
 	use debug && append-cppflags "-DDEBUG"
 
 	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--enable-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-system_screenrc="${EPREFIX}/etc/screenrc"
 		--with-pty-mode=0620
 		--with-pty-group=5
-		--enable-rxvt_osc
 		--enable-telnet
-		--enable-colors256
+		--enable-utmp
 		$(use_enable pam)
 	)
 	econf "${myeconfargs[@]}"
@@ -90,7 +90,6 @@ src_configure() {
 
 src_compile() {
 	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
 
 	emake -C doc screen.info
 	default
@@ -98,7 +97,7 @@ src_compile() {
 
 src_install() {
 	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		README ChangeLog INSTALL TODO NEWS*
 		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 	)
 


             reply	other threads:[~2022-02-19  6:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-19  6:31 Sven Wegener [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-16  6:49 [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/ Sam James
2023-04-10 19:57 Sven Wegener
2022-12-21 22:47 Sam James
2022-09-10  1:57 Sam James
2021-02-24 19:25 Sven Wegener
2020-02-27  8:59 Lars Wendler
2018-01-04 23:18 Sven Wegener
2018-01-04 23:18 Sven Wegener
2017-03-13 13:03 Lars Wendler
2016-01-29 12:37 Jeroen Roovers
2016-01-23 12:44 Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1645252301.7b99f401634d79ffe8cd4f0d1f49afa6cc136801.swegener@gentoo \
    --to=swegener@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox