rpms/openoffice.org/devel openoffice.org-2.0.3.rh187919.gtkunderkde.patch, NONE, 1.1 openoffice.org.spec, 1.755, 1.756

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15973

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch 
Log Message:
try some KDE fixes

openoffice.org-2.0.3.rh187919.gtkunderkde.patch:
 salnativewidgets-gtk.cxx |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.3.rh187919.gtkunderkde.patch ---
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.14
diff -u -p -u -r1.14 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -392,10 +393,15 @@ void GtkData::initNWF( void )
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
     
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
-        // KDE 3.3 invented a bug in the qt<->gtk theme engine
-        // that makes direct rendering impossible: they totally
-        // ignore the clip rectangle passed to the paint methods
-        GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+	{
+		if( g_type_from_name( "QtEngineStyle" ) )
+		{
+			// KDE 3.3 invented a bug in the qt<->gtk theme engine
+			// that makes direct rendering impossible: they totally
+			// ignore the clip rectangle passed to the paint methods
+			GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+		}
+	}
     
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "GtkPlugin: using %s NWF\n",


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- openoffice.org.spec	5 Jul 2006 10:21:07 -0000	1.755
+++ openoffice.org.spec	7 Jul 2006 12:03:41 -0000	1.756
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 5
+%define rh_rpm_release 4.cmc
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -109,6 +109,7 @@
 Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -845,6 +846,7 @@
 %patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
 %patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch46 -p1 -b .rh187919.gtkunderkde.patch
 
 tar xzf %{SOURCE1}
 
@@ -3324,6 +3326,7 @@
 %changelog
 * Wed Jul 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+- add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version