<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a3e653210676b8dbd83771e3c7bb60a111aa0a9d">https://github.com/macports/macports-ports/commit/a3e653210676b8dbd83771e3c7bb60a111aa0a9d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a3e65321067 libreoffice: update to 7.1.0.1
</span>a3e65321067 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a3e653210676b8dbd83771e3c7bb60a111aa0a9d
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Thu Dec 24 05:06:23 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: update to 7.1.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://gerrit.libreoffice.org/c/core/+/108262
</span>---
office/libreoffice/Portfile | 79 ++++++++++++----------
office/libreoffice/files/accept-macos-11.1.patch | 52 --------------
office/libreoffice/files/configure.patch | 4 +-
.../files/ucb_ucp_webdav_webdavprovider_cxx.patch | 21 ++++++
4 files changed, 66 insertions(+), 90 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/Portfile b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08e411d8aa8..83d0569988b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name libreoffice
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.0.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.1.0.1
</span> categories office aqua
license {LGPL-3 MPL-1.1}
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@ master_sites ${main_uri}:main \
</span> ${addons_uri}:epubgen \
${addons_uri}:exttextcat \
${addons_uri}:mwaw \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${addons_uri}:libnumbertext \
</span> ${addons_uri}:orcus \
${addons_uri}:qxp \
${addons_uri}:libstaroffice \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,32 +53,33 @@ distfiles ${main_distfile}:main \
</span> ${name}-translations-${version}.tar.xz:translations \
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz:ucpp \
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz:clucene-core \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf:opens \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:opens \
</span> a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz:mythes \
dtoa-20180411.tgz:dtoa \
libabw-0.1.3.tar.xz:abw \
libcmis-0.5.2.tar.xz:cmis \
libepubgen-0.1.1.tar.xz:epubgen \
libexttextcat-3.4.5.tar.xz:exttextcat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libmwaw-0.3.16.tar.xz:mwaw \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liborcus-0.15.4.tar.bz2:orcus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libmwaw-0.3.17.tar.xz:mwaw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liborcus-0.16.1.tar.bz2:orcus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnumbertext-1.0.6.tar.xz:libnumbertext \
</span> libqxp-0.0.2.tar.xz:qxp \
libstaroffice-0.0.7.tar.xz:libstaroffice \
libzmf-0.0.2.tar.xz:zmf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mdds-1.6.0.tar.bz2:mdds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mdds-1.7.0.tar.bz2:mdds
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums libreoffice-7.0.4.2.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5ee3744147329e33d9ec2033fc316c5f4cc1a4c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9fa9d2cc8d02f12b1f302b93056d5c0ff986090a6f309bafa506ba53779f2abd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 236477520 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libreoffice-dictionaries-7.0.4.2.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2598b985c247bacb1c4e8ead70995f18d9c02403 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d86888281c9862738360eb620f2a42c31bd8a780d4650e0b9dfcaa1210db8979 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 45989668 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libreoffice-translations-7.0.4.2.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f2eaf72271563089aa2ea90420641ca56241001f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 544b1a1b4ca795842fb0e4e5eee68f94dd16b10ca4c3c84b1be85467cabc73ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 175341984 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums libreoffice-7.1.0.1.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 808cfb6fb5a91509d3d0baf23fdd7d75d96cd200 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 91358a373617568d25404b9ba3c46c0021f1f78587c0762f62abeeb9928bd11f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 242930320 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libreoffice-dictionaries-7.1.0.1.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0b502987eb824548241e3e0554c3dfd12ed75c1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05b53060e341abcb97f83f5250e100fa2b087e88758f10960a28851620fa9a08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46930348 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libreoffice-translations-7.1.0.1.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b93446124362a8a678abec3b8862f022f6af1132 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 284cdbf49910d3987a57f7543bd174aa0f8efa940e7ef0f100b062a9d50d6aef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 184031052 \
</span> 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \
rmd160 dbeb7a7f8c89961ca2e544b810345d025561866b \
sha256 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +88,10 @@ checksums libreoffice-7.0.4.2.tar.xz \
</span> rmd160 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b \
sha256 ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab \
size 2241498 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 00b1e296adf2caad44c49ad9743e5da7c771e480 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 207544 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b9e2cc0c836faa59eca3bfc0f24e1b790646b112 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 207992 \
</span> a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz \
rmd160 4bf022808a362c0711ec857787bc3376e9adb940 \
sha256 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,14 +116,18 @@ checksums libreoffice-7.0.4.2.tar.xz \
</span> rmd160 da7b61766ac962abb4e0b2bcb2de6555b49cefc5 \
sha256 13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8 \
size 1041268 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libmwaw-0.3.16.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 111e5dc4e9cefbd812dafd4168ea0c0cc18aca04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1306872 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liborcus-0.15.4.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 21eac3c9b1f37fdb59031fec606a1b4492f95d7c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1840593 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libmwaw-0.3.17.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bb92b16e03bab3ec37e8c514341678e6e5a2837c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1349700 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liborcus-0.16.1.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2e8dd1982e1b28d1747bdbb4d7f8833af58addee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2082014 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnumbertext-1.0.6.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d03f6891a4c57d6e3be9e79a8ec52fee87ddceb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 283416 \
</span> libqxp-0.0.2.tar.xz \
rmd160 3363d46e334124f454c8b928c1e91e8f138ef250 \
sha256 e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,10 +140,10 @@ checksums libreoffice-7.0.4.2.tar.xz \
</span> rmd160 b0be3dbe0f6bf4565c1668a236850601616f625f \
sha256 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 \
size 320952 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mdds-1.6.0.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 003175ca1b3d1293a6f144490de94eba72cb1697 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 350406
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mdds-1.7.0.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f6fc155caa2c57af5d3496ed279dcfc3b8cdc297 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 363514
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,6 +160,7 @@ depends_lib-append \
</span> port:apr \
port:apr-util \
port:boost \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:box2d \
</span> port:bzip2 \
port:curl \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,8 +222,8 @@ if {${os.major} < 14} {
</span>
patchfiles \
configure.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- unpack-sources-fix-for-bsd-find.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- accept-macos-11.1.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ucb_ucp_webdav_webdavprovider_cxx.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpack-sources-fix-for-bsd-find.patch
</span>
set product_name LibreOffice
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,7 +248,6 @@ configure.args-append \
</span> --disable-fetch-external \
--disable-firebird-sdbc \
--disable-ldap \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libnumbertext \
</span> --disable-lotuswordpro \
--disable-lpsolve \
--disable-neon \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,6 +294,7 @@ configure.args-append \
</span> --without-system-libepubgen \
--without-system-libexttextcat \
--without-system-libmwaw \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-system-libnumbertext \
</span> --without-system-libqxp \
--without-system-libstaroffice \
--without-system-libzmf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/accept-macos-11.1.patch b/office/libreoffice/files/accept-macos-11.1.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a512f7dd65f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/accept-macos-11.1.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ad35a32c752e..5836bbb58d4a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3105,7 +3105,7 @@ if test $_os = Darwin; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # higher than or equal to the minimum required should be found.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([what macOS SDK to use])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for _macosx_sdk in ${with_macosx_sdk-11.0 10.15 10.14 10.13}; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for _macosx_sdk in ${with_macosx_sdk-11.1 11.0 10.15 10.14 10.13}; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d "$MACOSX_SDK_PATH"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with_macosx_sdk="${_macosx_sdk}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3137,8 +3137,11 @@ if test $_os = Darwin; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 11.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOSX_SDK_VERSION=110000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 11.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MACOSX_SDK_VERSION=110100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--11.0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--11.1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3200,8 +3203,11 @@ if test $_os = Darwin; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 11.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_OS_X_VERSION_MIN_REQUIRED="110000"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 11.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MAC_OS_X_VERSION_MIN_REQUIRED="110100"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--11.0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--11.1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3262,8 +3268,11 @@ if test $_os = Darwin; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 11.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_OS_X_VERSION_MAX_ALLOWED="110000"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 11.1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MAC_OS_X_VERSION_MAX_ALLOWED="110100"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--11.0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--11.1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/configure.patch b/office/libreoffice/files/configure.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0720915fd13..d79bac5295e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ index e4ef8bec2b3e..402979d77ffe 100644
</span> # Optionally user can pass an option to configure, i. e.
# ./configure PYTHON=/usr/bin/python
# =====================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $_os = Darwin -a "$enable_python" != fully-internal -a "$enable_python" != internal; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Only allowed choices for macOS are 'internal' (default) and 'fully-internal'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" != fully-internal -a "$enable_python" != internal; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Only allowed choices for macOS are 'no', 'internal' (default), and 'fully-internal'
</span> - enable_python=internal
-fi
if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/files/ucb_ucp_webdav_webdavprovider_cxx.patch b/office/libreoffice/files/ucb_ucp_webdav_webdavprovider_cxx.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ed370e131c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/files/ucb_ucp_webdav_webdavprovider_cxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ucb/source/ucp/webdav/webdavprovider.cxx ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 462e4e5a98f7..570b36e6180c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ucb/source/ucp/webdav/webdavprovider.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <comphelper/processfactory.hxx>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ucbhelper/contentidentifier.hxx>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ucbhelper/macros.hxx>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "webdavprovider.hxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css::lang::XServiceInfo* pX =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<css::lang::XServiceInfo*>(new ContentProvider( comphelper::getComponentContext(rSMgr) ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return css::uno::Reference< css::uno::XInterface >::query( pX );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>