diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-01-25 02:36:47 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-01-25 02:36:47 +0000 |
| commit | 7a94f6f32c5d5c879ade1ca0627833063484d651 (patch) | |
| tree | bdebe59d0be5c5ba13089a1dd07dc4c0a649bbfd /x11-terms | |
| parent | Bumped beta version (diff) | |
| download | gentoo-2-7a94f6f32c5d5c879ade1ca0627833063484d651.tar.gz gentoo-2-7a94f6f32c5d5c879ade1ca0627833063484d651.tar.bz2 gentoo-2-7a94f6f32c5d5c879ade1ca0627833063484d651.zip | |
Clean up patches.
(Portage version: 2.2.0_alpha19/cvs/Linux i686)
Diffstat (limited to 'x11-terms')
6 files changed, 21 insertions, 23 deletions
diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog index 11f2fbd517bc..5c5b7f6c8cee 100644 --- a/x11-terms/rxvt-unicode/ChangeLog +++ b/x11-terms/rxvt-unicode/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-terms/rxvt-unicode -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.175 2010/12/22 19:18:33 wired Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.176 2011/01/25 02:36:47 jer Exp $ + + 25 Jan 2011; Jeroen Roovers <jer@gentoo.org> + files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch, + files/rxvt-unicode-9.06-font-width.patch, + files/rxvt-unicode-9.06-no-urgency-if-focused.diff, + files/rxvt-unicode-9.06-popups-hangs.patch, + files/rxvt-unicode-9.10-force-hints.patch: + Clean up patches. 22 Dec 2010; Alex Alexander <wired@gentoo.org> rxvt-unicode-9.10.ebuild: added warning regarding force-hints diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch index 972adbe06836..0e8d256f9219 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch @@ -13,13 +13,8 @@ corresponding command line option or X resource. See also: http://bugs.gentoo.org/show_bug.cgi?id=237271 2008-09-10 Martin von Gagern -Index: src/init.C -=================================================================== -RCS file: /schmorpforge/rxvt-unicode/src/init.C,v -retrieving revision 1.253 -diff -u -r1.253 init.C ---- src/init.C 15 Jul 2008 16:41:22 -0000 1.253 -+++ src/init.C 10 Sep 2008 08:07:09 -0000 +--- a/src/init.C 15 Jul 2008 16:41:22 -0000 1.253 ++++ b/src/init.C 10 Sep 2008 08:07:09 -0000 @@ -1078,15 +1078,7 @@ #if ENABLE_FRILLS if (option (Opt_borderLess)) diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch index 659ea20cf246..2c803335d64f 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch @@ -1,5 +1,5 @@ ---- src/rxvtfont.C.orig 2008-07-09 12:21:45.000000000 +0400 -+++ src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300 +--- a/src/rxvtfont.C 2008-07-09 12:21:45.000000000 +0400 ++++ b/src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300 @@ -1195,12 +1195,14 @@ XGlyphInfo g; XftTextExtents16 (disp, f, &ch, 1, &g); diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff index 81a3646d4859..3408d73731c9 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff @@ -1,6 +1,5 @@ -diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C ---- rxvt-unicode-9.06.original/src/screen.C 2009-10-25 18:16:16.000000000 -0600 -+++ rxvt-unicode-9.06/src/screen.C 2009-10-25 18:17:53.000000000 -0600 +--- a/src/screen.C ++++ b/src/screen.C @@ -1927,11 +1927,11 @@ # endif XMapWindow (dpy, parent[0]); diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch index b09ad993405a..cad5a793d378 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch @@ -1,10 +1,5 @@ -Index: src/rxvtperl.xs -=================================================================== -RCS file: /schmorpforge/rxvt-unicode/src/rxvtperl.xs,v -retrieving revision 1.127 -diff -u -r1.127 rxvtperl.xs ---- src/rxvtperl.xs 30 May 2009 08:51:23 -0000 1.127 -+++ src/rxvtperl.xs 30 Jul 2009 22:19:33 -0000 +--- a/src/rxvtperl.xs 30 May 2009 08:51:23 -0000 1.127 ++++ b/src/rxvtperl.xs 30 Jul 2009 22:19:33 -0000 @@ -929,7 +929,9 @@ rxvt_term::grab (Time eventtime, int sync = 0) CODE: diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch index 0148ba95445e..59b02fd5e46e 100644 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch @@ -2,8 +2,9 @@ patch that forces hints on rxvt-unicode's geometry. for more info, read this Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=346553 ---- src/main.C -+++ src/main.C + +--- a/src/main.C ++++ b/src/main.C @@ -644,6 +644,8 @@ ncol = width / fwidth; |