Archives
Archives
| From: | "Ryan Hill (dirtyepic)" <dirtyepic@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.10-collision.patch wxGTK-2.8.6-wxrc_link_fix.patch wxGTK-2.8.8-collision.patch wxGTK-2.8.9-dont-touch-my-bools.patch wxGTK-2.8.9.2-nestedtables.patch |
| Date: | Tue, 02 Feb 2010 19:11:35 |
| Message-Id: | E1NcO9M-0001Me-6M@stork.gentoo.org |
| 1 | dirtyepic 10/02/02 19:11:00 |
| 2 | |
| 3 | Modified: wxGTK-2.8.10-collision.patch |
| 4 | Removed: wxGTK-2.8.6-wxrc_link_fix.patch |
| 5 | wxGTK-2.8.8-collision.patch |
| 6 | wxGTK-2.8.9-dont-touch-my-bools.patch |
| 7 | wxGTK-2.8.9.2-nestedtables.patch |
| 8 | Log: |
| 9 | Revbump to fix typo in collision patch. Remove unused patches. |
| 10 | (Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 11 | |
| 12 | Revision Changes Path |
| 13 | 1.2 x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch |
| 14 | |
| 15 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch?rev=1.2&view=markup |
| 16 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch?rev=1.2&content-type=text/plain |
| 17 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch?r1=1.1&r2=1.2 |
| 18 | |
| 19 | Index: wxGTK-2.8.10-collision.patch |
| 20 | =================================================================== |
| 21 | RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch,v |
| 22 | retrieving revision 1.1 |
| 23 | retrieving revision 1.2 |
| 24 | diff -u -r1.1 -r1.2 |
| 25 | --- wxGTK-2.8.10-collision.patch 18 May 2009 03:15:28 -0000 1.1 |
| 26 | +++ wxGTK-2.8.10-collision.patch 2 Feb 2010 19:10:59 -0000 1.2 |
| 27 | @@ -59,7 +59,7 @@ |
| 28 | if ( bLoadDefault ) |
| 29 | { |
| 30 | - bOk = AddCatalog(wxT("wxstd")); |
| 31 | -+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd")); |
| 32 | ++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION))); |
| 33 | |
| 34 | // there may be a catalog with toolkit specific overrides, it is not |
| 35 | // an error if this does not exist |