rpms/openoffice.org/devel openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch, NONE, 1.1 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, NONE, 1.1 openoffice.org.spec, 1.1375, 1.1376 openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch, 1.6, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4331

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch 
	openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 
Removed Files:
	openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch 
Log Message:
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch

openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch:

--- NEW FILE openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch ---
Index: scripts/soffice.sh
===================================================================
RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
retrieving revision 1.13
diff -u -p -r1.13 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh	26 Nov 2004 14:48:50 -0000	1.13
+++ openoffice.org/desktop/scripts/soffice.sh	29 Mar 2005 11:05:17 -0000
@@ -55,6 +55,7 @@
 #
 #*************************************************************************
 
+export SAL_ENABLE_NATIVE_XFONTS=0
 #
 # STAR_PROFILE_LOCKING_DISABLED=1
 # export STAR_PROFILE_LOCKING_DISABLED

openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:

--- NEW FILE openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch ---
Index: unx/source/plugadapt/salplug.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/plugadapt/salplug.cxx,v
retrieving revision 1.24
diff -u -r1.24 salplug.cxx
--- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	15 Oct 2007 13:07:38 -0000	1.24
+++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	10 Jan 2008 18:00:21 -0000
@@ -429,7 +429,7 @@
     else if( desktop == desktop_strings[DESKTOP_KDE] )
         pRet = "kde";
     else
-        pRet = "gen";
+        pRet = "gtk";
         
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "plugin autodetection: %s\n", pRet );
@@ -468,7 +468,7 @@
 
     // fallback to gen
     if( ! pInst )
-        pInst = tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "gen" ) ) );
+        pInst = tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "gtk" ) ) );
 
     if( ! pInst )
     {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -r1.1375 -r1.1376
--- openoffice.org.spec	10 Jan 2008 17:52:27 -0000	1.1375
+++ openoffice.org.spec	10 Jan 2008 18:03:23 -0000	1.1376
@@ -79,7 +79,7 @@
 Patch7:  openoffice.org.langpack-common.template
 Patch8:  openoffice.org.langpack-acor.template
 Patch9:  openoffice.org.langpack-ctl.template
-Patch10: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
+Patch10: openoffice.org-1.9.88.rhXXXXXX.noxfonts.desktop.patch
 Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 %if %{gtkprintui}
@@ -137,6 +137,7 @@
 Patch63: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
 Patch64: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 Patch65: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch66: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1030,7 +1031,7 @@
  tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
 mv -f redhat.soc extras/source/palettes/standard.soc
 cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
-%patch10 -p1 -b .rh133741.alwaysgtk.desktop.patch
+%patch10 -p1 -b .rhXXXXXX.noxfonts.desktop.patch
 %patch11 -p1 -b .rh161886.rpath.desktop.patch
 %patch12 -p1 -b .rh151357.setlangtolocale.patch
 %if %{gtkprintui}
@@ -1088,6 +1089,7 @@
 %patch63 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
 %patch64 -p1 -b .ooo85097.desktop.pagein.patch
 %patch65 -p1 -b .oooXXXXX.solenv.paths.patch
+%patch66 -p1 -b .rh133741.alwaysgtk.vcl.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2864,6 +2866,7 @@
 %changelog
 * Thu Jan 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.2
 - add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires
+- add openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 
 * Sat Jan 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.1
 - first OOH680_m1


--- openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch DELETED ---