rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.10, 1.11 openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.4, 1.5 openoffice.org.spec, 1.363, 1.364

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Log Message:
ppc returns

openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 inc/outdev.h                              |    0 
 inc/outfont.hxx                           |    0 
 inc/psprint/fontmanager.hxx               |    0 
 psprint/inc/psprint/fontmanager.hxx       |    4 
 psprint/source/fontmanager/fontcache.cxx  |    2 
 psprint/source/fontmanager/fontconfig.cxx |   20 +
 source/fontmanager/fontcache.cxx          |    0 
 source/fontmanager/fontconfig.cxx         |    0 
 source/gdi/outdev3.cxx                    |    0 
 util/makefile.mk                          |    0 
 vcl/inc/outdev.h                          |    3 
 vcl/inc/outfont.hxx                       |   15 +
 vcl/source/gdi/outdev3.cxx                |  421 +++++++++++++++++++++++-------
 vcl/util/makefile.mk                      |    2 
 14 files changed, 376 insertions(+), 91 deletions(-)

Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	27 Jul 2005 13:06:16 -0000	1.10
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	2 Aug 2005 07:35:33 -0000	1.11
@@ -76,7 +76,7 @@
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2670,6 +2674,193 @@ ImplFontCache::~ImplFontCache()
+@@ -2670,6 +2674,197 @@ ImplFontCache::~ImplFontCache()
      }
  }
  
@@ -95,13 +95,17 @@
 +
 +    if( pFontSelData->GetFamilyName().Len() )
 +    {
-+        // Only use the first font name in the list,
-+        // Fontconfig will take care of the rest
-+        sal_uInt16 nToken = 0;
-+        OString maTargetName = OUStringToOString( GetNextFontToken(pFontSelData->GetFamilyName(), nToken), RTL_TEXTENCODING_UTF8 );
++        sal_uInt16 nIndex = 0;
 +        aValue.type = FcTypeString;
-+        aValue.u.s = (FcChar8*)maTargetName.getStr();
-+        FcPatternAdd( pPattern, FC_FAMILY, aValue, true);
++	 String aTempName;
++        do
++        {
++                aTempName = GetNextFontToken(pFontSelData->GetFamilyName(), nIndex);
++                OString maTargetName = OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8);
++                aValue.u.s = (FcChar8*)maTargetName.getStr();
++                FcPatternAddWeak( pPattern, FC_FAMILY, aValue, true);
++        }
++        while (nIndex != STRING_NOTFOUND);
 +    }
 +
 +    ByteString aLangAttrib = ConvertLanguageToIsoByteString( pFontSelData->meLanguage );

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 inc/jobset.hxx                      |    0 
 inc/print.hxx                       |    0 
 psprint/source/printer/cupsmgr.cxx  |    7 
 source/dialogs/makefile.mk          |    0 
 source/dialogs/printdlg.cxx         |    0 
 source/gdi/jobset.cxx               |    0 
 source/printer/cupsmgr.cxx          |    0 
 svtools/source/dialogs/makefile.mk  |    4 
 svtools/source/dialogs/printdlg.cxx |  486 +++++++++++++++++++++++++++++++++++-
 svtools/util/makefile.mk            |    8 
 util/makefile.mk                    |    0 
 vcl/inc/jobset.hxx                  |    1 
 vcl/inc/print.hxx                   |    1 
 vcl/source/gdi/jobset.cxx           |  194 ++++++++++++++
 14 files changed, 698 insertions(+), 3 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	26 Jul 2005 19:05:43 -0000	1.4
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	2 Aug 2005 07:35:33 -0000	1.5
@@ -326,7 +326,7 @@
 +#include <osl/process.h>
 +#define WE_ARE_LIBGNOMEPRINT_INTERNALS
 +#include <libgnomeprint/private/gpa-utils.h>
-+G_END_DECLS
++G_END_DECLS //gnome#311253#
 +#include <libgnomeprint/gnome-print-config.h>
 +#include <libgnomeprint/gnome-print.h>
 +#include <libgnomeprint/private/gpa-printer.h>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- openoffice.org.spec	27 Jul 2005 14:18:09 -0000	1.363
+++ openoffice.org.spec	2 Aug 2005 07:35:33 -0000	1.364
@@ -1,5 +1,5 @@
 %define ooo2ver 121
-%define ooo_rpm_release 3
+%define ooo_rpm_release 4
 %define build_fc4 0
 %define build_fc5 1
 
@@ -71,8 +71,7 @@
 %define langpack_langs en-US
 %endif
 
-#ExclusiveArch:  %{ix86} ppc
-ExclusiveArch:  %{ix86}
+ExclusiveArch:  %{ix86} ppc
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
@@ -93,7 +92,7 @@
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
 BuildRequires:  %{gccjava} >= 4.0.0, %{libgcjdevel} >= 4.0.0
 BuildRequires: 	java-1.4.2-gcj-compat-devel
-BuildRequires: 	zlib-devel, freetype-devel, 
+BuildRequires: 	zlib-devel, freetype-devel
 BuildRequires: 	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
 BuildRequires: 	boost-devel >= 1.31.0, python-devel, mozilla-devel >= 1.7.5
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
@@ -103,6 +102,9 @@
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif
+%if %{build_fc5}
+BuildRequires:	libgnomeprintui22-devel
+%endif
 
 Patch0:  openoffice.org-1.9.80.NONE.skipuselessmodules.patch
 Patch1:  openoffice.org-1.9.71s1.noregisterwizard.patch
@@ -3071,6 +3073,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Aug 02 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.121-4
+- return of ppc
+
 * Wed Jul 27 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.121-3
 - add rh#164310# pipe giveup
 - add openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch for rh#161313#