rpms/openoffice.org/devel openoffice.org.spec, 1.2195, 1.2196 workspace.sw33bf03.patch, 1.1, 1.2 openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19221

Modified Files:
	openoffice.org.spec workspace.sw33bf03.patch 
Removed Files:
	openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch 
Log Message:
merge patches into accepted upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2195
retrieving revision 1.2196
diff -u -p -r1.2195 -r1.2196
--- openoffice.org.spec	26 Apr 2010 17:50:17 -0000	1.2195
+++ openoffice.org.spec	26 Apr 2010 17:53:06 -0000	1.2196
@@ -132,9 +132,8 @@ Patch61: workspace.koheicsvimport.patch
 Patch62: workspace.odfmetadata4.patch
 Patch63: workspace.tl80.patch
 Patch64: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch65: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
-Patch66: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
-Patch67: workspace.fwk140.patch
+Patch65: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
+Patch66: workspace.fwk140.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1663,7 +1662,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch45 -p1 -b .workspace.pythonssldedux.patch
 %patch46 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch47 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch48 -p0 -b .workspace.sw33bf03.patch
+%patch48 -p1 -b .workspace.sw33bf03.patch
 %patch49 -p0 -b .workspace.writerfilter07.patch
 %patch50 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
 %patch51 -p1 -b .workspace.sw33bf02.patch
@@ -1680,9 +1679,8 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch62 -p1 -b .workspace.odfmetadata4.patch
 %patch63 -p0 -b .workspace.tl80.patch
 %patch64 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch65 -p1 -b .ooo110523.rdf.resetsecprefs.patch
-%patch66 -p1 -b .ooo111152.i18npool.viramacursor.patch
-%patch67 -p1 -b .workspace.fwk140.patch
+%patch65 -p1 -b .ooo111152.i18npool.viramacursor.patch
+%patch66 -p1 -b .workspace.fwk140.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.sw33bf03.patch:
 sw/source/core/txtnode/fntcache.cxx     |   10 ++++++++++
 unoxml/source/rdf/librdf_repository.cxx |    5 +++++
 unoxml/source/rdf/makefile.mk           |    8 ++++++++
 3 files changed, 23 insertions(+)

Index: workspace.sw33bf03.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.sw33bf03.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.sw33bf03.patch	26 Feb 2010 14:51:46 -0000	1.1
+++ workspace.sw33bf03.patch	26 Apr 2010 17:53:06 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ru sw.orig/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcache.cxx
---- sw.orig/source/core/txtnode/fntcache.cxx	2009-12-21 10:33:36.000000000 +0000
-+++ sw/source/core/txtnode/fntcache.cxx	2009-12-22 13:34:48.000000000 +0000
+diff -ru sw/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcache.cxx
+--- a/sw/source/core/txtnode/fntcache.cxx	2009-12-21 10:33:36.000000000 +0000
++++ b/sw/source/core/txtnode/fntcache.cxx	2009-12-22 13:34:48.000000000 +0000
 @@ -482,6 +482,11 @@
          pScrFont = pPrtFont;
  
@@ -25,3 +25,51 @@ diff -ru sw.orig/source/core/txtnode/fnt
  			}
  
              const XubString aStandardStr( sStandardString,
+diff -r 21777680017e unoxml/source/rdf/librdf_repository.cxx
+--- a/unoxml/source/rdf/librdf_repository.cxx	Thu Mar 18 17:15:13 2010 +0000
++++ b/unoxml/source/rdf/librdf_repository.cxx	Thu Apr 01 16:23:56 2010 +0100
+@@ -52,6 +52,7 @@
+ #include <rtl/ustring.hxx>
+ 
+ #include <librdf.h>
++#include <libxslt/security.h>
+ 
+ #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
+@@ -1887,7 +1888,11 @@
+             m_rRep);
+     }
+     //FIXME logger, digest, features?
++    xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs();
+     librdf_world_open(pWorld);
++    xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs();
++    if (newprefs != origprefs)
++        xsltSetDefaultSecurityPrefs(origprefs);
+     return pWorld;
+ }
+ 
+diff -r 21777680017e unoxml/source/rdf/makefile.mk
+--- a/unoxml/source/rdf/makefile.mk	Thu Mar 18 17:15:13 2010 +0000
++++ b/unoxml/source/rdf/makefile.mk	Thu Apr 01 16:23:56 2010 +0100
+@@ -41,6 +41,13 @@
+ CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS)
+ .ENDIF
+ 
++.IF "$(SYSTEM_LIBXSLT)" == "YES"
++CFLAGS+= $(LIBXSLT_CFLAGS)
++.ELSE
++LIBXSLTINCDIR=external$/libxslt
++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ .IF "$(L10N_framework)"==""
+ 
+@@ -64,6 +71,7 @@
+ 
+ SHL1STDLIBS= \
+     $(REDLANDLIB) \
++    $(XSLTLIB) \
+ 	$(CPPUHELPERLIB) \
+ 	$(CPPULIB)	\
+ 	$(SALLIB) \


--- openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch DELETED ---