summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2005-07-06 18:07:56 +0000
committerSven Wegener <swegener@gentoo.org>2005-07-06 18:07:56 +0000
commitfa1b83f6ca0747abbdb323b3dd2ea5967c059892 (patch)
treed174b169b99ecd192e6b73d98ddc2d85d33626cb
parentfixed use flag warning, freetype to truetype (diff)
downloadgentoo-2-fa1b83f6ca0747abbdb323b3dd2ea5967c059892.tar.gz
gentoo-2-fa1b83f6ca0747abbdb323b3dd2ea5967c059892.tar.bz2
gentoo-2-fa1b83f6ca0747abbdb323b3dd2ea5967c059892.zip
Added a minor patch that makes %u work for the windowlist format.
(Portage version: 2.0.51.22-r1)
-rw-r--r--app-misc/screen/ChangeLog6
-rw-r--r--app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch12
-rw-r--r--app-misc/screen/screen-4.0.2-r4.ebuild5
3 files changed, 21 insertions, 2 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 7c10e7f4a938..11db3aa36405 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/screen
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.89 2005/06/13 19:03:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.90 2005/07/06 18:07:56 swegener Exp $
+
+ 06 Jul 2005; Sven Wegener <swegener@gentoo.org>
+ +files/4.0.2-windowlist-multiuser-fix.patch, screen-4.0.2-r4.ebuild:
+ Added a minor patch that makes %u work for the windowlist format.
13 Jun 2005; Sven Wegener <swegener@gentoo.org> files/screenrc:
Changed the xterm scrollback tweak to clear the screen after detaching and
diff --git a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
new file mode 100644
index 000000000000..09848e93ef2e
--- /dev/null
+++ b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur screen-4.0.2.orig/process.c screen-4.0.2/process.c
+--- screen-4.0.2.orig/process.c 2003-09-18 14:53:54.000000000 +0200
++++ screen-4.0.2/process.c 2005-07-06 19:55:08.370772955 +0200
+@@ -4841,7 +4841,7 @@
+ s = buf;
+ for (display = displays; display; display = display->d_next)
+ {
+- if (D_user == olddisplay->d_user)
++ if (olddisplay && D_user == olddisplay->d_user)
+ continue;
+ for (cv = D_cvlist; cv; cv = cv->c_next)
+ if (Layer2Window(cv->c_layer) == p)
diff --git a/app-misc/screen/screen-4.0.2-r4.ebuild b/app-misc/screen/screen-4.0.2-r4.ebuild
index 0a942f6fd65a..b2ab0a573ba0 100644
--- a/app-misc/screen/screen-4.0.2-r4.ebuild
+++ b/app-misc/screen/screen-4.0.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r4.ebuild,v 1.1 2005/06/07 13:00:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r4.ebuild,v 1.2 2005/07/06 18:07:56 swegener Exp $
inherit eutils flag-o-matic toolchain-funcs pam
@@ -44,6 +44,9 @@ src_unpack() {
# Patch for time function on 64bit systems
epatch "${FILESDIR}"/${PV}-64bit-time.patch
+ # Patch that makes %u work for windowlist formats
+ epatch "${FILESDIR}"/${PV}-windowlist-multiuser-fix.patch
+
# Fix manpage.
sed -i \
-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \