rpms/compat-wxPythonGTK2/FC-5 compat-wxPython-2.4.2.4-fixpango.patch, NONE, 1.1 compat-wxPython.spec, 1.3, 1.4
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Mon Sep 11 22:45:59 UTC 2006
Author: spot
Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24283/FC-5
Modified Files:
compat-wxPython.spec
Added Files:
compat-wxPython-2.4.2.4-fixpango.patch
Log Message:
Nuke the bad pango bits. Probably overkill, but no harm in doing it.
compat-wxPython-2.4.2.4-fixpango.patch:
--- NEW FILE compat-wxPython-2.4.2.4-fixpango.patch ---
--- wxPythonSrc-2.4.2.4/src/gtk/window.cpp.BAD 2006-09-11 15:24:25.000000000 -0500
+++ wxPythonSrc-2.4.2.4/src/gtk/window.cpp 2006-09-11 15:24:54.000000000 -0500
@@ -4015,10 +4015,7 @@
PangoContext *wxWindowGTK::GtkGetPangoX11Context()
{
- if (!m_x11Context)
- m_x11Context = pango_x_get_context( gdk_display );
-
- return m_x11Context;
+ return gtk_widget_get_pango_context(m_widget);
}
#endif
--- wxPythonSrc-2.4.2.4/src/gtk/dcclient.cpp.BAD 2006-09-11 15:23:35.000000000 -0500
+++ wxPythonSrc-2.4.2.4/src/gtk/dcclient.cpp 2006-09-11 15:24:14.000000000 -0500
@@ -1774,9 +1774,9 @@
if (m_owner)
{
- if (m_font.GetNoAntiAliasing())
- m_context = m_owner->GtkGetPangoX11Context();
- else
+ //if (m_font.GetNoAntiAliasing())
+ // m_context = m_owner->GtkGetPangoX11Context();
+ //else
m_context = m_owner->GtkGetPangoDefaultContext();
}
}
--- wxPythonSrc-2.4.2.4/src/x11/app.cpp.BAD 2006-09-11 15:54:58.000000000 -0500
+++ wxPythonSrc-2.4.2.4/src/x11/app.cpp 2006-09-11 16:17:58.000000000 -0500
@@ -1130,9 +1130,7 @@
if (use_xft)
ret = pango_xft_get_context( xdisplay, xscreen );
- else
#endif
- ret = pango_x_get_context( xdisplay );
if (!PANGO_IS_CONTEXT(ret))
wxLogError( wxT("No pango context.") );
Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-5/compat-wxPython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compat-wxPython.spec 19 Apr 2006 21:06:02 -0000 1.3
+++ compat-wxPython.spec 11 Sep 2006 22:45:59 -0000 1.4
@@ -4,13 +4,14 @@
Name: compat-wxPythonGTK2
Version: 2.4.2.4
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Compatibility version of the wxWidgets GUI toolkit for Python
Group: Development/Languages
License: LGPL
URL: http://www.wxpython.org/
Source0: http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: compat-wxPython-2.4.2.4-fixpango.patch
BuildRequires: compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
@@ -28,6 +29,7 @@
%prep
%setup -q -n wxPythonSrc-%{version}
+%patch0 -p1
%build
# Just build the wxPython part, not all of wxWindows which we already have
@@ -64,6 +66,9 @@
%{python_sitearch}/wx/
%changelog
+* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-12
+- fix pango cruft
+
* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-11
- add missing BuildRequires: mesa-libGLU-devel
More information about the fedora-extras-commits
mailing list