[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch, NONE, 1.1 openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch, NONE, 1.1 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.6, 1.7 openoffice.org.spec, 1.287, 1.288 openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch, 1.2, NONE openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch, 1.1, NONE



Author: caolanm

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

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch 
	openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch 
Removed Files:
	openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch 
	openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch 
Log Message:
upstream patches and add rh#162261#

openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch:
 config/ssolar.cmn              |    0 
 config/ssrc680.ini             |    0 
 config_office/configure.in     |   10 +++++++++-
 config_office/set_soenv.in     |    1 +
 solenv/config/ssolar.cmn       |    1 +
 solenv/config/ssrc680.ini      |    2 ++
 unx/source/app/makefile.mk     |    0 
 unx/source/app/vsound.hxx      |    0 
 util/makefile.mk               |    0 
 vcl/unx/source/app/makefile.mk |    8 ++++++++
 vcl/unx/source/app/vsound.hxx  |    4 ----
 vcl/util/makefile.mk           |    2 ++
 12 files changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -p -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 07:29:56 -0000
@@ -176,6 +176,9 @@ AC_ARG_WITH(myspell-dicts,
                           distributions where the myspell dictionaries are
                           installed from other sources
 ],,)
+AC_ARG_WITH(nas,
+[  --without-nas           Removes nas support
+],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla, python and
@@ -2991,7 +2999,9 @@ dnl ====================================
 dnl Check for system nas
 dnl ===================================================================
 AC_MSG_CHECKING([which nas to use])
-if test -n "$with_system_nas" -o -n "$with_system_libs" && \
+if test -n "$with_nas"; then
+    AC_MSG_RESULT([none])
+elif test -n "$with_system_nas" -o -n "$with_system_libs" && \
 	test "$with_system_nas" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_NAS=YES
@@ -3006,13 +3016,16 @@ if test -n "$with_system_nas" -o -n "$wi
     )
     AC_CHECK_LIB(audio, AuOpenServer, [],
         [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
+    ENABLE_NAS=YES
 else
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
+    ENABLE_NAS=YES
     BUILD_TYPE="$BUILD_TYPE NAS"
 fi
 AC_SUBST(SYSTEM_NAS)
 AC_SUBST(NAS_INCLUDES)
+AC_SUBST(ENABLE_NAS)
 
 AC_MSG_CHECKING([whether to enable portaudio/sndfile support])
 if test "$_os" != "WINNT" && \
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.68
diff -u -r1.68 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
+++ openoffice.org/config_office/set_soenv.in	7 Jul 2005 17:54:29 -0000
@@ -1741,6 +1741,7 @@
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "SYSTEM_NAS",        "@SYSTEM_NAS@",       "e" );
 ToFile( "NAS_INCLUDES",      "@NAS_INCLUDES@",     "e" );
+ToFile( "ENABLE_NAS",        "@ENABLE_NAS@",       "e" );
 ToFile( "ENABLE_PASF",       "@ENABLE_PASF@",      "e" );
 ToFile( "SYSTEM_SNDFILE",    "@SYSTEM_SNDFILE@",   "e" );
 ToFile( "SYSTEM_PORTAUDIO",  "@SYSTEM_PORTAUDIO@", "e" );
Index: config/ssolar.cmn
===================================================================
RCS file: /cvs/tools/solenv/config/ssolar.cmn,v
retrieving revision 1.51
diff -u -r1.51 ssolar.cmn
--- openoffice.org.orig/solenv/config/ssolar.cmn	18 Mar 2005 16:39:40 -0000	1.51
+++ openoffice.org/solenv/config/ssolar.cmn	7 Jul 2005 17:52:25 -0000
@@ -70,6 +70,7 @@
         ENABLE_GTK
         ENABLE_GNOMEVFS
         ENABLE_PASF
+        ENABLE_NAS
 		ENABLEUNICODE
         HAVE_GCC_VISIBILITY_FEATURE
 		GCRINC
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.71
diff -u -r1.71 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	18 Apr 2005 12:02:37 -0000	1.71
+++ openoffice.org/solenv/config/ssrc680.ini	7 Jul 2005 17:52:48 -0000
@@ -2064,6 +2064,7 @@
 		COPYALL
 		GXX_INCLUDE_PATH
         ENABLE_PASF
+        ENABLE_NAS
 	}
 	restore
 	{
@@ -2230,6 +2231,7 @@
 			CPUNAME INTEL
 			DLLSUFFIX li
             ENABLE_PASF TRUE
+            ENABLE_NAS TRUE
 			INPATH unxlngi6%PROEXT%
 			GVERDIR unxlngi6%PROEXT%
 			OUTPATH unxlngi6
Index: unx/source/app/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
retrieving revision 1.20
diff -u -r1.20 makefile.mk
--- openoffice.org.orig/vcl/unx/source/app/makefile.mk	18 Mar 2005 10:31:27 -0000	1.20
+++ openoffice.org/vcl/unx/source/app/makefile.mk	7 Jul 2005 17:56:44 -0000
@@ -108,6 +108,14 @@
 			$(SLO)$/rptpsound.obj		\
 			$(SLO)$/nassound.obj		
 
+
+
+.IF "$(ENABLE_NAS)" != ""
+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+CFLAGS+=-DUSE_NAS
+.ENDIF
+.ENDIF
+
 .IF "$(ENABLE_PASF)" != ""
 CFLAGS+=-DUSE_PASF
 SLOFILES+=$(SLO)$/pasfsound.obj
Index: unx/source/app/vsound.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/vsound.hxx,v
retrieving revision 1.8
diff -u -r1.8 vsound.hxx
--- openoffice.org.orig/vcl/unx/source/app/vsound.hxx	9 Nov 2004 16:49:10 -0000	1.8
+++ openoffice.org/vcl/unx/source/app/vsound.hxx	7 Jul 2005 17:57:05 -0000
@@ -69,10 +69,6 @@
 #define USE_DEVAUDIO
 #endif
 
-#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
-#define USE_NAS
-#endif
-
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.69
diff -u -r1.69 makefile.mk
--- openoffice.org.orig/vcl/util/makefile.mk	17 Jun 2005 09:29:14 -0000	1.69
+++ openoffice.org/vcl/util/makefile.mk	7 Jul 2005 17:57:38 -0000
@@ -325,6 +325,7 @@
 SHL2STDLIBS += -lsndfile -lportaudio
 .ENDIF # ENABLE_PASF
 
+.IF "$(ENABLE_NAS)" != ""
 .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 SHL2STDLIBS += -laudio
 .IF "$(OS)"=="SOLARIS"
@@ -332,6 +333,7 @@
 SHL2STDLIBS += -ldl -lnsl -lsocket
 .ENDIF # SOLARIS
 .ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+.ENDIF
 
 .IF "$(GUIBASE)"=="unx"
 

openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch:
 config_office/configure.in |    5 ++++-
 inc/tg_config.mk           |    0 
 solenv/inc/tg_config.mk    |   10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 09:42:26 -0000
@@ -105,6 +105,9 @@
                           assertions, object counting, etc. Larger build.
                           Independent from --enable-debug
 ],,)
