Update to SRC680_m148

3 files changed, 86 insertions, 9 deletions

diff --git a/editors/openoffice.org-2.0-devel/files/patch-icu+icu-2.6.patch b/editors/openoffice.org-2.0-devel/files/patch-icu+icu-2.6.patch
index eb643e9e4a97..91b67fb35cf3 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-icu+icu-2.6.patch
+++ b/editors/openoffice.org-2.0-devel/files/patch-icu+icu-2.6.patch
@@ -4,9 +4,14 @@ Author       : <maho@openoffice.org> (JCA)
 Description  : FreeBSD porting : Passing $ORIGIN to linker at icu project
 We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
 
---- icu/icu-2.6.patch	Fri Aug 26 20:43:35 2005
-+++ icu-2.6.patch	Mon Oct 24 18:18:45 2005
-@@ -2747,3 +2747,29 @@
+Index: icu/icu-2.6.patch
+===================================================================
+RCS file: /cvs/external/icu/icu-2.6.patch,v
+retrieving revision 1.15
+diff -u -r1.15 icu-2.6.patch
+--- icu/icu-2.6.patch	28 Dec 2005 16:54:16 -0000	1.15
++++ icu/icu-2.6.patch	5 Jan 2006 12:58:57 -0000
+@@ -2775,3 +2775,31 @@
        commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
    
        sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
@@ -36,3 +41,5 @@ We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case
 +  LD_RPATH_PRE=	-Wl,-rpath,
 +  
 +  ## Compiler switch to embed a library name
++
++
diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+makefile.mk
index 5735c62a3298..4e674ce211f0 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+makefile.mk
@@ -4,15 +4,20 @@ Author       : <maho@openoffice.org> (JCA)
 Description  : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project
 We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
 
---- libxmlsec/makefile.mk.org	Tue Oct 25 15:00:10 2005
-+++ libxmlsec/makefile.mk	Tue Oct 25 15:00:28 2005
-@@ -89,6 +89,9 @@
+Index: libxmlsec/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxmlsec/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxmlsec/makefile.mk	28 Dec 2005 16:58:06 -0000	1.7
++++ libxmlsec/makefile.mk	5 Jan 2006 12:34:24 -0000
+@@ -98,6 +98,9 @@
  .IF "$(OS)$(COM)"=="SOLARISC52"
- LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+ xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
  .ENDIF			# "$(OS)$(COM)"=="SOLARISC52"
 +.IF "$(OS)$(COM)"=="FREEBSDGCC"
 +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
 +.ENDIF			# "$(OS)$(COM)"=="FREEBSDGCC"
+ LDFLAGS:=$(xmlsec_LDFLAGS)
  .EXPORT: LDFLAGS
- .ENDIF
- CONFIGURE_DIR=
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
new file mode 100644
index 000000000000..9bde684bbaa8
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+fontmanager+parseAFM.cxx
@@ -0,0 +1,65 @@
+Issuetracker : #i60097#
+CWS          : N/A
+Author       : <maho@openoffice.org> (JCA)
+Description  : getc and ungetc are defined at stdio.h
+
+Index: psprint/source/fontmanager/parseAFM.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 parseAFM.cxx
+--- psprint/source/fontmanager/parseAFM.cxx	28 Dec 2005 17:08:38 -0000	1.6
++++ psprint/source/fontmanager/parseAFM.cxx	5 Jan 2006 22:05:26 -0000
+@@ -113,8 +113,8 @@
+     FileInputStream( const char* pFilename );
+     ~FileInputStream();
+     
+-    int getc() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
+-    void ungetc()
++    int getc_() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
++    void ungetc_()
+     {
+         if( m_nPos > 0 )
+             m_nPos--;
+@@ -278,18 +278,18 @@
+ 
+     /* skip over white space */
+     // relies on EOF = -1
+-    while( is_white_Array[ (ch = stream->getc()) & 255 ] )
++    while( is_white_Array[ (ch = stream->getc_()) & 255 ] )
+         ;
+     
+     idx = 0;
+     while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
+     {
+         ident[idx++] = ch;
+-        ch = stream->getc();
++        ch = stream->getc_();
+     }
+ 
+     if (ch == -1 && idx < 1) return ((char *)NULL);
+-    if (idx >= 1 && ch != ':' ) stream->ungetc();
++    if (idx >= 1 && ch != ':' ) stream->ungetc_();
+     if (idx < 1 ) ident[idx++] = ch;    /* single-character token */
+     ident[idx] = 0;
+     rLen = idx;
+@@ -311,16 +311,16 @@
+     static char ident[MAX_NAME]; /* storage buffer for keywords */
+     int ch, idx;
+ 
+-    while ((ch = stream->getc()) == ' ' || ch == '\t' ); 
++    while ((ch = stream->getc_()) == ' ' || ch == '\t' ); 
+     
+     idx = 0;
+     while (ch != -1 && ch != lineterm && ch != '\r') 
+     {
+         ident[idx++] = ch;
+-        ch = stream->getc();
++        ch = stream->getc_();
+     } /* while */
+     
+-    stream->ungetc();
++    stream->ungetc_();
+     ident[idx] = 0;
+ 
+     return(ident);  /* returns pointer to the token */