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.tmp/Makefile.knobs =================================================================== --- /dev/null +++ editors/openoffice-devel/files.tmp/Makefile.knobs @@ -0,0 +1,27 @@ +# Makefile for knobs +# Whom: Maho Nakata +# $FreeBSD$ + +CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant" +CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} + +pre-fetch: + @${ECHO} "OPTIONS:" + @${ECHO} + @${ECHO} "You can select the language for OOo by making it with:" + @${ECHO} "make LOCALIZED_LANG=xx" + @${ECHO} "while xx can be one of the following" + @${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da" + @${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl" + @${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk" + @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt" + @${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER" + @${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW" + @${ECHO} "zu" + @${ECHO} "Current setting: ${LOCALIZED_LANG}" + @${ECHO} + @${ECHO} "NOTICE:" + @${ECHO} + @${ECHO} "To build OOo, you should have a lot" + @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." + @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" Index: editors/openoffice-devel/files.tmp/Makefile.localized =================================================================== --- /dev/null +++ editors/openoffice-devel/files.tmp/Makefile.localized @@ -0,0 +1,400 @@ +# localized makefile +# Whom: Maho Nakata +# $FreeBSD$ +################################################################ +#See solenv/inc/postset.mk for details +################################################################ +.if defined(LOCALIZED_LANG) +.if ${LOCALIZED_LANG} == "af" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ar" +CATEGORIES+= arabic +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "as-IN" +LANG_PKGNAME= as +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "br" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ca" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "cs" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "cy" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "da" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "de" +CATEGORIES+= german +LANG_PKGNAME= ${LOCALIZED_LANG} +COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm +.endif +################################################################ +.if ${LOCALIZED_LANG} == "dz" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "el" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-GB" +LANG_PKGNAME= en +LANG_SUFFIX= GB +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-US" +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA +.endif +################################################################ +.if ${LOCALIZED_LANG} == "eo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "es" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "et" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "eu" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "fa" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "fi" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "fr" +CATEGORIES+= french +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ga" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "gl" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "gu-IN" +LANG_PKGNAME= gu +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "he" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "hi-IN" +LANG_PKGNAME= hi +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "hr" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "hu" +CATEGORIES+= hungarian +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "it" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ja" +CATEGORIES+= japanese +LANG_PKGNAME= ${LOCALIZED_LANG} +RUN_DEPENDS+= ${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ka" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "km" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "kn" +LANG_PKGNAME= kn +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ko" +CATEGORIES+= korean +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ku" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "lt" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ml-IN" +LANG_PKGNAME= ml +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mr-IN" +LANG_PKGNAME= mr +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ms" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "nb" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ne" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "nl" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "nn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "nr" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ns" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "oc" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "or-IN" +LANG_PKGNAME= or +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pa-IN" +LANG_PKGNAME= pa +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pl" +CATEGORIES+= polish +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pt" +COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado +CATEGORIES+= portuguese +LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_CONFIGURE_ARG= PORT +.endif +################################################################ +.if ${LOCALIZED_LANG} == "pt-BR" +COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado +CATEGORIES+= portuguese +LANG_PKGNAME= pt +LANG_SUFFIX= BR +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ru" +CATEGORIES+= russian +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "rw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sh" +LANG_PKGNAME= sh +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sl" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sr" +LANG_PKGNAME= sr +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ss" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "st" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ta-IN" +LANG_PKGNAME= ta +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "te-IN" +LANG_PKGNAME= te +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tg" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "th" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ti-ER" +LANG_PKGNAME= ti +LANG_SUFFIX= ER +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tr" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ts" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "uk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ur-IN" +LANG_PKGNAME= ur +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "uz" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ve" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "vi" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "xh" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-CN" +CATEGORIES+= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= CN +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-TW" +CATEGORIES+= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= TW +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zu" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.endif Index: editors/openoffice-devel/files.tmp/Makefile.others =================================================================== --- /dev/null +++ editors/openoffice-devel/files.tmp/Makefile.others @@ -0,0 +1,69 @@ +# Makefile for other stuffs +# Whom: Maho Nakata +# $FreeBSD$ + +#other stuffs which are not directly related to making ports +#package-rename: rename package for uploading +#package-canonical: making official packages (WIP) +#ure: URE (Uno Runtime Environment) packages (WIP) +#solver: solver +#languagepack: language pack + +package-rename: + @${ECHO_MSG} "===> Rename package for Apache OpenOffice mirror upload"; + @${LN} ${PKGFILE} \ + ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX} + +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice"; + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../. + +sdk: + @${ECHO_MSG} "===> Make SDK of Apache OpenOffice" + @${RM} -fr ${WRKDIR}/sdk_tmp + @${MKDIR} ${WRKDIR}/sdk_tmp + @cd ${WRKDIR}/sdk_tmp ; \ + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz + @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \ + ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ + ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk + +ure: + @${ECHO_MSG} "===> Make Uno Runtime Environment of Apache OpenOffice" + @${RM} -fr ${WRKDIR}/ure_tmp + @${MKDIR} ${WRKDIR}/ure_tmp + @cd ${WRKDIR}/ure_tmp ; \ + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz + @cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \ + ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ + ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR} + +solver: + @${ECHO_MSG} "===> Make Solver of Apache OpenOffice" + @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver + +languagepack: + @${ECHO_MSG} "===> Make languagepack of Apache OpenOffice" +.if defined (ALL_LOCALIZED_LANGS) + @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack' +.else + @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}' +.endif +.if !defined (ALL_LOCALIZED_LANGS) + @${RM} -fr ${WRKDIR}/langpack_tmp + @${MKDIR} ${WRKDIR}/langpack_tmp +.if defined (LOCALIZED_LANG) + @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK + @cd ${WRKDIR}/langpack_tmp ; \ + for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ + ${ECHO_CMD} "extracting $$i" ; \ + cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \ + done + @cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \ + ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ + ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR} +.endif +.endif Index: editors/openoffice-devel/files.tmp/patch-dbaccess_source_ui_uno_ColumnControl.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files.tmp/patch-dbaccess_source_ui_uno_ColumnControl.cxx @@ -0,0 +1,18 @@ +--- dbaccess/source/ui/uno/ColumnControl.cxx.orig 2014-09-19 17:58:10 UTC ++++ dbaccess/source/ui/uno/ColumnControl.cxx +@@ -117,6 +117,7 @@ void SAL_CALL OColumnControl::createPeer + if (!aComponentInfos.bEnable) + xW->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + xW->addWindowListener( &maWindowListeners ); + +@@ -134,6 +135,7 @@ void SAL_CALL OColumnControl::createPeer + + if (maPaintListeners.getLength()) + xW->addPaintListener( &maPaintListeners ); ++#endif + + Reference< ::com::sun::star::awt::XView > xPeerView(getPeer(), UNO_QUERY); + xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY ); Index: editors/openoffice-devel/files.tmp/patch-svx_source_fmcomp_fmgridif.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/files.tmp/patch-svx_source_fmcomp_fmgridif.cxx @@ -0,0 +1,18 @@ +--- svx/source/fmcomp/fmgridif.cxx.orig 2015-01-22 08:19:20 UTC ++++ svx/source/fmcomp/fmgridif.cxx +@@ -565,6 +565,7 @@ void SAL_CALL FmXGridControl::createPeer + if (!maComponentInfos.bEnable) + pPeer->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + pPeer->addWindowListener( &maWindowListeners ); + +@@ -582,6 +583,7 @@ void SAL_CALL FmXGridControl::createPeer + + if (maPaintListeners.getLength()) + pPeer->addPaintListener( &maPaintListeners ); ++#endif + + if (m_aModifyListeners.getLength()) + pPeer->addModifyListener( &m_aModifyListeners ); 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); + + // ------------------------------------------------------------------------------------- Index: editors/openoffice-devel/hide-patch-dbaccess_source_ui_uno_ColumnControl.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/hide-patch-dbaccess_source_ui_uno_ColumnControl.cxx @@ -0,0 +1,18 @@ +--- dbaccess/source/ui/uno/ColumnControl.cxx.orig 2014-09-19 17:58:10 UTC ++++ dbaccess/source/ui/uno/ColumnControl.cxx +@@ -117,6 +117,7 @@ void SAL_CALL OColumnControl::createPeer + if (!aComponentInfos.bEnable) + xW->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + xW->addWindowListener( &maWindowListeners ); + +@@ -134,6 +135,7 @@ void SAL_CALL OColumnControl::createPeer + + if (maPaintListeners.getLength()) + xW->addPaintListener( &maPaintListeners ); ++#endif + + Reference< ::com::sun::star::awt::XView > xPeerView(getPeer(), UNO_QUERY); + xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY ); Index: editors/openoffice-devel/hide-patch-svx_source_fmcomp_fmgridif.cxx =================================================================== --- /dev/null +++ editors/openoffice-devel/hide-patch-svx_source_fmcomp_fmgridif.cxx @@ -0,0 +1,18 @@ +--- svx/source/fmcomp/fmgridif.cxx.orig 2015-01-22 08:19:20 UTC ++++ svx/source/fmcomp/fmgridif.cxx +@@ -565,6 +565,7 @@ void SAL_CALL FmXGridControl::createPeer + if (!maComponentInfos.bEnable) + pPeer->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + pPeer->addWindowListener( &maWindowListeners ); + +@@ -582,6 +583,7 @@ void SAL_CALL FmXGridControl::createPeer + + if (maPaintListeners.getLength()) + pPeer->addPaintListener( &maPaintListeners ); ++#endif + + if (m_aModifyListeners.getLength()) + pPeer->addModifyListener( &m_aModifyListeners ); Index: editors/openoffice-devel/libreoffice-4.2.3.3-gcc-4.9-1.patch =================================================================== --- /dev/null +++ editors/openoffice-devel/libreoffice-4.2.3.3-gcc-4.9-1.patch @@ -0,0 +1,40 @@ +diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx +index 9f1da55..dfd31d7 100644 +--- a/dbaccess/source/ui/uno/ColumnControl.cxx ++++ b/dbaccess/source/ui/uno/ColumnControl.cxx +@@ -106,6 +106,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit + if (!aComponentInfos.bEnable) + xW->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + xW->addWindowListener( &maWindowListeners ); + +@@ -123,6 +124,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit + + if (maPaintListeners.getLength()) + xW->addPaintListener( &maPaintListeners ); ++#endif + + Reference< ::com::sun::star::awt::XView > xPeerView(getPeer(), UNO_QUERY); + xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY ); +diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx +index cd399ce..e5d5825 100644 +--- a/svx/source/fmcomp/fmgridif.cxx ++++ b/svx/source/fmcomp/fmgridif.cxx +@@ -551,6 +551,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: + if (!maComponentInfos.bEnable) + pPeer->setEnable(sal_False); + ++#ifndef __i386__ + if (maWindowListeners.getLength()) + pPeer->addWindowListener( &maWindowListeners ); + +@@ -568,6 +569,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: + + if (maPaintListeners.getLength()) + pPeer->addPaintListener( &maPaintListeners ); ++#endif + + if (m_aModifyListeners.getLength()) + pPeer->addModifyListener( &m_aModifyListeners );