| 1 | <!DOCTYPE html
|
|---|
| 2 | PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|---|
| 3 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|---|
| 4 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
|---|
| 5 | <head>
|
|---|
| 6 | <title>#1758: OpenOffice2.0.2-required.patch - BLFS Trac</title><link rel="start" href="/blfs/wiki" /><link rel="search" href="/blfs/search" /><link rel="help" href="/blfs/wiki/TracGuide" /><link rel="stylesheet" href="/blfs/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/blfs/chrome/common/css/diff.css" type="text/css" /><link rel="stylesheet" href="/blfs/chrome/common/css/code.css" type="text/css" /><link rel="icon" href="/blfs/chrome/site/favicon.ico" type="image/x-icon" /><link rel="shortcut icon" href="/blfs/chrome/site/favicon.ico" type="image/x-icon" /><link rel="up" href="/blfs/ticket/1758" title="Ticket #1758" /><link rel="alternate" href="/blfs/attachment/ticket/1758/OpenOffice2.0.2-required.patch?format=raw" title="Original Format" type="text/x-diff" /><style type="text/css">
|
|---|
| 7 |
|
|---|
| 8 | @import url(/blfs/chrome/site/main.css);
|
|---|
| 9 | #mainnav .active :link, #mainnav .active :visited {
|
|---|
| 10 | background: #a27700;
|
|---|
| 11 | }
|
|---|
| 12 |
|
|---|
| 13 | </style>
|
|---|
| 14 | <script type="text/javascript" src="/blfs/chrome/common/js/trac.js"></script>
|
|---|
| 15 | </head>
|
|---|
| 16 | <body>
|
|---|
| 17 |
|
|---|
| 18 | <div id="topnav">
|
|---|
| 19 | <ul>
|
|---|
| 20 | <li><a href="/lfs/">LFS</a></li>
|
|---|
| 21 | <li class="blfsactive"><a href="/blfs/">BLFS</a></li>
|
|---|
| 22 | <li><a href="/alfs/">ALFS</a></li>
|
|---|
| 23 | <li><a href="/clfs/">CLFS</a></li>
|
|---|
| 24 | <li><a href="/hlfs/">HLFS</a></li>
|
|---|
| 25 | <li><a href="/hints/">Hints</a></li>
|
|---|
| 26 | <li><a href="/livecd/">LiveCD</a></li>
|
|---|
| 27 | <li><a href="/patches/">Patches</a></li>
|
|---|
| 28 | </ul>
|
|---|
| 29 | </div>
|
|---|
| 30 |
|
|---|
| 31 |
|
|---|
| 32 | <div id="banner">
|
|---|
| 33 |
|
|---|
| 34 | <div id="header"><a id="logo" href="http://wiki.linuxfromscratch.org/blfs"><img src="/blfs/chrome/site/lfs-logo.png" width="192" height="75" alt="Beyond Linux From Scratch" /></a><hr /></div>
|
|---|
| 35 |
|
|---|
| 36 | <form id="search" action="/blfs/search" method="get">
|
|---|
| 37 | <div>
|
|---|
| 38 | <label for="proj-search">Search:</label>
|
|---|
| 39 | <input type="text" id="proj-search" name="q" size="10" accesskey="f" value="" />
|
|---|
| 40 | <input type="submit" value="Search" />
|
|---|
| 41 | <input type="hidden" name="wiki" value="on" />
|
|---|
| 42 | <input type="hidden" name="changeset" value="on" />
|
|---|
| 43 | <input type="hidden" name="ticket" value="on" />
|
|---|
| 44 | </div>
|
|---|
| 45 | </form>
|
|---|
| 46 |
|
|---|
| 47 |
|
|---|
| 48 |
|
|---|
| 49 | <div id="metanav" class="nav"><ul><li class="first">logged in as martyj19</li><li><a href="/blfs/logout">Logout</a></li><li><a href="/blfs/settings">Settings</a></li><li><a href="/blfs/wiki/TracGuide" accesskey="6">Help/Guide</a></li><li><a href="/blfs/about">About Trac</a></li><li class="last"><a href="/blfs/account">My Account</a></li></ul></div>
|
|---|
| 50 | </div>
|
|---|
| 51 |
|
|---|
| 52 | <div id="mainnav" class="nav"><ul><li class="first"><a href="/blfs/wiki" accesskey="1">Wiki</a></li><li><a href="/blfs/timeline" accesskey="2">Timeline</a></li><li><a href="/blfs/roadmap" accesskey="3">Roadmap</a></li><li><a href="/blfs/browser">Browse Source</a></li><li><a href="/blfs/report">View Tickets</a></li><li><a href="/blfs/newticket" accesskey="7">New Ticket</a></li><li class="last"><a href="/blfs/search" accesskey="4">Search</a></li></ul></div>
|
|---|
| 53 | <div id="main">
|
|---|
| 54 |
|
|---|
| 55 |
|
|---|
| 56 |
|
|---|
| 57 |
|
|---|
| 58 | <div id="ctxtnav" class="nav"></div>
|
|---|
| 59 |
|
|---|
| 60 | <div id="content" class="attachment">
|
|---|
| 61 |
|
|---|
| 62 |
|
|---|
| 63 | <h1><a href="/blfs/ticket/1758">Ticket #1758</a>: OpenOffice2.0.2-required.patch</h1>
|
|---|
| 64 | <div id="preview">
|
|---|
| 65 |
|
|---|
| 66 |
|
|---|
| 67 |
|
|---|
| 68 | <div class="diff"><ul class="entries"><li class="entry">
|
|---|
| 69 | <h2>OOB680_m5.orig/config_office/configure</h2>
|
|---|
| 70 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 71 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 72 | <thead><tr>
|
|---|
| 73 | <th>old</th>
|
|---|
| 74 | <th>new</th>
|
|---|
| 75 | <th> </th>
|
|---|
| 76 | </tr></thead><tbody><tr><th>309</th><th>309</th><td class="l"><span># include <unistd.h></span> </td></tr><tr><th>310</th><th>310</th><td class="l"><span>#endif"</span> </td></tr><tr><th>311</th><th>311</th><td class="l"><span></span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>312</th><th> </th><td class="l">ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA <del></del>MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' </td></tr><tr class="last"><th> </th><th>312</th><td class="r">ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA <ins>SYSTEM_FIREFOX </ins>MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' </td></tr></tbody><tbody><tr><th>313</th><th>313</th><td class="l"><span>ac_subst_files=''</span> </td></tr><tr><th>314</th><th>314</th><td class="l"><span></span> </td></tr><tr><th>315</th><th>315</th><td class="l"><span># Initialize some variables set by options.</span> </td></tr></tbody>
|
|---|
| 77 | <tbody class="skipped">
|
|---|
| 78 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 79 | </tbody><tbody><tr><th>11764</th><th>11764</th><td class="l"><span>echo $ECHO_N "checking whether to use Mozilla or Firefox... $ECHO_C" >&6</span> </td></tr><tr><th>11765</th><th>11765</th><td class="l"><span> if test -n "$with_firefox" && test "$with_firefox" != "no"; then</span> </td></tr><tr><th>11766</th><th>11766</th><td class="l"><span> moz_flavour=firefox</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>11767</th><td class="r"><ins> SYSTEM_FIREFOX=YES</ins> </td></tr></tbody><tbody><tr><th>11767</th><th>11768</th><td class="l"><span> else</span> </td></tr><tr><th>11768</th><th>11769</th><td class="l"><span> moz_flavour=mozilla</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>11770</th><td class="r"><ins> SYSTEM_FIREFOX=NO</ins> </td></tr></tbody><tbody><tr><th>11769</th><th>11771</th><td class="l"><span> fi</span> </td></tr><tr><th>11770</th><th>11772</th><td class="l"><span> tmp=`echo $moz_flavour | $PERL -e 'print ucfirst(<STDIN>);'`</span> </td></tr><tr><th>11771</th><th>11773</th><td class="l"><span> echo "$as_me:$LINENO: result: $tmp" >&5</span> </td></tr></tbody>
|
|---|
| 80 | <tbody class="skipped">
|
|---|
| 81 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 82 | </tbody><tbody><tr><th>12386</th><th>12388</th><td class="l"><span> echo "$as_me:$LINENO: result: internal" >&5</span> </td></tr><tr><th>12387</th><th>12389</th><td class="l"><span>echo "${ECHO_T}internal" >&6</span> </td></tr><tr><th>12388</th><th>12390</th><td class="l"><span> SYSTEM_MOZILLA=NO</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>12391</th><td class="r"><ins> SYSTEM_FIREFOX=NO</ins> </td></tr></tbody><tbody><tr><th>12389</th><th>12392</th><td class="l"><span> BUILD_TYPE="$BUILD_TYPE MOZ"</span> </td></tr><tr><th>12390</th><th>12393</th><td class="l"><span>if test -z "$with_mozilla_version"; then</span> </td></tr><tr><th>12391</th><th>12394</th><td class="l"><span> MOZILLA_VERSION=</span> </td></tr></tbody>
|
|---|
| 83 | <tbody class="skipped">
|
|---|
| 84 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 85 | </tbody><tbody><tr><th>21181</th><th>21184</th><td class="l"><span>s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t</span> </td></tr><tr><th>21182</th><th>21185</th><td class="l"><span>s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t</span> </td></tr><tr><th>21183</th><th>21186</th><td class="l"><span>s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>21187</th><td class="r"><ins>s,@SYSTEM_FIREFOX@,$SYSTEM_FIREFOX,;t t</ins> </td></tr></tbody><tbody><tr><th>21184</th><th>21188</th><td class="l"><span>s,@MOZ_INC@,$MOZ_INC,;t t</span> </td></tr><tr><th>21185</th><th>21189</th><td class="l"><span>s,@MOZ_LIB@,$MOZ_LIB,;t t</span> </td></tr><tr><th>21186</th><th>21190</th><td class="l"><span>s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t</span> </td></tr></tbody>
|
|---|
| 86 | </table>
|
|---|
| 87 | </li><li class="entry">
|
|---|
| 88 | <h2>OOB680_m5.orig/config_office/configure.in</h2>
|
|---|
| 89 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 90 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 91 | <thead><tr>
|
|---|
| 92 | <th>old</th>
|
|---|
| 93 | <th>new</th>
|
|---|
| 94 | <th> </th>
|
|---|
| 95 | </tr></thead><tbody><tr><th>2876</th><th>2876</th><td class="l"><span> AC_MSG_CHECKING([whether to use Mozilla or Firefox])</span> </td></tr><tr><th>2877</th><th>2877</th><td class="l"><span> if test -n "$with_firefox" && test "$with_firefox" != "no"; then</span> </td></tr><tr><th>2878</th><th>2878</th><td class="l"><span> moz_flavour=firefox</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>2879</th><td class="r"><ins> SYSTEM_FIREFOX=YES</ins> </td></tr></tbody><tbody><tr><th>2879</th><th>2880</th><td class="l"><span> else</span> </td></tr><tr><th>2880</th><th>2881</th><td class="l"><span> moz_flavour=mozilla</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>2882</th><td class="r"><ins> SYSTEM_FIREFOX=NO</ins> </td></tr></tbody><tbody><tr><th>2881</th><th>2883</th><td class="l"><span> fi</span> </td></tr><tr><th>2882</th><th>2884</th><td class="l"><span> tmp=`echo $moz_flavour | $PERL -e 'print ucfirst(<STDIN>);'`</span> </td></tr><tr><th>2883</th><th>2885</th><td class="l"><span> AC_MSG_RESULT($tmp)</span> </td></tr></tbody>
|
|---|
| 96 | <tbody class="skipped">
|
|---|
| 97 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 98 | </tbody><tbody><tr><th>2928</th><th>2930</th><td class="l"><span>else</span> </td></tr><tr><th>2929</th><th>2931</th><td class="l"><span> AC_MSG_RESULT([internal])</span> </td></tr><tr><th>2930</th><th>2932</th><td class="l"><span> SYSTEM_MOZILLA=NO</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>2933</th><td class="r"><ins> SYSTEM_FIREFOX=NO</ins> </td></tr></tbody><tbody><tr><th>2931</th><th>2934</th><td class="l"><span> BUILD_TYPE="$BUILD_TYPE MOZ"</span> </td></tr><tr><th>2932</th><th>2935</th><td class="l"><span>if test -z "$with_mozilla_version"; then</span> </td></tr><tr><th>2933</th><th>2936</th><td class="l"><span> MOZILLA_VERSION=</span> </td></tr></tbody>
|
|---|
| 99 | <tbody class="skipped">
|
|---|
| 100 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 101 | </tbody><tbody><tr><th>3025</th><th>3028</th><td class="l"><span></span> </td></tr><tr><th>3026</th><th>3029</th><td class="l"><span>fi</span> </td></tr><tr><th>3027</th><th>3030</th><td class="l"><span>AC_SUBST(SYSTEM_MOZILLA)</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>3031</th><td class="r"><ins>AC_SUBST(SYSTEM_FIREFOX)</ins> </td></tr></tbody><tbody><tr><th>3028</th><th>3032</th><td class="l"><span>AC_SUBST(MOZ_INC)</span> </td></tr><tr><th>3029</th><th>3033</th><td class="l"><span>AC_SUBST(MOZ_LIB)</span> </td></tr><tr><th>3030</th><th>3034</th><td class="l"><span>AC_SUBST(MOZ_LIB_XPCOM)</span> </td></tr></tbody>
|
|---|
| 102 | </table>
|
|---|
| 103 | </li><li class="entry">
|
|---|
| 104 | <h2>OOB680_m5.orig/config_office/set_soenv.in</h2>
|
|---|
| 105 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 106 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 107 | <thead><tr>
|
|---|
| 108 | <th>old</th>
|
|---|
| 109 | <th>new</th>
|
|---|
| 110 | <th> </th>
|
|---|
| 111 | </tr></thead><tbody><tr><th>86</th><th>86</th><td class="l"><span> $ATL_LIB, $ATL_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,</span> </td></tr><tr><th>87</th><th>87</th><td class="l"><span> $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,</span> </td></tr><tr><th>88</th><th>88</th><td class="l"><span> $PROEXT,</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>89</th><th> </th><td class="l"> $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA<del></del> ); </td></tr><tr class="last"><th> </th><th>89</th><td class="r"> $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA<ins>, $SYSTEM_FIREFOX</ins> ); </td></tr></tbody><tbody><tr><th>90</th><th>90</th><td class="l"><span>#</span> </td></tr><tr><th>91</th><th>91</th><td class="l"><span>#-------------------------------------------</span> </td></tr><tr><th>92</th><th>92</th><td class="l"><span># IId. Declaring the aliases.</span> </td></tr></tbody>
|
|---|
| 112 | <tbody class="skipped">
|
|---|
| 113 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 114 | </tbody><tbody><tr><th>119</th><th>119</th><td class="l"><span>$STLPORT4 = '@STLPORT4@'; # Location of STLport4</span> </td></tr><tr><th>120</th><th>120</th><td class="l"><span>$SYSTEM_PYTHON = '@SYSTEM_PYTHON@';</span> </td></tr><tr><th>121</th><th>121</th><td class="l"><span>$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>122</th><td class="r"><ins>$SYSTEM_FIREFOX = '@SYSTEM_FIREFOX@';</ins> </td></tr></tbody><tbody><tr><th>122</th><th>123</th><td class="l"><span>$JDK = '@JDK@';</span> </td></tr><tr><th>123</th><th>124</th><td class="l"><span>$MINGW = '@WITH_MINGWIN@'; # use MinGW for Windows build</span> </td></tr><tr><th>124</th><th>125</th><td class="l"><span>$CC = '@CC@'; # C compiler</span> </td></tr></tbody>
|
|---|
| 115 | <tbody class="skipped">
|
|---|
| 116 | <tr><th>…</th><th>…</th><td> </td></tr>
|
|---|
| 117 | </tbody><tbody><tr><th>1740</th><th>1741</th><td class="l"><span>ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" );</span> </td></tr><tr><th>1741</th><th>1742</th><td class="l"><span>ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );</span> </td></tr><tr><th>1742</th><th>1743</th><td class="l"><span>ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" );</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>1744</th><td class="r"><ins>ToFile( "SYSTEM_FIREFOX", "@SYSTEM_FIREFOX@", "e" );</ins> </td></tr></tbody><tbody><tr><th>1743</th><th>1745</th><td class="l"><span>ToFile( "MOZ_INC", "@MOZ_INC@", "e" );</span> </td></tr><tr><th>1744</th><th>1746</th><td class="l"><span>ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" );</span> </td></tr><tr><th>1745</th><th>1747</th><td class="l"><span>ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );</span> </td></tr></tbody>
|
|---|
| 118 | </table>
|
|---|
| 119 | </li><li class="entry">
|
|---|
| 120 | <h2>OOB680_m5.orig/extensions/source/plugin/util/makefile.pmk</h2>
|
|---|
| 121 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 122 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 123 | <thead><tr>
|
|---|
| 124 | <th>old</th>
|
|---|
| 125 | <th>new</th>
|
|---|
| 126 | <th> </th>
|
|---|
| 127 | </tr></thead><tbody><tr><th>41</th><th>41</th><td class="l"><span></span> </td></tr><tr><th>42</th><th>42</th><td class="l"><span>.IF "$(SYSTEM_MOZILLA)" == "YES"</span> </td></tr><tr><th>43</th><th>43</th><td class="l"><span>CFLAGS+=-DSYSTEM_MOZILLA</span> </td></tr></tbody><tbody class="add"><tr class="first"><th> </th><th>44</th><td class="r"><ins>.IF "$(SYSTEM_FIREFOX)" == "YES"</ins> </td></tr><tr><th> </th><th>45</th><td class="r"><ins>PKGCONFIG_MODULES=firefox-plugin</ins> </td></tr><tr class="last"><th> </th><th>46</th><td class="r"><ins>.ELSE</ins> </td></tr></tbody><tbody><tr><th>44</th><th>47</th><td class="l"><span>PKGCONFIG_MODULES=mozilla-plugin</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>48</th><td class="r"><ins>.ENDIF</ins> </td></tr></tbody><tbody><tr><th>45</th><th>49</th><td class="l"><span>.INCLUDE : pkg_config.mk</span> </td></tr><tr><th>46</th><th>50</th><td class="l"><span>.ENDIF</span> </td></tr></tbody>
|
|---|
| 128 | </table>
|
|---|
| 129 | </li><li class="entry">
|
|---|
| 130 | <h2>OOB680_m5.orig/filter/source/config/fragments/makefile.mk</h2>
|
|---|
| 131 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 132 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 133 | <thead><tr>
|
|---|
| 134 | <th>old</th>
|
|---|
| 135 | <th>new</th>
|
|---|
| 136 | <th> </th>
|
|---|
| 137 | </tr></thead><tbody><tr><th>156</th><th>156</th><td class="l"><span>MERGE:=python ../tools/merge/pyAltFCFGMerge</span> </td></tr><tr><th>157</th><th>157</th><td class="l"><span>.ELSE</span> </td></tr><tr><th>158</th><th>158</th><td class="l"><span>MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>159</th><th> </th><td class="l">.IF "$(J<del>DK)" == "gcj</del>" </td></tr><tr><th>160</th><th> </th><td class="l">XALANCLASS=$(S<del>OLARBINDIR</del>)/xalan.jar </td></tr><tr><th>161</th><th> </th><td class="l">CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))} </td></tr><tr><th>162</th><th> </th><td class="l">.ENDIF </td></tr><tr><th> </th><th>159</th><td class="r">.IF "$(J<ins>AVA_HOME)" != "</ins>" </td></tr><tr><th> </th><th>160</th><td class="r">XALANCLASS=$(S<ins>TAR_RESOURCEPATH</ins>)/xalan.jar </td></tr><tr><th> </th><th>161</th><td class="r">PACKLANG := $(JAVAI) -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(XALANCLASS) org.apache.xalan.xslt.Process -XSL langfilter.xsl </td></tr><tr class="last"><th> </th><th>162</th><td class="r">.ELSE </td></tr></tbody><tbody><tr><th>163</th><th>163</th><td class="l"><span>PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl</span> </td></tr><tr><th>164</th><th>164</th><td class="l"><span>.ENDIF</span> </td></tr></tbody><tbody class="add"><tr class="first last"><th> </th><th>165</th><td class="r"><ins>.ENDIF</ins> </td></tr></tbody><tbody><tr><th>165</th><th>166</th><td class="l"><span></span> </td></tr><tr><th>166</th><th>167</th><td class="l"><span># -----------------------------------------------------------------------------</span> </td></tr><tr><th>167</th><th>168</th><td class="l"><span># build every module seperated</span> </td></tr></tbody>
|
|---|
| 138 | </table>
|
|---|
| 139 | </li><li class="entry">
|
|---|
| 140 | <h2>OOB680_m5.orig/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java</h2>
|
|---|
| 141 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 142 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 143 | <thead><tr>
|
|---|
| 144 | <th>old</th>
|
|---|
| 145 | <th>new</th>
|
|---|
| 146 | <th> </th>
|
|---|
| 147 | </tr></thead><tbody><tr><th>73</th><th>73</th><td class="l"><span> SVersionRCFile sversion = SVersionRCFile.createInstance();</span> </td></tr><tr><th>74</th><th>74</th><td class="l"><span> </span> </td></tr><tr><th>75</th><th>75</th><td class="l"><span> try {</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>76</th><th> </th><td class="l"> Enumeration enum<del></del> = sversion.getVersions(); </td></tr><tr class="last"><th> </th><th>76</th><td class="r"> Enumeration enum<ins>er</ins> = sversion.getVersions(); </td></tr></tbody><tbody><tr><th>77</th><th>77</th><td class="l"><span> OfficeInstallation oi;</span> </td></tr><tr><th>78</th><th>78</th><td class="l"><span></span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>79</th><th> </th><td class="l"> while (enum<del></del>.hasMoreElements()) { </td></tr><tr><th>80</th><th> </th><td class="l"> oi = (OfficeInstallation)enum<del></del>.nextElement(); </td></tr><tr><th> </th><th>79</th><td class="r"> while (enum<ins>er</ins>.hasMoreElements()) { </td></tr><tr class="last"><th> </th><th>80</th><td class="r"> oi = (OfficeInstallation)enum<ins>er</ins>.nextElement(); </td></tr></tbody><tbody><tr><th>81</th><th>81</th><td class="l"><span> setOfficeDirectory(oi);</span> </td></tr><tr><th>82</th><th>82</th><td class="l"><span> return;</span> </td></tr><tr><th>83</th><th>83</th><td class="l"><span> }</span> </td></tr></tbody>
|
|---|
| 148 | </table>
|
|---|
| 149 | </li><li class="entry">
|
|---|
| 150 | <h2>OOB680_m5.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java</h2>
|
|---|
| 151 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 152 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 153 | <thead><tr>
|
|---|
| 154 | <th>old</th>
|
|---|
| 155 | <th>new</th>
|
|---|
| 156 | <th> </th>
|
|---|
| 157 | </tr></thead><tbody><tr><th>127</th><th>127</th><td class="l"><span> * <code>Vector</code> of <code>Document</code> objects.</span> </td></tr><tr><th>128</th><th>128</th><td class="l"><span> */</span> </td></tr><tr><th>129</th><th>129</th><td class="l"><span> public Enumeration getDocumentEnumeration() {</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>130</th><th> </th><td class="l"> Enumeration enum<del></del> = v.elements(); </td></tr><tr><th>131</th><th> </th><td class="l"> return (enum<del></del>); </td></tr><tr><th> </th><th>130</th><td class="r"> Enumeration enum<ins>er</ins> = v.elements(); </td></tr><tr class="last"><th> </th><th>131</th><td class="r"> return (enum<ins>er</ins>); </td></tr></tbody><tbody><tr><th>132</th><th>132</th><td class="l"><span> }</span> </td></tr><tr><th>133</th><th>133</th><td class="l"><span></span> </td></tr><tr><th>134</th><th>134</th><td class="l"><span></span> </td></tr></tbody>
|
|---|
| 158 | </table>
|
|---|
| 159 | </li><li class="entry">
|
|---|
| 160 | <h2>OOB680_m5.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java</h2>
|
|---|
| 161 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 162 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 163 | <thead><tr>
|
|---|
| 164 | <th>old</th>
|
|---|
| 165 | <th>new</th>
|
|---|
| 166 | <th> </th>
|
|---|
| 167 | </tr></thead><tbody><tr><th>155</th><th>155</th><td class="l"><span> */</span> </td></tr><tr><th>156</th><th>156</th><td class="l"><span> public Document deserialize() throws ConvertException, IOException {</span> </td></tr><tr><th>157</th><th>157</th><td class="l"><span> log("\nFound the XSLT deserializer");</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>158</th><th> </th><td class="l"> Enumeration enum<del></del> = cd.getDocumentEnumeration(); </td></tr><tr class="last"><th> </th><th>158</th><td class="r"> Enumeration enum<ins>er</ins> = cd.getDocumentEnumeration(); </td></tr></tbody><tbody><tr><th>159</th><th>159</th><td class="l"><span> org.w3c.dom.Document domDoc=null;</span> </td></tr><tr><th>160</th><th>160</th><td class="l"><span> DOMDocument docOut=null;</span> </td></tr><tr><th>161</th><th>161</th><td class="l"><span> GenericOfficeDocument doc = null;</span> </td></tr><tr><th>162</th><th>162</th><td class="l"><span> ByteArrayOutputStream baos =null;</span> </td></tr><tr><th>163</th><th>163</th><td class="l"><span> GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>164</th><th> </th><td class="l"> while (enum<del></del>.hasMoreElements()) { </td></tr><tr><th>165</th><th> </th><td class="l"> docOut = (DOMDocument) enum<del></del>.nextElement(); </td></tr><tr><th> </th><th>164</th><td class="r"> while (enum<ins>er</ins>.hasMoreElements()) { </td></tr><tr class="last"><th> </th><th>165</th><td class="r"> docOut = (DOMDocument) enum<ins>er</ins>.nextElement(); </td></tr></tbody><tbody><tr><th>166</th><th>166</th><td class="l"><span> }</span> </td></tr><tr><th>167</th><th>167</th><td class="l"><span> domDoc = docOut.getContentDOM(); </span> </td></tr><tr><th>168</th><th>168</th><td class="l"><span> try{</span> </td></tr></tbody>
|
|---|
| 168 | </table>
|
|---|
| 169 | </li><li class="entry">
|
|---|
| 170 | <h2>OOB680_m5.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java</h2>
|
|---|
| 171 | <table class="inline" summary="Differences" cellspacing="0">
|
|---|
| 172 | <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
|
|---|
| 173 | <thead><tr>
|
|---|
| 174 | <th>old</th>
|
|---|
| 175 | <th>new</th>
|
|---|
| 176 | <th> </th>
|
|---|
| 177 | </tr></thead><tbody><tr><th>183</th><th>183</th><td class="l"><span> String ext= ".txt";</span> </td></tr><tr><th>184</th><th>184</th><td class="l"><span> String mimeType = null;</span> </td></tr><tr><th>185</th><th>185</th><td class="l"><span> ConverterInfo ci = this.getConverterInfo();</span> </td></tr></tbody><tbody class="mod"><tr class="first"><th>186</th><th> </th><td class="l"> Enumeration enum<del></del> = ci.getDeviceMime(); </td></tr><tr><th>187</th><th> </th><td class="l"> while (enum<del></del>.hasMoreElements()) { </td></tr><tr><th>188</th><th> </th><td class="l"> mimeType= (String) enum<del></del>.nextElement(); </td></tr><tr><th> </th><th>186</th><td class="r"> Enumeration enum<ins>er</ins> = ci.getDeviceMime(); </td></tr><tr><th> </th><th>187</th><td class="r"> while (enum<ins>er</ins>.hasMoreElements()) { </td></tr><tr class="last"><th> </th><th>188</th><td class="r"> mimeType= (String) enum<ins>er</ins>.nextElement(); </td></tr></tbody><tbody><tr><th>189</th><th>189</th><td class="l"><span> }</span> </td></tr><tr><th>190</th><th>190</th><td class="l"><span> try {</span> </td></tr><tr><th>191</th><th>191</th><td class="l"><span> props.load(is);</span> </td></tr></tbody>
|
|---|
| 178 | </table>
|
|---|
| 179 | </li>
|
|---|
| 180 | </ul></div>
|
|---|
| 181 |
|
|---|
| 182 | </div>
|
|---|
| 183 |
|
|---|
| 184 |
|
|---|
| 185 |
|
|---|
| 186 | </div>
|
|---|
| 187 | <script type="text/javascript">searchHighlight()</script>
|
|---|
| 188 | <div id="altlinks"><h3>Download in other formats:</h3><ul><li class="first last"><a href="/blfs/attachment/ticket/1758/OpenOffice2.0.2-required.patch?format=raw">Original Format</a></li></ul></div>
|
|---|
| 189 |
|
|---|
| 190 | </div>
|
|---|
| 191 |
|
|---|
| 192 | <div id="footer">
|
|---|
| 193 | <hr />
|
|---|
| 194 | <a id="tracpowered" href="http://trac.edgewall.com/"><img src="/blfs/chrome/common/trac_logo_mini.png" height="30" width="107"
|
|---|
| 195 | alt="Trac Powered"/></a>
|
|---|
| 196 | <p class="left">
|
|---|
| 197 | Powered by <a href="/blfs/about"><strong>Trac 0.10dev</strong></a><br />
|
|---|
| 198 | By <a href="http://www.edgewall.com/">Edgewall Software</a>.
|
|---|
| 199 | </p>
|
|---|
| 200 | <p class="right">
|
|---|
| 201 | © 1998-2006 Gerard Beekmans.<br /> Website customization by Jeremy Huntwork.
|
|---|
| 202 | </p>
|
|---|
| 203 | </div>
|
|---|
| 204 |
|
|---|
| 205 |
|
|---|
| 206 |
|
|---|
| 207 | </body>
|
|---|
| 208 | </html>
|
|---|
| 209 |
|
|---|