+AC_ARG_ENABLE(xsltproc,
+[  --enable-xsltproc:      Use xsltproc at buildtime, even when java is available
+],,)
 AC_ARG_ENABLE(crashdump,
 [[  --enable-crashdump[=yes|TRUE|STATIC|no]
                           Enable (disable) the crashdump feature code. [default=STATIC]
@@ -1979,7 +1982,7 @@
 fi
 AC_SUBST(JAVACACHE)
 
-if test "$NEEDXSLTPROC" = "no"; then
+if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
    XSLTPROC=NO_XSLTPROC
 else
    dnl Check for xsltproc
Index: inc/tg_config.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
retrieving revision 1.2
diff -u -p -u -r1.2 tg_config.mk
--- openoffice.org.orig/solenv/inc/tg_config.mk	15 Mar 2005 13:00:23 -0000	1.2
+++ openoffice.org/solenv/inc/tg_config.mk	8 Jul 2005 09:36:02 -0000
@@ -84,7 +84,7 @@ $(XCS_TRIM) :   $(PRJ)$/registry$/compon
 $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
     @+echo -------------+ validating and stripping schema files
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -124,7 +124,7 @@ $(XCS_RESOURCES) :   $(XSLDIR)$/resource
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
     @+echo -------------+ creating locale dependent resource bundles
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
 .ELSE
 	$(XSLTPROC) -o $@ \
@@ -142,7 +142,7 @@ $(XCU_DEFAULT) : $(PRJ)$/registry$/compo
 $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
     @+echo -------------+ validating and creating a locale independent file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -184,7 +184,7 @@ $(XCU_LANG) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
     @+echo -------------+ creating locale dependent entries
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
@@ -220,7 +220,7 @@ $(XCU_MODULES) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
     @+echo -------------+ creating a module file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
 .ELSE

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                |  408 +++++++++++++++++++++++-------
 vcl/util/makefile.mk                      |    2 
 14 files changed, 363 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	7 Jul 2005 10:13:18 -0000	1.6
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	8 Jul 2005 16:32:17 -0000	1.7
@@ -1,6 +1,28 @@
---- SRC680_m104/vcl/inc/outfont.hxx.fontconfig	2005-05-24 15:12:13.000000000 -0400
-+++ SRC680_m104/vcl/inc/outfont.hxx	2005-05-26 12:22:42.000000000 -0400
-@@ -252,6 +252,7 @@
+Index: inc/outdev.h
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/outdev.h,v
+retrieving revision 1.17
+diff -u -p -r1.17 outdev.h
+--- openoffice.org.orig/vcl/inc/outdev.h	9 Nov 2004 16:32:20 -0000	1.17
++++ openoffice.org/vcl/inc/outdev.h	8 Jul 2005 16:26:15 -0000
+@@ -239,7 +239,8 @@ public:
+                              const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
+     ImplFontEntry*      GetFallback( ImplDevFontList* pFontList,
+                                      const Font& rFont, const Size& rSize,
+-                                     int nFallbackLevel );
++                                     int nFallbackLevel, sal_Unicode *pMissingUnicodes,
++                                     int nMissingUnicodes );
+     void                Release( ImplFontEntry* );
+     void                Invalidate();
+ };
+Index: inc/outfont.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/outfont.hxx,v
+retrieving revision 1.17
+diff -u -p -r1.17 outfont.hxx
+--- openoffice.org.orig/vcl/inc/outfont.hxx	31 Jan 2005 09:15:19 -0000	1.17
++++ openoffice.org/vcl/inc/outfont.hxx	8 Jul 2005 16:26:15 -0000
+@@ -252,6 +252,7 @@ public:
      ImplDevFontListData*    FindFontFamily( const String& rFontName ) const;
      ImplDevFontListData*    ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplFontSubstEntry* pDevSpecificSubst ) const;
      ImplDevFontListData*    ImplFindBySearchName( const String& ) const;
