rpms/openoffice.org/devel openoffice.org.spec, 1.391, 1.392 workspace.vcl39.patch, 1.8, 1.9

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.vcl39.patch 
Log Message:
work around font cachr format problem


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- openoffice.org.spec	17 Aug 2005 10:08:23 -0000	1.391
+++ openoffice.org.spec	17 Aug 2005 16:43:29 -0000	1.392
@@ -1,5 +1,5 @@
 %define ooo2ver 124
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
 %define build_fc4 0
 %define build_fc5 1
 
@@ -3119,10 +3119,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Aug 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.124-3
+- rh#166102# pspfontcache format problem hang on start
+- rebuild for new cairo
+
 * Mon Aug 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.124-2
 - experiment with jakub's suggestion for prelink based optimization
   intermediate library and binaries
-- rh#166102# pspfontcache format problem hang on start
 
 * Mon Aug 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.124-1
 - drop integrated workspace.fpicandrpath.patch

workspace.vcl39.patch:
 padmin/source/fontentry.cxx                |    6 
 psprint/inc/psprint/fontmanager.hxx        |    2 
 psprint/source/fontmanager/fontcache.cxx   |   40 --
 psprint/source/fontmanager/fontconfig.cxx  |    7 
 psprint/source/fontmanager/fontmanager.cxx |   17 -
 psprint/source/fontsubset/sft.c            |    8 
 psprint/source/fontsubset/sft.h            |    2 
 toolkit/source/awt/vclxtoolkit.cxx         |    5 
 vcl/inc/salframe.hxx                       |    2 
 vcl/inc/sallayout.hxx                      |   10 
 vcl/inc/scrbar.hxx                         |    1 
 vcl/inc/window.hxx                         |    2 
 vcl/source/app/stdtext.cxx                 |    5 
 vcl/source/app/svapp.cxx                   |    5 
 vcl/source/app/svdata.cxx                  |   41 +-
 vcl/source/control/button.cxx              |   52 ++-
 vcl/source/control/edit.cxx                |    6 
 vcl/source/control/ilstbox.cxx             |   29 -
 vcl/source/control/scrbar.cxx              |   88 +++--
 vcl/source/gdi/bmpfast.cxx                 |   34 +-
 vcl/source/gdi/sallayout.cxx               |   49 ++
 vcl/source/window/brdwin.cxx               |    7 
 vcl/source/window/menu.cxx                 |   63 ++-
 vcl/source/window/msgbox.cxx               |   23 +
 vcl/source/window/scrwnd.cxx               |   11 
 vcl/source/window/splitwin.cxx             |   15 
 vcl/source/window/window.cxx               |    5 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx   |   33 -
 vcl/unx/gtk/window/gtkframe.cxx            |   92 +++--
 vcl/unx/inc/plugins/gtk/gtkframe.hxx       |    1 
 vcl/unx/inc/salframe.h                     |    1 
 vcl/unx/inc/wmadaptor.hxx                  |   21 +
 vcl/unx/source/app/soicon.cxx              |    3 
 vcl/unx/source/app/wmadaptor.cxx           |  111 ++++++
 vcl/unx/source/gdi/pspgraphics.cxx         |    2 
 vcl/unx/source/gdi/xfont.cxx               |    5 
 vcl/unx/source/window/salframe.cxx         |   37 ++
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi.cxx              |    2 
 vcl/win/source/gdi/salgdi3.cxx             |  274 ++++++++++++----
 vcl/win/source/gdi/winlayout.cxx           |  492 ++++++++++++++++++-----------
 vcl/win/source/window/salframe.cxx         |   15 
 42 files changed, 1149 insertions(+), 476 deletions(-)

Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- workspace.vcl39.patch	17 Aug 2005 08:14:34 -0000	1.8
+++ workspace.vcl39.patch	17 Aug 2005 16:43:30 -0000	1.9
@@ -56,6 +56,15 @@
 diff -u -p -u -r1.12 -r1.12.14.2
 --- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx	31 Jan 2005 08:59:14 -0000	1.12
 +++ openoffice.org/psprint/source/fontmanager/fontcache.cxx	22 Mar 2005 10:26:15 -0000	1.12.14.2
+@@ -81,7 +81,7 @@
+ #endif
+
+ #define FONTCACHEFILE "/user/psprint/pspfontcache"
+-#define CACHE_MAGIC "PspFontCacheFile format 2"
++#define CACHE_MAGIC "PspFontCacheFile format 2rh"
+
+ using namespace std;
+ using namespace rtl;
 @@ -203,7 +203,7 @@ void FontCache::flush()
                  /*
                   *  for each font entry write: