rpms/openoffice.org/devel .cvsignore, 1.65, 1.66 openoffice.org.spec, 1.345, 1.346 sources, 1.92, 1.93

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
try and solve gcj accessor problem globally


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	21 Jul 2005 19:39:18 -0000	1.65
+++ .cvsignore	23 Jul 2005 17:19:18 -0000	1.66
@@ -123,3 +123,4 @@
 SRC680_m118.tar.bz2
 SRC680_m119.tar.bz2
 SRC680_m120.tar.bz2
+gcj-sed.sh


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- openoffice.org.spec	23 Jul 2005 15:03:34 -0000	1.345
+++ openoffice.org.spec	23 Jul 2005 17:19:18 -0000	1.346
@@ -67,7 +67,8 @@
 %define langpack_langs en-US
 %endif
 
-ExclusiveArch:  %{ix86} ppc
+#ExclusiveArch:  %{ix86} ppc
+ExclusiveArch:  %{ix86}
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
@@ -82,6 +83,7 @@
 Source2:	openoffice.org-myspell-contrib.tar.gz
 Source3:	GSI_ta-IN.sdf
 Source4:	openoffice.org-simple-crash_report.sh
+Source5:	gcj-sed.sh
 BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
@@ -123,9 +125,9 @@
 Patch22: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
 Patch23: openoffice.org-1.9.97.rh156067.noversionedicons.patch
 Patch24: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-Patch25: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
+#Patch25: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
 Patch26: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
+#Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
 Patch28: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
 Patch29: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
 Patch30: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
@@ -138,7 +140,7 @@
 Patch37: workspace.fpicandrpath.patch
 Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch40: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
+#Patch40: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
 Patch41: openoffice.org-1.9.112.ooo51724.testtools.patch
 Patch42: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch43: openoffice.org-1.9.114.ooo51718.rpath.patch
@@ -768,9 +770,9 @@
 %patch22 -p1 -b .ooo48256.nolongname.sysui.patch
 %patch23 -p1 -b .rh156067.noversionedicons.patch
 %patch24 -p1 -b .ooo48600.rtfparseerror.svx.patch
-%patch25 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
+#%patch25 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
 %patch26 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-%patch27 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
+#%patch27 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
 %patch28 -p1 -b .use-fontconfig-everwhere.patch
 %patch29 -p1 -b .berkeleydb-jni-casting-misuse.patch
 %patch30 -p1 -b .ooo44627.sal.brokencondition.patch
@@ -783,7 +785,7 @@
 %patch37 -p1 -b .workspace.fpicandrpath.patch
 %patch38 -p1 -b .NONE.gcc3gcj4.patch
 %patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch40 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
+#%patch40 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
 %patch41 -p1 -b .ooo51724.testtools.patch
 %patch42 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch43 -p1 -b .ooo51718.rpath.patch
@@ -882,14 +884,22 @@
 export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
 %endif
 
+# gcc#19870# gcj access problems, monsterous hack to force all java through
+# a sed script which replaces private and protected with public, shudder!
+cp %{SOURCE5} solenv/bin/gcj
+export TRUEJAVACOMPILER=$JAVACOMPILER
+export JAVACOMPILER=gcj
+
 #give these security flags a whirl
-export CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=3 -fasynchronous-unwind-tables"
+#export CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=3 -fasynchronous-unwind-tables"
 
+# see tamil translation issue rh#159381#, remove when complete and upstreamed
 cd transex3/prj
 build --dlv_switch link --all -P$MAXBUILDS
 deliver
 localize -m -x -l ta-IN -f %{SOURCE3}
 cd ../..
+
 cd instsetoo_native/util
 if ! build --dlv_switch link --all -P$MAXBUILDS; then
     echo Hmm...
@@ -899,7 +909,7 @@
 fi
 echo build end time is `date`
 df -h .
-#dance of the seven veils to get unpackaged install
+#getting an unpackaged install
 export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 export MAXPROCESS=1
 echo start en-US install time is `date`
@@ -3017,6 +3027,7 @@
 %changelog
 * Sat Jul 23 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.120-3
 - add openoffice.org-1.9.120.rh158977.execshield.bridges.patch
+- try to workaround gcj accessor problem on a global basis
 
 * Sat Jul 23 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.120-2
 - try and reenable ppc building


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	21 Jul 2005 19:39:18 -0000	1.92
+++ sources	23 Jul 2005 17:19:18 -0000	1.93
@@ -3,3 +3,4 @@
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
 6ce92137315708a925dd57cd948c5d37  SRC680_m120.tar.bz2
+c733528059f1ea2b51c78d07738bf121  gcj-sed.sh