From 6828083b9eddbf1e4ddc7d75ecee8c1213a6a3be Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 25 Jan 2011 02:36:47 +0000 Subject: Clean up patches. Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686 --- x11-terms/rxvt-unicode/ChangeLog | 12 ++++++++++-- x11-terms/rxvt-unicode/Manifest | 12 ++++++------ .../files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch | 9 ++------- .../rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch | 4 ++-- .../files/rxvt-unicode-9.06-no-urgency-if-focused.diff | 5 ++--- .../rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch | 9 ++------- .../rxvt-unicode/files/rxvt-unicode-9.10-force-hints.patch | 5 +++-- x11-terms/yeahconsole/Manifest | 6 +++--- 8 files changed, 30 insertions(+), 32 deletions(-) (limited to 'x11-terms') 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 + 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 rxvt-unicode-9.10.ebuild: added warning regarding force-hints diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 07bf3601e1ec..c00b0e8f5030 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,8 +1,8 @@ -AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440 -AUX rxvt-unicode-9.06-font-width.patch 791 RMD160 c2e1a23d55376613806aec20cafc4795548be4c3 SHA1 00292f5f7e7274dbb3953410055c569fdebd8995 SHA256 f0bf83b43a8f6c599be9326859239f5bf10bd1c7c9a1f97ac9cb87086bf1500c -AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e996e822a10d372a01d7e SHA1 7da560653290f6fd653be2dda396b19961f31c06 SHA256 f518571ae6c63110cc8b49f423c1cb864399335017ca17469df5e78a2f2aabc4 -AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60 -AUX rxvt-unicode-9.10-force-hints.patch 379 RMD160 2fa77698717b9a4983e211750b86d474f656c01e SHA1 e209a23bfbc74f5fa58eda23299b342a5b60068a SHA256 5ade3cc4ac010679d51b3b1db47f45e920881b9404d091ad0220e25f5bd22e95 +AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1230 RMD160 eb580a34407a3c605e1fdffa3847d71fac16a860 SHA1 93afc24408ce263fb71d56c6ed191307b54716a6 SHA256 59eb0b72ef05be7e7d9071ec5f05a349359768daa3c5893b14917c50e5e10175 +AUX rxvt-unicode-9.06-font-width.patch 790 RMD160 f2ebc97c769dc3034c55d2ceb5d776e275c6c368 SHA1 dc3b4921ed8d0a54822f203747a1551817d9b60d SHA256 fc241d7c11b86f589f41a0f488e8f04875ca6ca937e57bc2347c19dff423a38a +AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 287 RMD160 f978530bb245264be801908a680ea5a8da7265ef SHA1 3284901bb71c61cdeb1c82eb3011bbd0a5c6a85e SHA256 00fc63035890be675e6485277053c8bd0ba4b2253f81af15741a79c5f259fa79 +AUX rxvt-unicode-9.06-popups-hangs.patch 447 RMD160 634460478e418bef029af6254c6f23a73923a6ec SHA1 8677e04413cb1225d0a24926b339b5bd3807593c SHA256 34126249d44f55aa74e7b0929994821543fe2d0ec2d789496344a23426532642 +AUX rxvt-unicode-9.10-force-hints.patch 384 RMD160 3f5831edbbba5b9ceb2bf72c6c6a718abf7b3852 SHA1 479ebd309f39d49ab286b6c4b401b06855f21848 SHA256 6c67e4c43b1f99d1f99a9096d91f307dc40f56f9e59eb7106d01404a8c30a2d9 DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3 DIST rxvt-unicode-9.09.tar.bz2 883665 RMD160 283ad875b355b51a81d35ba4de4930cf96aa677c SHA1 02ec1b5c9c1dff241bfc3b6d2c2a7e5c00aa47ad SHA256 2891131672b4e84cbee4a83fda7d033c5398b71f8dc7b9bf83d04d9ef1fc819c DIST rxvt-unicode-9.10.tar.bz2 884501 RMD160 15c9f61e7c6ad3f05c6bf20bedad2cd8d5f1d5e9 SHA1 54c896a4885b8984b0dfa652269c3c34c4d75f2d SHA256 1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a @@ -10,5 +10,5 @@ EBUILD rxvt-unicode-9.07-r1.ebuild 3431 RMD160 3a52d506f22af8423f9669f3b3e917c79 EBUILD rxvt-unicode-9.07-r2.ebuild 3453 RMD160 05134498e65a920e595e714d9621221a6cbe2bc3 SHA1 e24466bc8c988d69170180de3a832817fb936f23 SHA256 3e688768c66771ccc996e55cc253c086dd5f923ca2544ca8ab22f844e7ba2cb5 EBUILD rxvt-unicode-9.09.ebuild 2366 RMD160 4d62ee3fdf37a5079744e14ff9800ba924afb6be SHA1 ab14ac5d94ef96fa041a6e3b43c3b7a5221faad7 SHA256 0e137a1fcf215e7a00460ec2c484a2e16261b69afba166783dbb7fa69c336835 EBUILD rxvt-unicode-9.10.ebuild 2955 RMD160 b0e9656adfb353416d8bb9bb2fc50562b18e1686 SHA1 077c00b92f8965cd33971cd2e141c23dc3209b89 SHA256 25de937b391325c1f8f1f2592b384824fa148240fd5c7f438d3e2ddac522d320 -MISC ChangeLog 26459 RMD160 967e19d405e98074c00a7c2fee457bbee8752a4d SHA1 af5bb09bf9d51f7d6fde8de0dd45fd57cd0b78c8 SHA256 0a4997ded3774bda2eb6d151b5bdf99b1b0d2da525ac0dee3c2d0a43a7540dbb +MISC ChangeLog 26764 RMD160 454fc2d0aef3e5408c858d4ebdd1db050b84d06d SHA1 b4c5b2c50cf0eff9990b4cae036e6b492913f4e9 SHA256 2ea42a99a334013d97f2f5c20d9eff33932bd2cdeb0dfd1b8815ff61e6e4cc64 MISC metadata.xml 1190 RMD160 bcaa035b5e7681f50221aad7f56c21598e18cb2c SHA1 a67504cafe0182f483fd29bd3d5ae5e7ee70055a SHA256 12d5f189416b5d43a50973fd62ba1aa7aa31bed0bcdac1b442c7b34d41a0cac0 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; diff --git a/x11-terms/yeahconsole/Manifest b/x11-terms/yeahconsole/Manifest index aee44ab44d56..0c0f027b52bf 100644 --- a/x11-terms/yeahconsole/Manifest +++ b/x11-terms/yeahconsole/Manifest @@ -1,5 +1,5 @@ -AUX yeahconsole-0.3.4-make.patch 806 RMD160 bf2458ed396b1fe0fdf09d7047afcfa94a04ecbe SHA1 27818a7dacb66080221359a9f3114edb3529c7b0 SHA256 a596ca2a7db7dd4da1ed7d9493910937cc4e9166ea769a5c5f842938c9c4a9f3 +AUX yeahconsole-0.3.4-make.patch 769 RMD160 ae6fddeef34686904c8cb9d84fbc23af572ff47e SHA1 b9c182c1597cf3a562d72d5525291d9cc18518b6 SHA256 478d7469b804806468fefea15d7b71775e2508e0f3f25a093a8e95ff9acabb59 DIST yeahconsole-0.3.4.tar.gz 12281 RMD160 0503254c8ff4f124ca7ec122b3a204826e03a43a SHA1 78b589c21dc16d5b570ceade1d6c9bf337a51eef SHA256 fcf3481f78a263a70f1cb5163630fc22e78bb0915013eb05689c6f4aeb0583ef -EBUILD yeahconsole-0.3.4-r1.ebuild 982 RMD160 ab9e46ab4899e18b16419afbfb0d04a3f98a7430 SHA1 1cd9321b08745606dd561ee1fb347faae3fd8084 SHA256 6ce8c59b1844996d0010b2207d4ffe4144294f1a1d98742c1bd47cca73ecb5ca -MISC ChangeLog 1720 RMD160 d3f551613afce84ab9b89898376dd0c71eefb459 SHA1 b983d64603a1f874b0c750e377b055db5179ab6e SHA256 d29cdca74f97e20a8664dc73bec20bf2b8b0a8388d5350389bd9aee3ce485566 +EBUILD yeahconsole-0.3.4-r1.ebuild 975 RMD160 12302b6c3856d7b488105cce8122649e8b5ff531 SHA1 dcd29b547cb98e54c0ef1933324e86b90386fe7b SHA256 10f67f874ef1919469d88b3cc164f65d41ecb433cca5a0436313f0b89eeb46aa +MISC ChangeLog 1875 RMD160 9e57d434e02ac452eb98a470f9b36d331c6537e2 SHA1 6c04b351c28dda6c8bfae6458c36c12aa954e140 SHA256 03a94ec7f29242edea4f399014fd90af1bbbe43c980e54eb3123070a7bef965f MISC metadata.xml 247 RMD160 ce510949efadc662a8bdf3f163ab8da65425031b SHA1 9e77d3a27a86999fbe9fd9c8098a6f487512cd89 SHA256 219ac51d48f3a246086b75c336a1be44caafec3dd2c86ba61a44caa6374778df -- cgit v1.2.3-65-gdbad