Author: mattdm
Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10189
Modified Files: wxGTK.spec Added Files: wxGTK-2.6.2-intl_cpp.patch Log Message: * Wed Nov 30 2005 Matthew Miller mattdm@mattdm.org - 2.6.2-3 - add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other issues (see bug #154618 comment #47) - obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion
wxGTK-2.6.2-intl_cpp.patch:
--- NEW FILE wxGTK-2.6.2-intl_cpp.patch --- =================================================================== 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,v 1.166 2005/09/18 23:38:06 VZ Exp $ +// RCS-ID: $Id: intl.cpp,v 1.166.2.1 2005/09/28 09:48:03 VZ Exp $ // Copyright: (c) 1998 Vadim Zeitlin zeitlin@dptmaths.ens-cachan.fr // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1260,9 +1260,14 @@ inputConv = csConv = new wxCSConv(m_charset); } - else // no conversion needed + else // no need to convert the encoding { + // we still need the conversion for Unicode build +#if wxUSE_UNICODE + inputConv = wxConvCurrent; +#else // !wxUSE_UNICODE inputConv = NULL; +#endif }
// conversion to apply to msgid strings before looking them up: we only
Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wxGTK.spec 28 Nov 2005 19:57:40 -0000 1.14 +++ wxGTK.spec 30 Nov 2005 21:37:34 -0000 1.15 @@ -2,7 +2,7 @@
Name: wxGTK Version: 2.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -11,6 +11,7 @@ Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%%7Bname%7D-%%7Bversion%7D.tar.bz2 +Patch0: wxGTK-2.6.2-intl_cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 @@ -19,16 +20,19 @@ BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
# all of these are for previous Fedora Extras sub-packages -Obsoletes: wxGTK2 < %{version}-%{release} +Obsoletes: wxGTK2 < 2.6.2-1 Provides: wxGTK2 = %{version}-%{release} -Obsoletes: wxGTK-common < %{version}-%{release} + +Obsoletes: wxGTK-common < 2.6.2-1 Provides: wxGTK-common = %{version}-%{release} -Obsoletes: wxGTK2-xrc < %{version}-%{release} -Obsoletes: wxGTK-xrc < %{version}-%{release} + +Obsoletes: wxGTK2-xrc < 2.6.2-1 +Obsoletes: wxGTK-xrc < 2.6.2-1 Provides: wxGTK2-xrc = %{version}-%{release} Provides: wxGTK-xrc = %{version}-%{release} -Obsoletes: wxGTK2-stc < %{version}-%{release} -Obsoletes: wxGTK-stc < %{version}-%{release} + +Obsoletes: wxGTK2-stc < 2.6.2-1 +Obsoletes: wxGTK-stc < 2.6.2-1 Provides: wxGTK2-stc = %{version}-%{release} Provides: wxGTK-stc = %{version}-%{release}
@@ -67,6 +71,7 @@
%prep %setup -q +%patch0 -p0 -b .intlcpp
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -163,6 +168,11 @@
%changelog +* Wed Nov 30 2005 Matthew Miller mattdm@mattdm.org - 2.6.2-3 +- add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other + issues (see bug #154618 comment #47) +- obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion + * Mon Nov 28 2005 Matthew Miller mattdm@mattdm.org - 2.6.2-2 - implemented some suggestions from Matthias Saou: - removed extraneous / from last line of ./configure
scm-commits@lists.fedoraproject.org