summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Wojtaszek <sekretarz@gentoo.org>2005-11-26 18:39:50 +0000
committerKarol Wojtaszek <sekretarz@gentoo.org>2005-11-26 18:39:50 +0000
commitaabf1665bd3095140a285eb9c88d20a952c9e2cb (patch)
tree596b866908131aa8a1296c2746187621c4c17b13 /x11-libs/wxGTK
parentadded ~ppc64 and marked 0.9.9 stable on ppc64 (diff)
downloadgentoo-2-aabf1665bd3095140a285eb9c88d20a952c9e2cb.tar.gz
gentoo-2-aabf1665bd3095140a285eb9c88d20a952c9e2cb.tar.bz2
gentoo-2-aabf1665bd3095140a285eb9c88d20a952c9e2cb.zip
Fixed unicode patch not to expand cvs tag
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog5
-rw-r--r--x11-libs/wxGTK/files/intl.cpp.diff13
2 files changed, 4 insertions, 14 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 9fcc0b9b76d8..1a225326d949 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.95 2005/11/26 17:32:08 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.96 2005/11/26 18:39:50 sekretarz Exp $
+
+ 26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> files/intl.cpp.diff:
+ Fixed unicode patch not to expand cvs tag
*wxGTK-2.6.2-r1 (26 Nov 2005)
diff --git a/x11-libs/wxGTK/files/intl.cpp.diff b/x11-libs/wxGTK/files/intl.cpp.diff
index 1e64b18abae7..724cdd43aaca 100644
--- a/x11-libs/wxGTK/files/intl.cpp.diff
+++ b/x11-libs/wxGTK/files/intl.cpp.diff
@@ -1,19 +1,6 @@
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
-retrieving revision 1.166
-retrieving revision 1.166.2.1
diff -u -r1.166 -r1.166.2.1
--- src/common/intl.cpp 2005/09/18 23:38:06 1.166
+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1
-@@ -5,7 +5,7 @@
- // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
- // (2003/09/30 - PluralForms support)
- // Created: 29/01/98
--// RCS-ID: $Id: intl.cpp.diff,v 1.1 2005/11/26 17:32:08 sekretarz Exp $
-+// RCS-ID: $Id: intl.cpp.diff,v 1.1 2005/11/26 17:32:08 sekretarz Exp $
- // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
@@ -1260,9 +1260,14 @@
inputConv =
csConv = new wxCSConv(m_charset);