[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - ucb/source
ucb/source/ucp/webdav/webdavprovider.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 80146da04ce3595aa95f30d7490b83c048b0a000 Author: Andrew Udvare AuthorDate: Thu Dec 24 06:04:16 2020 -0500 Commit: Andras Timar CommitDate: Thu Apr 15 00:21:33 2021 +0200 ucp: fix call to getComponentContext Commit 3f9940c2e050830051a31e4b70736132e034a9db mistakenly removed include/ucbhelper/getcomponentcontext.hxx seeing the getComponentContext method as unused. According to that file, ucbhelper::getComponentContext was just a duplicate of comphelper::getComponentContext so this commit changes to calling that method instead. Change-Id: Ibd66b56a72afce437a26417d7944ec1ace34a4eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108262 Reviewed-by: Julien Nabet Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 462e4e5a98f7..570b36e6180c 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include "webdavprovider.hxx" @@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = -static_cast(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); +static_cast(new ContentProvider( comphelper::getComponentContext(rSMgr) )); return css::uno::Reference< css::uno::XInterface >::query( pX ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/unpack-sources
bin/unpack-sources |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f3b7dc649bc384be6000d98a87763cab26fe3f32 Author: Andrew Udvare AuthorDate: Fri Dec 18 03:23:37 2020 -0500 Commit: Thorsten Behrens CommitDate: Fri Feb 26 00:33:45 2021 +0100 fix unpack-sources to not require GNU find This makes bin/unpack-sources work on systems that do not have GNU coreutils in PATH, such as macOS. Change-Id: I54ed219eedf0f45c039edb6e486f3afe273dd51f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107936 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/bin/unpack-sources b/bin/unpack-sources index 2408eda1e14c..7221696e199f 100755 --- a/bin/unpack-sources +++ b/bin/unpack-sources @@ -85,7 +85,7 @@ for tarball in $tarballs ; do fi # create symlinks for module directories; ignore git-hooks directory -for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks -o -printf "$tarname/%f\n"` ; do -ln -sf "src/$dir" "$start_dir" -done +while read -r dir; do +ln -sf "src/${tarname}/$(basename "$dir")" "$start_dir" +done < <(find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks) done ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit d1dc51f95f9e831aa6adbbeff549c2017d2dfd82 Author: Andrew Udvare AuthorDate: Tue Dec 29 15:18:06 2020 -0500 Commit: Michael Stahl CommitDate: Tue Feb 9 18:36:23 2021 +0100 configure.ac: allow --enable-python=system on macOS if PYTHON is non-empty This will work as long as a valid Python is in PATH, such as /usr/bin/python3 from Xcode or another version in some prefix like /opt/local. Change-Id: Ic967c3ce2f9949d94c11c3449363841a1565cfa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108486 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac index e6607334b067..78bb7998e62c 100644 --- a/configure.ac +++ b/configure.ac @@ -9238,8 +9238,9 @@ AC_SUBST(XMLLINT) # Optionally user can pass an option to configure, i. e. # ./configure PYTHON=/usr/bin/python # = -if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" != fully-internal -a "$enable_python" != internal; then +if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" != fully-internal -a "$enable_python" != internal -a "$enable_python" != system; then # Only allowed choices for macOS are 'no', 'internal' (default), and 'fully-internal' +# unless PYTHON is defined as above which allows 'system' enable_python=internal fi if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then @@ -9311,7 +9312,7 @@ fully-internal) ;; system) AC_MSG_RESULT([system]) -if test "$_os" = Darwin; then +if test "$_os" = Darwin -a -z "$PYTHON"; then AC_MSG_ERROR([--enable-python=system doesn't work on macOS because the version provided is obsolete]) fi ;; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/webdavprovider.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f14b83b38d35a585976ef5d422754d8e0d0266a6 Author: Andrew Udvare AuthorDate: Thu Dec 24 06:04:16 2020 -0500 Commit: Noel Grandin CommitDate: Fri Dec 25 06:19:42 2020 +0100 ucp: fix call to getComponentContext Commit 3f9940c2e050830051a31e4b70736132e034a9db mistakenly removed include/ucbhelper/getcomponentcontext.hxx seeing the getComponentContext method as unused. According to that file, ucbhelper::getComponentContext was just a duplicate of comphelper::getComponentContext so this commit changes to calling that method instead. Change-Id: Ibd66b56a72afce437a26417d7944ec1ace34a4eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108262 Reviewed-by: Julien Nabet Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 462e4e5a98f7..570b36e6180c 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include "webdavprovider.hxx" @@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = -static_cast(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); +static_cast(new ContentProvider( comphelper::getComponentContext(rSMgr) )); return css::uno::Reference< css::uno::XInterface >::query( pX ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits