diff options
| author |   Daniel Solano Gómez <gentoo@sattvik.com> | 2011-05-04 11:42:02 -0500 |
|---|---|---|
| committer | Daniel Solano Gómez <gentoo@sattvik.com> | 2011-05-04 11:42:02 -0500 |
| commit | 77a1b9634b83cbbbbaca57cf376cd0e6980e4dde (patch) | |
| tree | a2516f22630f3d5026f68c9496b69b4b944bc48c | |
| parent | Sync up with main tree (diff) | |
| download | sattvik-77a1b9634b83cbbbbaca57cf376cd0e6980e4dde.tar.gz sattvik-77a1b9634b83cbbbbaca57cf376cd0e6980e4dde.tar.bz2 sattvik-77a1b9634b83cbbbbaca57cf376cd0e6980e4dde.zip | |
Update patches from tree
7 files changed, 26 insertions, 29 deletions
diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog index 3a53dfe..6dc893b 100644 --- a/x11-terms/rxvt-unicode/ChangeLog +++ b/x11-terms/rxvt-unicode/ChangeLog @@ -3,6 +3,14 @@ # $Header: $ 04 May 2011; Daniel Solano Gómez <gentoo@sattvik.com> + 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: + Update with patches from main tree + + 04 May 2011; Daniel Solano Gómez <gentoo@sattvik.com> -rxvt-unicode-9.07.ebuild, rxvt-unicode-9.10.ebuild: Sync up with main tree. diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 926dc16..cb5350b 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,17 +1,16 @@ AUX dan-colours.patch 10356 RMD160 acde5f0d11e56c6db88a0ce834cc9fe990d6a6cf SHA1 8e7b45e951c05b9e9abe800cae6b673cbc4bca47 SHA256 d220bb31b4a8964ed26f824d04a50e787d02c1e259cfb97485f939d46adf47e9 -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.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.09-sattvik-colours.patch 9808 RMD160 f57f9cb2e7688cc2e703b7aba23efede61308482 SHA1 bcb3d2aaa14e06d8769bec21dc64c5af8d6c2726 SHA256 e77b8a0cffdbad4bd7e81974660463cef533174c5069d3067b8e724862900d40 -AUX rxvt-unicode-9.10-force-hints.patch 379 RMD160 2fa77698717b9a4983e211750b86d474f656c01e SHA1 e209a23bfbc74f5fa58eda23299b342a5b60068a SHA256 5ade3cc4ac010679d51b3b1db47f45e920881b9404d091ad0220e25f5bd22e95 +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 EBUILD rxvt-unicode-9.07-r1.ebuild 3472 RMD160 aa596062cdde264e64604a7726d79119dafe6911 SHA1 006365bd672ee28f5e1dc0d618fc9f4476e4b75f SHA256 914179f34234e2400f3879321707c177966606e5c763319c74df3c4e6eb52f27 EBUILD rxvt-unicode-9.07-r2.ebuild 3494 RMD160 8c570e7d2ded9dc3e947284a90fb7a537b4e0ae6 SHA1 5cc0cb9fa9663bd952ee9fea2be178ef14c94c15 SHA256 a8f1143d8428d6ed5f549dedefe2b6b1688642bb012907dbc8d56602dd160753 -EBUILD rxvt-unicode-9.07.ebuild 3382 RMD160 ad050a76c73e78acb3d24800e8d6d9da5729f1d6 SHA1 10486523d1c16a03888d08a4c8d8d45fb74bae97 SHA256 88b556edf75597ddb0669481c6213edd16d8da0ea91dd3c747109738e39b7107 EBUILD rxvt-unicode-9.09.ebuild 2422 RMD160 a90e2144e92456c3f9fd4cf4409a79068de89c9d SHA1 47b86e71ab4c480a9fef94c462c4f0f9e332f794 SHA256 975e184622158c5b6664f36f2b6a23b8e36ab393395f1e8eb3941796845883b0 -EBUILD rxvt-unicode-9.10.ebuild 3011 RMD160 d40631b366f007d80be459347a968787fed78f6a SHA1 3ee85efa547e4194a04dcce48ce6cf04c878a7d1 SHA256 11025dcd8ff41f7049f06153943f3ec4c9648b93d09bab650278409f45192fd9 -MISC ChangeLog 1689 RMD160 a8e8cf9386a57c925ff40ef9212432ebf7674c55 SHA1 1b65d604ccc56d05ac0e5cbd36859a6a9bb47643 SHA256 f8ade758584b63394e9bc9d732671e9b590a51e56ac2521f45c9a84dcd754cde +EBUILD rxvt-unicode-9.10.ebuild 2987 RMD160 121dddefb41e7315a0caef458796c30698e041c9 SHA1 53b378c944989d64b3a7e80486e6c2b44d36fc6e SHA256 a012ad9e209c7e1d8cfe25ad273ed12afce71334e546a40f5e2948dd48a387a0 +MISC ChangeLog 2162 RMD160 85a0beb38ce6e845c0e3d4e5660b6690bff75638 SHA1 d6a16b8b1e745845271498da3e68b1352184b1c7 SHA256 ead1304e4fc77c79292323b15c92c11e5d8e8dac6f96be84319458ce898a484b 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 972adbe..0e8d256 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 659ea20..2c80333 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 81a3646..3408d73 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 b09ad99..cad5a79 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 0148ba9..59b02fd 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; |