@@ -8,7 +30,7 @@
  
      bool                    HasFallbacks() const;
      void                    SetFallbacks( ImplDevFontListData**, int nCount );
-@@ -354,6 +355,10 @@
+@@ -354,6 +355,10 @@ public:
                          ImplFontEntry( const ImplFontSelectData& );
      virtual             ~ImplFontEntry() {}
  
@@ -19,7 +41,7 @@
  public: // TODO: make data members private
      ImplFontSelectData  maFontSelData;      // FontSelectionData
      ImplFontMetricData  maMetric;           // Font Metric
-@@ -364,6 +369,16 @@
+@@ -364,6 +369,16 @@ public: // TODO: make data members priva
      short               mnOwnOrientation;   // text angle if lower layers don't rotate text themselves
      short               mnOrientation;      // text angle in 3600 system
      bool                mbInit;             // true if maMetric member is valid
@@ -36,31 +58,25 @@
  };
  
  
---- SRC680_m104/vcl/inc/outdev.h.fontconfig	2005-05-24 16:53:31.000000000 -0400
-+++ SRC680_m104/vcl/inc/outdev.h	2005-05-25 11:42:33.000000000 -0400
-@@ -239,7 +239,8 @@
-                              const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
-     ImplFontEntry*      GetFallback( ImplDevFontList* pFontList,
-                                      const Font& rFont, const Size& rSize,
--                                     int nFallbackLevel );
-+                                     int nFallbackLevel, sal_Unicode *pMissingUnicodes,
-+                                     int nMissingUnicodes );
-     void                Release( ImplFontEntry* );
-     void                Invalidate();
- };
---- SRC680_m104/vcl/source/gdi/outdev3.cxx.fontconfig	2005-05-25 13:09:50.000000000 -0400
-+++ SRC680_m104/vcl/source/gdi/outdev3.cxx	2005-05-27 10:33:03.000000000 -0400
-@@ -185,6 +185,9 @@
+Index: source/gdi/outdev3.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
+retrieving revision 1.200
+diff -u -p -r1.200 outdev3.cxx
+--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	18 May 2005 08:04:00 -0000	1.200
++++ openoffice.org/vcl/source/gdi/outdev3.cxx	8 Jul 2005 16:26:43 -0000
+@@ -185,6 +185,10 @@
  #include <memory>
  #include <algorithm>
  
