rpms/compat-wxGTK/devel compat-wxGTK-2.4.2-fixpango.patch, NONE, 1.1 compat-wxGTK.spec, 1.6, 1.7

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22828/devel

Modified Files:
	compat-wxGTK.spec 
Added Files:
	compat-wxGTK-2.4.2-fixpango.patch 
Log Message:

Fix pango mess, rebuild for FC-6


compat-wxGTK-2.4.2-fixpango.patch:

--- NEW FILE compat-wxGTK-2.4.2-fixpango.patch ---
--- wxGTK-2.4.2/src/gtk/window.cpp.BAD	2006-09-11 16:28:42.000000000 -0500
+++ wxGTK-2.4.2/src/gtk/window.cpp	2006-09-11 16:29:18.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
 
--- wxGTK-2.4.2/src/gtk/dcclient.cpp.BAD	2006-09-11 16:29:29.000000000 -0500
+++ wxGTK-2.4.2/src/gtk/dcclient.cpp	2006-09-11 16:29:56.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();
         }
     }


Index: compat-wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compat-wxGTK.spec	22 Aug 2006 22:15:13 -0000	1.6
+++ compat-wxGTK.spec	11 Sep 2006 22:09:10 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           compat-wxGTK
 Version:        2.4.2
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Compatibility version of the wxWidgets GTK GUI library
 License:        BSD
 Group:          System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch2:         wxGTK-2.4.2-gcc4.patch
 Patch3:         wxGTK-2.4.2-locale-compat.patch
 Patch4:         wxGTK-2.4.2-ft2fix.patch
+Patch5:         compat-wxGTK-2.4.2-fixpango.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
@@ -153,6 +154,7 @@
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .locale-compat
 %patch4 -p1 -b .ft2fix
+%patch5 -p1 -b .fixpango
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -327,6 +329,9 @@
 
 
 %changelog
+* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-21
+- fix pango mess
+
 * Wed Aug 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-20
 - add patch to make the code find the renamed .mo files