From 6b623b3222d890e09ee1ca7161eedffc8eb97d44 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 29 Jun 2012 12:36:39 +0000 Subject: Fix build for NetBSD current/GCC. Almost fix build with Clang. --- misc/openoffice3/distinfo | 16 ++++++++++++---- misc/openoffice3/patches/patch-ch | 8 ++++---- ...patch-configmgr_source_treemgr_templateimpl.hxx | 12 ++++++++++++ misc/openoffice3/patches/patch-cs | 8 ++++---- ...patch-oox_inc_oox_drawingml_chart_modelbase.hxx | 22 ++++++++++++++++++++++ .../patch-oox_inc_oox_helper_containerhelper.hxx | 13 +++++++++++++ .../patches/patch-soltools_inc_st__list.hxx | 22 ++++++++++++++++++++++ .../patch-toolkit_source_awt_vclxdialog.cxx | 13 +++++++++++++ .../patch-toolkit_source_awt_vclxscroller.cxx | 13 +++++++++++++ .../patch-toolkit_source_awt_vclxsplitter.cxx | 13 +++++++++++++ .../patch-toolkit_source_awt_vclxtabcontrol.cxx | 13 +++++++++++++ .../patches/patch-xml2cmp_source_support_list.hxx | 13 +++++++++++++ 12 files changed, 154 insertions(+), 12 deletions(-) create mode 100644 misc/openoffice3/patches/patch-configmgr_source_treemgr_templateimpl.hxx create mode 100644 misc/openoffice3/patches/patch-oox_inc_oox_drawingml_chart_modelbase.hxx create mode 100644 misc/openoffice3/patches/patch-oox_inc_oox_helper_containerhelper.hxx create mode 100644 misc/openoffice3/patches/patch-soltools_inc_st__list.hxx create mode 100644 misc/openoffice3/patches/patch-toolkit_source_awt_vclxdialog.cxx create mode 100644 misc/openoffice3/patches/patch-toolkit_source_awt_vclxscroller.cxx create mode 100644 misc/openoffice3/patches/patch-toolkit_source_awt_vclxsplitter.cxx create mode 100644 misc/openoffice3/patches/patch-toolkit_source_awt_vclxtabcontrol.cxx create mode 100644 misc/openoffice3/patches/patch-xml2cmp_source_support_list.hxx (limited to 'misc') diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 058bc93e7f7..882f5fa1bd0 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2011/11/24 14:13:26 mrg Exp $ +$NetBSD: distinfo,v 1.33 2012/06/29 12:36:39 joerg Exp $ SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0 @@ -50,21 +50,21 @@ SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447 -SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe SHA1 (patch-bs) = bea7e5fddee7056558747a6801816e2955dd0657 SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 -SHA1 (patch-ch) = caa598140bcb78ec61bc33d44c5873da84e1628a +SHA1 (patch-ch) = 1e456a34ebcf8639aa1a976e8c5fd05d1ef3ef5c SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444 +SHA1 (patch-configmgr_source_treemgr_templateimpl.hxx) = d34ed7ddfcd879072993f84e44b32e52c961dffe SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d -SHA1 (patch-cs) = 3f4f360870ad22b1fb88a2ca9f7907e03010ac79 +SHA1 (patch-cs) = 49b457e23f9edca560abee0acfbbe5ea64b5ea1a SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e @@ -100,3 +100,11 @@ SHA1 (patch-gb) = 70c11692129ef17cf47afa8dbff25e5e41719599 SHA1 (patch-gc) = 51c00c2fbb64c299d528c072fe68e1f9786a0fff SHA1 (patch-ha) = 174125037d080b5bb61c1565520d72556cd3a7e5 SHA1 (patch-hb) = 31de8d81c05d974d58599d8ff20bd60101b4a143 +SHA1 (patch-oox_inc_oox_drawingml_chart_modelbase.hxx) = 024a3611dc6e676b0e9621623217054c70c4b930 +SHA1 (patch-oox_inc_oox_helper_containerhelper.hxx) = 3859f9c72b2fad37a5bcd9318af2198f8856878d +SHA1 (patch-soltools_inc_st__list.hxx) = cd76c1beaed94cbb2af63cc84d1296162677d054 +SHA1 (patch-toolkit_source_awt_vclxdialog.cxx) = d1643bd9dab32f195dc9107fe2bcc92ebed9ba06 +SHA1 (patch-toolkit_source_awt_vclxscroller.cxx) = 95701209a9cbeab61178c845ca3956307d4362f0 +SHA1 (patch-toolkit_source_awt_vclxsplitter.cxx) = 5a03124e1484dc632c8497e9da26244e76f8b9ba +SHA1 (patch-toolkit_source_awt_vclxtabcontrol.cxx) = 3ec76db3b3a1a7ae0378ddc5bdd3c0e0c424f48c +SHA1 (patch-xml2cmp_source_support_list.hxx) = 011838b8052a671e6c68f8c85a8f746a92383ea2 diff --git a/misc/openoffice3/patches/patch-ch b/misc/openoffice3/patches/patch-ch index 4ec30f1c0a6..471d194fc0a 100644 --- a/misc/openoffice3/patches/patch-ch +++ b/misc/openoffice3/patches/patch-ch @@ -1,7 +1,7 @@ -$NetBSD: patch-ch,v 1.2 2008/10/16 23:16:46 hira Exp $ +$NetBSD: patch-ch,v 1.3 2012/06/29 12:36:39 joerg Exp $ ---- solenv/inc/unxbsdi3.mk.orig 2007-10-05 10:11:25.000000000 +0900 -+++ solenv/inc/unxbsdi3.mk 2008-10-16 19:14:03.000000000 +0900 +--- solenv/inc/unxbsdi3.mk.orig 2012-06-22 21:21:26.000000000 +0000 ++++ solenv/inc/unxbsdi3.mk @@ -0,0 +1,178 @@ +# +# mk file for NetBSD/i386 with gcc 3.4.x and higher. @@ -112,7 +112,7 @@ $NetBSD: patch-ch,v 1.2 2008/10/16 23:16:46 hira Exp $ + +# default linker flags +LINKFLAGSDEFS*=-Wl,-z,defs -+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' ++LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications diff --git a/misc/openoffice3/patches/patch-configmgr_source_treemgr_templateimpl.hxx b/misc/openoffice3/patches/patch-configmgr_source_treemgr_templateimpl.hxx new file mode 100644 index 00000000000..4da15ee08a4 --- /dev/null +++ b/misc/openoffice3/patches/patch-configmgr_source_treemgr_templateimpl.hxx @@ -0,0 +1,12 @@ +$NetBSD: patch-configmgr_source_treemgr_templateimpl.hxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- configmgr/source/treemgr/templateimpl.hxx.orig 2012-06-23 17:27:43.000000000 +0000 ++++ configmgr/source/treemgr/templateimpl.hxx +@@ -31,6 +31,7 @@ + #ifndef CONFIGMGR_TEMPLATEIMPL_HXX_ + #define CONFIGMGR_TEMPLATEIMPL_HXX_ + ++#include "treemanager.hxx" + #include "template.hxx" + #include "configpath.hxx" + #include "requestoptions.hxx" diff --git a/misc/openoffice3/patches/patch-cs b/misc/openoffice3/patches/patch-cs index 6bda8bf7d69..29e8fc28cfc 100644 --- a/misc/openoffice3/patches/patch-cs +++ b/misc/openoffice3/patches/patch-cs @@ -1,7 +1,7 @@ -$NetBSD: patch-cs,v 1.3 2008/10/18 01:05:08 hira Exp $ +$NetBSD: patch-cs,v 1.4 2012/06/29 12:36:39 joerg Exp $ ---- solenv/inc/unxbsdx3.mk.orig 2007-10-13 00:24:19.000000000 +0900 -+++ solenv/inc/unxbsdx3.mk 2008-10-16 19:28:56.000000000 +0900 +--- solenv/inc/unxbsdx3.mk.orig 2012-06-22 21:21:26.000000000 +0000 ++++ solenv/inc/unxbsdx3.mk @@ -0,0 +1,178 @@ +# +# mk file for NetBSD/amd64 with gcc 3.4.x and higher. @@ -112,7 +112,7 @@ $NetBSD: patch-cs,v 1.3 2008/10/18 01:05:08 hira Exp $ + +# default linker flags +LINKFLAGSDEFS*=-Wl,-z,defs -+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' ++LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications diff --git a/misc/openoffice3/patches/patch-oox_inc_oox_drawingml_chart_modelbase.hxx b/misc/openoffice3/patches/patch-oox_inc_oox_drawingml_chart_modelbase.hxx new file mode 100644 index 00000000000..eadc87f428a --- /dev/null +++ b/misc/openoffice3/patches/patch-oox_inc_oox_drawingml_chart_modelbase.hxx @@ -0,0 +1,22 @@ +$NetBSD: patch-oox_inc_oox_drawingml_chart_modelbase.hxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- oox/inc/oox/drawingml/chart/modelbase.hxx.orig 2012-06-23 17:29:44.000000000 +0000 ++++ oox/inc/oox/drawingml/chart/modelbase.hxx +@@ -52,13 +52,13 @@ public: + + inline bool is() const { return this->get() != 0; } + +- inline ModelType& create() { reset( new ModelType ); return **this; } ++ inline ModelType& create() { this->reset( new ModelType ); return **this; } + template< typename Param1Type > +- inline ModelType& create( const Param1Type& rParam1 ) { reset( new ModelType( rParam1 ) ); return **this; } ++ inline ModelType& create( const Param1Type& rParam1 ) { this->reset( new ModelType( rParam1 ) ); return **this; } + +- inline ModelType& getOrCreate() { if( !*this ) reset( new ModelType ); return **this; } ++ inline ModelType& getOrCreate() { if( !*this ) this->reset( new ModelType ); return **this; } + template< typename Param1Type > +- inline ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) reset( new ModelType( rParam1 ) ); return **this; } ++ inline ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; } + }; + + // ============================================================================ diff --git a/misc/openoffice3/patches/patch-oox_inc_oox_helper_containerhelper.hxx b/misc/openoffice3/patches/patch-oox_inc_oox_helper_containerhelper.hxx new file mode 100644 index 00000000000..4fe4985bf6d --- /dev/null +++ b/misc/openoffice3/patches/patch-oox_inc_oox_helper_containerhelper.hxx @@ -0,0 +1,13 @@ +$NetBSD: patch-oox_inc_oox_helper_containerhelper.hxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- oox/inc/oox/helper/containerhelper.hxx.orig 2012-06-23 17:25:25.000000000 +0000 ++++ oox/inc/oox/helper/containerhelper.hxx +@@ -189,7 +189,7 @@ private: + + inline const mapped_type* getRef( key_type nKey ) const + { +- typename container_type::const_iterator aIt = find( nKey ); ++ typename container_type::const_iterator aIt = this->find( nKey ); + return (aIt == this->end()) ? 0 : &aIt->second; + } + }; diff --git a/misc/openoffice3/patches/patch-soltools_inc_st__list.hxx b/misc/openoffice3/patches/patch-soltools_inc_st__list.hxx new file mode 100644 index 00000000000..c655847f47b --- /dev/null +++ b/misc/openoffice3/patches/patch-soltools_inc_st__list.hxx @@ -0,0 +1,22 @@ +$NetBSD: patch-soltools_inc_st__list.hxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- soltools/inc/st_list.hxx.orig 2012-06-23 16:39:03.000000000 +0000 ++++ soltools/inc/st_list.hxx +@@ -297,7 +297,7 @@ DynamicList::operator=( const Dynami + it != i_rList.end(); + ++it ) + { +- push_back( new XY(*(*it)) ); ++ this->push_back( new XY(*(*it)) ); + } + return *this; + } +@@ -310,7 +310,7 @@ DynamicList::Insert(unsigned pos, XY + if ( pos > this->len ) + return; + +- checkSize(DynamicList::len+2); ++ this->checkSize(DynamicList::len+2); + memmove( DynamicList::inhalt+pos+1, DynamicList::inhalt+pos, (DynamicList::len-pos) * sizeof(XY*) ); + this->inhalt[pos] = elem_; + this->len++; diff --git a/misc/openoffice3/patches/patch-toolkit_source_awt_vclxdialog.cxx b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxdialog.cxx new file mode 100644 index 00000000000..a0065e87639 --- /dev/null +++ b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxdialog.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_source_awt_vclxdialog.cxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- toolkit/source/awt/vclxdialog.cxx.orig 2012-06-23 18:17:00.000000000 +0000 ++++ toolkit/source/awt/vclxdialog.cxx +@@ -109,7 +109,7 @@ void SAL_CALL VCLXDialog::dispose() thro + ::vos::OGuard aGuard( GetMutex() ); + + ::com::sun::star::lang::EventObject aDisposeEvent; +- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); ++ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*(VCLXDevice *)this); + // maTabListeners.disposeAndClear( aDisposeEvent ); + } + diff --git a/misc/openoffice3/patches/patch-toolkit_source_awt_vclxscroller.cxx b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxscroller.cxx new file mode 100644 index 00000000000..0266c6fc4e0 --- /dev/null +++ b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxscroller.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_source_awt_vclxscroller.cxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- toolkit/source/awt/vclxscroller.cxx.orig 2012-06-23 18:22:34.000000000 +0000 ++++ toolkit/source/awt/vclxscroller.cxx +@@ -75,7 +75,7 @@ void SAL_CALL VCLXScroller::dispose() th + ::vos::OGuard aGuard( GetMutex() ); + + EventObject aDisposeEvent; +- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); ++ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*(VCLXDevice *)this); + // maTabListeners.disposeAndClear( aDisposeEvent ); + } + diff --git a/misc/openoffice3/patches/patch-toolkit_source_awt_vclxsplitter.cxx b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxsplitter.cxx new file mode 100644 index 00000000000..fe987f93683 --- /dev/null +++ b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxsplitter.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_source_awt_vclxsplitter.cxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- toolkit/source/awt/vclxsplitter.cxx.orig 2012-06-23 18:25:49.000000000 +0000 ++++ toolkit/source/awt/vclxsplitter.cxx +@@ -113,7 +113,7 @@ void SAL_CALL VCLXSplitter::dispose() th + ::vos::OGuard aGuard( GetMutex() ); + + EventObject aDisposeEvent; +- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); ++ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*(VCLXDevice *)this); + // maTabListeners.disposeAndClear( aDisposeEvent ); + } + diff --git a/misc/openoffice3/patches/patch-toolkit_source_awt_vclxtabcontrol.cxx b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxtabcontrol.cxx new file mode 100644 index 00000000000..09ab9ce268e --- /dev/null +++ b/misc/openoffice3/patches/patch-toolkit_source_awt_vclxtabcontrol.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_source_awt_vclxtabcontrol.cxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- toolkit/source/awt/vclxtabcontrol.cxx.orig 2012-06-23 18:31:17.000000000 +0000 ++++ toolkit/source/awt/vclxtabcontrol.cxx +@@ -100,7 +100,7 @@ void SAL_CALL VCLXTabControl::dispose( ) + ::vos::OGuard aGuard( GetMutex() ); + + EventObject aDisposeEvent; +- aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); ++ aDisposeEvent.Source = W3K_EXPLICIT_CAST (*(VCLXDevice *)this); + // maTabListeners.disposeAndClear( aDisposeEvent ); + } + diff --git a/misc/openoffice3/patches/patch-xml2cmp_source_support_list.hxx b/misc/openoffice3/patches/patch-xml2cmp_source_support_list.hxx new file mode 100644 index 00000000000..dc60081d787 --- /dev/null +++ b/misc/openoffice3/patches/patch-xml2cmp_source_support_list.hxx @@ -0,0 +1,13 @@ +$NetBSD: patch-xml2cmp_source_support_list.hxx,v 1.1 2012/06/29 12:36:39 joerg Exp $ + +--- xml2cmp/source/support/list.hxx.orig 2012-06-23 16:45:20.000000000 +0000 ++++ xml2cmp/source/support/list.hxx +@@ -231,7 +231,7 @@ DynamicList::insert(unsigned pos, XY + if ( pos > this->len ) + return; + +- checkSize(this->len+2); ++ this->checkSize(this->len+2); + memmove(this->inhalt[pos+1], this->inhalt[pos], (this->len-pos) * sizeof(XY*) ); + this->inhalt[pos] = elem_; + this->len++; -- cgit v1.2.3