This commit was manufactured by cvs2svn to create tagDEBIAN-1_1_2-5

'DEBIAN-1_1_2-5'.

6 files changed, 274 insertions, 0 deletions

diff --git a/patches/OOO_1_1/desktop-debug-fix.diff b/patches/OOO_1_1/desktop-debug-fix.diff
new file mode 100644
index 000000000..01a9c8f95
--- /dev/null
+++ b/patches/OOO_1_1/desktop-debug-fix.diff
@@ -0,0 +1,65 @@
+Index: desktop/source/app/app.cxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/app/app.cxx,v
+retrieving revision 1.121.10.8
+diff -u -r1.121.10.8 app.cxx
+--- desktop/source/app/app.cxx	2 Mar 2004 10:06:34 -0000	1.121.10.8
++++ desktop/source/app/app.cxx	2 Oct 2004 16:36:23 -0000
+@@ -2128,14 +2128,14 @@
+         OUString aMsg = OUString::createFromAscii(
+             "Desktop::OpenDefault() IllegalArgumentException while calling loadComponentFromURL: ") 
+             + iae.Message;
+-        OSL_ENSURE( sal_False, aMsg);
++        OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+     }
+     catch (com::sun::star::io::IOException& ioe)
+     {
+         OUString aMsg = OUString::createFromAscii(
+             "Desktop::OpenDefault() IOException while calling loadComponentFromURL: ") 
+             + ioe.Message;
+-        OSL_ENSURE( sal_False, aMsg);
++        OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+     }
+ 
+     // shut down again if no component could be loaded
+@@ -2286,14 +2286,14 @@
+                     OUString aMsg = OUString::createFromAscii(
+                         "handle app event IllegalArgumentException while calling loadComponentFromURL: ") 
+                         + iae.Message;
+-                    OSL_ENSURE( sal_False, aMsg);
++                    OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+                 }
+                 catch (com::sun::star::io::IOException& ioe)
+                 {
+                     OUString aMsg = OUString::createFromAscii(
+                         "handle app event IOException while calling loadComponentFromURL: ") 
+                         + ioe.Message;
+-                    OSL_ENSURE( sal_False, aMsg);
++                    OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+                 }
+ 
+                 if ( !xDoc.is() )
+Index: desktop/source/app/dispatchwatcher.cxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/app/dispatchwatcher.cxx,v
+retrieving revision 1.15.82.1
+diff -u -r1.15.82.1 dispatchwatcher.cxx
+--- desktop/source/app/dispatchwatcher.cxx	9 Jan 2004 16:43:26 -0000	1.15.82.1
++++ desktop/source/app/dispatchwatcher.cxx	2 Oct 2004 16:36:24 -0000
+@@ -353,14 +353,14 @@
+                 OUString aMsg = OUString::createFromAscii(
+                     "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: ") 
+                     + iae.Message;
+-                OSL_ENSURE( sal_False, aMsg);
++                OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+             }
+             catch (com::sun::star::io::IOException& ioe)
+             {
+                 OUString aMsg = OUString::createFromAscii(
+                     "Dispatchwatcher IOException while calling loadComponentFromURL: ") 
+                     + ioe.Message;
+-                OSL_ENSURE( sal_False, aMsg);
++                OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+             }
+ 			if ( aDispatchRequest.aRequestType == REQUEST_OPEN ||
+ 				 aDispatchRequest.aRequestType == REQUEST_VIEW ||
diff --git a/patches/OOO_1_1/sparc-v8-fixes.diff b/patches/OOO_1_1/sparc-v8-fixes.diff
new file mode 100644
index 000000000..6a3e7d095
--- /dev/null
+++ b/patches/OOO_1_1/sparc-v8-fixes.diff
@@ -0,0 +1,98 @@
+Index: sal/osl/unx/util.c
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/util.c,v
+retrieving revision 1.5
+diff -u -u -r1.5 util.c
+--- sal/osl/unx/util.c	2 Jul 2003 13:35:19 -0000	1.5
++++ sal/osl/unx/util.c	12 Jul 2004 08:02:39 -0000
+@@ -398,3 +398,23 @@
+ 
+ #endif
+ 
++#if defined ( LINUX ) && defined ( SPARC )
++#include <sys/utsname.h>
++void osl_InitSparcV9(void)  __attribute__((constructor));
++void osl_InterlockedCountSetV9(sal_Bool bV9);
++/* Determine which machine we are running on (sparc or sparc64)
++ * The approach is very similar to Solaris.
++ */
++void osl_InitSparcV9(void)
++{
++	struct utsname name;
++	int rc;	
++	rc = uname(&name);
++	if ( rc != -1 ) {
++		if ( !strcmp( "sparc", name.machine )) 
++			return;
++	osl_InterlockedCountSetV9(sal_True);
++	}
++}
++
++#endif
+Index: sal/osl/unx/asm/interlck_sparc.s
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/asm/interlck_sparc.s,v
+retrieving revision 1.3
+diff -u -u -r1.3 interlck_sparc.s
+--- sal/osl/unx/asm/interlck_sparc.s	28 Apr 2003 17:13:44 -0000	1.3
++++ sal/osl/unx/asm/interlck_sparc.s	12 Jul 2004 08:02:39 -0000
+@@ -248,7 +248,9 @@
+ 
+ 1:      ld      [%o0], %o1
+         add     %o1, 1, %o2
+-        cas     [%o0], %o1, %o2
++!       allow linux to build for v8
++        .word 0xD5E21009 
++!       cas     [%o0], %o1, %o2
+         cmp     %o1, %o2
+         bne     1b
+         nop                         ! delay slot
+@@ -267,7 +269,9 @@
+ 
+ 1:      ld      [%o0], %o1
+         sub     %o1, 1, %o2
+-        cas     [%o0], %o1, %o2
++!       allow linux to build for v8
++        .word 0xD5E21009            
++!       cas     [%o0], %o1, %o2
+         cmp     %o1, %o2
+         bne     1b
+         nop                         ! delay slot
+@@ -276,4 +280,3 @@
+ 
+  .type  osl_decrementInterlockedCountV9,#function
+  .size  osl_decrementInterlockedCountV9,.-osl_decrementInterlockedCountV9
+-
+Index: sc/source/core/data/makefile.mk
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v
+retrieving revision 1.6.260.3
+diff -u -u -r1.6.260.3 makefile.mk
+--- sc/source/core/data/makefile.mk	28 Jan 2004 10:02:07 -0000	1.6.260.3
++++ sc/source/core/data/makefile.mk	12 Jul 2004 08:02:42 -0000
+@@ -205,7 +205,8 @@
+ 		$(SLO)$/table3.obj \
+ 		$(SLO)$/table4.obj  \
+ 		$(SLO)$/documen4.obj \
+-		$(SLO)$/conditio.obj
++		$(SLO)$/conditio.obj \
++		$(SLO)$/validat.obj
+ .ENDIF
+ 
+ EXCEPTIONSFILES= \
+Index: solenv/inc/unxlngs.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxlngs.mk,v
+retrieving revision 1.2.50.2
+diff -u -u -r1.2.50.2 unxlngs.mk
+--- solenv/inc/unxlngs.mk	30 Mar 2004 13:17:38 -0000	1.2.50.2
++++ solenv/inc/unxlngs.mk	12 Jul 2004 08:02:55 -0000
+@@ -62,7 +62,7 @@
+ 
+ # mk file for unxlngs
+ ASM=$(CC)
+-AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS)
++AFLAGS=-Wa,-K,PIC -c $(CDEFS)
+ 
+ SOLAR_JAVA*=TRUE
+ JAVAFLAGSDEBUG=-g
diff --git a/patches/OOO_1_1/system-curl.diff b/patches/OOO_1_1/system-curl.diff
index feccd995d..64b97027b 100644
--- a/patches/OOO_1_1/system-curl.diff
+++ b/patches/OOO_1_1/system-curl.diff
@@ -67,3 +67,38 @@ diff -u -r1.11 ftpurl.hxx
  SHL1DEF=$(MISC)$/$(SHL1TARGET).def
  SHL1LIBS= \
  	$(LIB1TARGET)