++#include <psprint/fontmanager.hxx>
 +#include <fontconfig/fontconfig.h>
 +#include <tools/isolang.hxx>
 +
  // =======================================================================
  
  DBG_NAMEEX( OutputDevice );
-@@ -2668,6 +2671,182 @@
+@@ -2670,6 +2674,184 @@ ImplFontCache::~ImplFontCache()
      }
  }
  
@@ -186,10 +202,12 @@
 +        FcPatternAddWeak( pPattern, FC_SPACING, aValue, true);
 +    }
 +
-+    FcConfigSubstitute( NULL, pPattern, FcMatchPattern );
++    psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++
++    FcConfigSubstitute( rMgr.getFontconfig(), pPattern, FcMatchPattern );
 +    FcDefaultSubstitute( pPattern );
 +    FcResult eResult = FcResultNoMatch;
-+    FcPattern* pResult = FcFontMatch( NULL, pPattern, &eResult );
++    FcPattern* pResult = FcFontMatch( rMgr.getFontconfig(), pPattern, &eResult );
 +    FcPatternDestroy( pPattern );
 +
 +    if( pResult )
@@ -243,7 +261,7 @@
  // -----------------------------------------------------------------------
  
  ImplFontEntry* ImplFontCache::Get( ImplDevFontList* pFontList,
-@@ -2705,8 +2877,12 @@
+@@ -2707,8 +2889,12 @@ ImplFontEntry* ImplFontCache::Get( ImplD
  
      if( !pEntry ) // no direct cache hit
      {
@@ -258,7 +276,7 @@
          DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
          aFontSelData.maSearchName = pFontFamily->GetSearchName();
  
-@@ -3026,109 +3202,122 @@
+@@ -3028,109 +3214,122 @@ ImplDevFontListData* ImplDevFontList::Im
  // -----------------------------------------------------------------------
  
  ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -464,7 +482,7 @@
      if( pFallbackFont && !pFallbackFont->mbInit )
      {
          // HACK: maMetrics are irrelevant for fallback fonts, but
-@@ -3137,6 +3326,27 @@
+@@ -3139,6 +3338,27 @@ ImplFontEntry* ImplFontCache::GetFallbac
          pFallbackFont->maMetric.maStyleName = String();
      }
  
@@ -492,7 +510,7 @@
      return pFallbackFont;
  }
  
-@@ -6103,7 +6313,7 @@
+@@ -6105,7 +6325,7 @@ SalLayout* OutputDevice::ImplLayout( con
      // do glyph fallback if needed
      // #105768# avoid fallback for very small font sizes
      if( aLayoutArgs.NeedFallback() )
@@ -501,7 +519,7 @@
              pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
  
      // position, justify, etc. the layout
-@@ -6147,6 +6357,17 @@
+@@ -6149,6 +6369,17 @@ SalLayout* OutputDevice::ImplGlyphFallba
          rLayoutArgs.ResetPos();
      }
  #endif
@@ -519,7 +537,7 @@
  
      ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
      Size aFontSize( aFontSelData.mnWidth, aFontSelData.mnHeight );
-@@ -6163,7 +6384,8 @@
+@@ -6165,7 +6396,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
      {
          // find a font family suited for glyph fallback
          ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
@@ -529,7 +547,7 @@
          if( !pFallbackFont )
              break;
  
-@@ -6215,6 +6437,8 @@
+@@ -6217,6 +6449,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
              break;
      }
  
@@ -538,20 +556,62 @@
      if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
          pSalLayout = pMultiSalLayout;
      
---- SRC680_m104/vcl/util/makefile.mk.fontconfig	2005-05-24 13:47:19.000000000 -0400
-+++ SRC680_m104/vcl/util/makefile.mk	2005-05-24 13:47:47.000000000 -0400
-@@ -261,7 +261,7 @@
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.69
+diff -u -p -r1.69 makefile.mk
+--- openoffice.org.orig/vcl/util/makefile.mk	17 Jun 2005 09:29:14 -0000	1.69
++++ openoffice.org/vcl/util/makefile.mk	8 Jul 2005 16:27:18 -0000
+@@ -261,7 +261,7 @@ SHL1STDLIBS += -framework Cocoa
  .ENDIF
  
  
 -SHL1STDLIBS += -lX11
-+SHL1STDLIBS += -lX11 -lfontconfig
++SHL1STDLIBS += -lX11 -lpsp$(VERSION)$(DLLPOSTFIX) -lfontconfig
  
  .ENDIF          # "$(GUI)"=="UNX"
  
---- SRC680_m104/psprint/source/fontmanager/fontcache.cxx.fontconfig	2005-05-24 15:34:26.000000000 -0400
-+++ SRC680_m104/psprint/source/fontmanager/fontcache.cxx	2005-05-24 15:34:33.000000000 -0400
-@@ -703,9 +703,9 @@
+Index: inc/psprint/fontmanager.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
+retrieving revision 1.22
+diff -u -p -r1.22 fontmanager.hxx
+--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	31 Jan 2005 08:58:54 -0000	1.22
++++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	8 Jul 2005 16:05:06 -0000
+@@ -79,7 +79,7 @@
+ #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
+ #include <com/sun/star/lang/Locale.hpp>
+ #endif
+-
++#include <fontconfig/fontconfig.h>
+ #define ATOM_FAMILYNAME                     2
+ #define ATOM_PSNAME                         3
+ 
+@@ -415,6 +442,7 @@ class PrintFontManager
+     std::hash_multimap< sal_uInt8, sal_Unicode >	m_aAdobecodeToUnicode;
+ 
+     mutable FontCache*							m_pFontCache;
++    FcConfig *mpFontConfig;
+         
+     rtl::OString getAfmFile( PrintFont* pFont ) const;
+     rtl::OString getFontFile( PrintFont* pFont ) const;
+@@ -468,6 +496,7 @@ class PrintFontManager
+     ~PrintFontManager();
+ public:
+     static PrintFontManager& get(); // one instance only
++    FcConfig *getFontconfig() { return mpFontConfig; }
+ 
+     int addFontFile( const rtl::OString& rFileName, int nFaceNum ); 
+ 
+Index: source/fontmanager/fontcache.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
+retrieving revision 1.13
+diff -u -p -r1.13 fontcache.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx	6 Jun 2005 16:07:21 -0000	1.13
++++ openoffice.org/psprint/source/fontmanager/fontcache.cxx	8 Jul 2005 16:05:07 -0000
+@@ -703,9 +703,9 @@ bool FontCache::getFontCacheFile( int nD
          FontDirMap::const_iterator entry = dir->second.m_aEntries.find( rFile );
          if( entry != dir->second.m_aEntries.end() )
          {
@@ -562,3 +622,78 @@
                  PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
                  rNewFonts.push_back( pFont );
              }
+Index: source/fontmanager/fontconfig.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
+retrieving revision 1.7
+diff -u -p -r1.7 fontconfig.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	13 Oct 2004 08:22:03 -0000	1.7
++++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	8 Jul 2005 16:05:07 -0000
+@@ -113,6 +113,8 @@ class FontCfgWrapper
+     FcPattern*		(*m_pFcPatternCreate)();
+     void			(*m_pFcPatternDestroy)(FcPattern*);
+     FcFontSet*		(*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
++    FcBool		(*m_pFcConfigAppFontAddFile)(FcConfig*,const char *);
++    FcConfig*		(*m_pFcConfigCreate)(void);
+     FcFontSet*		(*m_pFcFontSetCreate)();
+     void			(*m_pFcFontSetDestroy)(FcFontSet*);
+     FcBool			(*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
+@@ -164,6 +166,12 @@ public:
+     
+     FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
+     { return m_pFcFontList( pConfig, pPattern, pSet ); }
++
++    FcBool FcConfigAppFontAddFile( FcConfig* pConfig, const char *file )
++    { return m_pFcConfigAppFontAddFile( pConfig, file); }
++
++    FcConfig* FcConfigCreate( void )
++    { return m_pFcConfigCreate(); }
+     
+     FcFontSet* FcFontSetCreate()
+     { return m_pFcFontSetCreate(); }
+@@ -239,6 +247,10 @@ FontCfgWrapper::FontCfgWrapper()
+         loadSymbol( "FcPatternDestroy" );
+     m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
+         loadSymbol( "FcFontList" );
++    m_pFcConfigAppFontAddFile = (FcBool(*)(FcConfig*,const char*))
++        loadSymbol( "FcConfigAppFontAddFile" );
++    m_pFcConfigCreate = (FcConfig*(*)())
++        loadSymbol( "FcConfigCreate" );
+     m_pFcFontSetCreate = (FcFontSet*(*)())
+         loadSymbol( "FcFontSetCreate" );
+     m_pFcFontSetDestroy = (void(*)(FcFontSet*))
+@@ -271,6 +283,8 @@ FontCfgWrapper::FontCfgWrapper()
+             m_pFcPatternCreate				&&
+             m_pFcPatternDestroy				&&
+             m_pFcFontList					&&
++            m_pFcConfigAppFontAddFile		&&
++            m_pFcConfigCreate				&&
+             m_pFcFontSetCreate				&&
+             m_pFcFontSetDestroy				&&
+             m_pFcFontSetAdd					&&
+@@ -330,12 +344,15 @@ void FontCfgWrapper::release()
+ bool PrintFontManager::initFontconfig()
+ {
+     int nFonts = 0;
++    mpFontConfig = 0;
+ 
+ #ifdef ENABLE_FONTCONFIG    
+     FontCfgWrapper& rWrapper = FontCfgWrapper::get();
+     if( ! rWrapper.isValid() )
+         return false;
+ 
++    mpFontConfig = rWrapper.FcConfigCreate();
++
+     FcConfig* pConfig = rWrapper.getDefConfig();
+     FcObjectSet* pOSet = rWrapper.FcObjectSetBuild( FC_FAMILY,
+                                                     FC_STYLE,
+@@ -394,6 +411,9 @@ bool PrintFontManager::initFontconfig()
+             if( eOutRes == FcResultMatch && ! outline )
+                 continue;
+ 
++	    /*cmc add only acceptable fonts to our config, for future fontconfig use*/
++            rWrapper.FcConfigAppFontAddFile(mpFontConfig, (const char*)file);
++
+             // see if this font is already cached
+             // update attributes
+             std::list< PrintFont* > aFonts;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- openoffice.org.spec	8 Jul 2005 15:58:09 -0000	1.287
+++ openoffice.org.spec	8 Jul 2005 16:32:32 -0000	1.288
@@ -119,8 +119,8 @@
 Patch51: openoffice.org-1.9.114.ooo51638.mailmerge.patch
 Patch52: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch53: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch54: openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
-Patch55: openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch
+Patch54: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch55: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
 Patch56: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
@@ -755,8 +755,8 @@
 %patch51 -p1 -b .ooo51638.mailmerge.patch
 %patch52 -p1 -b .oooXXXXX.nostlport.patch
 %patch53 -p1 -b .ooo51673.printing.checkerror.patch
-%patch54 -p1 -b .oooXXXXX.audio.withoutnas.patch
-%patch55 -p1 -b .oooXXXXX.xsltproc.evenwithjava.patch
+%patch54 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch55 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
 %patch56 -p1 -b .oooXXXXX.systemxmlsec.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system


--- openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch DELETED ---


--- openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]