Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10268/10.4-transitional/unstable/main/finkinfo/x11
Modified Files:
openoffice.org-lang.info openoffice.org.info
Added Files:
openoffice.org.patch
Log Message:
Add #51940 patch
--- NEW FILE: openoffice.org.patch ---
diff -ur package/inc/ZipPackageFolder.hxx package_new/inc/ZipPackageFolder.hxx
--- package/inc/ZipPackageFolder.hxx 2005-07-12 14:28:10.000000000 +0200
+++ package_new/inc/ZipPackageFolder.hxx 2005-07-14 17:30:52.000000000
+0200
@@ -121,7 +121,7 @@
}
void setPackageFormat_Impl( sal_Bool bPackageFormat ) {
m_bPackageFormat = bPackageFormat; }
- void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) {
ZipPackageEntry::mbAllowRemoveOnInsert = bRemove; }
+ void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) {
this->mbAllowRemoveOnInsert = bRemove; }
// Recursive functions
void saveContents(rtl::OUString &rPath, std::vector <
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > >
&rManList, ZipOutputStream & rZipOut, com::sun::star::uno::Sequence < sal_Int8
> &rEncryptionKey, rtlRandomPool & rRandomPool)
diff -ur package/source/zippackage/ZipPackageFolder.cxx
package_new/source/zippackage/ZipPackageFolder.cxx
--- package/source/zippackage/ZipPackageFolder.cxx 2005-07-12
14:31:33.000000000 +0200
+++ package_new/source/zippackage/ZipPackageFolder.cxx 2005-07-14
17:31:14.000000000 +0200
@@ -128,7 +128,7 @@
{
OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package
folder!" );
- ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
+ this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
SetFolder ( sal_True );
aEntry.nVersion = -1;
diff -ur package/source/zippackage/ZipPackageStream.cxx
package_new/source/zippackage/ZipPackageStream.cxx
--- package/source/zippackage/ZipPackageStream.cxx 2005-07-12
14:31:48.000000000 +0200
+++ package_new/source/zippackage/ZipPackageStream.cxx 2005-07-14
17:32:10.000000000 +0200
@@ -137,7 +137,7 @@
{
OSL_ENSURE( m_xFactory.is(), "No factory is provided to
ZipPackageStream!\n" );
- ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
+ this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
SetFolder ( sal_False );
aEntry.nVersion = -1;
Index: openoffice.org.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/openoffice.org.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- openoffice.org.info 2 Aug 2005 01:01:11 -0000 1.6
+++ openoffice.org.info 2 Aug 2005 04:14:31 -0000 1.7
@@ -2,7 +2,7 @@
Package: openoffice.org
Description: Integrated office productivity suite
Version: 1.9m121
-Revision: 55
+Revision: 57
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -39,6 +39,7 @@
/bin/mv gpc231/gpc.{c,h} external/gpc
/usr/bin/tar zcf moz/download/mozilla-source-1.7.5.tar.gz mozilla
/usr/bin/bzip2 -dc openoffice.org.113to121.patch.bz2 | /usr/bin/patch -p1
+ /usr/bin/patch -p0 < %a/%n.patch
<<
SetCC: gcc-3.3
Index: openoffice.org-lang.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/openoffice.org-lang.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openoffice.org-lang.info 2 Aug 2005 01:01:10 -0000 1.3
+++ openoffice.org-lang.info 2 Aug 2005 04:14:31 -0000 1.4
@@ -2,7 +2,7 @@
Package: openoffice.org-%type_pkg[lang]
Description: Language Pack(%type_pkg[lang]) for OpenOffice.org
Version: 1.9m121
-Revision: 55
+Revision: 57
Type: lang (af, ar, bg, ca, cs, cy, da, de, el, en-gb, eo, es, et, eu, fi, fr,
gl, he, hi-in, hu, it, ja, km, kn-in, ko, lt, ms, nb, nl, nn, ns, pl, pt,
pt-br, ru, sk, sl, sv, th, tn, tr, xh, zh-cn, zh-tw, zu)
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -40,6 +40,7 @@
/bin/mv gpc231/gpc.{c,h} external/gpc
/usr/bin/tar zcf moz/download/mozilla-source-1.7.5.tar.gz mozilla
/usr/bin/bzip2 -dc openoffice.org.113to121.patch.bz2 | /usr/bin/patch -p1
+ /usr/bin/patch -p0 < %a/openoffice.org.patch
<<
SetCC: gcc-3.3
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