+Index: ftphandleprovider.hxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 ftphandleprovider.hxx
+--- ucb/source/ucp/ftp/ftphandleprovider.hxx	15 Oct 2002 09:21:17 -0000	1.2
++++ ucb/source/ucp/ftp/ftphandleprovider.hxx	20 Jul 2004 22:02:48 -0000
+@@ -1,5 +1,5 @@
+ #include <rtl/ustring.hxx>
+-#include <curl/types.h>
++#include <curl/curl.h>
+ 
+ namespace ftp {
+ 	
+Index: ftploaderthread.hxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v
+retrieving revision 1.5
+diff -u -r1.5 ftploaderthread.hxx
+--- ucb/source/ucp/ftp/ftploaderthread.hxx	28 Aug 2002 07:23:14 -0000	1.5
++++ ucb/source/ucp/ftp/ftploaderthread.hxx	20 Jul 2004 22:02:48 -0000
+@@ -71,11 +71,10 @@
+ #ifndef _OSL_THREAD_H_
+ #include <osl/thread.h>
+ #endif
+-#ifndef __CURL_TYPES_H
+-#include <curl/types.h>
++#ifndef __CURL_CURL_H
++#include <curl/curl.h>
+ #endif
+ 
+-
+ namespace ftp {
+ 	
+ 	/** A loaderthread acts as factory for CURL-handles,
diff --git a/patches/OOO_1_1/tmpfile-fix.diff b/patches/OOO_1_1/tmpfile-fix.diff
new file mode 100644
index 000000000..73093df8d
--- /dev/null
+++ b/patches/OOO_1_1/tmpfile-fix.diff
@@ -0,0 +1,64 @@
+Index: tempfile.cxx
+===================================================================
+RCS file: /cvs/util/unotools/source/ucbhelper/tempfile.cxx,v
+retrieving revision 1.14
+retrieving revision 1.14.72.1
+diff -u -r1.14 -r1.14.72.1
+--- unotools/source/ucbhelper/tempfile.cxx	9 Sep 2002 10:25:47 -0000	1.14
++++ unotolls/source/ucbhelper/tempfile.cxx	1 Sep 2004 09:28:55 -0000	1.14.72.1
+@@ -70,6 +70,7 @@
+ #include <tools/time.hxx>
+ #include <tools/debug.hxx>
+ #include <stdio.h>
++#include <sys/stat.h>
+ 
+ using namespace osl;
+ 
+@@ -119,7 +120,15 @@
+     // HACK: create directory on a mount point with nobrowse option
+     // returns ENOSYS in any case !!
+     osl::Directory aDirectory( aPath );
++#ifdef UNX
++#include <sys/stat.h>
++/* RW permission for the user only! */
++ mode_t old_mode = umask(077);
++#endif
+     osl::FileBase::RC nError = aDirectory.open();
++#ifdef UNX
++umask(old_mode);
++#endif
+     aDirectory.close();
+     if( nError == osl::File::E_None )
+         return sal_True;
+@@ -240,7 +249,15 @@
+         {
+             DBG_ASSERT( bKeep, "Too expensive, use directory for creating name!" );
+             File aFile( aTmp );
++#ifdef UNX
++#include <sys/stat.h>
++/* RW permission for the user only! */
++ mode_t old_mode = umask(077);
++#endif
+             FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
++#ifdef UNX
++umask(old_mode);
++#endif
+             if (  err == FileBase::E_None )
+             {
+                 rName = aTmp;
+@@ -318,7 +335,15 @@
+         else
+         {
+             File aFile( aTmp );
++#ifdef UNX
++#include <sys/stat.h>
++/* RW permission for the user only! */
++ mode_t old_mode = umask(077);
++#endif
+             FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
++#ifdef UNX
++umask(old_mode);
++#endif
+             if ( err == FileBase::E_None )
+             {
+                 pImp->aName = aTmp;
diff --git a/patches/OOO_1_1_1/apply b/patches/OOO_1_1_1/apply
index b0095d698..596e0ac5a 100644
--- a/patches/OOO_1_1_1/apply
+++ b/patches/OOO_1_1_1/apply
@@ -68,6 +68,9 @@ build-sparc-assembler.diff
 # Fix alignment of long/doubles on Sparc #24059
 bridges-sparc-alignment.diff
 
+# make libsal v8 on sparc, #30774
+sparc-v8-fixes.diff
+
 # Don't -DBUILD, -DBUILD_ID for our build system #12782: rc3
 stlport-defeat-include.diff
 
diff --git a/patches/OOO_1_1_2/apply b/patches/OOO_1_1_2/apply
index 6528cb9c0..7ff736f05 100644
--- a/patches/OOO_1_1_2/apply
+++ b/patches/OOO_1_1_2/apply
@@ -44,6 +44,9 @@ flash-compile-fix.diff
 # help people get debugging
 debug-helper.diff
 
+# fix debug build in desktop/, #28330
+desktop-debug-fix.diff
+
 # do not build extras for icu, workaround for http://bugs.debian.org/210608
 icu-build-no-extras.diff
 
@@ -132,6 +135,12 @@ security-sonames.diff
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff
 
+# make libsal v8 on sparc, #30774
+sparc-v8-fixes.diff
+
+# fix tmpfile permissions, #33357
+tmpfile-fix.diff
+
 [ ODKFixes ]
 
 # Fix ODK Java bits