Add a patch which solves a problem with saving documents, see bug #147493

(Portage version: 2.1.1)

4 files changed, 48 insertions, 7 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 393290a639d7..c227a51c8770 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.251 2006/09/14 08:34:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.252 2006/09/14 16:36:02 suka Exp $
+
+  14 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.4_rc1/sfx2-docfile-newfilesave.diff,
+  files/2.0.4_rc1/gentoo-2.0.4_rc1.diff, openoffice-2.0.4_rc1-r1.ebuild:
+  Add a patch which solves a problem with saving documents, see bug #147493
 
   14 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
   files/2.0.4_rc1/gentoo-2.0.4_rc1.diff, openoffice-2.0.4_rc1-r1.ebuild:
diff --git a/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff b/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
index 6b9ff00fcff5..94cd96817dfd 100644
--- a/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
+++ b/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
@@ -42,16 +42,34 @@
  cp -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
 --- patches/src680/apply 
 +++ patches/src680/apply 
-@@ -1014,8 +1014,6 @@
+@@ -150,6 +150,9 @@
+ 
+ # add SPARC platform to automation
+ automation-sparc-platform.diff, i#66140, rengelha
++
++#Fix new file save error in ood-m1 and ood-m2
++sfx2-docfile-newfilesave.diff, i#69232 jianhua
+ 
+ # [ LinuxOnly ]
+ 
+@@ -1008,16 +1011,10 @@
+ 
+ # system STLport
+ dont-copy-and-install-stlport.diff, i#63732, rengelha
+-# support server-only versions of 64bit JDKs
+-64bit-jdk-server-paths.diff, i#65974
+ # throw also Java exception on JNI error
  jni-throw-exception.diff, i#65977
  # system db check
  system-db-check.diff, i#65979
 -# Gentoo's portaudio ...
 -system-portaudio-use-lpthread.diff
- # use IBM j9vm over IBM classic JVM
- ibm-j9vm.diff
+-# use IBM j9vm over IBM classic JVM
+-ibm-j9vm.diff
  
-@@ -1031,7 +1029,10 @@
+ [ GentooOnly ]
+ SectionOwner => aprosky
+@@ -1031,7 +1028,14 @@
  gentoo-gcc-naming-and-versioning.diff, hmth
  # build with -fomit-frame-pointer
  #omit-fp-workaround.diff, i#50625, hmth
@@ -60,10 +78,14 @@
 +xmlhelp-use-libxslt-from-system.diff, i#30380, rengelha
 +# Gentoo's portaudio ...
 +system-portaudio-use-lpthread.diff, hmth
++# support server-only versions of 64bit JDKs
++64bit-jdk-server-paths.diff, i#65974, hmth
++# use IBM j9vm over IBM classic JVM
++ibm-j9vm.diff, hmth
  
  [ DebianBaseOnly ]
  SectionOwner => rengelha
-@@ -1494,8 +1495,6 @@
+@@ -1494,8 +1498,6 @@
  [ GentooExperimental ]
  SectionOwner => hmth
  
diff --git a/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff b/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff
new file mode 100644
index 000000000000..f270c8a78b7b
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff
@@ -0,0 +1,13 @@
+--- sfx2/source/doc/docfile.cxx	2006-09-02 00:25:16.000000000 +0800
++++ sfx2/source/doc/docfile.cxx	2006-09-04 17:16:59.000000000 +0800
+@@ -2274,7 +2274,9 @@ void SfxMedium::GetMedium_Impl()
+         }
+ 
+         //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
+-        if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
++        //When you create a new file, it will cause the file set Error. but it is correct. 
++        //And the pURLObj will mark the file is new one or opened -- base on gdb.
++        if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() && pURLObj)
+             SetError( ERRCODE_IO_ACCESSDENIED );
+ 
+ 		if ( !GetError() )
diff --git a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
index 7aa74dae623f..01bd3e216851 100644
--- a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild,v 1.7 2006/09/14 08:34:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild,v 1.8 2006/09/14 16:36:02 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
@@ -168,6 +168,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+	cp -a ${FILESDIR}/${PV}/sfx2-docfile-newfilesave.diff ${S}/patches/src680 || die
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}