summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-09-22 16:40:09 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-09-22 16:40:09 +0000
commit69fa3802b07e7022c68f8dd009fe0d6b2fd1e29c (patch)
tree33682422e2410f16a3962a0297a098610fd7bfd1 /app-office/openoffice/files
parentBump to 2.0.4_rc2, also add sound use-flag (diff)
downloadgentoo-2-69fa3802b07e7022c68f8dd009fe0d6b2fd1e29c.tar.gz
gentoo-2-69fa3802b07e7022c68f8dd009fe0d6b2fd1e29c.tar.bz2
gentoo-2-69fa3802b07e7022c68f8dd009fe0d6b2fd1e29c.zip
Bump to 2.0.4_rc2, also add sound use-flag
(Portage version: 2.1.2_pre1) (Unsigned Manifest commit)
Diffstat (limited to 'app-office/openoffice/files')
-rw-r--r--app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff96
-rw-r--r--app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff13
-rw-r--r--app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r139
3 files changed, 0 insertions, 148 deletions
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
deleted file mode 100644
index 94cd96817dfd..000000000000
--- a/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
+++ /dev/null
@@ -1,96 +0,0 @@
---- bin/package-ooo
-+++ bin/package-ooo
-@@ -57,6 +57,7 @@
- #!/bin/sh
- export OOO_EXTRA_ARG='$2'
-+unset PYTHONPATH
- $OOINSTBASE/program/ooqstart $3 "\$@"
- EOT
- chmod 755 $1
- }
---- bin/ooo-wrapper.in
-+++ bin/ooo-wrapper.in
-@@ -92,6 +89,9 @@
- print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
- }
-
-+# Clear PYTHONPATH, otherwise Python scripting does not work
-+delete $ENV{'PYTHONPATH'};
-+
- # And here we go.
- exec "$SystemInstallDir/program/$Binary", @ooo_argv
-
---- bin/unpack
-+++ bin/unpack
-@@ -89,7 +89,7 @@
- # it is necessary in ODK
- # it can be built even on linux by mingw32, though
- if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
-- cp -f $TOOLSDIR/src/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
-+ cp -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
- fi
-
- # copy in misc Mono related dlls if we need to
-@@ -319,7 +319,7 @@
- cp -af $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
-
- echo "Installing bibliography overwrides";
--tar xjf $TOOLSDIR/src/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
-+tar xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
-
- echo "Copying custom user-dicts into tree"
- cp -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
---- patches/src680/apply
-+++ patches/src680/apply
-@@ -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
-
- [ 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
--
-+# use libxslt from system for xmlhelp / disable sablot
-+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 +1498,6 @@
- [ GentooExperimental ]
- SectionOwner => hmth
-
--# use libxslt from system for xmlhelp / disable sablot
--xmlhelp-use-libxslt-from-system.diff, i#30380
- # Gnu JRE paths.
- gentooexperimental-gnujre.diff
-
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
deleted file mode 100644
index f270c8a78b7b..000000000000
--- a/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/digest-openoffice-2.0.4_rc1-r1 b/app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r1
deleted file mode 100644
index 42d4fcba02de..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r1
+++ /dev/null
@@ -1,39 +0,0 @@
-MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
-RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
-SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
-MD5 2aa6bb72a257abcd896014b08fa4e6f0 cli_types.dll 634880
-RMD160 2cba491d27cc349a3468127a93981396756c6fc8 cli_types.dll 634880
-SHA256 7316a75be649b5a1c09c953b6ac20aa1953afbddd82a454a864d4a1c70a5a3ca cli_types.dll 634880
-MD5 f06322e5157495c22ba77f310fa4a89b cli_types_bridgetest.dll 20480
-RMD160 ac4a4110cf21d5bc7d9797f651a84fa20627c03b cli_types_bridgetest.dll 20480
-SHA256 3e62533c0f9e337021d2396332438ad23ea0fd480aab849c50aab48ab40579bb cli_types_bridgetest.dll 20480
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
-SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
-MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
-RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
-SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
-RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
-SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 686f009ac0b587f7abba5b4c3f419559 ood680-m2-binfilter.tar.bz2 16799814
-RMD160 ed2e583d811bfad162b917f2269ace9f98a8cc6a ood680-m2-binfilter.tar.bz2 16799814
-SHA256 a4235f16b247afa4cca03fc6f8c6b8edd1500f20753ad0db256fadfc0035809f ood680-m2-binfilter.tar.bz2 16799814
-MD5 d112d0dcc105c9e6c5c049eb1dde28a4 ood680-m2-core.tar.bz2 121415950
-RMD160 5017151853c48464e6b0258fd220c0636367c188 ood680-m2-core.tar.bz2 121415950
-SHA256 9baafec147f8ff78b7ffc2f71fe0ee2ed7e016170233549e86f5bf2083b2755f ood680-m2-core.tar.bz2 121415950
-MD5 c1a53a7e22476f7b10db82ea39150beb ood680-m2-lang.tar.bz2 67723249
-RMD160 81426d415733025b31899db7c45319e2249378de ood680-m2-lang.tar.bz2 67723249
-SHA256 d4db201f04260ee3e48f6c8c0269b9bc5443cfc692178bbb6f3adeef981c84f6 ood680-m2-lang.tar.bz2 67723249
-MD5 df3e3d8d35a4269555b88a8b055355ee ood680-m2-system.tar.bz2 28794310
-RMD160 5d885ccec07b2cba543a026f4966f36aba736570 ood680-m2-system.tar.bz2 28794310
-SHA256 f6f120be87fe6284bf4af0b8757b5bba8656e6a8e2bf6738317cd29cc296aa98 ood680-m2-system.tar.bz2 28794310
-MD5 b107dceb6f5a11a819531f21fdc8b90f ooo-build-ood680-m2.tar.gz 4314684
-RMD160 3bcf113cf87202bd5ff413fe476eeb4dcbaa8143 ooo-build-ood680-m2.tar.gz 4314684
-SHA256 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd ooo-build-ood680-m2.tar.gz 4314684
-MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
-RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
-SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
-MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
-RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
-SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516