rpms/openoffice.org/devel openoffice.org.spec, 1.1744, 1.1745 workspace.vcl98.patch, 1.2, 1.3 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29785

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch 
Log Message:
patch merged into upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1744
retrieving revision 1.1745
diff -u -r1.1744 -r1.1745
--- openoffice.org.spec	7 Jan 2009 10:22:13 -0000	1.1744
+++ openoffice.org.spec	7 Jan 2009 12:23:10 -0000	1.1745
@@ -129,10 +129,9 @@
 Patch56: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch57: workspace.transogl03.patch
 Patch58: workspace.vcl97.patch
-Patch59: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
-Patch60: workspace.vcl98.patch
-Patch61: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
-Patch62: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch59: workspace.vcl98.patch
+Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1409,10 +1408,9 @@
 %patch56 -p1
 %patch57 -p0 -b .workspace.transogl03.patch
 %patch58 -p1 -b .workspace.vcl97.patch
-%patch59 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
-%patch60 -p1 -b .workspace.vcl98.patch
-%patch61 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
-%patch62 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch59 -p1 -b .workspace.vcl98.patch
+%patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.vcl98.patch	17 Dec 2008 19:13:45 -0000	1.2
+++ workspace.vcl98.patch	7 Jan 2009 12:23:10 -0000	1.3
@@ -100,3 +100,27 @@
  	int i;
  
  	for( i = 0; i < TOGGLE_LAST; i++ )
+Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.47
+diff -u -r1.47 salnativewidgets-gtk.cxx
+--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2008 14:30:38 -0000	1.47
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	12 Dec 2008 11:14:39 -0000
+@@ -405,6 +408,8 @@
+     
+     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
+     {
++        // Ensure that theme is instantiated to test for QtEngineStyle
++        GtkWidget *pThemeInstantiater = gtk_button_new();
+         if( g_type_from_name( "QtEngineStyle" ) )
+         {
+             // KDE 3.3 invented a bug in the qt<->gtk theme engine
+@@ -412,6 +417,7 @@
+             // ignore the clip rectangle passed to the paint methods
+             GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+         }
++        gtk_widget_destroy(pThemeInstantiater);
+     }
+     static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
+     if( pEnv && *pEnv )


--- openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch DELETED ---