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

rpms/openoffice.org/devel openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch, NONE, 1.1 openoffice.org.spec, 1.115, 1.116 workspace-gcj4.patch, 1.4, 1.5



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

Modified Files:
	openoffice.org.spec workspace-gcj4.patch 
Added Files:
	openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch 
Log Message:
add better gcj compile options, and systemjpeg workaround

openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch:
 inc/rc.hxx           |    0 
 inc/resmgr.hxx       |    0 
 tools/inc/rc.hxx     |    8 ++++----
 tools/inc/resmgr.hxx |    9 ++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch ---
Index: inc/rc.hxx
===================================================================
RCS file: /cvs/util/tools/inc/rc.hxx,v
retrieving revision 1.2
diff -u -p -r1.2 rc.hxx
--- openoffice.org.orig/tools/inc/rc.hxx	3 Jan 2005 17:07:16 -0000	1.2
+++ openoffice.org/tools/inc/rc.hxx	1 Apr 2005 08:02:32 -0000
@@ -110,15 +110,15 @@ protected:
 							{ return GetResManager()->GetRemainSize(); }
 
 	// Gibt einen long zurueck
-	static INT32		GetLongRes( void * pLong )
+	static sal_Int32	GetLongRes( void * pLong )
 							{ return ResMgr::GetLong( pLong ); }
 	// Gibt einen long zurueck
-	static INT16		GetShortRes( void * pShort )
+	static sal_Int16	GetShortRes( void * pShort )
 							{ return ResMgr::GetShort( pShort ); }
 
-	static INT32		ReadLongRes()
+	static sal_Int32	ReadLongRes()
 							{ return GetResManager()->ReadLong(); }
-	static INT16		ReadShortRes()
+	static sal_Int16	ReadShortRes()
 							{ return GetResManager()->ReadShort(); }
 	static UniString	ReadStringRes()
 							{ return GetResManager()->ReadString(); }
Index: inc/resmgr.hxx
===================================================================
RCS file: /cvs/util/tools/inc/resmgr.hxx,v
retrieving revision 1.6
diff -u -p -r1.6 resmgr.hxx
--- openoffice.org.orig/tools/inc/resmgr.hxx	18 Jan 2005 13:30:25 -0000	1.6
+++ openoffice.org/tools/inc/resmgr.hxx	1 Apr 2005 08:02:32 -0000
@@ -61,7 +61,6 @@
 
 #ifndef _TOOLS_RESMGR_HXX
 #define _TOOLS_RESMGR_HXX
-
 #ifndef _STRING_HXX
 #include <string.hxx>
 #endif
@@ -234,9 +233,9 @@ public:
     // return a int64
     static sal_uInt64   GetUInt64( void* pDatum );
 	// Gibt einen long zurueck
-	static INT32		GetLong( void * pLong );
+	static sal_Int32		GetLong( void * pLong );
 	// return a short
-	static INT16		GetShort( void * pShort );
+	static sal_Int16		GetShort( void * pShort );
 
 	// Gibt einen Zeiger auf die Resource zurueck
 	void *				GetClass();
@@ -248,8 +247,8 @@ public:
 
 	const rtl::OUString&GetFileName() const;
 
-	INT16				ReadShort();
-	INT32				ReadLong();
+	sal_Int16			ReadShort();
+	sal_Int32			ReadLong();
 	UniString			ReadString();
     
      // generate auto help id for current resource stack


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- openoffice.org.spec	31 Mar 2005 21:27:05 -0000	1.115
+++ openoffice.org.spec	1 Apr 2005 08:23:19 -0000	1.116
@@ -69,6 +69,7 @@
 Patch29: openoffice.org-1.9.89.ooo46389.parallel.framework.patch
 Patch30: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
 Patch31: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch32: openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -591,6 +592,7 @@
 %patch29 -p1 -b .ooo46389.parallel.framework.patch
 %patch30 -p1 -b .ooo35627.parallel.cppumaker.patch
 %patch31 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch32 -p1 -b .oooXXXXX.systemjpeg.tools.patch
 
 cd solenv/bin
 tar xvzf %{SOURCE2} Archive-Zip-1.13/lib

workspace-gcj4.patch:
 bin/deliver.pl             |    0 
 config_office/configure.in |   20 ++++++++++++++++++++
 config_office/set_soenv.in |    8 +++++++-
 inc/settings.mk            |    0 
 solenv/bin/deliver.pl      |   22 ++++++++++++++++++++++
 solenv/inc/settings.mk     |    5 ++---
 6 files changed, 51 insertions(+), 4 deletions(-)

Index: workspace-gcj4.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace-gcj4.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace-gcj4.patch	24 Mar 2005 13:30:10 -0000	1.4
+++ workspace-gcj4.patch	1 Apr 2005 08:23:19 -0000	1.5
@@ -118,8 +118,8 @@
 +    my $file = shift;
 +    my $to = $file.".so";
 +    print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
-+    print "Caching 1/2: $ENV{JAVACOMPILER} -shared -O2 -findirect-dispatch -fjni -o $to $file\n";
-+    system("$ENV{JAVACOMPILER} -shared -O2 -findirect-dispatch -fjni -o $to $file");
++    print "Caching 1/2: $ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file\n";
++    system("$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file");
 +    print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n";
 +    system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to");
 +};


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