rpms/openoffice.org/FC-5 openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, NONE, 1.1 openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch, NONE, 1.1 openoffice.org.spec, 1.679, 1.680
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 6 08:03:24 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10006
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch
Log Message:
db4 fix
openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch:
source/cxxhelp/qe/Search.cxx | 0
xmlhelp/source/cxxhelp/qe/Search.cxx | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch ---
Index: source/cxxhelp/qe/Search.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/qe/Search.cxx,v
retrieving revision 1.7
diff -u -r1.7 Search.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/qe/Search.cxx 9 Sep 2005 12:23:53 -0000 1.7
+++ openoffice.org/xmlhelp/source/cxxhelp/qe/Search.cxx 25 Jul 2006 07:47:28 -0000
@@ -473,10 +473,11 @@
genHeap_.reset();
}
while( nextDocGenHeap_.isNonEmpty() );
-
+#if 0
for( sal_uInt32 i = 0; i < start.size(); ++i )
if( start[i] != RoleFiller::STOP() )
delete start[i];
+#endif
}
openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch:
source/cxxhelp/provider/databases.cxx | 0
source/cxxhelp/provider/db.cxx | 0
source/cxxhelp/provider/db.hxx | 0
xmlhelp/source/cxxhelp/provider/databases.cxx | 4 +-
xmlhelp/source/cxxhelp/provider/db.cxx | 43 +-------------------------
xmlhelp/source/cxxhelp/provider/db.hxx | 24 --------------
6 files changed, 5 insertions(+), 66 deletions(-)
--- NEW FILE openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch ---
Index: source/cxxhelp/provider/databases.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/databases.cxx,v
retrieving revision 1.45
diff -u -r1.45 databases.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/databases.cxx 20 Jun 2006 00:38:50 -0000 1.45
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/databases.cxx 3 Sep 2006 13:15:31 -0000
@@ -571,7 +571,7 @@
if( aPair.second && ! it->second )
{
- Db* table = new Db( 0,DB_CXX_NO_EXCEPTIONS );
+ Db* table = new Db();
rtl::OUString fileNameOU =
getInstallPathAsSystemPath() +
@@ -794,7 +794,7 @@
fileNameOU.getLength(),
osl_getThreadTextEncoding() );
- Db table(0,DB_CXX_NO_EXCEPTIONS);
+ Db table;
if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
{
std::vector<KeywordInfo::KeywordElement> aVector;
Index: source/cxxhelp/provider/db.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/db.cxx,v
retrieving revision 1.4
diff -u -r1.4 db.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/db.cxx 20 Jun 2006 00:39:06 -0000 1.4
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/db.cxx 3 Sep 2006 13:15:31 -0000
@@ -56,44 +56,6 @@
//----------------------------------------------------------------------------
-DbEnv::DbEnv(u_int32_t flags)
-: m_pDBENV(0)
-{
- db_internal::check_error( db_env_create(&m_pDBENV,flags), "DbEnv::DbEnv" );
-}
-
-DbEnv::~DbEnv()
-{
- if (m_pDBENV)
- {
- // should not happen
- // TODO: add assert
- m_pDBENV->close(m_pDBENV,0);
- }
-}
-
-int DbEnv::open(const char *db_home, u_int32_t flags, int mode)
-{
- return db_internal::check_error( m_pDBENV->open(m_pDBENV,db_home,flags,mode), "DbEnv::open" );
-}
-
-void DbEnv::close(u_int32_t flags)
-{
- int error = m_pDBENV->close(m_pDBENV,flags);
- m_pDBENV = 0;
-
- db_internal::check_error(error, "DbEnv::close");
-}
-
-int DbEnv::set_alloc(db_malloc_fcn_type app_malloc,
- db_realloc_fcn_type app_realloc,
- db_free_fcn_type app_free)
-{
- int err = m_pDBENV->set_alloc(m_pDBENV,app_malloc,app_realloc,app_free);
- return db_internal::check_error(err,"Db::set_alloc");
-}
-//----------------------------------------------------------------------------
-
int Db::set_alloc( db_malloc_fcn_type app_malloc,
db_realloc_fcn_type app_realloc,
db_free_fcn_type app_free)
@@ -102,10 +64,9 @@
return db_internal::check_error(err,"Db::set_alloc");
}
-Db::Db(DbEnv* pDbenv,u_int32_t flags)
-: m_pDBP(0)
+Db::Db()
{
- db_internal::check_error( db_create(&m_pDBP,pDbenv ? pDbenv->m_pDBENV:0,flags),"Db::Db" );
+ db_internal::check_error( db_create(&m_pDBP,0,0),"Db::Db" );
}
Index: source/cxxhelp/provider/db.hxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/db.hxx,v
retrieving revision 1.6
diff -u -r1.6 db.hxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/db.hxx 20 Jun 2006 00:39:17 -0000 1.6
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/db.hxx 3 Sep 2006 13:15:31 -0000
@@ -52,7 +52,6 @@
namespace berkeleydbproxy {
- class DbEnv;
class Dbc;
class Dbt;
@@ -81,34 +80,13 @@
{ return what_.getStr(); }
};
-
- class DbEnv : db_internal::Noncopyable
- {
- friend class Db;
-
- private:
- DB_ENV* m_pDBENV;
-
- public:
- explicit DbEnv(u_int32_t flags);
- ~DbEnv();
-
- int open(const char *db_home, u_int32_t flags, int mode);
- void close(u_int32_t flags);
-
- int set_alloc(
- db_malloc_fcn_type app_malloc,
- db_realloc_fcn_type app_realloc,
- db_free_fcn_type app_free);
- };
-
class Db : db_internal::Noncopyable
{
private:
DB* m_pDBP;
public:
- Db(DbEnv* dbbenv,u_int32_t flags);
+ Db();
~Db();
int close(u_int32_t flags);
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -r1.679 -r1.680
--- openoffice.org.spec 26 Aug 2006 14:32:35 -0000 1.679
+++ openoffice.org.spec 6 Sep 2006 08:03:10 -0000 1.680
@@ -1,6 +1,6 @@
%define oootag OOB680
%define ooomilestone 5
-%define rh_rpm_release 17
+%define rh_rpm_release 18
%define build_fc5 1
@@ -182,6 +182,8 @@
Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch55: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
Patch56: openoffice.org.2.0.3.gcc28370.statics.patch
+Patch57: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch58: openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -211,8 +213,6 @@
# We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
# rpm doesn't "do the right thing" if only the packages are Required.
Requires: libbluecurve.so, libcrux-engine.so
-# rh#201213#
-Requires: libXp.so.6
Requires: %{libgcj} >= 4.0.0
%if ! %{internaljavabits}
Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
@@ -849,6 +849,8 @@
%patch54 -p1 -b .rh187919.gtkunderkde.patch
%patch55 -p1 -b .gcc28357.binfilter.constcrash.patch
%patch56 -p1 -b .gcc28370.statics.patch
+%patch57 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch58 -p1 -b .ooo69213.xmlhelp.db4.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3294,6 +3296,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue Sep 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.18
+- add openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+- add openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch
+
* Fri Jul 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.17
- rh#197618# add openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
- add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make
More information about the fedora-cvs-commits
mailing list