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

Package-Manager: portage-2.1.1

5 files changed, 64 insertions, 19 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/Manifest b/app-office/openoffice/Manifest
index 5a5cf4857b67..96840ed33b45 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,14 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4_rc1/gentoo-2.0.4_rc1.diff 2205 RMD160 fab139d7e3b3fe4c713df71668700668e7bb8c7d SHA1 439bfb737448eeaeef91206d74961f1f4a9327c0 SHA256 7c58d847395d45f9561c8211e3171ab1b032b906ba1ba1fdd82d9ea4f9f29322
-MD5 413b3c367b991120f9c7c828ad2c4e72 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2205
-RMD160 fab139d7e3b3fe4c713df71668700668e7bb8c7d files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2205
-SHA256 7c58d847395d45f9561c8211e3171ab1b032b906ba1ba1fdd82d9ea4f9f29322 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2205
+AUX 2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824 RMD160 005f3cd7b7c1233e0d2f3ff730b92641b4ccb628 SHA1 f3f9bbffd4d71667c97770c0425f4646a7d52934 SHA256 946275bb8b76998296e4c83780ef4db6dbeead39dc81cd3aa8d77c71cf708950
+MD5 5679305f1ff009a9f7635b9527835c91 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
+RMD160 005f3cd7b7c1233e0d2f3ff730b92641b4ccb628 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
+SHA256 946275bb8b76998296e4c83780ef4db6dbeead39dc81cd3aa8d77c71cf708950 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
+AUX 2.0.4_rc1/sfx2-docfile-newfilesave.diff 703 RMD160 7a0075c051bcb72200976169691cef3717255b65 SHA1 9ead520d7c168096a65816eac97d78814a1d3282 SHA256 ef54f6ef67a1dfe4a2e6ad5066210d87698471a10b53fc9d007d01bf3d9ef53f
+MD5 7c49cc405fa89a62fc2b5e222397ffd6 files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
+RMD160 7a0075c051bcb72200976169691cef3717255b65 files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
+SHA256 ef54f6ef67a1dfe4a2e6ad5066210d87698471a10b53fc9d007d01bf3d9ef53f files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
@@ -29,14 +33,14 @@ EBUILD openoffice-2.0.3.ebuild 9247 RMD160 a67381ccc78f5921e0f4dad60dd311ac9153b
 MD5 14ed969a034981cd1fb0f4a2d6298a7f openoffice-2.0.3.ebuild 9247
 RMD160 a67381ccc78f5921e0f4dad60dd311ac9153bf0d openoffice-2.0.3.ebuild 9247
 SHA256 911d9fa1e2d6a54c6729a40fc907bf3fbab750b81df2f2bfef223bbedcd775fa openoffice-2.0.3.ebuild 9247
-EBUILD openoffice-2.0.4_rc1-r1.ebuild 9516 RMD160 bd16e5abee230f5c3fabdcceb58b64c6f14ec2e3 SHA1 ca4de62cf8ec6aa52e3c8b30502929336ba78751 SHA256 73be99e8f33df267742e6a88f2322bd07c0a6e5bbf35a442631fa89dd0fae345
-MD5 dced2484128290e3b96ee779655d9b9e openoffice-2.0.4_rc1-r1.ebuild 9516
-RMD160 bd16e5abee230f5c3fabdcceb58b64c6f14ec2e3 openoffice-2.0.4_rc1-r1.ebuild 9516
-SHA256 73be99e8f33df267742e6a88f2322bd07c0a6e5bbf35a442631fa89dd0fae345 openoffice-2.0.4_rc1-r1.ebuild 9516
-MISC ChangeLog 53000 RMD160 f24ac63249c96b943ae0312b4d822df8afaace14 SHA1 55b00469dde42e6c9c289f2d3a8d01b4262e4725 SHA256 473fba5775624fec518447dfcf08817547dc422242e7508d93d4fd27aff0de25
-MD5 183e75816bf8f21eb956f45c1be715b5 ChangeLog 53000
-RMD160 f24ac63249c96b943ae0312b4d822df8afaace14 ChangeLog 53000
-SHA256 473fba5775624fec518447dfcf08817547dc422242e7508d93d4fd27aff0de25 ChangeLog 53000
+EBUILD openoffice-2.0.4_rc1-r1.ebuild 9598 RMD160 950eabbb9ce06243f83912d8daff4e18ab309447 SHA1 2bc43a127b1bb9cfad6783f9ca9c25d23350cee3 SHA256 9ce0c64226452bca074a7cb37e192f2d12616a2806d21ac8e6297ffb77bafc15
+MD5 d26f83998fad917dc3660fd7f4306a32 openoffice-2.0.4_rc1-r1.ebuild 9598
+RMD160 950eabbb9ce06243f83912d8daff4e18ab309447 openoffice-2.0.4_rc1-r1.ebuild 9598
+SHA256 9ce0c64226452bca074a7cb37e192f2d12616a2806d21ac8e6297ffb77bafc15 openoffice-2.0.4_rc1-r1.ebuild 9598
+MISC ChangeLog 53253 RMD160 bac2907fccdf6bb1d9f2f79d0544114bdb0ad534 SHA1 e6aba238d5ff4bac9c9992e8221e6605ebe1bfb4 SHA256 1151c09409c97757616ce1cf2d0f0b6c91acea39abe8c00d371eb6643651c090
+MD5 418d823e4e239f2a0288160653b2b5ec ChangeLog 53253
+RMD160 bac2907fccdf6bb1d9f2f79d0544114bdb0ad534 ChangeLog 53253
+SHA256 1151c09409c97757616ce1cf2d0f0b6c91acea39abe8c00d371eb6643651c090 ChangeLog 53253
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
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}