Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile +++ editors/openoffice-devel/Makefile @@ -100,7 +100,7 @@ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes -USE_GCC= 4.8 +USE_GCC= 4.9 USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:xz USE_PERL5= build WITHOUT_CPU_CFLAGS= true Index: editors/openoffice-devel/files/patch-toolkit_inc_toolkit_helper_listenermultiplexer.hxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-toolkit_inc_toolkit_helper_listenermultiplexer.hxx @@ -0,0 +1,47 @@ +--- toolkit/inc/toolkit/helper/listenermultiplexer.hxx.orig 2014-09-19 18:06:55 UTC ++++ toolkit/inc/toolkit/helper/listenermultiplexer.hxx +@@ -86,7 +86,7 @@ DECL_LISTENERMULTIPLEXER_END + // ---------------------------------------------------- + // class FocusListenerMultiplexer + // ---------------------------------------------------- +-DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) ++DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) + void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException); + DECL_LISTENERMULTIPLEXER_END +@@ -95,7 +95,7 @@ DECL_LISTENERMULTIPLEXER_END + // ---------------------------------------------------- + // class WindowListenerMultiplexer + // ---------------------------------------------------- +-DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) ++DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) + void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException); +@@ -115,7 +115,7 @@ DECL_LISTENERMULTIPLEXER_END + // ---------------------------------------------------- + // class KeyListenerMultiplexer + // ---------------------------------------------------- +-DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) ++DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) + void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException); + DECL_LISTENERMULTIPLEXER_END +@@ -133,7 +133,7 @@ DECL_LISTENERMULTIPLEXER_END + // ---------------------------------------------------- + // class MouseMotionListenerMultiplexer + // ---------------------------------------------------- +-DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) ++DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) + void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException); + DECL_LISTENERMULTIPLEXER_END +@@ -141,7 +141,7 @@ DECL_LISTENERMULTIPLEXER_END + // ---------------------------------------------------- + // class PaintListenerMultiplexer + // ---------------------------------------------------- +-DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) ++DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) + void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException); + DECL_LISTENERMULTIPLEXER_END + Index: editors/openoffice-devel/files/patch-toolkit_inc_toolkit_helper_macros.hxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files/patch-toolkit_inc_toolkit_helper_macros.hxx @@ -0,0 +1,13 @@ +--- toolkit/inc/toolkit/helper/macros.hxx.orig 2014-09-19 18:06:54 UTC ++++ toolkit/inc/toolkit/helper/macros.hxx +@@ -147,8 +147,8 @@ class TOOLKIT_DLLPUBLIC ClassName : publ + public: \ + ClassName( ::cppu::OWeakObject& rSource ); \ + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); \ +- void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ +- void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ ++ void SAL_CALL TOOLKIT_DLLPUBLIC acquire() throw() { ListenerMultiplexerBase::acquire(); } \ ++ void SAL_CALL TOOLKIT_DLLPUBLIC release() throw() { ListenerMultiplexerBase::release(); } \ + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + + // -------------------------------------------------------------------------------------