From 74a8af2f2fd6510e34e7ef36d6f48e48d44dd2d2 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 6 Apr 2008 05:11:20 +0000 Subject: 1. For all language build "all" to "alllangs". 2. Fix hang "Glib bug". http://qa.openoffice.org/issues/show_bug.cgi?id=75190 Bump port revision for openoffice.org-2 port accordingly. 3. Fix language pack builds for openoffice.org-3-devel port. PR: 121953 (2) Submitted by: Dwayne MacKinnon and Marcin Cieslak (will be SCAed; saperski@openoffice.org) (2) --- editors/openoffice-3-devel/Makefile | 6 +- editors/openoffice-3-devel/files/Makefile.knobs | 6 +- .../openoffice-3-devel/files/Makefile.localized | 3 +- editors/openoffice-3-devel/files/Makefile.others | 8 +- editors/openoffice-3-devel/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice-3/Makefile | 6 +- editors/openoffice-3/files/Makefile.knobs | 6 +- editors/openoffice-3/files/Makefile.localized | 2 +- editors/openoffice-3/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-2-RC/Makefile | 4 +- editors/openoffice.org-2-RC/files/Makefile.knobs | 6 +- .../openoffice.org-2-RC/files/Makefile.localized | 2 +- editors/openoffice.org-2-RC/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-2-devel/Makefile | 4 +- .../openoffice.org-2-devel/files/Makefile.knobs | 6 +- .../files/Makefile.localized | 2 +- editors/openoffice.org-2-devel/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-2/Makefile | 6 +- editors/openoffice.org-2/files/Makefile.knobs | 6 +- editors/openoffice.org-2/files/Makefile.localized | 2 +- editors/openoffice.org-2/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-3-RC/Makefile | 4 +- editors/openoffice.org-3-RC/files/Makefile.knobs | 6 +- .../openoffice.org-3-RC/files/Makefile.localized | 2 +- editors/openoffice.org-3-RC/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-3-devel/Makefile | 6 +- .../openoffice.org-3-devel/files/Makefile.knobs | 6 +- .../files/Makefile.localized | 3 +- .../openoffice.org-3-devel/files/Makefile.others | 8 +- editors/openoffice.org-3-devel/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-3/Makefile | 6 +- editors/openoffice.org-3/files/Makefile.knobs | 6 +- editors/openoffice.org-3/files/Makefile.localized | 2 +- editors/openoffice.org-3/files/patch-i75190 | 107 +++++++++++++++++++++ editors/openoffice.org-vcltesttool/Makefile | 4 +- .../files/Makefile.knobs | 6 +- .../files/Makefile.localized | 2 +- .../openoffice.org-vcltesttool/files/patch-i75190 | 107 +++++++++++++++++++++ 38 files changed, 1034 insertions(+), 65 deletions(-) create mode 100644 editors/openoffice-3-devel/files/patch-i75190 create mode 100644 editors/openoffice-3/files/patch-i75190 create mode 100644 editors/openoffice.org-2-RC/files/patch-i75190 create mode 100644 editors/openoffice.org-2-devel/files/patch-i75190 create mode 100644 editors/openoffice.org-2/files/patch-i75190 create mode 100644 editors/openoffice.org-3-RC/files/patch-i75190 create mode 100644 editors/openoffice.org-3-devel/files/patch-i75190 create mode 100644 editors/openoffice.org-3/files/patch-i75190 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i75190 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 2459afd32e60..8406b00d08ed 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -201,12 +201,12 @@ do-build: @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp @@ -220,7 +220,7 @@ do-install: cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\ done @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} - @cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} + @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .else @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 6370fb721b04..63051290d634 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -121,10 +121,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -144,7 +144,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized index 1bdd7e8b3e23..a9a2c7ad694f 100644 --- a/editors/openoffice-3-devel/files/Makefile.localized +++ b/editors/openoffice-3-devel/files/Makefile.localized @@ -397,10 +397,9 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif ################################################################ .endif - \ No newline at end of file diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others index 444a91beac69..f5848df41e31 100644 --- a/editors/openoffice-3-devel/files/Makefile.others +++ b/editors/openoffice-3-devel/files/Makefile.others @@ -57,9 +57,13 @@ languagepack: @${RM} -fr ${WRKDIR}/langpack_tmp @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) + @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z - @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ + for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ + ${ECHO_CMD} "extracting $$i" ; \ + cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \ + done + @cd ${WRKDIR}/langpack_tmp/opt/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} diff --git a/editors/openoffice-3-devel/files/patch-i75190 b/editors/openoffice-3-devel/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 1ff8da786317..9966a8b02df0 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -198,12 +198,12 @@ do-build: .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice-3/files/Makefile.knobs +++ b/editors/openoffice-3/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice-3/files/Makefile.localized +++ b/editors/openoffice-3/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice-3/files/patch-i75190 b/editors/openoffice-3/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice-3/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index c61303901bc0..6855e543dde3 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -198,12 +198,12 @@ do-build: .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.knobs +++ b/editors/openoffice.org-2-RC/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.localized +++ b/editors/openoffice.org-2-RC/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-2-RC/files/patch-i75190 b/editors/openoffice.org-2-RC/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 0a283e19b81d..a7f6af36e732 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -202,12 +202,12 @@ do-build: @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2-devel/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.localized +++ b/editors/openoffice.org-2-devel/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-2-devel/files/patch-i75190 b/editors/openoffice.org-2-devel/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 1ff8da786317..9966a8b02df0 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -198,12 +198,12 @@ do-build: .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-2/files/Makefile.knobs +++ b/editors/openoffice.org-2/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-2/files/Makefile.localized +++ b/editors/openoffice.org-2/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-2/files/patch-i75190 b/editors/openoffice.org-2/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-2/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index c61303901bc0..6855e543dde3 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -198,12 +198,12 @@ do-build: .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.knobs +++ b/editors/openoffice.org-3-RC/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.localized +++ b/editors/openoffice.org-3-RC/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-3-RC/files/patch-i75190 b/editors/openoffice.org-3-RC/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 2459afd32e60..8406b00d08ed 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -201,12 +201,12 @@ do-build: @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp @@ -220,7 +220,7 @@ do-install: cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\ done @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} - @cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} + @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .else @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index 6370fb721b04..63051290d634 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -121,10 +121,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -144,7 +144,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized index 1bdd7e8b3e23..a9a2c7ad694f 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.localized +++ b/editors/openoffice.org-3-devel/files/Makefile.localized @@ -397,10 +397,9 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif ################################################################ .endif - \ No newline at end of file diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others index 444a91beac69..f5848df41e31 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.others +++ b/editors/openoffice.org-3-devel/files/Makefile.others @@ -57,9 +57,13 @@ languagepack: @${RM} -fr ${WRKDIR}/langpack_tmp @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) + @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z - @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ + for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ + ${ECHO_CMD} "extracting $$i" ; \ + cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \ + done + @cd ${WRKDIR}/langpack_tmp/opt/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} diff --git a/editors/openoffice.org-3-devel/files/patch-i75190 b/editors/openoffice.org-3-devel/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 1ff8da786317..9966a8b02df0 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ @@ -198,12 +198,12 @@ do-build: .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-3/files/Makefile.knobs +++ b/editors/openoffice.org-3/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-3/files/Makefile.localized +++ b/editors/openoffice.org-3/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-3/files/patch-i75190 b/editors/openoffice.org-3/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-3/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 0a283e19b81d..a7f6af36e732 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -202,12 +202,12 @@ do-build: @cd ${WRKSRC} ; ./bootstrap @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index a0926318a1c6..e34df3fe27d8 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs @@ -118,10 +118,10 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if ${LOCALIZED_LANG} != "all" +.if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" - @${ECHO} "make LOCALIZED_LANG=all" + @${ECHO} "make LOCALIZED_LANG=alllangs" .endif @${ECHO} @${ECHO} "You can select the language for OOo by making it with:" @@ -141,7 +141,7 @@ pre-fetch: @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." -.elif ${LOCALIZED_LANG} == "all" +.elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized index 1e928e2e04cd..a9a2c7ad694f 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.localized +++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized @@ -397,7 +397,7 @@ BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "all" +.if ${LOCALIZED_LANG} == "alllangs" ALL_LOCALIZED_LANGS=yes PKGNAMESUFFIX= -alllangs .endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-i75190 b/editors/openoffice.org-vcltesttool/files/patch-i75190 new file mode 100644 index 000000000000..f382267ffd7e --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i75190 @@ -0,0 +1,107 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=121953 (Dwayne MacKinnon) +http://qa.openoffice.org/issues/show_bug.cgi?id=75190 +Turn the GTK Recent Manager feature off. +Other workaround +% setenv OOO_FORCE_DESKTOP gnome + +Backout of misfeature in cws_src680_obr05 branch. +* rev 1.9 of gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +* rev 1.8 of gsl/shell/source/unix/sysshell/systemshell.cxx + +See also +http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/003453.html +gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx +(rev. 1.8.44.2) +gsl/shell/source/unix/sysshell/systemshell.cxx +(rev. 1.7.44.1) + +Index: systemshell.cxx +=================================================================== +RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v +retrieving revision 1.8 +diff -u -u -r1.8 systemshell.cxx +--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8 ++++ shell/source/unix/sysshell/systemshell.cxx 30 Mar 2008 22:06:15 -0000 +@@ -72,9 +72,6 @@ + const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so"); + const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext"); + +-void * (* sym_gtk_recent_manager_get_default) () = NULL; +-void (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL; +- + // We need to re-encode file urls because osl_getFileURLFromSystemPath converts + // to UTF-8 before encoding non ascii characters, which is not what other apps expect. + static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +@@ -114,57 +111,31 @@ + return url; + } + +- bool init_recent_manager_api() +- { +- oslModule hDefault; +- if( osl_getModuleHandle( NULL, &hDefault ) ) +- { +- sym_gtk_recent_manager_get_default = (void * (*)()) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default"); +- sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) +- osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item"); +- +- } +- bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item); +- return ret; +- } +- +- + //############################## + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + { +- static bool bIsRecentManagerPresent = init_recent_manager_api(); +- + // Convert file URL for external use (see above) + rtl::OUString externalUrl = translateToExternalUrl(aFileUrl); ++ rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); ++ + if( 0 == externalUrl.getLength() ) + externalUrl = aFileUrl; +- +- if( bIsRecentManagerPresent ) +- { +- void * recent_manager = sym_gtk_recent_manager_get_default(); +- sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); +- } +- else ++ ++ if (librecentfile_url.getLength()) + { +- rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE); +- +- if (librecentfile_url.getLength()) +- { +- osl::Module module(librecentfile_url); ++ osl::Module module(librecentfile_url); + +- if (module.is()) +- { +- // convert from reinterpret_cast +- // not allowed in gcc 3.3 without permissive. +- PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = +- reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); +- +- if (add_to_recently_used_file_list) +- add_to_recently_used_file_list(aFileUrl, aMimeType); +- } ++ if (module.is()) ++ { ++ // convert from reinterpret_cast ++ // not allowed in gcc 3.3 without permissive. ++ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = ++ reinterpret_cast(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST)); ++ ++ if (add_to_recently_used_file_list) ++ add_to_recently_used_file_list(aFileUrl, aMimeType); + } +- } ++ } + } + + } // namespace SystemShell -- cgit v1.2.3