diff options
Diffstat (limited to 'editors/openoffice-4/files/patch-configure.ac')
| -rw-r--r-- | editors/openoffice-4/files/patch-configure.ac | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/editors/openoffice-4/files/patch-configure.ac b/editors/openoffice-4/files/patch-configure.ac index 9340d7d40ccf..e7b392f1aea2 100644 --- a/editors/openoffice-4/files/patch-configure.ac +++ b/editors/openoffice-4/files/patch-configure.ac @@ -1,32 +1,11 @@ ---- configure.ac.orig 2019-11-12 05:10:21 UTC +--- configure.ac.orig 2025-04-12 20:16:51 UTC +++ configure.ac -@@ -367,11 +367,11 @@ AC_ARG_WITH(bundled-extension-blobs, - and comply with their distribution requirements by updating the - files LICENSE_aggregated and NOTICE_aggregated accordingly - ],,) --#AC_ARG_WITH(bundled-prereg-extensions, --#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that --# are to be bundled as pre-registered extensions. Make sure to only bundle --# extensions which can be installed without requiring a license dialog --#],,) -+AC_ARG_WITH(bundled-prereg-extensions, -+[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that -+ are to be bundled as pre-registered extensions. Make sure to only bundle -+ extensions which can be installed without requiring a license dialog -+],,) - AC_ARG_ENABLE(bundled-dictionaries, - [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus) - according to main/extensions.lst and bundle them. Make sure to -@@ -1538,9 +1538,9 @@ else - fi - AC_SUBST(BUNDLED_EXTENSION_BLOBS) - --#dnl =================================================================== --#dnl Check extensions that are to be bundled as pre-registerd --#dnl =================================================================== -+dnl =================================================================== -+dnl Check extensions that are to be bundled as pre-registerd -+dnl =================================================================== - if test -n "$with_bundled_prereg_extensions"; then - BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions" - else +@@ -3377,7 +3377,7 @@ if test "$enable_epm" = "yes"; then + dnl =================================================================== + dnl Check for epm - not needed for windows + dnl =================================================================== +- if test "$_os" != "WINNT"; then ++ if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then + if test -n "$with_epm"; then + EPM=$with_epm + else |