[Libreoffice-commits] core.git: vcl/headless

[David Ostrovsky (via logerrit)]

 vcl/headless/svpinst.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 52dd3d085b95084fa6539aec64700f9b129ea116
Author: David Ostrovsky 
AuthorDate: Sun Feb 28 09:26:54 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 1 11:59:52 2021 +0100

Fix -Werror=unused-result

Change-Id: I9d6f4b29b6045d5d64c0ee730588299c41d33419
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111689
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 9654243f5ac3..b5540301f21c 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -369,7 +369,11 @@ void SvpSalYieldMutex::doAcquire(sal_uInt32 const 
nLockCount)
 m_bNoYieldLock = true;
 bool const bEvents = pInst->DoYield(false, request == 
SvpRequest::MainThreadDispatchAllEvents);
 m_bNoYieldLock = false;
-write(m_FeedbackFDs[1], , sizeof(bool));
+if (write(m_FeedbackFDs[1], , sizeof(bool)) != 
sizeof(bool))
+{
+SAL_WARN("vcl.headless", "Could not write: " << 
strerror(errno));
+std::abort();
+}
 }
 }
 while (true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - pyuno/source

[David Ostrovsky (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d29de0b38ef6854bb129e82fd280f33b0d5b9a08
Author: David Ostrovsky 
AuthorDate: Mon Dec 21 07:56:11 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 5 22:18:52 2021 +0100

tdf#138987 pyuno: PyEval_InitThreads is a no-op in Python 3.9

Change-Id: I220eecfa6aaf4d5cb12e3b4eacadf25843b41452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108403
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 8be493744cafc2572c701e681ab147fa28c6bc39)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108718
Reviewed-by: David Ostrovsky 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index a8722dd835bb..873a3c3bbe71 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -216,7 +216,9 @@ void pythonInit() {
 
 // initialize python
 Py_Initialize();
+#if PY_VERSION_HEX < 0x0309
 PyEval_InitThreads();
+#endif
 
 PyThreadState *tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - pyuno/source

[David Ostrovsky (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c82bb0297ea0dbba77823230ed36b81a39e8cbab
Author: David Ostrovsky 
AuthorDate: Mon Dec 21 07:56:11 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 5 22:12:21 2021 +0100

tdf#138987 pyuno: PyEval_InitThreads is a no-op in Python 3.9

Change-Id: I220eecfa6aaf4d5cb12e3b4eacadf25843b41452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108403
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 8be493744cafc2572c701e681ab147fa28c6bc39)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108719
Reviewed-by: David Ostrovsky 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index 07dc748235f9..dc428fb1f3a2 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -229,7 +229,9 @@ PythonInit() {
 
 // initialize python
 Py_Initialize();
+#if PY_VERSION_HEX < 0x0309
 PyEval_InitThreads();
+#endif
 
 PyThreadState *tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/source

[David Ostrovsky (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c099288c232c864583b9a263069390a75bf43524
Author: David Ostrovsky 
AuthorDate: Mon Dec 21 07:56:11 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Jan 5 12:18:11 2021 +0100

tdf#138987 pyuno: PyEval_InitThreads is a no-op in Python 3.9

Change-Id: I220eecfa6aaf4d5cb12e3b4eacadf25843b41452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108403
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index 3a7bfd5cf45f..0db6e637a2a7 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -223,7 +223,9 @@ void pythonInit() {
 
 // initialize python
 Py_Initialize();
+#if PY_VERSION_HEX < 0x0309
 PyEval_InitThreads();
+#endif
 
 PyThreadState *tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/source

[David Ostrovsky (via logerrit)]

 pyuno/source/module/pyuno_module.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6dd1d2268487920e8bda44dfd169a5bda4d62f13
Author: David Ostrovsky 
AuthorDate: Fri Dec 18 11:25:05 2020 +0100
Commit: Michael Stahl 
CommitDate: Sat Dec 19 17:34:50 2020 +0100

tdf#138987 pyuno: PyEval_InitThreads is a no-op in Python 3.9

Change-Id: I7cf95ab1f237e315e8bd80b47758839bca34f970
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107946
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/pyuno/source/module/pyuno_module.cxx 
b/pyuno/source/module/pyuno_module.cxx
index 4a9d1921386f..35986b3646ba 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -883,7 +883,9 @@ PyObject* PyInit_pyuno()
 PyUNO_initType();
 PyUNOStruct_initType();
 // noop when called already, otherwise needed to allow multiple threads
+#if PY_VERSION_HEX < 0x0309
 PyEval_InitThreads();
+#endif
 static struct PyModuleDef moduledef =
 {
 PyModuleDef_HEAD_INIT,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

[David Ostrovsky (via logerrit)]

 download.lst |4 
 external/boost/UnpackedTarball_boost.mk  |3 
 external/boost/boost-android-unified.patch.1 |8 
 external/boost/sse.patch.0   |  533 ---
 external/boost/ubsan.patch.0 |   35 -
 solenv/flatpak-manifest.in   |6 
 6 files changed, 9 insertions(+), 580 deletions(-)

New commits:
commit e355d2dc89963f26e5856be8b324d386e4c564f6
Author: David Ostrovsky 
AuthorDate: Sat Jan 11 09:44:20 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 15 10:27:06 2020 +0100

Bump boost version to 1.71

Change-Id: Ica4aba467aa00236a4d1c5b0411d1ebc657ea4df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86594
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index d438db7d9375..0fdcf72b1b87 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@ export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c7
 export APR_TARBALL := apr-1.5.2.tar.gz
 export APR_UTIL_SHA256SUM := 
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
-export BOOST_SHA256SUM := 
8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
-export BOOST_TARBALL := boost_1_69_0.tar.bz2
+export BOOST_SHA256SUM := 
d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
+export BOOST_TARBALL := boost_1_71_0.tar.bz2
 export BREAKPAD_SHA256SUM := 
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
 export BREAKPAD_TARBALL := breakpad.zip
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 33f2f2cd9b50..acb6d6af6b77 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -17,7 +17,6 @@ boost_patches += boost.utility.Wundef.warnings.patch
 
 boost_patches += boost.noiconv.patch
 
-boost_patches += ubsan.patch.0
 boost_patches += rtti.patch.0
 
 # https://svn.boost.org/trac/boost/ticket/11505
@@ -38,8 +37,6 @@ boost_patches += gcc9.patch.0
 
 boost_patches += msvc2017.patch.0
 
-boost_patches += sse.patch.0
-
 boost_patches += c++20-allocator.patch.0
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/boost-android-unified.patch.1 
b/external/boost/boost-android-unified.patch.1
index 46181b862f49..6488bf619e2b 100644
--- a/external/boost/boost-android-unified.patch.1
+++ b/external/boost/boost-android-unified.patch.1
@@ -4,8 +4,8 @@
 template 
 struct is_function : public false_type {};
  
--#if defined(__cpp_noexcept_function_type) && !defined(_MSC_VER)
-+#if defined(__cpp_noexcept_function_type) && !defined(_MSC_VER) && !(defined 
__ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 
0 && __clang_patchlevel__ == 300080)
+-#if defined(__cpp_noexcept_function_type) && 
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
++#if defined(__cpp_noexcept_function_type) && 
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) && !(defined __ANDROID__ && 
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
  #define BOOST_TT_NOEXCEPT_PARAM , bool NE
  #define BOOST_TT_NOEXCEPT_DECL noexcept(NE)
  #else
@@ -15,8 +15,8 @@
 template 
 struct is_member_function_pointer : public 
is_member_function_pointer {};
  
--#if defined(_MSVC_LANG) && (_MSVC_LANG >= 201703) 
-+#if (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703)) || (defined __ANDROID__ 
&& defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
+-#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
++#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) || (defined __ANDROID__ && 
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
 // MSVC can't handle noexcept(b) as a deduced template parameter 
 // so we will have to write everything out :(
  #define BOOST_TT_NOEXCEPT_PARAM
diff --git a/external/boost/sse.patch.0 b/external/boost/sse.patch.0
deleted file mode 100644
index d431c185e7f8..
--- a/external/boost/sse.patch.0
+++ /dev/null
@@ -1,533 +0,0 @@
 boost/type_traits/detail/is_function_cxx_11.hpp
-+++ boost/type_traits/detail/is_function_cxx_11.hpp
-@@ -107,8 +107,10 @@
-template 
-struct is_function : public 
true_type {};
- #endif
-+#if !(defined _M_IX86_FP && _M_IX86_FP == 1) // error C2215: '__vectorcall' 
cannot be used with '/arch:SSE'
-template 
-struct is_function : 
public true_type {};
-+#endif
-// const:
- #ifde

Cannot review Gerrit patch

[David Ostrovsky]

Regina Henschel wrote on Fri Jan 3 01:15:56 UTC 2020:

> I can confirm, that it does not work in the old UI.

The old UI works as expected now, see this issue: [1].

[1] https://redmine.documentfoundation.org/issues/3068

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - sax/source

[David Ostrovsky (via logerrit)]

 sax/source/fastparser/fastparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7814e7a912aacd4022a5903d8cbf2955a12af5f1
Author: David Ostrovsky 
AuthorDate: Fri Feb 17 22:21:08 2017 +
Commit: Michael Stahl 
CommitDate: Wed May 8 11:59:51 2019 +0200

MSVC 14.0: Fix warning C4702: unreachable code

Change-Id: I38db92984daae40981f2d3f60c4efa38684d5328
Reviewed-on: https://gerrit.libreoffice.org/34382
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
(cherry picked from commit 996960f5a25c0833942c03b94356d2137c4d7557)

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 88a193eb3732..7494d71aa83e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -927,7 +927,7 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
 return false;
 case EXCEPTION:
 rEntity.throwException( mxDocumentLocator, false );
-return false;
+SAL_FALLTHROUGH; // avoid unreachable code warning with some 
comilers
 default:
 assert(false);
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - sax/source

[David Ostrovsky (via logerrit)]

 sax/source/fastparser/fastparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e11c790d3a8535bf8e0c2d43533106f1ba1081ab
Author: David Ostrovsky 
AuthorDate: Fri Feb 17 22:21:08 2017 +
Commit: Michael Stahl 
CommitDate: Wed May 8 11:23:08 2019 +0200

MSVC 14.0: Fix warning C4702: unreachable code

Change-Id: I38db92984daae40981f2d3f60c4efa38684d5328
Reviewed-on: https://gerrit.libreoffice.org/34382
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
(cherry picked from commit 996960f5a25c0833942c03b94356d2137c4d7557)

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 88a193eb3732..7494d71aa83e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -927,7 +927,7 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
 return false;
 case EXCEPTION:
 rEntity.throwException( mxDocumentLocator, false );
-return false;
+SAL_FALLTHROUGH; // avoid unreachable code warning with some 
comilers
 default:
 assert(false);
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Upstreaming LO Firebird patches

[David Ostrovsky]

On Mon, 2019-02-11 at 12:26 +0100, Lionel Elie Mamane wrote:
> Hi everyone,
> 
> Your name/email appears as "Author" in a git commit that changes one
> of the "patch" files in external/firebird.
> 
> Do you agree that these patches be contributed upstream?

Yes.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

testTdf108947 failure on master

[David Ostrovsky]

It seems that I need this patch: [1] on most recent master
to pass the rtfimport test. All other tests pass. My autogen
input file is here: [2]. Build tool chain used:

$ gcc --version
gcc (SUSE Linux) 7.3.1 20180323 [gcc-7-branch revision 258812]

When I open this test document testTdf108947, I'm seeing in
fact one single page: [3]. Any clue, what is going on here?

[1] http://paste.openstack.org/show/720207
[2] http://paste.openstack.org/show/720208
[3] https://imgur.com/a/3eQdQDA
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Let failed Jenkins builds set Verified: -1 in Gerrit?

[David Ostrovsky]

On Fri Mar 9 19:14:33 UTC 2018, Eike Rathke wrote:

>> On Tuesday, 2018-03-06 10:09:22 +0100, Stephan Bergmann wrote:
>> for a Gerrit change on which I'm listed as reviewer, I do get mails
for mine
>> and all other people's comments, just not for comments from Jenkins.
>
>Same here. I also don't get Jenkins comments mails for changes in
areas
>that touch my Watched Projects list (under Settings), even though
>I ticked All Comments for each entry there as well.

You and Stephan tell us, that you do want to be notified from
Jenkins and get all that spam (on start job and finish job, and re-
scheduled verification on rebases, and fixed patch sets in case first
17 verifications failed). Other developers told us the wuite the
opposite: shutdown the notification firehose and stop spam reviewers.

Gerrit has a mean for that: ACL "Email Reviewers" that can be denied:
[1] that id documented on Gerrit ACL page: [2] and to be easy to find
is even documented on the Jenkins Gerrit Trigger plugin: [3].

The bottom line of the discussion was: we shutdown the firehose and
disallow Jenkins to spam reviewers. On this screenshot, from All-
Project ACL page in gerrit, you can see how/where this DENY rule is
implemented: [4].

Of course, we could easily remove that DENY rule (again), but
I'm sure, that this would just restart the bikeshedding on that topic
that would probably end up (again) in disabling the firehose.

But let us do a step back and re-visit this thread: the actual
problem we are trying to solve is a different one: a missing
feedback from Jenkins on failed verifications jobs. Let me repeat
this again: the LibreOffice Gerrit-Jenkins setup deviates from
the standard recommended setup, by preventing voting Verified-1 on
failed builds.

That was an oversight, as confirmed by infra team, and in case of
false negative, Verified-1 vote can be easily removed by anyone, who
was granted the Remove Revievers ACL. In recent gerrit versions, I
even added "Delete Vote" feature, that let you preserve the reviewer
on a change, and only remove the vote. I would like to re-new my
call and ask infra team (again) to enable voting Verified-1 on failed
verifications.

My proposal to solve that for now and avoid future discussions:

1. Grant "Remove Reviewer" ACL to stewards group: [5]. That way many
devs are able to drop the wrong vote, and someone is always on the IRC.
2. Re-configure Jenkins Trigger Plugin set-up and enable voting of
Verified-1 on failed jobs.

[1] https://github.com/GerritCodeReview/gerrit/commit/d9488f0c37084f3e8
b6426ad9fd7722bea776ae2
[2] https://gerrit-review.googlesource.com/Documentation/access-control
.html#capability_emailReviewers
[3] https://wiki.jenkins.io/display/JENKINS/Gerrit+Trigger#GerritTrigge
r-Reducenumberofnotificationemails
[4] https://imgur.com/a/Lz3XM
[5] https://gerrit-review.googlesource.com/Documentation/access-control
.html#category_remove_reviewer

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[David Ostrovsky]

On Fri, 2017-12-01 at 11:27 -0600, Norbert Thiebaud wrote:
> On Fri, Dec 1, 2017 at 1:32 AM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:
> > On Thu Nov 30 08:25:40 UTC 2017, Stephan Bergmann wrote:
> > 
> > > Does "(with a help of maintainers)" imply that there are change
> > > owners who could not override a VRFY-1 from Jenkins themselves?
> > 
> > Yes. I believe that "registered users" group members will not be
> > able to remove VRFY-1 vote.
> 
> I do not know of anyway, anyone can remove it using the ui, short of
> impersonating jenkins' user.

RTFM: [1]? Quoting:

"
*Remove Reviewer*

This category permits users to remove other users from the list of
reviewers on a change.
[...]
Project owners and site administrators can always remove any reviewer
(even without having the Remove Reviewer access right assigned).

Users without this access right can only remove themselves from the
reviewer list on a change.
"

Also note, that the ancient/legacy Gerrit version @LibreOffice
has a major design bug/missing feature: [2] there is now way to
remove a vote. Only the whole reviewer, with all votes can
be wiped out. I fixed this years ago: [3]. But unfortunately,
LibreOffice's infra team is unable to allocate resources to
upgrade gerrit. We are almost 4 major releases behind.
(Wikimedia: [3] and OpenStack: [4] projects upgraded to
2.13.9 years ago without any issue).

[1] https://gerrit.libreoffice.org/Documentation/access-control.html#ca
tegory_remove_reviewer
[2] https://bugs.chromium.org/p/gerrit/issues/detail?id=3035
[2] https://gerrit-review.googlesource.com/#/c/gerrit/+/62410/
[3] https://gerrit.wikimedia.org
[4] https://review.openstack.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Let failed Jenkins builds set Verified: -1 in Gerrit?

[David Ostrovsky]

On Thu Nov 30 08:25:40 UTC 2017, Stephan Bergmann wrote:

>Does "(with a help of maintainers)" imply that there are change
>owners who could not override a VRFY-1 from Jenkins themselves?

Yes. I believe that "registered users" group members will not be
able to remove VRFY-1 vote.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac external/gpgme

[David Ostrovsky]

 configure.ac|2 
 external/gpgme/ExternalProject_gpgme.mk |   25 ++
 external/gpgme/UnpackedTarball_gpgme.mk |1 
 external/gpgme/w32-build-fixes.patch.1  |  122 
 4 files changed, 149 insertions(+), 1 deletion(-)

New commits:
commit bafbaa3fed95f28f368b0bd4256dbe2a714e3bd8
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Wed Sep 27 08:57:36 2017 +0200

gpg4libre: build gpgme natively on windows

Change-Id: I0b77ba0c1b8f84affa483181e26a26beaf39e878
Reviewed-on: https://gerrit.libreoffice.org/42838
Reviewed-by: Siegmund Gorr <siegmund.g...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/configure.ac b/configure.ac
index dacb5ee98ffe..25d3f4153f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10162,7 +10162,7 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 else
 # TODO(davido): Windows build must be protected with a configure option
 # unless CI doesn't support libtool with windres with gcc preprocessor
-BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR"
+BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR GPGMEPP"
 GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
 GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
 LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
diff --git a/external/gpgme/ExternalProject_gpgme.mk 
b/external/gpgme/ExternalProject_gpgme.mk
index 5c2407c1c771..dcaaf6bdfa2a 100644
--- a/external/gpgme/ExternalProject_gpgme.mk
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -20,6 +20,30 @@ $(eval $(call gb_ExternalProject_use_externals,gpgme,\
libassuan \
 ))
 
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,gpgme,build):
+   $(call gb_ExternalProject_run,build,\
+   autoreconf \
+   && ./configure \
+  --enable-languages="cl cpp" \
+  --disable-gpgconf-test \
+  --disable-gpg-test \
+  --disable-gpgsm-test \
+  --disable-g13-test \
+  GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+  GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+  LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
+  LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \
+   CFLAGS='$(CFLAGS) \
+   $(if $(ENABLE_OPTIMIZED), \
+   
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+   $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
+   $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+  --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+ && $(MAKE) \
+   )
+
+else
 $(call gb_ExternalProject_get_state_target,gpgme,build):
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -41,4 +65,5 @@ $(call gb_ExternalProject_get_state_target,gpgme,build):
  && $(MAKE) \
)
 
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/UnpackedTarball_gpgme.mk 
b/external/gpgme/UnpackedTarball_gpgme.mk
index 15259971f798..4e95fe0ab160 100644
--- a/external/gpgme/UnpackedTarball_gpgme.mk
+++ b/external/gpgme/UnpackedTarball_gpgme.mk
@@ -17,5 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgme, \
 external/gpgme/find-libgpg-error-libassuan.patch \
 external/gpgme/fix-autoconf-macros.patch \
 external/gpgme/add-minimal-keyexport.patch \
+$(if $(filter MSC,$(COM)),external/gpgme/w32-build-fixes.patch.1) \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/w32-build-fixes.patch.1 
b/external/gpgme/w32-build-fixes.patch.1
new file mode 100755
index ..cd45b45a31d9
--- /dev/null
+++ b/external/gpgme/w32-build-fixes.patch.1
@@ -0,0 +1,122 @@
+diff -ru gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 
gpgme/m4/ax_cxx_compile_stdcxx.m4
+--- gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 2016-05-27 22:04:36.0 
+0200
 gpgme/m4/ax_cxx_compile_stdcxx.m4  2017-09-29 17:34:49.795243600 +0200
+@@ -156,7 +156,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
+--- gpgme.orig/src/dirinfo.c   2017-03-21 11:09:41.0 +0100
 gpgme/src/dirinfo.c2017-09-30 08:36:13.239279300 +0200
+@@ -33,6 +33,10 @@
+ 
+ DEFINE_STATIC_LOCK (dirinfo_lock);
+ 
++#ifndef F_OK
++#define F_OK 0
++#endif
++
+ /* Constants used internally to select the data.  */
+

[Libreoffice-commits] core.git: configure.ac external/libassuan

[David Ostrovsky]

 configure.ac|8 ++
 external/libassuan/ExternalProject_libassuan.mk |   16 
 external/libassuan/UnpackedTarball_libassuan.mk |1 
 external/libassuan/w32-build-fixes.patch.1  |   77 
 4 files changed, 101 insertions(+), 1 deletion(-)

New commits:
commit 5f981d30e2f186ab6b7fc925832b6eb1ae658308
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Sep 24 10:28:05 2017 +0200

gpg4libre: build libassuan natively on windows

Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114
Reviewed-on: https://gerrit.libreoffice.org/42745
Reviewed-by: Siegmund Gorr <siegmund.g...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/configure.ac b/configure.ac
index fe5731470d2e..dacb5ee98ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10160,7 +10160,13 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs 
-lassuan"
 fi
 else
-BUILD_TYPE="$BUILD_TYPE LIBGPGERROR"
+# TODO(davido): Windows build must be protected with a configure option
+# unless CI doesn't support libtool with windres with gcc preprocessor
+BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR"
+GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
+GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
+LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
+LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
 fi
 AC_SUBST(SYSTEM_GPGMEPP)
 AC_SUBST(GPG_ERROR_CFLAGS)
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index bcfc08a82cca..e796f16bf017 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -19,6 +19,21 @@ $(eval $(call gb_ExternalProject_use_externals,libassuan,\
libgpg-error \
 ))
 
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,libassuan,build):
+   $(call gb_ExternalProject_run,build,\
+   autoreconf \
+   && ./configure \
+   --enable-static \
+   --disable-shared \
+   CXXFLAGS="$(CXXFLAGS)" \
+   GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+   GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+   --host=$(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+ && $(MAKE) \
+   )
+
+else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_ExternalProject_run,build,\
autoreconf \
@@ -32,4 +47,5 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
  && $(MAKE) \
)
 
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk 
b/external/libassuan/UnpackedTarball_libassuan.mk
index 924d610bf9c9..f23608eb6a6c 100644
--- a/external/libassuan/UnpackedTarball_libassuan.mk
+++ b/external/libassuan/UnpackedTarball_libassuan.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
 external/libassuan/find-libgpg-error.patch \
 external/libassuan/fix-autoconf-macros.patch \
+$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
new file mode 100755
index ..c9250c4e5573
--- /dev/null
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -0,0 +1,77 @@
+--- libassuan.orig/src/Makefile.in 2017-09-15 08:16:41.601057500 +0200
 libassuan/src/Makefile.in  2017-09-24 13:01:24.950711300 +0200
+@@ -424,7 +424,7 @@
+ nodist_include_HEADERS = assuan.h
+ @HAVE_LD_VERSION_SCRIPT_FALSE@libassuan_version_script_cmd = 
+ @HAVE_LD_VERSION_SCRIPT_TRUE@libassuan_version_script_cmd = 
-Wl,--version-script=$(srcdir)/libassuan.vers
+-CLEANFILES = mkheader assuan.h
++CLEANFILES = mkheader$(EXEEXT) assuan.h
+ BUILT_SOURCES = assuan.h
+ parts_of_assuan_h = \
+   posix-includes.inc.h   w32-includes.inc.h \
+@@ -1183,10 +1183,10 @@
+ @HAVE_W32CE_SYSTEM_TRUE@  mv -f $(DESTDIR)$(bindir)/libgpgcedev-0.dll \
+ @HAVE_W32CE_SYSTEM_TRUE@  $(DESTDIR)$(bindir)/gpgcedev.dll
+ 
+-mkheader: mkheader.c Makefile
++mkheader$(EXEEXT): mkheader.c Makefile
+   $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
+ 
+-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
++assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+   ./mkheader $(host_os) $(srcdir)/assuan.h.in \
+   

Gerrit Code-Style verification -- was ESC / Rome discussion ...

[David Ostrovsky]

On Mon, Oct 30 08:35:36 UTC 2017, Miklos Vajna wrote:

>On Fri, Oct 27, 2017 at 04:49:55PM +0200, Jan Holesovsky wrote:
>> Good point - another reason why not to do the rewriting completely
>> automatically server side I guess.
>> 
>> But still, I see the Thorsten's point why it would be easier for
people
>> in many cases; that's why I proposed the 'automatic, but ending up
as
>> an additional changeset' way, that at least gives a chance to
inspect &
>> do something about that.
>
>I see the benefit of that, and I can accept that as a compromise,
>though
>I fear a bit it introduces another set of problems:
[...]

Many OSS projects in the wild enforce code styles. Some projects,
even enforce multiple different code style checks for different
languages and even different checks for a single language.

One example is tensoflow:
https://github.com/tensorflow/tensorflow/blob/c44f67a7ed5870fe8a1c0d625
7ce597ca2ef7564/tensorflow/tools/ci_build/ci_sanity.sh

is using:

* pylint
* pep8
* buildifier (Bazel BUILD files)
* clang_format_check

The way it's implemented, obviously, is the CI build check.

In Gerrit Code Review, we've added dedicates Gerrit Label: Code-Style,
that blocks the change, when voted -1, and +1 is required for a change
to be submittable.

I would not recommend any magic, neither on the client nor on the
server (Gerrit) side: no pre-commit hooks, no automagical new patch set
creation, in case Code-Style check(s) are failed (say both checks
verify and code-style are failed, and creation of new patch set would
not fix the root cause for verification failure, like compiler error or
similar; the patch set was created by human and should be fxied by
human).

Of course, a script should be provided to run the check at any time by
contributor, it should not be integrated in the commit hook. That how I
would expect it to be implemented. When I push to gerrit, see below,
all checks should be run as part of Gerrit Code-Syle verification job.
For those who don't use gerrit, and push directly to master, well, they
should check the style on their own, but hey, they already verify on
their own the commit on 4 platform locally, so running locally the
code-style checks shouldn't be a problem.

Next reason why client side pre-commit hook wouldn't solve all use
cases: it's possible to create a modification in Gerrit,
using inline edit feature. Any client pre-commit hooks wouldn't be
executed in that use case.

My advice would be to add Code-Style label to gerrit, say Code-Style,
like we did in Gerrit Code Review upstream, in this change: [1],
with the range [-1,+1]. In additional add new Jenkins job that is
running the checks and is voting on the new label.

So that a normal change in Gerrit Code Review project must now have max
positive votes on all these labels, to be submittable, e.g.: [2].

Code-Review +2
Code-Style +1
Library-Compliance +1
Verified +1

And no, I'm not volunteering to do the job.

* [1] https://gerrit-review.googlesource.com/#/c/gerrit/+/108216
* [2] https://gerrit-review.googlesource.com/#/c/gerrit/+/122170
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

gpg4libre: Advanced autoconf question

[David Ostrovsky]

I'm working on porting gpg4libre to native Windows build: [1].

You can find the status here: [2]. libgpg-error and lubassuan can be
built right naow. gpgme configure script is failing with two different
problems:

- 1 Detection of glib
- 2 Detection whether or not the provided compiler supports C++11.

I documented the confiuration breakages here: [3] and my analysis.
I will be on vacation in the next weeks, and wonder if you can have
an idea, how to rectify those problems, or, even better, just fix
them ;-)

* [1] https://gerrit.libreoffice.org/#/q/topic:gpg4libre-win32
* [2] https://wiki.documentfoundation.org/Development/msvc-x86_64#Ongoi
ng_efforts_to_build_gpgme_on_Windows
* [3] https://wiki.documentfoundation.org/Development/msvc-x86_64#gpgme
pp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/gcc-wrappers

[David Ostrovsky]

 solenv/gcc-wrappers/wrapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bef91f7e5f3121dced360d4b90a09c334f12e56e
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Sep 19 01:20:04 2017 +0200

gpg4libre: have gcc-wrapper handle linking properly

Change-Id: I83305f504f7d492195f07f11f06d2c9855d92400
Reviewed-on: https://gerrit.libreoffice.org/42441
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 6e3fe1393fdb..800687ad65a6 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -142,7 +142,7 @@ string processccargs(vector rawargs) {
 else if(!(*i).compare(0,2,"-L")) {
 linkargs.append(" -LIBPATH:"+(*i).substr(2));
 }
-else if(!(*i).compare(0,2,"-l")) {
+else if(!(*i).compare(0,2,"-l") && (*i).compare(0,5,"-link")) {
 linkargs.append(" "+(*i).substr(2)+".lib");
 }
 else if(!(*i).compare(0,5,"-def:") || !(*i).compare(0,5,"/def:")) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/boost

[David Ostrovsky]

 external/boost/UnpackedTarball_boost.mk|4 
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 ++
 2 files changed, 18 insertions(+)

New commits:
commit ffdbcb111c1713297ed890b0571907f3ac4142ae
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Sep 5 21:53:32 2017 +0200

Boost: Update last known MSVC version to VS2017.3

Change-Id: I41952279cc9d40769bfc51dd0f03c0b0624815d2
Reviewed-on: https://gerrit.libreoffice.org/41961
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Grzegorz Araminowicz <g.araminow...@gmail.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 92012cfad0611f178ea0013674fc3e07008b8b03)
Reviewed-on: https://gerrit.libreoffice.org/41983

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index efd23d317098..d6c53401064f 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -39,6 +39,10 @@ boost_patches += clang-cl.patch.0
 boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
+# Silence unknown-compiler-warning for MSVC version 19.11.25506:
+# 
https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914
+boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 
b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
new file mode 100755
index ..41557095a5e3
--- /dev/null
+++ b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
@@ -0,0 +1,14 @@
+diff -ru boost.orig/boost/config/compiler/visualc.hpp 
boost/boost/config/compiler/visualc.hpp
+--- boost.orig/boost/config/compiler/visualc.hpp   2016-12-22 
13:33:14.0 +0100
 boost/boost/config/compiler/visualc.hpp2017-09-05 21:33:16.462142600 
+0200
+@@ -293,8 +293,8 @@
+ #endif
+ 
+ //
+-// last known and checked version is 19.10.24629 (VC++ 2017 RC):
+-#if (_MSC_VER > 1910)
++// last known and checked version is 19.11.25506 (VC++ 2017.3):
++#if (_MSC_VER > 1911)
+ #  if defined(BOOST_ASSERT_CONFIG)
+ # error "Unknown compiler version - please run the configure tests and 
report the results"
+ #  else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/boost

[David Ostrovsky]

 external/boost/UnpackedTarball_boost.mk|4 
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 ++
 2 files changed, 18 insertions(+)

New commits:
commit 92012cfad0611f178ea0013674fc3e07008b8b03
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Sep 5 21:53:32 2017 +0200

Boost: Update last known MSVC version to VS2017.3

Change-Id: I41952279cc9d40769bfc51dd0f03c0b0624815d2
Reviewed-on: https://gerrit.libreoffice.org/41961
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Grzegorz Araminowicz <g.araminow...@gmail.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index efd23d317098..d6c53401064f 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -39,6 +39,10 @@ boost_patches += clang-cl.patch.0
 boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
+# Silence unknown-compiler-warning for MSVC version 19.11.25506:
+# 
https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914
+boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 
b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
new file mode 100755
index ..41557095a5e3
--- /dev/null
+++ b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
@@ -0,0 +1,14 @@
+diff -ru boost.orig/boost/config/compiler/visualc.hpp 
boost/boost/config/compiler/visualc.hpp
+--- boost.orig/boost/config/compiler/visualc.hpp   2016-12-22 
13:33:14.0 +0100
 boost/boost/config/compiler/visualc.hpp2017-09-05 21:33:16.462142600 
+0200
+@@ -293,8 +293,8 @@
+ #endif
+ 
+ //
+-// last known and checked version is 19.10.24629 (VC++ 2017 RC):
+-#if (_MSC_VER > 1910)
++// last known and checked version is 19.11.25506 (VC++ 2017.3):
++#if (_MSC_VER > 1911)
+ #  if defined(BOOST_ASSERT_CONFIG)
+ # error "Unknown compiler version - please run the configure tests and 
report the results"
+ #  else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 6dce5d167ebbe1f69d2198b2809e0ae3e5451bd4
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Sep 5 08:55:25 2017 +0200

MSVC 15.0: Fix configure to work with update 15.3

Update 15.3 renamed redist directory from 150 to 141 and introduced
intermediate build number directories, that are different from the
compiler build number directories.

While the compiler is located under:

  [...]/MSVC/14.11.25503/bin/HostX64/x64/cl.exe

the merge modules are located now under:

  VC/redist/MSVC/14.11.25325/MergeModules

Change the hard coded detection approach, to the dynamic one: list
all directories in suspected locations and check for existnace of
the artifacts we are looking for.

Change-Id: Ie040f290d1748ab4ec5c715b6636cc3733329e1c
Reviewed-on: https://gerrit.libreoffice.org/41922
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/configure.ac b/configure.ac
index 39f42eb6d0ed..127998708b30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5207,6 +5207,9 @@ find_winsdk()
 find_msms()
 {
 my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
+if test $VCVER = 150; then
+my_msm_file=Microsoft_VC141_CRT_x86.msm
+fi
 AC_MSG_CHECKING([for $my_msm_file])
 msmdir=
 for ver in 14.0 15.0; do
@@ -5236,16 +5239,14 @@ find_msms()
 
 dnl Starting from MSVC 15.0, merge modules are located in different 
directory
 if test $VCVER = 150; then
-my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/MergeModules/"
-if test -e "$my_msm_dir/$my_msm_file"; then
-msmdir=$my_msm_dir
-else
-# got everything in 14.10.15017 except the MSMS in 25008... huh?
-my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/14.10.25008/MergeModules/"
+for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
+AC_MSG_CHECKING([for $VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules])
+my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/"
 if test -e "$my_msm_dir/$my_msm_file"; then
 msmdir=$my_msm_dir
+break
 fi
-fi
+done
 fi
 
 if test -n "$msmdir"; then
@@ -5265,11 +5266,13 @@ find_msvc_x64_dlls()
 {
 msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
 if test "$VCVER" = 150; then
-if test $vcbuildnumber = 14.10.25017; then
-
msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/onecore/x64/Microsoft.VC${VCVER}.CRT"
-else
-
msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/x64/Microsoft.VC${VCVER}.CRT"
-fi
+for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
+AC_MSG_CHECKING([for 
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC141.CRT])
+if test -d 
"$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC141.CRT"; then
+
msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC141.CRT"
+break
+fi
+done
 fi
 msvcdlls="msvcp140.dll vcruntime140.dll"
 for dll in $msvcdlls; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - download.lst external/python3

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit f18ea813967c1b35a8977bd193c19857f61f7a8c
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41028

diff --git a/download.lst b/download.lst
index 2e22bd1101df..9faf3b465130 100644
--- a/download.lst
+++ b/download.lst
@@ -142,8 +142,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
 export PYTHON_TARBALL := Python-3.3.5.tgz
 else
-export PYTHON_MD5SUM := 6192f0e45f02575590760e68c621a488
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_MD5SUM := 2ed4802b7a2a7e40d2e797272bf388ec
+export PYTHON_TARBALL := Python-3.5.4.tgz
 endif
 
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index f84b98299b8c..20192af318bf 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1
index c4bc117f5558..beb6fe38882f 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.5.4-ssl.patch.1
@@ -1,11 +1,11 @@
 -*- Mode: diff -*-
 
-Tweak SSL build to find OpenSSL in solver & not build it itself in 
"ssl.vcproj" etc.
+Tweak SSL build to find OpenSSL in w

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst external/python3

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit a2762b96f605ab5a3269b37c3bee8e7917a9e111
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41026

diff --git a/download.lst b/download.lst
index d7f08d41fb2f..ba60f47751f1 100644
--- a/download.lst
+++ b/download.lst
@@ -193,8 +193,8 @@ export POPPLER_SHA256SUM := 
869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e851
 export POPPLER_TARBALL := poppler-0.56.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
+export PYTHON_TARBALL := Python-3.5.4.tgz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 915416f2c952..ce2087497db8 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
si

[Libreoffice-commits] core.git: download.lst external/python3

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/download.lst b/download.lst
index 8e926aada0db..724524a1ddd0 100644
--- a/download.lst
+++ b/download.lst
@@ -197,8 +197,8 @@ export POPPLER_SHA256SUM := 
0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae
 export POPPLER_TARBALL := poppler-0.57.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
+export PYTHON_TARBALL := Python-3.5.4.tgz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 915416f2c952..ce2087497db8 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1

Re: DesktopLOKTest::testRedlineWriter is failing

[David Ostrovsky]

On Thu Jun 1 07:30:13 UTC 2017, Stephan Bergmann wrote:

>>On 06/01/2017 08:37 AM, David Ostrovsky wrote:
>> It didn't fix it, unfortunately. I will check whether building
>> against internal boost version helps.
>
>what's the output of 'locale' in the shell where you do all that 
>building/testing?

http://paste.openstack.org/show/611267
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: DesktopLOKTest::testRedlineWriter is failing

[David Ostrovsky]

On Wed May 31 08:04:50 UTC 2017, Stephan Bergmann wrote:

>On Wed, 2017-05-31 at 08:17 +0200, David Ostrovsky wrote:
> >Test name: DesktopLOKTest::testRedlineWriter
> >equality assertion failed
> >- Expected: Insert “t”
> >- Actual  : Insert t

>Some issue with the locale you've set?  (The usage of U+201C LEFT
DOUBLE 
>QUOTATION MARK and U+201D RIGHT DOUBLE QUOTATION MARK in 
>desktop/qa/desktop_lib/test_desktop_lib.cxx was rather brittle, so
>I've 
fixed that now with 
><https://cgit.freedesktop.org/libreoffice/core/commit/?id=92be65d31103
827bdbd82801ea203a504dce5316> 
>"Avoid implementation-defined behavior when mapping non-ASCII
characters".)

It didn't fix it, unfortuantely. I will check whether building
against internal boost version helps.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: DesktopLOKTest::testRedlineWriter is failing

[David Ostrovsky]

Hi Miklos,

On Wed May 31 07:13:35 UTC 2017, Miklos Vajna wrote:

>On Wed, 2017-05-31 at 08:17 +0200, David Ostrovsky wrote:
> >On most recent master one test is failing here:
> >
> >Test name: DesktopLOKTest::testRedlineWriter

> I added that test on 2016-08-17, I assume it was working up to the
> recent past? If so, can you bisect which commit started to fail for
you?

Actually I'm not sure it ever worked here. I wasn't following the
master recently and upgraded the OpenSUSE here to 42.2, so not sure
what caused this breakage. I will try see if the very first version of
this test, back to 2016-08-17 works here.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

DesktopLOKTest::testRedlineWriter is failing

[David Ostrovsky]

On most recent master one test is failing here:

Test name: DesktopLOKTest::testRedlineWriter
equality assertion failed
- Expected: Insert “t”
- Actual  : Insert t

When i adapt the code to be: [1] and print out the actual
values in gdb, I'm getting:

(gdb) print first
$1 = {static npos = , _M_dataplus =
{ = {<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x1b12378 "Insert “t”"}}

(gdb) print second
$3 = {static npos = , _M_dataplus =
{ = {<__gnu_cxx::new_allocator> = {}, }, _M_p = 0x14e91b8 "Insert
\177\177\177t\177\177\177"}}

If i uncomment this line:

CPPUNIT_ASSERT_EQUAL(first, second);

all tests are passing. autogen.input is here: [2].

* [1] http://paste.openstack.org/show/611048/
* [2] http://paste.openstack.org/show/611049/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: jvmfwk/source

[David Ostrovsky]

On Fri May 19 20:10:43 UTC 2017, Stephan Bergmann wrote:

>jvmfwk/source/elements.cxx |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>New commits:
>commit 957874168491f4b030fda85c65dd969aae82a670
>Author: Stephan Bergmann 
>Date:   Fri May 19 22:10:19 2017 +0200
>
>    loplugin:stringcopy
>    
>    Change-Id: I04e3faf18cd6dae39d948cfb3dd0834dd96751b1
>
>diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
>index 353eab37ba6f..19c3e1b1f44c 100644
>--- a/jvmfwk/source/elements.cxx
>+++ b/jvmfwk/source/elements.cxx
>@@ -260,7 +260,7 @@ void NodeJava::load()
>             {
>                 CXmlCharPtr sUser(xmlNodeListGetString(
>                     docUser, cur->children, 1));
>-m_userClassPath =
boost::optional>(OUString(sUser));
>+m_userClassPath = boost::optional(sUser);
>             }
>         }
>         else if (xmlStrcmp(cur->name, reinterpret_cast("javaInfo")) == 0)

This doesn't compile against system boost 1.54.0 here: [1].

$ gcc --version
  gcc (SUSE Linux) 4.8.5

Complete autogen.input is: [2].

* [1] http://paste.openstack.org/show/610812
* [2] http://paste.openstack.org/show/610814
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build issue with system icu version

[David Ostrovsky]

Hi Eike,

On Mon, 2017-05-15 at 18:22 +0200, Eike Rathke wrote:
> Hi,
> 
> On Monday, 2017-05-15 18:07:27 +0200, Eike Rathke wrote:
> 
> > 
> > On Monday, 2017-05-15 16:27:04 +0200, Tomáš Chvátal wrote:
> > > 
> > > 2017-05-15 13:09 GMT+02:00 Eike Rathke :
> > > > 
> > > > ICU_DATA=/usr/share/icu/52.1/ make
> > > 
> > > It is broken even on OBS when building 5.4.
> > > 
> > > If I revert c60e07a86338b13eda6487f45b393e407275904b it works
> > > fine again.
> > > I suppose openSUSE ICU does not find it datafile if -i overrides
> > > the
> > > location to some non-existent one...
> > 
> > I guess that should be conditional on SYSTEM_ICU so we don't
> > override
> > with -i when building with system icu. I'll try.
> 
> Please try if cherry-picking d29557b7efacbe0c201dfb7f8a121f558946b6a9
> helps your cases.

Thanks, works like a charm with system icu now.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build issue with system icu version

[David Ostrovsky]

Hi Eike,

On Thu, 2017-05-11 at 23:13 +0200, Eike Rathke wrote:
> Hi David,
> 
> Noticed that
> 
> > 
> > libicudata.so.52.1 => /usr/lib64/libicudata.so.52.1
> 
> I wonder why the minor version is included, here it is
> libicudata.so.56 => /lib64/libicudata.so.56

I have updated from openSUSE 42.1. These icu components are currently
installed here:

icu:52.1:11.5:1494560900:International Components for Unicode
libharfbuzz-icu0:1.4.5:5.3.1:1493494980:An OpenType text shaping engine
- ICU library
libicu52_1:52.1:11.5:1493494587:International Components for Unicode
libicu52_1-data:52.1:11.5:1493494027:International Components for
Unicode
libicu-devel:52.1:11.5:1493494663:International Components for Unicode
(development files)

> Btw, you can run /usr/bin/genbrk on the command line, can't you?

Yes, that works. Output is here: http://paste.openstack.org/show/609400

> What does /usr/bin/icuinfo say, specifically the second last line
> ICU Initialization returned: ...

ICU Initialization returned: U_ZERO_ERROR

The complete output is here: http://paste.openstack.org/show/609401
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build issue with system icu version

[David Ostrovsky]

Hi Eike,

On Thu, 2017-05-11 at 13:58 +0200, Eike Rathke wrote:
> Hi David,
> 
> On Wednesday, 2017-05-10 09:06:13 +0200, David Ostrovsky wrote:
> 
> > 
> > Building LO on OpenSUSE 42.2, against the latest available system
> > icu version (52.1) is failing here with:
> > [...]
> > /usr/bin/genbrk: can not initialize ICU.  status =
> > U_FILE_ACCESS_ERROR
> 
> Does  ldd /usr/bin/genbrk   show any peculiarity?
> If not, then does this? i.e. output should be identical
> make cmd cmd='ldd /usr/bin/genbrk'

The output looks sane:

echo "custom cmd" && ( ldd /usr/bin/genbrk )
custom cmd
linux-vdso.so.1 (0x7ffd76b9c000)
libicutu.so.52.1 => /usr/lib64/libicutu.so.52.1
(0x2b5a599a)
libicuuc.so.52.1 => /usr/lib64/libicuuc.so.52.1
(0x2b5a59c04000)
libstdc++.so.6 => /usr/lib64/libstdc++.so.6
(0x2b5a59f83000)
libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x2b5a5a30c000)
libc.so.6 => /lib64/libc.so.6 (0x2b5a5a523000)
libicui18n.so.52.1 => /usr/lib64/libicui18n.so.52.1
(0x2b5a5a8c7000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x2b5a5acdb000)
libicudata.so.52.1 => /usr/lib64/libicudata.so.52.1
(0x2b5a5aef8000)
libdl.so.2 => /lib64/libdl.so.2 (0x2b5a5b0fa000)
libm.so.6 => /lib64/libm.so.6 (0x2b5a5b2fe000)
/lib64/ld-linux-x86-64.so.2 (0x5636661fb000)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Build issue with system icu version

[David Ostrovsky]

Building LO on OpenSUSE 42.2, against the latest available system
icu version (52.1) is failing here with:

$ make verbose=T
[build BRK] CustomTarget/i18npool/breakiterator/char_in.brk
S=/home/davido/projects/libo && I=$S/instdir && W=$S/workdir
&&  /usr/bin/genbrk -i $W/UnpackedTarball/icu/source/data/out/tmp -r
$W/CustomTarget/i18npool/breakiterator/char_in.txt -o
$W/CustomTarget/i18npool/breakiterator/char_in.brk > /dev/null
/usr/bin/genbrk: can not initialize ICU.  status = U_FILE_ACCESS_ERROR

I can extract and reproduce the failure as standalone command as well:

$ S=/home/davido/projects/libo && I=$S/instdir && W=$S/workdir
&&  /usr/bin/genbrk -i $W/UnpackedTarball/icu/source/data/out/tmp -r
$W/CustomTarget/i18npool/breakiterator/char_in.txt -o
$W/CustomTarget/i18npool/breakiterator/char_in.brk
/usr/bin/genbrk: can not initialize ICU.  status = U_FILE_ACCESS_ERROR

Any ideas how I could further investigate that breakage would be highly
appreciated. Workaround for now is to use internal icu version, by
adding this line to the autogen.input:

  --without-system-icu


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: tools/source

[David Ostrovsky]

 tools/source/generic/fract.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f68be99919871283238e4a12940d9581d724af2
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu May 4 19:14:13 2017 +0200

Use gcd from boost::math::gcd

According to the documentation "Run-time GCD & LCM Determination": [1],
gcd should be consumed from boost::math::gcd.

[1] 
<http://www.boost.org/doc/libs/1_64_0/libs/math/doc/html/math_toolkit/run_time.html>

Change-Id: I026a4e8ead75399765eb73fa5434a57958676383
Reviewed-on: https://gerrit.libreoffice.org/37260
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index bc9bef467e86..afcb2e60ba42 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 template
@@ -180,8 +181,8 @@ namespace
 T den = r.denominator();
 
 // Avoid overflow and preserve normalization
-T gcd1 = boost::integer::gcd(i.numerator(), den);
-T gcd2 = boost::integer::gcd(num, i.denominator());
+T gcd1 = boost::math::gcd(i.numerator(), den);
+T gcd2 = boost::math::gcd(num, i.denominator());
 
 bool fail = false;
 fail |= o3tl::checked_multiply(i.numerator() / gcd1, num / gcd2, num);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Raise boost baseline version check?

[David Ostrovsky]

Building LO on OpenSUSE 42.2, against the latest available system
boost library (1.54.0), is failing here with:

/home/davido/projects/libo/tools/source/generic/fract.cxx:183:25:
error: ‘boost::integer’ has not been declared
 T gcd1 = boost::integer::gcd(i.numerator(), den);

Looking into the most recent version:

http://www.boost.org/doc/libs/1_64_0/boost/rational.hpp

reveals, that this part of the code is consumed from:

#include  // for
boost::integer::gcd, lcm

On 1.54 the similar line in rational.hpp read:

#include   // for boost::math::gcd,
lcm

So that this diff fixed the problem here:

diff --git a/tools/source/generic/fract.cxx
b/tools/source/generic/fract.cxx
index bc9bef467e86..02fb711c0c84 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -180,8 +180,8 @@ namespace
 T den = r.denominator();
 
 // Avoid overflow and preserve normalization
-T gcd1 = boost::integer::gcd(i.numerator(), den);
-T gcd2 = boost::integer::gcd(num, i.denominator());
+T gcd1 = boost::math::gcd(i.numerator(), den);
+T gcd2 = boost::math::gcd(num, i.denominator());
 
 bool fail = false;
 fail |= o3tl::checked_multiply(i.numerator() / gcd1, num /
gcd2, num);

Unless we want to make the code compile against different boost
versions, should we rather bump the boost version check?

My autogen.input is: [1].

* [1] http://paste.openstack.org/show/608796/

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |   45 -
 1 file changed, 28 insertions(+), 17 deletions(-)

New commits:
commit 7fd432e6f2d7d30228c705bd8db5046387d65866
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Mar 5 21:19:02 2017 +0100

MSVC 15.0: Fix 32bit build

Change-Id: I0e6e01918f58ada6a58f1d3b3278b72944cf300e
Reviewed-on: https://gerrit.libreoffice.org/34904
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/configure.ac b/configure.ac
index 9480220..57506a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3501,8 +3501,13 @@ if test "$_os" = "WINNT"; then
 CL_LIB=
 
 if test "$BITNESS_OVERRIDE" = ""; then
-MSPDB_PATH="$VC_PRODUCT_DIR/../Common7/IDE"
-CL_DIR=bin
+if test "$vcnum" = "150"; then
+
MSPDB_PATH="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX86/x86"
+CL_DIR=Tools/MSVC/$vcbuildnumber/bin/HostX86/x86
+else
+MSPDB_PATH="$VC_PRODUCT_DIR/../Common7/IDE"
+CL_DIR=bin
+fi
 else
 if test "$vcexpress" = "Express"; then
 MSPDB_PATH="$VC_PRODUCT_DIR/bin"
@@ -3545,8 +3550,9 @@ if test "$_os" = "WINNT"; then
 dnl Save the true MSVC cl.exe for use when CC/CXX is actually clang-cl,
 dnl needed when building CLR code:
 if test -z "$MSVC_CXX"; then
+AC_MSG_CHECKING([real MSVC])
 if test "$BITNESS_OVERRIDE" = ""; then
-if test -f "$VC_PRODUCT_DIR/bin/cl.exe"; then
+if test -f "$VC_PRODUCT_DIR/$CL_DIR/cl.exe"; then
 MSVC_CXX="$VC_PRODUCT_DIR/$CL_DIR/cl.exe"
 fi
 else
@@ -3561,6 +3567,7 @@ if test "$_os" = "WINNT"; then
 fi
 fi
 
+AC_MSG_RESULT([$MSVC_CXX])
 # This gives us a posix path with 8.3 filename restrictions
 MSVC_CXX=`win_short_path_for_make "$MSVC_CXX"`
 fi
@@ -3577,7 +3584,11 @@ if test "$_os" = "WINNT"; then
 # Remove /cl.exe from CC case insensitive
 AC_MSG_RESULT([found Visual C++ $vcyear $vcexpress ($CC)])
 if test "$BITNESS_OVERRIDE" = ""; then
-COMPATH=`echo "$CC" | $SED -e 
's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
+   if test "$vcnum" = "150"; then
+   COMPATH="$VC_PRODUCT_DIR"
+   else
+   COMPATH=`echo "$CC" | $SED -e 
's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
+   fi
 else
 if test -n "$VC_PRODUCT_DIR"; then
 COMPATH=$VC_PRODUCT_DIR
@@ -9758,7 +9769,7 @@ ML_EXE=""
 if test "$_os" = "WINNT"; then
 if test "$BITNESS_OVERRIDE" = ""; then
 assembler=ml.exe
-assembler_bin=bin
+assembler_bin=$CL_DIR
 else
 if test "$vcexpress" = "Express"; then
 assembler=ml64.exe
@@ -12306,12 +12317,10 @@ if test "$build_os" = "cygwin"; then
 ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x64"
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x64"
 fi
-if test $VCVER = 140 -o $VCVER = 150; then
-PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x64"
-ucrtlibpath_formatted=$formatted_path
-ILIB="$ILIB;$ucrtlibpath_formatted"
-ILIB1="$ILIB1 -LIBPATH:$ucrtlibpath_formatted"
-fi
+PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x64"
+ucrtlibpath_formatted=$formatted_path
+ILIB="$ILIB;$ucrtlibpath_formatted"
+ILIB1="$ILIB1 -LIBPATH:$ucrtlibpath_formatted"
 else
 if test $vcnum = "150"; then
 ILIB="$ILIB;$COMPATH/lib/x86"
@@ -12326,12 +12335,10 @@ if test "$build_os" = "cygwin"; then
 ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x86"
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x86"
 fi
-if test $VCVER = 140; then
-PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x86"
-ucrtlibpath_formatted=$formatted_path
-ILIB="$ILIB;$ucrtlibpath_formatted"
-ILIB1="$ILIB1 -LIBPATH:$ucrtlibpath_formatted"
-fi
+PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x86"
+ucrtlibpath_formatted=$formatted_path
+ILIB=&qu

[Libreoffice-commits] core.git: solenv/gbuild

[David Ostrovsky]

 solenv/gbuild/platform/com_MSC_defs.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 96af392ba495383927dc886f13a1f5a5cc46d9c1
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Jan 28 11:37:10 2017 +0100

Use /debug:fastlink linker option to improve link performance

/debug:fastlink improve build performance and reduce resources
consumption. When this linker oprion is used the linker-produced
program database (PDB) files doesn’t have any private symbol
information. Debug information is distributed among input object
and library files, and the linker PDB just serves as an indexing
database. Obviously, this provides a huge performance benefit for
the daily developer builds.

fastlink PDB files cannot be shared with another developer on the
team or uploaded directly to symbol server. There is spcial tooling
which is able to create a full PDB from the /debug:fastlink PDB
on demand: mspdbcmf: [1]. The integration of mspdbcmf is beyond
the scope of this change.

[1] 
https://blogs.msdn.microsoft.com/vcblog/2016/10/05/faster-c-build-cycle-in-vs-15-with-debugfastlink/

Change-Id: I14e29cf116407b420598f692c8d6d851e686268b
Reviewed-on: https://gerrit.libreoffice.org/34330
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
    Tested-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index a6b1b32..f9b077d 100755
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -250,6 +250,7 @@ gb_LinkTarget_LDFLAGS += \
 gb_DEBUGINFO_FLAGS := \
-FS \
-Zi \
+   -DEBUG:fastlink \
 
 gb_DEBUG_CFLAGS :=
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source

[David Ostrovsky]

 bridges/inc/except.hxx  |2 --
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx  |   16 +---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |   16 +---
 3 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit 1d4f1eae902fa115b1d7ef818a75dcdcdb9c8a65
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Mar 13 23:21:57 2016 +0100

UNO bridges: Remove MSVC 2013 legacy code

Change-Id: Ia6f59f825ead50f92ed7a343df0c01f34ce5c6f8
Reviewed-on: https://gerrit.libreoffice.org/23199
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/bridges/inc/except.hxx b/bridges/inc/except.hxx
index f1437f3..4b90ee1 100644
--- a/bridges/inc/except.hxx
+++ b/bridges/inc/except.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX
 #define INCLUDED_BRIDGES_INC_EXCEPT_HXX
 
-#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
 // extern "C" void** __cdecl __current_exception()
 // is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp:
 // return &__vcrt_getptd()->_curexception;
@@ -34,7 +33,6 @@
 //void*  _curexception;// current exception
 //[...]
 extern "C" void** __current_exception();
-#endif
 
 #endif
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index bd805a4..3fa9474 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -484,21 +484,7 @@ int msci_filterCppException(
 
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
-pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
-#if _MSC_VER >= 1900 // VC 2015 (and later?)
-   __current_exception()
-#else
-// hack to get msvcrt internal _curexception field:
-reinterpret_cast< char * >( __pxcptinfoptrs() ) +
-// as long as we don't demand msvcr source as build prerequisite
-// (->platform sdk), we have to code those offsets here.
-//
-// crt\src\mtdll.h:
-// offsetof (_tiddata, _curexception) -
-// offsetof (_tiddata, _tpxcptinfoptrs):
-0x28 // msvcr80.dll (and later?)
-#endif
-);
+pRecord = *reinterpret_cast< EXCEPTION_RECORD ** 
>(__current_exception());
 }
 // rethrow: handle only C++ exceptions:
 if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 5687c0d..8860344 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -802,21 +802,7 @@ int mscx_filterCppException(
 
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
-pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
-#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
-__current_exception()
-#else
-// Hack to get msvcrt internal _curexception field
-reinterpret_cast< char * >( __pxcptinfoptrs() ) +
-// As long as we don't demand MSVCR source as build prerequisite,
-// we have to code those offsets here.
-//
-// MSVS9/crt/src/mtdll.h:
-// offsetof (_tiddata, _curexception) -
-// offsetof (_tiddata, _tpxcptinfoptrs):
-0x48
-#endif
-);
+pRecord = *reinterpret_cast< EXCEPTION_RECORD ** 
>(__current_exception());
 }
 
 // Rethrow: handle only C++ exceptions:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Verification problem on tb72?

[David Ostrovsky]

There seem to be a prolem with tb72, e.g.
on verification of this change: [1],[2]:

make[2]: ***
[C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc
_dbgutil_32/external/lcms2/ExternalProject_lcms2.mk:19:
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_
dbgutil_32/workdir/ExternalProject/lcms2/build] Error 1
make[2]: *** Waiting for unfinished jobs
cl : Command line warning D9025 : overriding '/W4' with '/w'
make[2]: Leaving directory
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc
_dbgutil_32'
make[1]: *** [Makefile:267: build] Error 2
make[1]: Leaving directory
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc
_dbgutil_32'
make: *** [C:/cygwin//home/tdf/lode/bin/cygwrapper.Makefile:6: all]
Error 2
Build step 'Execute shell' marked build as failure
Finished: FAILURE

I am not able to reproduce it here, and even on anoter TB, a next
change: [3], that depends on [1], can be verified without any issue,
however on tb78: [4].

To avoid annoying false negatives, can we please fix tb72 or take it
downm unless the problem is tracked down, isolated, reproduced and
fixed?

* [1] https://gerrit.libreoffice.org/#/c/34330
* [2] https://ci.libreoffice.org/job/lo_gerrit/7862/Config=windows_msc_
dbgutil_32/consoleFull
* [3] https://gerrit.libreoffice.org/#/c/23199
* [4] https://ci.libreoffice.org/job/lo_gerrit/7861/Config=windows_msc_
dbgutil_32/consoleFull
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Baseline bump to MSVC 2015 Update 3

[David Ostrovsky]

On Thu Mar 2 20:53:46 UTC 2017 Caolán McNamara wrote:

>>On Thu, 2017-03-02 at 17:02 +0100, Stephan Bergmann wrote:
>>[...]
>
>That means that _MSC_VER is always >= 1900 (?), I presume, outside of
>the headers exposed through the sdk, that means we can remove the
>ifdef branches that support earlier versions of that now ?

Yes, but please check first what is already pending for review: [1].

* [1] https://gerrit.libreoffice.org/#/q/topic:toolchain-cleanup
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Baseline bump to MSVC 2015 Update 3

[David Ostrovsky]

On Thu Mar 2 16:02:30 UTC 2017 Stephan Bergmann wrote:

>As has been brewing for some time and just got accepted in today's ESC
>meeting, we'll bump master (towards LO 5.4) to MSVC 2015 Update 3 as 
>basline for MSVC builds on Windows.

Thanks!

>* The wiki developer documentation will likely need updating.  Any 
>volunteers?

Done.

>* Noteworthy improvements this brings to us regarding C++11-and-beyond
>support is that HAVE_CXX11_CONSTEXPR and HAVE_UTF16_STRING_LITERAL 
>should now always be true.

I would also add python de-duplication and shipping the same python
version 3.5.3 on all platforms (duplication was needed, as Python 3.5.x
abandoned support for msvc 2013 and only supported msvc 2015).

It worth also noting that there is substantial performance benefit for
debug build, once /debug:fastlink support CL is merged: [1].

* [1] https://gerrit.libreoffice.org/34330

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac download.lst external/Module_external.mk external/python33

[David Ostrovsky]

 configure.ac|   85 -
 download.lst|7 
 external/Module_external.mk |2 
 external/python33/ExternalPackage_python3.mk|  826 --
 external/python33/ExternalProject_python3.mk|  145 -
 external/python33/GeneratedPackage_python3.mk   |   18 
 external/python33/Makefile  |7 
 external/python33/Module_python33.mk|   22 
 external/python33/README|1 
 external/python33/UnpackedTarball_python3.mk|   61 
 external/python33/clang-cl.patch.0  |   11 
 external/python33/i100492-freebsd.patch.1   |   80 -
 external/python33/python-3.3.0-clang.patch.1|   13 
 external/python33/python-3.3.0-darwin.patch.1   |   85 -
 external/python33/python-3.3.0-gcc-4.8.patch.1  |   15 
 external/python33/python-3.3.0-i42553.patch.2   |   18 
 external/python33/python-3.3.0-msvc-disable.patch.1 |   47 
 external/python33/python-3.3.0-msvc-x64.patch.1 |  289 ---
 external/python33/python-3.3.0-msvc2012.patch.1 |   72 
 external/python33/python-3.3.0-pythreadstate.patch.1|   15 
 external/python33/python-3.3.0-ssl.patch.1  |  208 --
 external/python33/python-3.3.3-aix.patch.1  |  145 -
 external/python33/python-3.3.3-disable-obmalloc.patch.0 |   21 
 external/python33/python-3.3.3-elf-rpath.patch.1|   13 
 external/python33/python-3.3.3-msvc2012-winxp.patch.1   |  117 -
 external/python33/python-3.3.3-py17797.patch.1  |   45 
 external/python33/python-3.3.5-darwin-gnu-xargs.patch.1 |   12 
 external/python33/python-3.3.5-pyexpat-symbols.patch.1  |   28 
 external/python33/python-3.3.5-vs2013.patch.1   |   14 
 external/python33/python-lsan.patch.0   |   19 
 external/python33/python-msvc-disable-sse2.patch.1  |   23 
 external/python33/python-vc2013.patch.1 | 1213 
 external/python33/ubsan.patch.0 |   79 -
 33 files changed, 27 insertions(+), 3729 deletions(-)

New commits:
commit 84b36c704d73362d4d86dc9e9c0efa0625958347
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Jan 22 22:54:44 2017 +0100

Drop support for MSVC 2013

Change-Id: Ibf47c9ff7b5fb098e284a58c547b61286264dd80
Reviewed-on: https://gerrit.libreoffice.org/22588
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/configure.ac b/configure.ac
index 8756e52..76da4e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2097,10 +2097,9 @@ libo_FUZZ_ARG_WITH(doxygen,
 ,with_doxygen=yes)
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2013/2015/2017>],
+AS_HELP_STRING([--with-visual-studio=<2015/2017>],
 [Specify which Visual Studio version to use in case several are
- installed. If not specified, only 2013 is detected automatically
- because 2015 and 2017 support is currently experimental.]),
+ installed. If not specified, defaults to 2015.]),
 ,)
 
 AC_ARG_WITH(windows-sdk,
@@ -3269,8 +3268,6 @@ map_vs_year_to_version()
 unset vsversion
 
 case $1 in
-2013)
-vsversion=12.0;;
 2015)
 vsversion=14.0;;
 2017)
@@ -3291,8 +3288,8 @@ vs_versions_to_check()
 map_vs_year_to_version "$1"
 vsversions=$vsversion
 else
-# By default we prefer 2013/2015/2017, in this order
-vsversions="12.0 14.0 15.0"
+# By default we prefer 2015/2017, in this order
+vsversions="14.0 15.0"
 fi
 }
 
@@ -3348,7 +3345,7 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2013/2015/2017
+# Find Visual C++ 2015/2017
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
 
@@ -3382,10 +3379,6 @@ find_msvc()
 if test -n "$vctest"; then
 vcnumwithdot=$ver
 case "$vcnumwithdot" in
-12.0)
-vcyear=2013
-vcnum=120
-;;
 14.0)
 vcyear=2015
 vcnum=140
@@ -3415,7 +3408,7 @@ if test "$_os" = "WINNT"; then
 if test -n "$with_visual_studio"; then
 AC_MSG_ERROR([No Visual Studio $with_visual_studio installation 
found])
 else
-AC_MSG_ERROR([No Visual Studio 2013/2015/2017 installation found])
+AC_MSG_ERROR([No Visual Studio 2015/2017 installation found])
 fi
 fi
 
@@ -3454,27 +3447,21 @@ if test "$_os" = "WINNT"; then
 UCRTSDKDIR=
 UCRTVERSION=
 
-AC_MSG_CHECKING([whether UCRT is needed for this compiler version])
-if test "

Gerrit: Proposals for private changes and wip workflows

[David Ostrovsky]

Gerrit team is working on adding new workflows in Gerrit core:

* private changes workflow
* wip (work in progress) workflow

As the consequence, the draft workflow, that caused some confusion
among Gerrit users, is going to be discontinued. In fact, I removed it
already: [1].

Today, I would like to ask your opinion on those proposals. Please
comment on the proposal changes upstream, or answer on this thread:

* Proposal private changes: [2]
* Proposal wip: [3]

Thanks.

[1] https://gerrit-review.googlesource.com/97230
[2] https://gerrit-review.googlesource.com/94557
[3] https://gerrit-review.googlesource.com/97245
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f6f58a06260029e3ef784956114a730d5790adc
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Feb 23 23:49:03 2017 +0100

configure.ac: Add missing result message

Change-Id: Ib5d84e67d36e41d20e137ce96ce66f758b110198
Reviewed-on: https://gerrit.libreoffice.org/34596
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/configure.ac b/configure.ac
index e69e9f1..a2448e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3502,6 +3502,7 @@ if test "$_os" = "WINNT"; then
 else
 AC_MSG_ERROR([No msbuild found, Visual Studio installation 
broken?])
 fi
+   AC_MSG_RESULT([$regvalue])
 fi
 
 # Find the version of devenv.exe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Can tb73 be upgraded to VS 2015 Update 3, to avoid false negative?

[David Ostrovsky]

On Mon Feb 20 09:14:32 UTC 2017 Stephan Bergmann wrote:

>On 02/18/2017 06:04 PM, David Ostrovsky wrote:
>> Conclusion: tb73 and probably other TBs need to be upgraded to the
>> latest MSVC 2015 update 3.
>
>If we want to only support latest update 3 (and it probably makes
>sense to do so), can we check that during configure?

Thanks, Stephan, your check: [1] to detect and reject MSVC < SP3 works
like a charm: [2]:

checking whether MSVC 2015 compiler
C:/PROGRA~2/MICROS~3.0/VC/bin/cl.exe -arch:SSE is at least SP3... no
configure: error: When using MSVC 2015, at least SP3 must be installed

The better question is: who can upgrade the TBs now, that still have
MSVC 2015 SP1 on them installed, and there are quite of them tb73 ...
tb80. I know, that we are all very busy people and do it all in our
spare free time, so if all other options fail, please contact me
privately, give me the credentials and I volunteer to do the upgrade.

Should be straight forward: de-install MSVC 2015 prof. and install MSVC
2015 SP3 community edition. Estimated time 60 min. pro TB. 4 affected
TBs(?) we are talking approx. about 4 hours of work, that would allow
us to discontinue MSVC 2013 (as per ESC decision, TBs upgrade is the
only blocking issue here) [3] and move forward with code and build tool
chain cleanups pending for review and verification: [4].

* [1] When using MSVC 2015, require at least SP3
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a8538f0774bd0f
abf6012d735d1e86b3ff1c291f
* [2] https://ci.libreoffice.org/job/lo_gerrit/7550/Config=windows_msc_
dbgutil_32/console
* [3] https://gerrit.libreoffice.org/#/q/topic:raise-compiler-baseline-
msvc-2015
* [4] https://gerrit.libreoffice.org/#/q/topic:toolchain-clenaup

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/coinmp external/cppunit external/lcms2 external/libgltf external/python3

[David Ostrovsky]

 external/coinmp/ExternalProject_coinmp.mk   |2 +-
 external/cppunit/ExternalProject_cppunit.mk |2 +-
 external/lcms2/ExternalProject_lcms2.mk |2 +-
 external/libgltf/ExternalProject_libgltf.mk |2 +-
 external/python3/ExternalProject_python3.mk |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f0c7cbe1d8505d3c1f5a2b2253efda35542c898b
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Feb 21 23:08:19 2017 +0100

MSVC 14.0: Make it work with older SDK version

Change-Id: I50a9e8b122250af445c2a1b3d0941d508e027318
Reviewed-on: https://gerrit.libreoffice.org/34528
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index 3e7f0cc..53d8865 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
-   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
 \
,CoinMP/MSVisualStudio/v9)
 
 else
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index ac84aca..2a5a934 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
-   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))"
 \
&& msbuild.exe cppunit_dll.vcxproj 
/p:Configuration=$${PROFILEFLAGS}  \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj 
/p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index a6f03f3..e1beee8 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
-   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
 \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) 
/p:TargetName=lcms2 \
,Projects/VC2013/lcms2_DLL)
diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 047e90d..746c574 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
-   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
 \
'/p:AdditionalIncludeDire

Re: MSVC 2015 builds Failing After 2017 Support added

[David Ostrovsky]

On Sun, 2017-02-19 at 20:53 +, Luke Benes wrote:
> config_host.mk: 
> export UCRTSDKDIR=C:/PROGRA~2/WI3CF2~1/10/
> export UCRTVERSION=10.0.10240.0
> 
> Looking at the creation date of that folder, it matches the creation
>  date of C:\Program Files (x86)\Microsoft Visual Studio 14.0. 

Thanks again for the infos and apologize for the regression. It should
be fixed now for all supported compiler/SDK permutations in:[1].

* [1] https://gerrit.libreoffice.org/34528
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: MSVC 2015 builds Failing After 2017 Support added

[David Ostrovsky]

On Sun, 2017-02-19 at 20:53 +, Luke Benes wrote:
> config_host.mk: 
> export UCRTSDKDIR=C:/PROGRA~2/WI3CF2~1/10/
> export UCRTVERSION=10.0.10240.0
> 
> Looking at the creation date of that folder, it matches the creation
>  date of C:\Program Files (x86)\Microsoft Visual Studio 14.0.  
> 
> So it seems that even if you do not install the win 10 SDK component,
> the MSVC 2015 installer will still create the "Windows Kits" folder
> and install some files. 

Thanks for the infos. I think I understand now what is going on:

* Install fresh VM
* Install MSVC 2013
* Istall SDK 8.x
* try compile latest master: works as expected
* Install MSVC 2015 *without* installing SDK 10
* try compile latest master: broken

Is that correct?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Can tb73 be upgraded to VS 2015 Update 3, to avoid false negative?

[David Ostrovsky]

On Mon Feb 20 09:14:32 UTC 2017 Stephan Bergmann wrote:

>On 02/18/2017 06:04 PM, David Ostrovsky wrote:
>> Conclusion: tb73 and probably other TBs need to be upgraded to the
>> latest MSVC 2015 update 3.
>
>If we want to only support latest update 3 (and it probably makes
sense 
>to do so), can we check that during configure?

This sounds like a good proposal to avoid wasting 75% of build time on
this and other machines with outdated compiler tool chain. Any
volunteers to implement it?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sax/source

[David Ostrovsky]

 sax/source/fastparser/fastparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 996960f5a25c0833942c03b94356d2137c4d7557
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Feb 17 22:21:08 2017 +

MSVC 14.0: Fix warning C4702: unreachable code

Change-Id: I38db92984daae40981f2d3f60c4efa38684d5328
Reviewed-on: https://gerrit.libreoffice.org/34382
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 498bd4d..1b0ad53 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -980,7 +980,7 @@ bool FastSaxParserImpl::consume(EventList *pEventList)
 return false;
 case EXCEPTION:
 rEntity.throwException( mxDocumentLocator, false );
-return false;
+SAL_FALLTHROUGH; // avoid unreachable code warning with some 
comilers
 default:
 assert(false);
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MSVC 2015 error C2220: warning treated as error

[David Ostrovsky]

On Sun Feb 19 19:19:12 UTC 2017 Luke Benes wrote:

> I'm getting the following build error:
>
>[build CXX] sax/source/fastparser/legacyfastparser.cxx
>c:\core\sax\source\fastparser\fastparser.cxx(983) : error C2220:
>warning treated as error - no 'object' file generated

This was fixed already and the fix is pending for merge: [1].

* [1] https://gerrit.libreoffice.org/34382
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: MSVC 2015 builds Failing After 2017 Support added

[David Ostrovsky]

On Sun, 2017-02-19 at 18:56 +, Luke Benes wrote:
> >  The default should be that whatever comes with the compiler should
> > be
> >  enough, and that installing any separate SDK should be optional.
> 
> 
> Agreed, this is how MSVC 2015 worked before the 2017 patch.
> 
> 
> >  So, if your UCRTVERSION is 10.0.10240.0 (can you verify in
> > config_host.mk?)

I don't see the answer to my question above.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

MSVC 2015 builds Failing After 2017 Support added

[David Ostrovsky]

On Sat Feb 18 19:52:23 UTC 2017 Luke Benes wrote:

>I'm getting the following build error: 
>C:\Program Files
(x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\Win32\PlatformToolsets\
v140\Toolset.targets(34,5): >error MSB8036: The Windows SDK version
10.0.10240.0 was not found. >Install the required version of Windows
SDK or change the SDK version >in the project property pages or by
right-clicking the solution and >selecting "Retarget solution".

Hm.., what was changed since MSVC 2017 support, is that we are passing 
toolset version, see commit message of the change you pointed to, and
particularly this line in external packages make files:

  $(if $(filter
$(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \

e.g.

https://cgit.freedesktop.org/libreoffice/core/diff/external/lcms2/Exter
nalProject_lcms2.mk?id=b862cbdd345ec57c2595629ded6a3969e1e65d56

So, if your UCRTVERSION is 10.0.10240.0 (can you verify in
config_host.mk?), then the corresponding msbuild toolset must be
installed. Looks like you have only partially installed SDK 10 on your
machine, so you are on your own.

As explained in the commit message, that was needed to force msbuild to
use non default toolset (fro SDK 10) when no default one (SDK 8) is
installed on the system.

As Tor pointed out, complete installation of what is coming with your
compiler should do the job.

> Have Windows SDK requirements changed for 2015 or is this a bug? 

Normally we announce something like that on dev ML, or even ask for ESC
decision. So, no, it wasn't intended. Also note, that all TBs have no
problems with verification of MSVC 2017 change.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Can tb73 be upgraded to VS 2015 Update 3, to avoid false negative?

[David Ostrovsky]

The verification of the change series that removed VS 2013 and follow
-up changes, is flaky, e.g.: https://gerrit.libreoffice.org/#/c/23199/

tb73: is correctly detects MSVC 14.0:


checking Visual C++... checking whether vs inst is 14.0 15.0...
checking ver is now: 14.0... C:/PROGRA~2/MICROS~3.0/VC/

but failing with "(implementation limitation)":

C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_
dbgutil_32/vcl/source/app/IconThemeInfo.cxx(19): error C2220: warning
treated as error - no 'object' file generated
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_
dbgutil_32/vcl/source/app/IconThemeInfo.cxx(19): warning C4592:
'HIGH_CONTRAST_ID': symbol will be dynamically initialized
(implementation limitation)

However, on tb77, that also correctly detects MSVC 14.0:

checking Visual C++... checking whether vs inst is 14.0 15.0...
checking ver is now: 14.0... C:/PROGRA~2/MICROS~3.0/VC/ 

for the same change series:
https://gerrit.libreoffice.org/#/c/22588/16

this implementation limitation bug isn't reported:

http://ci.libreoffice.org/job/lo_gerrit/7192/Config=windows_msc_dbgutil
_32/

I also cannot reproduce the problem in MSVC 14.0, update 3 and on MSVC
15.0 RC3. All is fine, even with --enable-werror on both compilers.

Conclusion: tb73 and probably other TBs need to be upgraded to the
latest MSVC 2015 update 3.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Does anyone use windows

[David Ostrovsky]

On Thu Feb 16 18:26:00 UTC 2017 Abulfaz Ahmadov wrote:

>Does anyone of you use windows for libreoffice development?

No.

>Do you have some
>experience with Visual studio 2015?It's written on set up page that it
>probabbly won't work,and it's recommended to use Visual studio 2013
>with updates

This statement on the wiki: "... 2013 the preferred compiler for new
developers" is stale and must be removed. This statement pre-dated
two major fixes for VS 2015 and VS 2017 compilers, that were merged
very recently: [1], [2].

Moreover, for developer builds with debug mode enabled, with this diff
pending for review: [3] applied, there should be significant
performance benefit to use VS 2015 (not to mention VS 2017) compared to
VS 2013.

It worth also noting that VS 2013 is slated for removal, see recent ESC minutes.

* [1] 
 
"Keep original CFLAGS etc. unmodified in configure.ac" will hopefully 
fix that.
* [2] https://gerrit.libreoffice.org/#/c/33366/
VC++ Runtime installed in wrong directory
* [3] https://gerrit.libreoffice.org/#/c/34330/
Use /debug:fastlink linker option to improve link performance

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/firebird

[David Ostrovsky]

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-vs2017.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Wed Feb 15 22:31:00 2017 +0100

Fix firebird MSVC 15.0 detection

Change-Id: I9721632c68e6428b03b0368e7802c6eb4f5eb0a2
Reviewed-on: https://gerrit.libreoffice.org/34323
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 3cd7a42..29395c0 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch \
+   external/firebird/firebird-vs2017.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
new file mode 100644
index 000..ba747b3
--- /dev/null
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -0,0 +1,12 @@
+diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os/win32/mod_loader.cpp
+--- firebird.orig/src/common/os/win32/mod_loader.cpp   2017-02-15 
22:11:48.939042400 +0100
 firebird/src/common/os/win32/mod_loader.cpp2017-02-15 
22:12:30.062262700 +0100
+@@ -103,6 +103,8 @@
+   "msvcr120.dll",
+ #elif _MSC_VER == 1900
+   "vcruntime140.dll",
++#elif _MSC_VER == 1910
++  "vcruntime140.dll",
+ #else
+ #error Specify CRT DLL name here !
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Support new and discontinue old compilers

[David Ostrovsky]

On Wed, 2017-02-15 at 15:39 +0200, marius adrian popa wrote:
> I will check the issue with Firebird 
> 
> http://paste.openstack.org/show/594333/
> 

Not needed, the failure above was outdated, the recent firebird failure
is: [1],
which was trivial to fix: [2]. As a good open source citizen, I
uploaded this PR
[3] upstream.
IOW, LO can be built on MSVC 15.0, even with firebird ;) I updated the
WIKI
correspondingly: [4].
* [1] http://paste.openstack.org/show/599110/
* [2] https://gerrit.libreoffice.org/#/c/34323/
* [3] https://github.com/FirebirdSQL/firebird/pull/84
* [4] https://wiki.documentfoundation.org/Development/BuildingOnWindows
#Visual_Studio_2017_compiler
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Support new and discontinue old compilers

[David Ostrovsky]

I'm pleased to share with you, that MSVC 15 (aka VS 2017) is up
and running on master: [1].

After fixing the VC++ runtime merge module merging problem in resulted
MSI in MSVC 14.0 and MSVC 15.0, the produced MSI can not only be
installed, but the LO can actually run after the installation. The VC++
Runtime merge module merging bug that started to show up since MSVC
14.0, is appeared to be a trivial problem, that was surprisingly hard
to track down: [2]. I don't want to enter into glory details here as
for why that was the case, but I will write a blog about that one.

That raises the question, if we are ready to move forward and left MSVC
12.0 (aka VS 2013) behind us: [3]. I know, it's always hard to get a
feedback on such questions, as you can see no reaction on this infra
issue: [4]. Needless to say that I asked on IRC too, without any
response, so I guess the only way to get a feedback on that one, is to
merge that change and see, if it's going to be reverted...

* [1] https://gerrit.libreoffice.org/#/c/31279
* [2] https://gerrit.libreoffice.org/#/c/33366/
* [3] https://gerrit.libreoffice.org/#/c/22588/
* [4] https://redmine.documentfoundation.org/issues/2147

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk bridges/inc bridges/source configure.ac external/coinmp external/cppunit external/lcms2 external/libgltf external/python3 scp2/source

[David Ostrovsky]

 basic/CppunitTest_basic_macros.mk   |2 
 bridges/inc/except.hxx  |2 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 
 configure.ac|  183 
 external/coinmp/ExternalProject_coinmp.mk   |2 
 external/cppunit/ExternalProject_cppunit.mk |4 
 external/lcms2/ExternalProject_lcms2.mk |5 
 external/libgltf/ExternalProject_libgltf.mk |2 
 external/python3/ExternalProject_python3.mk |8 
 scp2/source/ooo/vc_redist.scp   |   19 ++
 10 files changed, 192 insertions(+), 37 deletions(-)

New commits:
commit b862cbdd345ec57c2595629ded6a3969e1e65d56
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Wed Nov 23 23:53:55 2016 +0100

Support MSVC 15.0

New compiler changes quite some stuff:

* Compiler detection done based on different registry key
* .NET SDK detection done based on different registry key
* Msbuild installation directory changed
* Merge modules installation directory changed
* SDK number in registry doesn't match the directory name:
  (registry key: 10.0.14393, directory name: 10.0.14393.0)
* Compiler, include and library location directories changed
* Architecture specific directory changed: x64 instead of amd64
* Compiler own include directory must be added with -I option
* To force usage of SDK 10 (8.1 is selected per default) new
  switch WindowsTargetPlatformVersion is passed to msbuild, to
  avoid patching VC project files with this line:
/WindowsTargetPlatformVersion>

Known issues:

* Firebird is broken: http://paste.openstack.org/show/594333

Change-Id: I148d7932aff43bbbd07bd493504df974726234c2
Reviewed-on: https://gerrit.libreoffice.org/31279
Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index 8d64f40..3435224 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
-   $(if $(filter 140,$(VCVER)),legacy_stdio_definitions) \
+   $(if $(filter 140 150,$(VCVER)),legacy_stdio_definitions) \
odbc32 \
odbccp32 \
 ))
diff --git a/bridges/inc/except.hxx b/bridges/inc/except.hxx
index 32e9113..f1437f3 100644
--- a/bridges/inc/except.hxx
+++ b/bridges/inc/except.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX
 #define INCLUDED_BRIDGES_INC_EXCEPT_HXX
 
-#if _MSC_VER >= 1900 // VC 2015 (and later?)
+#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
 // extern "C" void** __cdecl __current_exception()
 // is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp:
 // return &__vcrt_getptd()->_curexception;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 8348014..5687c0d 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -803,7 +803,7 @@ int mscx_filterCppException(
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
 pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
-#if _MSC_VER >= 1900 // VC 2015 (and later?)
+#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
 __current_exception()
 #else
 // Hack to get msvcrt internal _curexception field
diff --git a/configure.ac b/configure.ac
index 244ea87..5982240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2112,10 +2112,10 @@ libo_FUZZ_ARG_WITH(doxygen,
 ,with_doxygen=yes)
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2013/2015>],
+AS_HELP_STRING([--with-visual-studio=<2013/2015/2017>],
 [Specify which Visual Studio version to use in case several are
  installed. If not specified, only 2013 is detected automatically
- because 2015 support is currently experimental.]),
+ because 2015 and 2017 support is currently experimental.]),
 ,)
 
 AC_ARG_WITH(windows-sdk,
@@ -3288,6 +3288,8 @@ map_vs_year_to_version()
 vsversion=12.0;;
 2015)
 vsversion=14.0;;
+2017)
+vsversion=15.0;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3304,16 +3306,22 @@ vs_versions_to_check()
 map_vs_year_to_version "$1"
 vsversions=$vsversion
 else
-# By default we prefer 2013/2015, in this order
-vsversions="12.0 14.0"
+# By default we prefer 2013/2015/2017, in this order
+vsversions="1

[Libreoffice-commits] core.git: solenv/bin

[David Ostrovsky]

 solenv/bin/modules/installer.pm   |   26 -
 solenv/bin/modules/installer/globals.pm   |1 
 solenv/bin/modules/installer/windows/directory.pm |   62 ++
 solenv/bin/modules/installer/windows/idtglobal.pm |   25 
 solenv/bin/modules/installer/windows/update.pm|   28 +
 5 files changed, 141 insertions(+), 1 deletion(-)

New commits:
commit 30473907a565764eb35a19051dc0d52704cf7bb7
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Jan 21 11:44:33 2017 +0100

tdf#105311 VC++ Runtime installed in wrong directory

Starting from MSVC 14.0, the directory table layout of VC++ Runtime merge
module changed. As consequence, all MSI produced with newer compilers,
including MSVC 15.0 (aka VS 2017) are broken in term that the VC++
Runtime DLLs are installed in the wrong directory, e.g.: C:\System64.

According to the specification for merging merge module (msm), see:
"Authoring Merge Module Directory Tables": [1], custom action 51 (set
property) must be emitted for every directory name in the merge module
directory table if the directory name is starting with the standard
directory name.

Quoting it here:

"
When a predefined directory is included in a merge module, the merge
tool automatically adds a Custom Action Type 51 to the target database.
The merge module author must ensure that a CustomAction table is also
included. The CustomAction table may be empty, but this table is required
to exist in the target database and ensures that the modified predefined
directories are written to the correct locations. For example, when a
system directory is included in a merge module, the merge module author
must ensure that a Custom Action table exists.

Note that the matching algorithm for the generation of these type 51
custom actions only checks that the directory name begins with one of
the predefined SystemFolder properties. It does not verify that the
directory name exactly equals the directory property. Any directory
beginning with one of these standard folder names gets a type 51 custom
action, even if the rest of the name is not a GUID. Authors need to take
care that this does not generate false positive matches, and unintended
custom action generation, on derivative primary keys that begin with one
of the SystemFolder properties."

Rectify the problem by analyzing the directory table from the merge
module, checking whether the directory name starts with the standard
prefix name and if it is the case, emitting custom action 51 to set this
variable to the standard directory name.

Implementation details:

We use the existing facility for emitting the custom action table events
including referencing them in the corresponding sequence tables. Given
that the specification above doesn't mention what sequence table should
be referencing this emitted custom action, we reversed engineer this
information from WiX toolkit. Merging the VC++ CRT module with WiX
toolkit and investigating the resulting MSI with Orca MSI reader, reveals
that these sequence tables were referencing from these sequence tables:

* AdminExecuteSequence
* AdminUISequence
* AdvtExecuteSequence
* InstallExecuteSequence
* InstallUISequence

Replicate this behaviour here as well. Note, though, that custom actions
are generally not referenced in AdminUISequence and AdvtExecuteSequence
tables in LibreOffice MSI building tool chain.

Rendering of the custom action is achieved by programmatic emulation of
custom action in SCP module. Consider this similar SCP module based
action:

  Name = "MigrateInstallPath";
  Typ = "321";
  Source = "shlxtmsi.dll";
  Target = "MigrateInstallPath";
  Inbinarytable = 1;
  Assignment1 = ("InstallExecuteSequence", "", "CostInitialize");
  Assignment2 = ("InstallUISequence", "", "CostInitialize");

We instantiate the following data structure to emit custom action
System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1:

  Name = "System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1"
  Typ = "51"
  Source = "System64Folder.3CFBED52_9B44_3A4D_953C_90E456671BA1"
  Target = "[System64Folder]"
  Styles = "NO_FILES"
  Assignment1 = ("AdminExecuteSequence", "", "CostInitialize")
  Assignment2 = ("InstallExecuteSequence", "", "CostInitialize")
  Assignment3 = ("InstallUISequence", "", "CostInitialize")

[1] 
https://msdn.microsoft.com/en-us/library/windows/desktop/aa

minutes of ESC call ...

[David Ostrovsky]

On Thu Jan 26 15:49:52 UTC 2017, Michael Meeks wrote:

[...]
>* Gerrit feedback for David (Michael)
>+ going to the gerrit conf. on our behalf.

Thanks!

>+ annoying behavior – automatic lost of comments when not logged
in (Miklos)
>+ if reply needs re-login, comment is lost.

Yes. This is very annoying. I think the problem still exists even on
master. What could help, is increasing the session expiration timeout
in gerrit configuration:

cache.web_sessions.maxAge 1 week

(default is 12 hours)

And also increase the cache size limit:

cache.web_sessions.memoryLimit 4096

(default is 1024)

https://gerrit-review.googlesource.com/Documentation/config-gerrit.html

>+ love a queue that auto-merged when CI succeeds (Michael)

The missing bits for that feature were finalized and merged during
recent Gerrit hackathon and will be included in the upcoming release
2.14. ETA is June 2017.

https://gerrit-review.googlesource.com/#/c/79760/

>+ one button migration of github pull requests ? (Bjoern)

There is a plugin for that: guthub-plugin from Luca Milanesio. I looked
into it years ago and it was very impressive, one button click and PR
was imported into gerrit as change for review.

https://gerrit-review.googlesource.com/#/admin/projects/plugins/github

I have another topic, updating our gerrit instance to 2.13.5,
from 2.11.8. There are a lot of improvements. For example submodule
subscriptions seems to work very reliably, so you never need to update
the reference to submodule again manually, after it was updated. Gerrit
does it for you, e.g. this commit upstream:


https://github.com/GerritCodeReview/gerrit/commit/c3c271b892a54f3e93346
d6de713a0c18b229940

It would be also cool, if you could look into new and shiny gerrit UI,
based on JavaScript Polymer framework, and provide feedback. You can
see the new UI in action upstream by switching in footer to new UI.
Only change screen is implemented for now. All diffs on one page is
already implemented:

https://gerrit-review.googlesource.com/

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: package/source

[David Ostrovsky]

 package/source/zipapi/ZipFile.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 32c9876d51fe0357ba66eb6292f772728080510b
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Jan 15 11:05:03 2017 +0100

ZipFile: make it work on MSVC 14.0

Change-Id: I99a00c61634375a75e15a8c1530213f5aad25b51

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 0f436ab..76eea85 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -35,6 +35,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include "blowfishcontext.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

[David Ostrovsky]

 scp2/source/ooo/vc_redist.scp |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 252e42cb5448f40c4bb26dbdf732168ff466b8ea
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Jan 6 22:04:17 2017 +0100

Clean up stale merge modules

Change-Id: I2489238d5295650a3c51581a037185440f641005
Reviewed-on: https://gerrit.libreoffice.org/32797
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 23214f0..8f21124 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,28 +18,6 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC100_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC110_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
 #if defined(WITH_VC120_REDIST)
 
 #if defined WINDOWS_X64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Status of microsoft visual studio 2015.

[David Ostrovsky]

On Sun Nov 20 22:25:43 UTC 2016, Jan Iversen wrote:

> Can someone please tell me, what is our status with microsoft visual
> studio 2015 ?

[...]

>What should I recommend to new people ?

GCC (or clang) on Linux?

> Sorry if this has been answered before, but I have honestly lost
track.

Quoting the wiki page, that is linked from the main compilation page
for that other OS:

https://wiki.documentfoundation.org/Development/msvc-x86_64#Ongoing_eff
orts_to_support_MSVC_14.0_.28aka_VS_2015.29

"
*Status*

64bit mode and 32bit modes, both debug and release modes are known to
work

After installation, LO refuses to start with the following error
message:

  The program can't start because VCRUNTIME140.dll is missing on your
computer.
   Try reinstalling the program to fix this problem.
"

And, on the same page:

"
*Unsolved problems (help wanted)*

VC Runtime libraries are installed in wrong directory (redist libraries
for MSVC 14.0)https://connect.microsoft.com/VisualStudio/feedback/detai
ls/1639267/c-runtime-and-mfc-merge-modules-for-x64-are-broken-install
-to-syswow64-instead-of-system32 ;- here MS claims that since VS 2015
U1, the merge modules for 64-bit runtime are fixedEven after MSVC 14.0
Upgrade 3 installation, and building LO, installing the msi package
refuses to start unless vc2015_redist package is installed separately.

There are two workarounds:

1. install MSVC 14.0 Redistributable manually: 
https://www.microsoft.com/en-us/download/details.aspx?id=48145.

2. patch C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC140_CRT_x64.msm before building LO:

Open the merge module Microsoft_VC140_CRT_x64.msm with an editor,
and replace two lines in "Directory" section: 

System64Folder.363ED482_721F_3A34_85B3_A96CD936D64F: TARGETDIR
 System64Folder_amd64_VC.363ED482_721F_3A34_85B3_A96CD936D64F: 
System64Folder.363ED482_721F_3A34_85B3_A96CD936D64F

with

System64Folder: TARGETDIR
 System64Folder_amd64_VC.363ED482_721F_3A34_85B3_A96CD936D64F:
System64Folder


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: MSVC 14.0 U3: LO msi package put VC redist libraries in wrong directory

[David Ostrovsky]

On Mon Aug 1 19:50:13 UTC 2016, V Stuart Foote wrote:

> OK, sucess. But had to do a bit to meet the KB2999226 issue...

Thanks Stuart, really appreciated. I totally missed that UCRT
dependency, that MSVC 14.0 build tool chain is using, must be installed
on the earlier version of Windows as 10:

"
Microsoft Visual Studio 2015 creates a dependency on the Universal CRT
when applications are built by using the Windows 10 Software
Development Kit (SDK).
"

And it seems that not all older Windows versions are supported for that
upgrade...

We should document your steps related to KB2999226 on some prominent
place, before we ship LO built with MSVC 14.0.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

MSVC 14.0 U3: LO msi package put VC redist libraries in wrong directory

[David Ostrovsky]

So, one year later, and even with upgrade 3 of MSVC 14.0 installed, the
problem reported here still doesn't seem to be fixed: [1]. Or at least
it still doesn't work with LO msi tool chain. In my case, it was
installing the redist libraries in C:\System64 directory. Looking into
the merge module, it diverges in directory table from working msm
module from MSVC 12.0.

One approach to fix it is to patch the merge module (more or less
reproduce the situation with working msm package from MSVC 12.0). The
process is documented here: [2].

The question is if there is a better way to achieve what we want,
though, as to mess around with msm file supplied by the MSVC 14.0, e.g.
try to substitute somehow the variable in question in msi build:

System64Folder.363ED482_721F_3A34_85B3_A96CD936D64F
with
System64Folder

I wonder if someone could give the LO msi built that way a try,
recent master, 64bit, release mode: [3]? LO should be installed on a
fresh Windows 64bit, installation, without and development tools and/or
any other applications that could supply vc_redist from MSVC 14.0 (i
wonder how it would work for them, though?) installed. Ideally, install
new Windows 64bit, install LO, try to start it.

As another test, before LO installation this file (and another 3):
C:\Windows\system32\msvcp140.dll
shouldn't exist, after the installation it should be there.

Thanks.

[1] https://connect.microsoft.com/VisualStudio/feedback/details/1746644
/microsoft-vc140-crt-x64-msm-merge-module-installs-c-c-runtime-dlls-in
-x32-folder
[2] https://wiki.documentfoundation.org/Development/msvc-x86_64#Unsolve
d_problems_.28help_wanted.29
[3] http://ostrovsky.org/libo/LibreOfficeDev_5.3.0.0.alpha0_Win_x64.msi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

compiler plugin

[David Ostrovsky]

On Tue, Jul 12, 2016 at 02:58:35PM +0200, Stephan Bergmann  wrote:
> where the first link, 
is the
> one to the results of the new Clang+plugins bot.  However, it is
unclear to
> me how to navigate from that page to the relevant information about
the
> failure, .

This is well known issue of non-obvious way to find out where actually
the logs of Jenkins matrix job are. And if you think you were happy to
find the logs for the right patch set and platform combination, you
start the game from the beginning to find out where the logs for
another patch set/platform combinations are. There are *four* different
kind of meta data involved in the process:

1. Gerrit: find out the right comment in the comment table from the
Jenkins Matrix job (watch for the patch set it was commented on)
2. Jenkins: find out the matrix job that corresponds to the comment in
1
3. Jenkins: find out the right platform job from the matrix job in 2
4. Jenkins: find out single job build outcome for the platform job in 3

Too many steps? Confusing? Something that could be improved?

Khai from the Openstack project and myself wrote verify-status gerrit
plugin: [1], that maintains secondary verify notification channel (the
fist one is reviewers notification channel; the comment table on change
screen should only include human comments and no spam with build
start/end notifications), persists the data in its own database (one
table) and loads and visualizes the data per patch set on the change
screen. With this plugin deployed, all 4 steps above are gone. Either
drop down control is used with links to the build log per per job that
corresponds to the patch set currently loaded on the change screen. Or,
alternatively, dedicated verify-status panel from the plugin is
rendered directly on the change screen.

Announcement: [2]. Screenshot: [3].

ATM Jenkins trigger plugin must be extended to support this verify
channel, e.g. plugin ssh command must be invoked to add build events to
the plugin data: [4].

Needless to say, that ones this works, the notification fire hose that
spams comment table with build notifications should be shut down.
Moreover the data gathered in the plugin can be easily accessed and
evaluated either directly with database own SQL tools, or even remotely
per plugin own ssh command: [5].

* [1] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/resources/Documentation
* [2] http://lists.openstack.org/pipermail/openstack-infra/2016-March/0
04098.html
* [3] https://imgur.com/KDquXfy
* [4] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/resources/Documentation/cmd-save.md
* [5] https://gerrit.googlesource.com/plugins/verify-status/+/master/sr
c/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/Verif
yStatusAdminQueryShell.java


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[David Ostrovsky]

On Mon, 2016-07-04 at 18:08 -0500, Norbert Thiebaud wrote:
> On Mon, Jul 4, 2016 at 3:04 PM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:

[...]

> Have you read the minutes you answered to ?
> "if +2 __by author__ and +1 by jenkins -> auto-push"
> 
> > 
> > project:core
> > branch:master
> > is:open
> > is:mergeable
> > label:Code-Review+2
> > label:Verified+1,c...@libreoffice.org
> > NOT label:Code-Review-2
> > NOT label:Verified-1
> 
> that does not implement the rule desired. see above
> we want Code-Review+2 _from the author_.
> that query return 4 records instead of 2 (at the time of testing

On second thought it would add some value to gerrit upstream to be able
to detect change owner votes, e.g.: "label:CodeReview+2,change_owner". 

So, I uploaded a change to gerrit: [1] and teached GQL or more
specifically label predicate from the secondary index to emit
additional value per change owner vote on labels during reindex-phase
and thus being able to detect those votes: [1]. With this patch applied
there is native way with GQL to do what you want:

project:core
branch:master
is:open
is:mergeable
label:Code-Review+2,change_owner
label:Verified+1,c...@libreoffice.org
NOT label:Code-Review-2
NOT label:Verified-1

I applied this commit on master (upcoming 2.13) as this is gerrit
policy for adding new features, but it would be trivial to backport
this non-intrusive diff to LO gerrit version (2.11.8), reindex, done.

[1] https://gerrit-review.googlesource.com/79760


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[David Ostrovsky]

On Mon, 2016-07-04 at 18:08 -0500, Norbert Thiebaud wrote:
> On Mon, Jul 4, 2016 at 3:04 PM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:
[...]
> Have you read the minutes you answered to ?
> "if +2 __by author__ and +1 by jenkins -> auto-push"
> 
> > 
> > project:core
> > branch:master
> > is:open
> > is:mergeable
> > label:Code-Review+2
> > label:Verified+1,c...@libreoffice.org
> > NOT label:Code-Review-2
> > NOT label:Verified-1
> 
> that does not implement the rule desired. see above
> we want Code-Review+2 _from the author_.
> that query return 4 records instead of 2 (at the time of testing)

OK, I missed that requirement. It cannot be done natively in GQL
because the data is retrieved from the secondary index, an it is stored
as list of only approvals in addition to approval,account form:

[code-review+2, verified+1, verified+1,100, code-review+2,100,
custom-label+1, custom-label+1,100]

There is global:Change-Owner pseudo system group in Gerrit, but it
cannot be rewritten as a valid predicate, because different changes
have different change owners.

So the way to go is still to use the query I suggested with --current
-patch-set option (use text or JSON response, what is easier for you to
parse) and filter out changes, that weren't approved by the change
owner. You have all infos necessary to preform the check.

e.g: this change that is returned by GQL query wouldn't pass this
check, because author != CRVW+2 voter:

[90018d327e9a41085585519a704f9fa07953cbf3]
ref: refs/changes/08/26308/1
uploader:
  name: Mark Page
  email: aptitude at btconnect.com
  username: rombust
createdOn: 2016-06-15 13:10:35 UTC
author:
  name: Mark Page
  email: aptitude at btconnect.com
  username: rombust
isDraft: false
kind: REWORK
approvals:
  type: Verified
  description: Verified
  value: 1
  grantedOn: 2016-06-15 14:21:31 UTC
  by:
name: Jenkins
email: ci at libreoffice.org
username: ci
approvals:
  type: Code-Review
  description: Code-Review
  value: 2
  grantedOn: 2016-06-16 07:25:52 UTC
  by:
name: Eike Rathke
email: erack at redhat.com
username: erAck
sizeInsertions: 1515
sizeDeletions: -1515

Sounds like a couple of lines of python script to me.

Alternatively, you could still use your SQL query for now (change-owner
-approval), combined with my GQL query (is:mergeable predicate):
intersecting the result sets from both queries should give you the
desired answer. 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[David Ostrovsky]

On Mon, 2016-07-04 at 09:34 -0500, Norbert Thiebaud wrote:
> On Sun, Jul 3, 2016 at 3:59 PM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:
> > On Thu Jun 30 15:46:27 UTC 2016 Michael Meeks wrote:
[...]
> > I think you are confused.
> 
> No, although using 3 different back-end is indeed a confused design.
> and yes H2 is off-limit.. but NoteDB hopefully will not be hidden
> behind a wall of java crap

After picking Java based Gerrit and Jenkins, really, just don't pick
Java based tool next time.

> 
> 
> > 
> > I do not have a better explanation how you came to the idea to mess
> > around with backend details of the persistent layer for change meta
> > data in Gerrit Code Review.
> 
> Because stream does not contain the necessary information to get the
> data...
> when I get a stream message about an approval +2 I do not know if
> that
> change was +1 verified by gerrit

Nobody ever told you to use stream events, but GQL.

> 
> > 
> > In the end you probably don't use emacs, to access content.xml from
> > ODT
> > file, if you want to read it, don't you?
> 
> I do not want to but I may have to.
> for instance how exactly do you handle duplicate account using
> 'gerrit
> front end' ?

Don't mix accounts and groups entities with change meta data.
The only way to fix duplicate account mess is sql, indeed,
but this is only because the infra team procrastinating to switch
to LDAP.

[...]
> select change_id || ',' || patch_set_id from patch_set_approvals
> where
> change_id in (select c.change_id from changes c, patch_sets p,
> patch_set_approvals a where status = 'n' and c.change_id =
> p.change_id
> and c.change_id = a.change_id and p.patch_set_id =
> c.current_patch_set_id and a.patch_set_id = c.current_patch_set_id
> and
> p.uploader_account_id = a.account_id and a.category_id = 'Code
> -Review'
> and a.value = 2) and category_id = 'Verified' and value = 1 and
> account_id = 1000855

What is the value of having (non working, because of missing
is:mergeable predicate) SQL statement if you don't have a database (in
near future)? Or is your plan to never upgrade to newer Gerrit
versions?

> how do you suggest to write that in 'GQL' query ? (note: teh querry
> above is missing a filter on the 'master' branch but that is trivial
> to add )

Have you read my original mail? Here is the fixed SQL version as GQL:

+ missing is:mergeable predicate
+ missing branch:master filter
+ missing exclusion of changes with reject votes on Code-Review (-2)
+ missing exclusion of changes with reject votes on Verified (-1)

project:core
branch:master
is:open
is:mergeable
label:Code-Review+2
label:Verified+1,c...@libreoffice.org
NOT label:Code-Review-2
NOT label:Verified-1 

> > This would dump the commit ids to supply to the gerrit review
> > command.
> > Iterating over the result above and calling (untested):
> > 
> > $ ssh logerrit gerrit review --submit 

Actually it can be simplified, you don't need to iterate, as gerrit
review command accepts list of commits, so just add this one liner to
crontab and move forward with the life (untested):

ssh logerrit gerrit review --submit $(ssh logerrit gerrit query -
-current-patch-set "'project:core branch:master is:open is:mergeable
label:Code-Review+2 label:Verified+1,c...@libreoffice.org NOT label:Code
-Review-2 NOT label:Verified-1'" | grep "  revision:" | awk '{print
$2}' | xargs)

> yeah except you need to find a way to analyze the result of this not
> not try over and over again to submit the same patch that won't go
> for
> some reason (merge conflict for instance).

Nope. Just rely on Gerrit design and is:mergeable predicate from the
query above. If you have two commits, c_1 and c_2 that are both
mergeable separately, but c_2 cannot be merged because of conflicts,
once c_1 was merged, all you need is to wait for the next run of the
cronjob: c_2 would not be picked up any more. Why? Because after c_1 is
merged, post ref-updated hook is run for each open change on the
project, and c_2 would be marked as not mergeable, and is:mergeable
predicate in GQL above for this change would return false in the next
run. (The same happens, if c_1 would be merged manually in Gerrit, by
clicking the Submit button, obviously).


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

minutes of ESC call ...

[David Ostrovsky]

On Thu Jun 30 15:46:27 UTC 2016 Michael Meeks wrote:

[...]
>* Pending Action Items:
[...]
>+ investigate a cron job that queries & auto-merges (Norbert)
> + if +2 by author and +1 by jenkins -> auto-push (on-going)
>+ SQL query done.. but yield interesting result...
>  https://gerrit.libreoffice.org/#/c/26347/  which 1/
is marked
>  'not mergeable' but I can't yet detect that
>  and really should not be merged anyway.. based on
comments.
>  + Not found a way to detect this yet.

I think you are confused.

I do not have a better explanation how you came to the idea to mess
around with backend details of the persistent layer for change meta
data in Gerrit Code Review. As you have noticed, not everything is
stored in the database, e.g. mergeability bit is stored in the
persistent (H2-based) cache. But it's even worth: as you may know, the
database layer for change meta data is already migrated to the GIT
storage (NoteDb) on Gerrit master, so everything that seems to work
today per SQL query would stop to work tomorrow, after upgrade.

In the end you probably don't use emacs, to access content.xml from ODT
file, if you want to read it, don't you? You would rather use a
frontend application (writer?) to do the job.

What you want to use instead here is the Gerrit frontend: Query
Language that is mapped to the right backend pieces and would adjust
the predicates once the data they are accessing is moved from the
database to persistent caches or GIT storage so the API is remaining
stable for the user (frontend is backend implementation agnostic,
obviously).

So the GQL query you are looking for, that is executed through SSH
query command, is:

$ ssh logerrit gerrit query "'project:core is:open is:mergeable
label:Code-Review+2 label:Verified+1,c...@libreoffice.org NOT label:Code
-Review-2 NOT label:Verified-1'"

The result of it right now on gerrit.libreoffice.org are these two
changes: 26566, 26308.

You could use query --format json option and parse it with a couple of
lines of python script, or alternatively you could add --current-patch
-set option and grep for the "  revision:" line:

$ ssh logerrit gerrit query --current-patch-set "'project:core ...'" | 
grep "  revision:" | awk '{print $2}'
50d05404589960804ebaba6d1ffa5afeddd1df6d
d145feafa6c8c94b3848ecbbd624d2ceb1904b2f

This would dump the commit ids to supply to the gerrit review command.
Iterating over the result above and calling (untested):

$ ssh logerrit gerrit review --submit 

with a user that has required ACL, should do the job.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Problem with multiple identities on Gerrit

[David Ostrovsky]

On Mon, 2016-05-09 at 08:42 -0500, Norbert Thiebaud wrote:
> On Mon, May 9, 2016 at 1:43 AM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:
> > 
> > > On Sat May 7 18:11:11 UTC 2016 Norbert Thiebaud wrote:
> > 
> > > > On Fri, May 6, 2016 at 6:31 PM, Mike Kaganski  > hotmail.com> wrote:
> > > > Hello!
> > > > 
> > > > Currently I have a gerrit account with two identities:
> > [...]
> > 
> > > I not sure if you really try to link (iow log
> > > on with an existing identity -> setting -> add ana identity) and
> > > there
> > > is a bug in OAuth + openid that recognized your old gerrit openid
> > > and
> > > link Oauth to that.
> > 
> > There is no way for him to link Google OpenID account, that he
> > cannot
> > use to log in, to Google OAuth2, obviously. That why the linking is
> > working out of the box, so it's enough to just log in. It's funny
> > you
> > are talking about "a bug in OAuth + openid"
> 
> you are quote mining and dropped from the above the all important:
> 
> "or you did not and it worked as designed and
> attached your google OAuth to your old expired goggle openid"
> 
> I offered 2 alternative:
> 
> Either he was logged on an existing account (not the one that had the
> old google openid, but some other that was created using a different
> identity)
> and he tried to 'add a new identity'
> 
> Or he simply just tryied to log-in using google OAuth straight up
> 
> in the later case I expect indeed things to work the way you describe
> (which is way I said: "or you did not and it worked as designed and
> attached your google OAuth to your old expired goggle openid"
> 
> in the former case I do not expect that the new Oauth identity to be
> attached to another account than the one he was logged in while
> trying
> to 'add a new identity'

Indeed, that's how it's supposed to work. Looks like I misread your
comment; thanks for clarifying.

Note, though, that mapping support for the OpenID 2.0 identifier
(legacy OpenID 2.0 Google identities) and automagically linking during
log-in using Google OAuth straight up is only supported until January
1, 2017, as mentioned in the migration spec[1]:

"
Note: Support for the OpenID 2.0 identifier mapping described above
will remain in effect until January 1, 2017.
"

[1] https://developers.google.com/identity/protocols/OpenID2Migration#u
pdate-to-plus


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Problem with multiple identities on Gerrit

[David Ostrovsky]

> On Sat May 7 18:11:11 UTC 2016 Norbert Thiebaud wrote:

>>On Fri, May 6, 2016 at 6:31 PM, Mike Kaganski  wrote:
>> Hello!
>>
>> Currently I have a gerrit account with two identities:
[...]

> I not sure if you really try to link (iow log
>on with an existing identity -> setting -> add ana identity) and there
>is a bug in OAuth + openid that recognized your old gerrit openid and
>link Oauth to that.

There is no way for him to link Google OpenID account, that he cannot
use to log in, to Google OAuth2, obviously. That why the linking is
working out of the box, so it's enough to just log in. It's funny you
are talking about "a bug in OAuth + openid", while I spent weeks to
make it work this way.  It's not a bug, it's a feature.

I know nobody understands that, so I will try to explain it again:

1. a user subscribed to gerrit.libreoffice.org in 2013 with Google
OpenID and ... disappeared
2. today the same user log in (note, no way for her to link anything,
because she has only one single, iow disabled Google OpenID account)
3. Google OAuth2 plugin will detect that this is the same user and will
link OpenID account from 2013 to the new OAuth2 identity


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cppu/qa external/curl external/icu include/cppu onlineupdate/Executable_updater.mk solenv/gbuild solenv/gcc-wrappers

[David Ostrovsky]

 cppu/qa/test_unotype.cxx   |   60 -
 external/curl/ExternalProject_curl.mk  |2 -
 external/icu/UnpackedTarball_icu.mk|1 
 external/icu/icu4c-wchar_t.patch   |   16 
 include/cppu/unotype.hxx   |6 +--
 onlineupdate/Executable_updater.mk |6 ---
 solenv/gbuild/platform/com_MSC_defs.mk |2 -
 solenv/gcc-wrappers/wrapper.cxx|1 
 8 files changed, 3 insertions(+), 91 deletions(-)

New commits:
commit e16fa715c43dcdf836ce8c400b6d54eae87b627d
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sun Mar 13 09:18:00 2016 +0100

Handle wchar_t as native C++11 type on windows

The option /Zc:wchar_t- prevented to use wchar_t as a built-in type
according to the C++ standard. In Visual C++ 6.0 and earlier, wchar_t
was not implemented as a built-in type, but was declared in wchar.h as
a typedef for unsigned short. Now, years later after the end of life
this outdated toolchain, there is no reason not to use native type.

The only issue could be the ABI compatibility. But on a quick look at
least, it looks like none of the mangled C++ symbols in the stable URE
interface actually depend on wchar_t.

We forgot to get rid of /Zc:wchar_t- in 5.1. Do that for LibreOffice
5.2, though.

Change-Id: I8d6b380660859efa44c83c830734978d31d756a0
Reviewed-on: https://gerrit.libreoffice.org/22589
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 0f2beb0..bbaaac7 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -235,12 +235,7 @@ void Test::testUnoType() {
 }
 
 void Test::testGetTypeFavourUnsigned() {
-#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
-// cf. sal/types.h sal_Unicode
-CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
-#else
 CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
-#endif
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(static_cast(nullptr)),
 cppu::UnoType::get());
@@ -284,16 +279,9 @@ void Test::testGetTypeFavourUnsigned() {
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(static_cast(nullptr)),
 cppu::UnoType::get());
-#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
-// cf. sal/types.h sal_Unicode
-CPPUNIT_ASSERT_EQUAL(
-cppu::getTypeFavourUnsigned(static_cast(nullptr)),
-cppu::UnoType::get());
-#else
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(static_cast(nullptr)),
 cppu::UnoType::get());
-#endif
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(static_cast(nullptr)),
 cppu::UnoType::get());
@@ -330,22 +318,6 @@ void Test::testGetTypeFavourUnsigned() {
 cppu::UnoType<
 cppu::UnoSequenceType<
 cppu::UnoSequenceType>>::get());
-#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
-// cf. sal/types.h sal_Unicode
-CPPUNIT_ASSERT_EQUAL(
-cppu::getTypeFavourUnsigned(
-static_cast<css::uno::Sequence *>(nullptr)),
-cppu::UnoType<
-cppu::UnoSequenceType>::get());
-CPPUNIT_ASSERT_EQUAL(
-cppu::getTypeFavourUnsigned(
-static_cast<
-css::uno::Sequence<
-css::uno::Sequence> *>(nullptr)),
-cppu::UnoType<
-cppu::UnoSequenceType<
-cppu::UnoSequenceType>>::get());
-#else
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(
 static_cast<css::uno::Sequence *>(nullptr)),
@@ -358,7 +330,6 @@ void Test::testGetTypeFavourUnsigned() {
 cppu::UnoType<
 cppu::UnoSequenceType<
 cppu::UnoSequenceType>>::get());
-#endif
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourUnsigned(
 static_cast(nullptr)),
@@ -429,12 +400,7 @@ void Test::testGetTypeFavourUnsigned() {
 }
 
 void Test::testGetTypeFavourChar() {
-#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
-// cf. sal/types.h sal_Unicode
-CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
-#else
 CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
-#endif
 CPPUNIT_ASSERT_EQUAL(
 cppu::getTypeFavourChar(static_cast(nullptr)),
 cppu::UnoType::get());
@@ -454,16 +420,9 @@ void Test::testGetTypeFavourChar() {
 cppu::getTypeFavourChar(
 static_cast(nullptr)),
 cppu::UnoType::get());
-#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__
-// cf. sal/types.h sal_Unicode
-CPPUNIT_ASSERT_EQUAL(
-cppu::getTypeFavourChar(static_c

Lode and Chocolate.

[David Ostrovsky]

On Sat Mar 12 09:06:40 UTC 2016, jan iversen wrote:

>> On 12 Mar 2016, at 09:52, Norbert Thiebaud 
wrote:
>> 
>> On Sat, Mar 12, 2016 at 2:10 AM, jan iversen
>>  wrote:
>>> Hi.
>>> 
>>> Just tried the new chocolate setup with lode, works very nicely.
GOOD WORK.
>>> 
>>> It would be even nice if we got it integrated into the first lode
install script, or at least the script check for the prerequsites.
>> 
>> lode is meant to be run as a non-admin, on purpose so that the
cygwin
>> installed is owned by the normal user.. which save the back and
forth
>> to install new packages or edit /etc or usr/
>> and in general it is a good thing to build with a regular user (just
>> like on linux you should not build as root)
>> 
>> chocolate, and the stuff it install need to be as 'admin'
>> so that still would require two step...
>> Still that can make things much nicer.. since lode could provide a
>> chocolate wrapper that the user be instructed to run as admin
>> 
>Interesting, when I read the instructions, I read that
>install_cygwin.ps1 is run as admin, and ./setup as a normal user (due
>to the fat warning before running ./setup).
>
>My thinking was to have the chocolate steps in install_cygwin.ps1 with
>our "defaults" and command line options to overwrite them.

This is a valid point. How about provide a new script, say lode_boot
(or some such), that would install all prerequisites (using chocolate +
current install_cygwin.ps1):

* SDK10,
* MSVC 14.0
* JDK8
* Emacs
* Cygwin + all usual suspects: ant, junit, make, nasm, ...

The workflow for a contributor and/or Jenkins/TB administrator would be
(square brackets steps are optional):

0. set up Windows VM
1. relax Powershell script execution restriction
2. install Chocolate
3. clone lode project
4. cd lode
5. ./lode_boot # as admin, with some option, like msvc-proffesional, ..
6. ./setup # as normal user
7. cd dev/core
[8]. add more autogen.input options
9. ./autogen.sh
10. make
[11]. start Emacs, hack, or
[12]. make vs2015-ide-integration
[13]. start MSVC 14.0, hack

PS. Oh, just saw, that vs2015-ide-integration target wasn't implemented
yet ;-( Would be nice if we would have an easy hack for that.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/lcms2

[David Ostrovsky]

 external/lcms2/ExternalProject_lcms2.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3bd54fd17bddea8b7460279153209729a54c9369
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Mar 12 08:20:32 2016 +0100

Fix lcms2 on MSVC 14.0

Without explicitly specifying toolset v140, the build was
failing when only MSVC 14.0 was installed:

  The builds tools for v120 (Platform Toolset = 'v120')
  cannot be found

Change-Id: I6fb386d56e38cbf922de5069e70a3d3def147c0b
Reviewed-on: https://gerrit.libreoffice.org/23162
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 6bf69b3..981c1e6 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -19,6 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade 
lcms2_DLL.vcxproj,echo up-to-date) && \
MSBuild.exe lcms2_DLL.vcxproj \
+   $(if $(filter 
140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) 
/p:TargetName=lcms2 \
,Projects/VC2013/lcms2_DLL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/glew

[David Ostrovsky]

 external/glew/ExternalProject_glew.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 682da4010b45cbb3268ea8b2b3da455bca413acd
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Mar 12 01:01:48 2016 +0100

Fix glew on MSVC 14.0

Without explicitly specifying toolset v140, the build was
failing when only MSVC 14.0 was installed:

  The builds tools for v120 (Platform Toolset = 'v120')
  cannot be found

Change-Id: I5849821f291b705ad75db8b4c9404af8458902ba
Reviewed-on: https://gerrit.libreoffice.org/23160
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index bb78dce..0d80cd0 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,10 +17,10 @@ ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo 
up-to-date) && \
-   msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 
140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
,build/vc12) \
$(call gb_ExternalProject_run,build,\
-   msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release \
+   msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release $(if $(filter 
140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
,build/vc12)
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[David Ostrovsky]

Hi,

On Fri, 2016-03-11 at 11:00 -0600, Norbert Thiebaud wrote:
> On Fri, Mar 11, 2016 at 1:29 AM, David Ostrovsky <d.ostrov...@gmx.de>
> wrote:
> > 
> > I've just approved this change: [1] and after confirmtaion from
> > Norbert
> > that our CI infra was extended to support MSVC 2015, I will merge
> > it.
> 
> in another related thread vmiklos pointed to a residual problem with
> 32 bits on vs2015 only setup.
> something about missing dotnet stuff it seems... I'm not sure.. but
> that is prolly something
> that need explaining/addressing before we switch...

Sorry, fixed in: [1]. I added the TODO there, and asked shm_get to drop
support for Windows 32 bit platform. After he said no, /me forgot to
test 32bit build on 32bit platform. I only tested it on 64bit platform.

Unrelated to this thread, but while setting new 32bit VM I tried

  LODE on Chocolate 

combination, and it was v. impressive. Thanks to all (mostly shm_get)
who made the setup on this platform so ... painless. I extended the
Wiki here: [2].

* [1] https://gerrit.libreoffice.org/23159
* [2] https://wiki.documentfoundation.org/Development/lode#Preparing_Wi
ndows_with_Chocolate

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dc519b6dea7653e4b68b45aa664e3c0b5189d682
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Mar 12 00:07:28 2016 +0100

Fix .NET detection on 32bit platform

Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
Reviewed-on: https://gerrit.libreoffice.org/23159
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/configure.ac b/configure.ac
index cd3d79a..23b6fb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5279,13 +5279,17 @@ find_dotnetsdk46()
 {
 unset frametest
 
-for ver in 4.6; do
-# TODO(davido): Do we need to take care about 32bit?
+for ver in 4.6.1 4.6; do
 reg_get_value_64 
"HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
 if test -n "$regvalue"; then
 frametest=$regvalue
 return
 fi
+reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
+if test -n "$regvalue"; then
+frametest=$regvalue
+return
+fi
 done
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[David Ostrovsky]

Hi Lionel,

adding Christian to the CC.

On Fri, 2016-03-11 at 07:57 +0100, Lionel Elie Mamane wrote:
> On Fri, Mar 11, 2016 at 07:30:54AM +0100, David Ostrovsky wrote:
> > On Fri, 2016-03-11 at 06:45 +0100, Lionel Elie Mamane wrote:
> > > On Thu, Mar 10, 2016 at 07:28:58PM +0100, David Ostrovsky wrote:
> > > > On Thu Mar 10 16:40:50 UTC 2016, Michael Meeks wrote:
> > 
> > [...]
> > 
> > > > >+ decision needed: (Norbert)
> > > > >+ effort to support VS 2015
> > > > >+ not eager to turn it off.
> > > > > AI:=> regret; disable for now for CI (Norbert)
> > > 
> > > > (...) the FB devs rejected support for the new toolchain
> > > > (C++14/C++17) for the next 10 years (at least) because they
> > > > need
> > > > the
> > > > compatibility with WinXP (see the thread from their ML I
> > > > mentioned
> > > > in my previous mail).
> > > 

[...]

> > > then AFAICS we don't have a problem.
> 
> > I see it differently. Just in case, we dropped MSVC 2013 and the
> > LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME = 10 years,
> 
> No, more like 1 year.
> 
> > 1/ How is LO 6,7,8,9,10, ... going to be released, after support
> > for
> > MSVC 2013 was discontinued on master?
> 
> ?

I've just approved this change: [1] and after confirmtaion from Norbert
that our CI infra was extended to support MSVC 2015, I will merge it.

How is the next LibreOffice release (5.2?) supposed to be built after
this change was merged, when FB cannot be built on MSVC 2015 toolchain?
And other releases during this 1 year (too optimistic assumption for
me, but still)?

@Christian, any comments on that from your side?

> > 2/ For all this time, that FB is not buildable on some platform(s),
> > but still in the tree
> 
> We will not let it like that for the timeframe that you mention.
> 
> > Can we try to answer my questions 1/ and 2/ above in next ESC
> > meeting?
> 
> If/when we have enough new information that a discussion at the ESC
> makes sense, would you like to participate at that ESC meeting?
> 

I will attend Gerrit developer Hackathon in Berlin next week, but I can
try to join you.

* [1] https://gerrit.libreoffice.org/22588

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[David Ostrovsky]

Hi Lionel,

On Fri, 2016-03-11 at 06:45 +0100, Lionel Elie Mamane wrote:
> On Thu, Mar 10, 2016 at 07:28:58PM +0100, David Ostrovsky wrote:
> > On Thu Mar 10 16:40:50 UTC 2016, Michael Meeks wrote:

[...]

> > >+ decision needed: (Norbert)
> > >+ effort to support VS 2015
> > >+ not eager to turn it off.
> > > AI:=> regret; disable for now for CI (Norbert)
> 
> > (...) the FB devs rejected support for the new toolchain
> > (C++14/C++17) for the next 10 years (at least) because they need
> > the
> > compatibility with WinXP (see the thread from their ML I mentioned
> > in my previous mail).
> 
> I read that thread and I didn't see a rejection of compatibility with
> a new toolchain. I saw a requirement for compatibility with an old
> toolchain. If they intend (and do test it at least "for every
> release") to:
> 
>  * be compatible with MSVC2013
>  * build their binaries with MSVC2013
>  * AND be compatible with


Can you point me to this statement in this thread?

> MSVC${LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME}

You are missing one subtle delay here:

TIME_NEEDED_THAT_A_HACKER_SHOWS_UP_AND_BUMP_CURRENT_FB_VERSION_TO_THE_R
ECENT_ONE_THAT_SUPPORTS
MSVC${LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME}

> then AFAICS we don't have a problem.

I see it differently. Just in case, we dropped MSVC 2013 and the
LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME = 10 years,

1/ How is LO 6,7,8,9,10, ... going to be released, after support for
MSVC 2013 was discontinued on master?

I havn't seen the answer to this question in ESC minutes.

With disabled FB? Also disable it in release build on Mac (it's failing
on recent toolchain there too)? Is this our vision for the (default)
embedded database, to be buildable and shipped on only one platform for
years (from major 3): linux? Really?

2/ For all this time, that FB is not buildable on some platform(s), but
still in the tree with --enable-foo=true option we must try very hard
to prevent one thing from happening: that a casual contributor will go
that far, set up build environment, checkout the sources, and the build
would fail hours later with compiler error, because FB cannot be built
on that platform, see the value of the variable
LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME above.

Can we try to answer my questions 1/ and 2/ above in next ESC meeting?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

minutes of ESC call ...

[David Ostrovsky]

On Thu Mar 10 16:40:50 UTC 2016, Michael Meeks wrote:

>* embedded database / firebird mess (Lionel/David O)

[...]

>+ or bundle their binaries (urgh) (Lionel)
> + deep non-enthusiasm (Norbert, Michael, Bjoern)

But isn't this is exactly what we did for years with Seamonkey based
Mozab driver ... and TBH if /me wouldn't remove it in: [2], we would
probably still ship the prebuilt binaries of this mess for years. So
what is wrong to ship parts of our suite that we can't build? Why it
was the right thing to do, to ship prebuilt Mozab mess for years, but
is wrong thing to do to ship prebuilt FB?

>+ decision needed: (Norbert)
>+ effort to support VS 2015
>+ not eager to turn it off.
>AI:=> regret; disable for now for CI (Norbert)

I have strong impression that there is still some misunderstanding
left: we don't "regret; disable (FB) for now for CI", but we can't
build it any more in next 10 years with our current toolchain at all,
after this patch is merged: [1]. After [1] is merged, say in a couple
of weeks, after we have enough TB and gerrit slaves settled with MSVC
2015, we have exactly two options:

* a) drop FB
* b) ship the prebuilt binaries on windows, built with old and removed
toolchain (and on Mac, because it cannot be built there as well?)

And no, we don't have the option:

* c) fix FB to build on MSVC 2015

because the FB devs rejected support for the new toolchain
(C++14/C++17) for the next 10 years (at least) because they need the
compatibility with WinXP (see the thread from their ML I mentioned in
my previous mail).

In case someone is in doubt, why should we merge [1]: we urgently need
MSVC 2015 to support recent Python 3.5, because Python project dropped
support for MSVC 2013 last year, and we are shipping outdated Python
3.3 in LO 5.1 on Windows because of the outdated compiler toolchain on
this platform. Not to mention better C++ standard C++14/C++17 support.

So, what option should we choose to move forward with merging [1]: a)
or b)?

[1] https://gerrit.libreoffice.org/22588
[2] https://gerrit.libreoffice.org/19560


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - download.lst external/nss

[David Ostrovsky]

 download.lst|2 +-
 external/nss/ExternalProject_nss.mk |1 +
 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.cygwin64.in32bit.patch |   14 ++
 external/nss/nss.patch  |   31 +++
 external/nss/nss.vs2015.patch   |   22 +++---
 external/nss/ubsan.patch.0  |   28 
 7 files changed, 64 insertions(+), 36 deletions(-)

New commits:
commit ecdb54d5f129c96c06feda32915f249d01254e18
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Feb 23 22:25:06 2016 +0100

Bump nss to 3.22.1 and nspr to 4.12

It seems like nss has activated -Werror, even though the code is not
warning free: [1].  This applies also to the additional patches that
would need to be patched to be a warning free patch, endless recursion.

To avoid messing around with something like that: [2], we disable
-Werror option for now. Also note, that [2] doesn't fix all warnings,
but only part of them so that we let with unsolved non-trivially to
fix warnings on different supported compilers if we would choose the
warning-free-compilation-path.

[1] 
https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion
[2] 
https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec

Reviewed-on: https://gerrit.libreoffice.org/22650
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
(cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f)

Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2
Reviewed-on: https://gerrit.libreoffice.org/23097
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/download.lst b/download.lst
index d621dc2..c17a097 100755
--- a/download.lst
+++ b/download.lst
@@ -103,7 +103,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_TARBALL := 
478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
+export NSS_TARBALL := 
d45f17e742acd490d1df7256cb4356b6-nss-3.22.1-with-nspr-4.12.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 17ea6f1..bd64971 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -22,6 +22,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
+   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
,,nss_configure.log)
 
 ifeq ($(OS),WNT)
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 4afd275..bf3ef9a 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -27,6 +27,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-chromium-nss-static.patch \
 external/nss/nss-more-static.patch \
 external/nss/nss-ios.patch) \
+   $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
+   external/nss/nss.cygwin64.in32bit.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.cygwin64.in32bit.patch 
b/external/nss/nss.cygwin64.in32bit.patch
new file mode 100755
index 000..b00761a
--- /dev/null
+++ b/external/nss/nss.cygwin64.in32bit.patch
@@ -0,0 +1,14 @@
+This fixes architecture mismatch, when building
+on Cygwin 64bit and in 32bit mode
+diff -ru nss.orig/nss/Makefile nss/nss/Makefile
+--- a/nss.orig/nss/Makefile   2016-02-26 01:00:52.146713100 +0100
 b/nss/nss/Makefile2016-02-26 01:02:05.303560100 +0100
+@@ -59,6 +59,8 @@
+ # Translate coreconf build options to NSPR configure options.
+ #
+
++NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin
++
+ ifeq ($(OS_TARGET),Android)
+ NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
+--target=$(ANDROID_PREFIX) \
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/nss

[David Ostrovsky]

 external/nss/nss.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 5e4f1ab7c045f46d2c21639e69b96c38b1f0
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Mar 4 19:59:18 2016 +0100

nss: Fix pointer truncation from 'char *' to 'long'

Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005
Reviewed-on: https://gerrit.libreoffice.org/22916
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b)
Reviewed-on: https://gerrit.libreoffice.org/23103
Reviewed-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 2cb23be..5483635 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,3 +1,14 @@
+--- a/nss.orig/nspr/pr/src/misc/prnetdb.c  2016-02-12 14:51:25.0 
+0100
 b/nss/nspr/pr/src/misc/prnetdb.c   2016-03-04 19:23:00.462892600 +0100
+@@ -438,7 +438,7 @@
+   char *buf = *bufp;
+   PRIntn buflen = *buflenp;
+ 
+-  if (align && ((long)buf & (align - 1))) {
++  if (align && ((ptrdiff_t)buf & (align - 1))) {
+   PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
+   if (buflen < skip) {
+   return 0;
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100
 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst external/nss

[David Ostrovsky]

 download.lst|2 +-
 external/nss/ExternalProject_nss.mk |1 +
 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.cygwin64.in32bit.patch |   14 ++
 external/nss/nss.patch  |   31 +++
 external/nss/ubsan.patch.0  |   28 
 6 files changed, 53 insertions(+), 25 deletions(-)

New commits:
commit 8e6ee22f2bffecff9d85058c6c21312585c6f1cc
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Feb 23 22:25:06 2016 +0100

Bump nss to 3.22.1 and nspr to 4.12

It seems like nss has activated -Werror, even though the code is not
warning free: [1].  This applies also to the additional patches that
would need to be patched to be a warning free patch, endless recursion.

To avoid messing around with something like that: [2], we disable
-Werror option for now. Also note, that [2] doesn't fix all warnings,
but only part of them so that we let with unsolved non-trivially to
fix warnings on different supported compilers if we would choose the
warning-free-compilation-path.

[1] 
https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion
[2] 
https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec

Reviewed-on: https://gerrit.libreoffice.org/22650
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
(cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f)

Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2
Reviewed-on: https://gerrit.libreoffice.org/23102
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/download.lst b/download.lst
index f000f78..40f44e6 100644
--- a/download.lst
+++ b/download.lst
@@ -109,7 +109,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_TARBALL := 
478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
+export NSS_TARBALL := 
d45f17e742acd490d1df7256cb4356b6-nss-3.22.1-with-nspr-4.12.tar.gz
 export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
 export ODFGEN_VERSION_MICRO := 4
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 17ea6f1..bd64971 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -22,6 +22,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
+   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
,,nss_configure.log)
 
 ifeq ($(OS),WNT)
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 1b9f45d..803e809 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -26,6 +26,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-chromium-nss-static.patch \
 external/nss/nss-more-static.patch \
 external/nss/nss-ios.patch) \
+   $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
+   external/nss/nss.cygwin64.in32bit.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.cygwin64.in32bit.patch 
b/external/nss/nss.cygwin64.in32bit.patch
new file mode 100755
index 000..b00761a
--- /dev/null
+++ b/external/nss/nss.cygwin64.in32bit.patch
@@ -0,0 +1,14 @@
+This fixes architecture mismatch, when building
+on Cygwin 64bit and in 32bit mode
+diff -ru nss.orig/nss/Makefile nss/nss/Makefile
+--- a/nss.orig/nss/Makefile   2016-02-26 01:00:52.146713100 +0100
 b/nss/nss/Makefile2016-02-26 01:02:05.303560100 +0100
+@@ -59,6 +59,8 @@
+ # Translate coreconf build options to NSPR configure options.
+ #
+
++NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin
++
+ ifeq ($(OS_TARGET),Android)
+ NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
+--target=$(ANDROID_PREFIX) \
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index e555d6e..2cb23be 100644
--- a/external/nss/nss.patch
+++ b/external/nss/ns

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/nss

[David Ostrovsky]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.vs2015.pdb.patch   |   22 ++
 2 files changed, 24 insertions(+)

New commits:
commit dcdb34007cfc95bf993dd8b764cf94a93197d578
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Mar 4 19:55:16 2016 +0100

Fix nss on MSVC 14.0 in debug mode

outdir doesn't seem to be created. Use current directory for
pdb files as the obj files are already stored in the current
directory.

Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56
Reviewed-on: https://gerrit.libreoffice.org/22888
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a)
Reviewed-on: https://gerrit.libreoffice.org/23099
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index bf3ef9a..0e2f20c 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
+   $(if $(filter WNTMSC,$(OS)$(COM)), \
+   external/nss/nss.vs2015.pdb.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.vs2015.pdb.patch 
b/external/nss/nss.vs2015.pdb.patch
new file mode 100755
index 000..dc4f463
--- /dev/null
+++ b/external/nss/nss.vs2015.pdb.patch
@@ -0,0 +1,22 @@
+diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- a/nss.orig/nss/coreconf/WIN32.mk   2016-03-04 08:30:16.306639400 +0100
 b/nss/nss/coreconf/WIN32.mk2016-03-04 08:31:17.987233200 +0100
+@@ -169,15 +169,15 @@
+   DLLFLAGS   += -OUT:$@
+   ifdef MOZ_DEBUG_SYMBOLS
+   ifdef MOZ_DEBUG_FLAGS
+-  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
++  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./
+   else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/
++  OPTIMIZER += -Zi -Fd./
+   endif
+   DLLFLAGS += -DEBUG -OPT:REF
+   LDFLAGS += -DEBUG -OPT:REF
+   endif
+ else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
++  OPTIMIZER += -Zi -Fd./ -Od
+   NULLSTRING :=
+   SPACE  := $(NULLSTRING) # end of the line
+   USERNAME   := $(subst $(SPACE),_,$(USERNAME))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/nss

[David Ostrovsky]

 external/nss/nss.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 61d98a02facfd3615338582256ddf193c4cf02f8
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Mar 4 19:59:18 2016 +0100

nss: Fix pointer truncation from 'char *' to 'long'

Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005
Reviewed-on: https://gerrit.libreoffice.org/22916
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b)
Reviewed-on: https://gerrit.libreoffice.org/23098
Reviewed-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index e555d6e..d02a65b 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,3 +1,14 @@
+--- a/nss.orig/nspr/pr/src/misc/prnetdb.c  2016-02-12 14:51:25.0 
+0100
 b/nss/nspr/pr/src/misc/prnetdb.c   2016-03-04 19:23:00.462892600 +0100
+@@ -438,7 +438,7 @@
+   char *buf = *bufp;
+   PRIntn buflen = *buflenp;
+ 
+-  if (align && ((long)buf & (align - 1))) {
++  if (align && ((ptrdiff_t)buf & (align - 1))) {
+   PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
+   if (buflen < skip) {
+   return 0;
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100
 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source dbaccess/source sd/source sfx2/source slideshow/source svx/source vcl/source xmloff/source

[David Ostrovsky]

 chart2/source/inc/CommonConverters.hxx   |1 +
 chart2/source/tools/DataSourceHelper.cxx |2 ++
 dbaccess/source/filter/xml/xmlExport.cxx |1 +
 sd/source/ui/sidebar/MasterPageObserver.cxx  |1 +
 sfx2/source/view/classificationhelper.cxx|1 +
 slideshow/source/engine/shapes/drawshape.cxx |1 +
 svx/source/form/formcontroller.cxx   |1 +
 vcl/source/gdi/textlayout.cxx|1 +
 xmloff/source/chart/SchXMLTableContext.cxx   |1 +
 xmloff/source/text/txtparae.cxx  |1 +
 10 files changed, 11 insertions(+)

New commits:
commit adfa77254927dcb3f2a87eb0d23c71ad7282948b
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Wed Mar 9 00:01:36 2016 +0100

Add missing includes

These include were needed to compile on Windows, MSVC 14.0 with
clang-cl.

Change-Id: I4ca5cec8314920e90fcca6fa69ec4df87d680f29
Reviewed-on: https://gerrit.libreoffice.org/23044
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/chart2/source/inc/CommonConverters.hxx 
b/chart2/source/inc/CommonConverters.hxx
index 46288be..af72ba1 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -38,6 +38,7 @@
 
 #include 
 #include 
+#include 
 
 namespace chart
 {
diff --git a/chart2/source/tools/DataSourceHelper.cxx 
b/chart2/source/tools/DataSourceHelper.cxx
index 6e37732..3d90fa9 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -37,6 +37,8 @@
 #include 
 #include 
 
+#include 
+
 namespace chart
 {
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx 
b/dbaccess/source/filter/xml/xmlExport.cxx
index 14bf274..2938173 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -54,6 +54,7 @@
 
 #include 
 #include 
+#include 
 
 namespace dbaxml
 {
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx 
b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 78b6dbc..cc32177 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -20,6 +20,7 @@
 #include "MasterPageObserver.hxx"
 
 #include 
+#include 
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include 
diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index c3161b6..ab913b5 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index 1d58d8d..667a176 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index 238c265..d0c93d3 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -88,6 +88,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 0b7ac69..1e01659 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -33,6 +33,7 @@
 #endif
 
 #include 
+#include 
 
 namespace vcl
 {
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx 
b/xmloff/source/chart/SchXMLTableContext.cxx
index d70b8f6..5bef107 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -49,6 +49,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace ::xmloff::token;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index b2c4320..3cadc6a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -109,6 +109,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::std;
 using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[David Ostrovsky]

 solenv/gbuild/platform/com_MSC_defs.mk |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1baf5c3c66700b8072436ae0fdb210a442cc7e68
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Mar 8 19:54:42 2016 +

Fix unrecognized -Wv:18 option for clang-cl on MSVC 14.0

Change-Id: I4ac94475b663c1ec1f5148b766a81a31adb1d49e
Reviewed-on: https://gerrit.libreoffice.org/23038
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 93994e9..16abf4c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -164,7 +164,6 @@ gb_CFLAGS := \
-wd4706 \
-wd4800 \
-Zc:wchar_t- \
-   $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
 
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CFLAGS += \
@@ -175,6 +174,11 @@ gb_CFLAGS += \
-Wundef \
-Wunused-macros \
 
+else
+
+gb_CFLAGS += \
+   $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+
 endif
 
 gb_CXXFLAGS := \
@@ -207,7 +211,6 @@ gb_CXXFLAGS := \
-wd4800 \
-wd4913 \
-Zc:wchar_t- \
-   $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
 
 ifeq ($(CPUNAME),X86_64)
 
@@ -235,6 +238,11 @@ gb_CXXFLAGS += \
-Wundef \
-Wunused-macros \
 
+else
+
+gb_CXXFLAGS += \
+   $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+
 endif
 
 # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gerrit supports inline edit feature now

[David Ostrovsky]

More than one year has passed since my announcement on this list: [1]
that upstream Gerrit supports inline edit feature, meant changing the
code directly in browser without clonning/fetching anything. Yesterday,
the right Gerrit version was deployed on gerrit.l.o.

Meantime, inline edit feature supports different workflows and
navigation to the integrated editor with syntax highlighting is offered
on many places in the UI. This documentation page: [2] was added to
Gerrit that is dedicated to inline edit feature. I also gave a talk
during FOSDEM 2015 and last Hamburg hackathon how to use this feature:
[3]. (Note, that not all features, mentioned in this talk are supported
on 2.11.7 version deployed on gerrit.l.o. Some of them only available
on recent released gerrit version, 2.12.1, or even master).

[1] https://lists.freedesktop.org/archives/libreoffice/2014-December/06
5326.html
[2] https://gerrit.libreoffice.org/Documentation/user-inline-edit.html
[3] http://ostrovsky.org/gerrit/gerrit-inline-edit
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Firebird doesn't support MSVC 2015

[David Ostrovsky]

Hi Lionel, 

On Fri, 2016-03-04 at 19:59 +0100, Lionel Elie Mamane wrote:
> On Wed, Mar 02, 2016 at 08:02:39AM +0100, David Ostrovsky wrote:
> 
> > So, after fixing number of MSVC 14.0 related bugs in FB
> > module: [1], I filed this bug upstream: [2] and got there
> > this comment from Egor Pugin:
> 
> > "I tried to compile fb with MSVC2015. 
> > After fixing macro issues, you'll see more errors and more serious.
> > The
> > list of errors is almost endless. (Of course no, but it's huge.) 
> > There will be errors that can change the runtime behaviour. So,
> > it's
> > better to coordinate your efforts with FB devs and not do all
> > yourself." 
> 

[...]

> Would a "headlong rush" makes things better? That is, Firebird 3.0
> has
> its Release Candidate 2 out now. So we could start using it, and make
> it non-experimental only with their 3.0 final or something like that?
> If it support MSVC2015, maybe even has a fixed build system, then
> "things get better".

AFAICT upcoming Firebird 3.0 doesn't support MSVC 2015. Moreover,
following the discussion on FB developer mailing list, in this thread:
[1], it turns out, that MSVC 2013 was selected to be used for the next
FB 4 release, that tentatively expected to land in 2020 (info from the
mentioned thread). IOW, we can hope that FB > 4 will eventually support
MSVC 2015, something around 2025. Given that Python 3.5, that this
project currently depends on, dropped support for MSVC 2013, it could
be problematic to not being able to upgrade the tool chain on Windows
for the next 10 years.

* [1] [Firebird-devel] Compiler for official Firebird 4 release on
Windows
http://www.mail-archive.com/firebird-devel@lists.sourceforge.net/msg112
99.html

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/nss

[David Ostrovsky]

 external/nss/nss.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Mar 4 19:59:18 2016 +0100

nss: Fix pointer truncation from 'char *' to 'long'

Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005
Reviewed-on: https://gerrit.libreoffice.org/22916
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>

diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 2cb23be..5483635 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,3 +1,14 @@
+--- a/nss.orig/nspr/pr/src/misc/prnetdb.c  2016-02-12 14:51:25.0 
+0100
 b/nss/nspr/pr/src/misc/prnetdb.c   2016-03-04 19:23:00.462892600 +0100
+@@ -438,7 +438,7 @@
+   char *buf = *bufp;
+   PRIntn buflen = *buflenp;
+ 
+-  if (align && ((long)buf & (align - 1))) {
++  if (align && ((ptrdiff_t)buf & (align - 1))) {
+   PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
+   if (buflen < skip) {
+   return 0;
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100
 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[David Ostrovsky]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.vs2015.pdb.patch   |   22 ++
 2 files changed, 24 insertions(+)

New commits:
commit 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Fri Mar 4 19:55:16 2016 +0100

Fix nss on MSVC 14.0 in debug mode

outdir doesn't seem to be created. Use current directory for
pdb files as the obj files are already stored in the current
directory.

Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56
Reviewed-on: https://gerrit.libreoffice.org/22888
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 2d960b8..75b1f84 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
+   $(if $(filter WNTMSC,$(OS)$(COM)), \
+   external/nss/nss.vs2015.pdb.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.vs2015.pdb.patch 
b/external/nss/nss.vs2015.pdb.patch
new file mode 100755
index 000..dc4f463
--- /dev/null
+++ b/external/nss/nss.vs2015.pdb.patch
@@ -0,0 +1,22 @@
+diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- a/nss.orig/nss/coreconf/WIN32.mk   2016-03-04 08:30:16.306639400 +0100
 b/nss/nss/coreconf/WIN32.mk2016-03-04 08:31:17.987233200 +0100
+@@ -169,15 +169,15 @@
+   DLLFLAGS   += -OUT:$@
+   ifdef MOZ_DEBUG_SYMBOLS
+   ifdef MOZ_DEBUG_FLAGS
+-  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
++  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./
+   else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/
++  OPTIMIZER += -Zi -Fd./
+   endif
+   DLLFLAGS += -DEBUG -OPT:REF
+   LDFLAGS += -DEBUG -OPT:REF
+   endif
+ else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
++  OPTIMIZER += -Zi -Fd./ -Od
+   NULLSTRING :=
+   SPACE  := $(NULLSTRING) # end of the line
+   USERNAME   := $(subst $(SPACE),_,$(USERNAME))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp

[David Ostrovsky]

 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/osi_cuts_iterator.patch.0 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 7df498c828b36259397e2dd2769d99e7f30f7470
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Mar 3 22:42:41 2016 +0100

Fix coinmp on MSVC 14.0

Iterator category tags carry information that can be used
to select the most efficient algorithms for the specific
requirement set that is implied by the category. OsiCuts
defines bidirectional category tag, but doesn't implement
operator--(). This is illegal: [1].

* [1] http://paste.openstack.org/show/489235

Change-Id: I68a6d297d5c33848c4b8a324e081c5118fd936a4
Reviewed-on: https://gerrit.libreoffice.org/22882
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 468589b..98d54403 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 $(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
+   external/coinmp/osi_cuts_iterator.patch.0 \
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
diff --git a/external/coinmp/osi_cuts_iterator.patch.0 
b/external/coinmp/osi_cuts_iterator.patch.0
new file mode 100755
index 000..42ed5af
--- /dev/null
+++ b/external/coinmp/osi_cuts_iterator.patch.0
@@ -0,0 +1,12 @@
+diff -ru coinmp.orig/Osi/src/Osi/OsiCuts.hpp coinmp/Osi/src/Osi/OsiCuts.hpp
+--- Osi/src/Osi/OsiCuts.hpp2011-06-13 17:08:11.0 +0200
 Osi/src/Osi/OsiCuts.hpp2016-03-03 22:21:04.669838200 +0100
+@@ -74,7 +74,7 @@
+ class const_iterator {
+   friend class OsiCuts;
+   public:
+-typedef std::bidirectional_iterator_tag iterator_category;
++typedef std::forward_iterator_tag iterator_category;
+ typedef OsiCut* value_type;
+ typedef size_t difference_type;
+ typedef OsiCut ** pointer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6153a30e1eba0f7fc05dc2070ebb23f0b2a6df9d
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Thu Mar 3 08:49:11 2016 +0100

.NET detection: Don't try to add not existing path

This fixed this warning:

  cygpath: cannot create short name of \
  C:\PROGRA~2\WI3CF2~1\NETFXSDK\4.6\bin

Change-Id: I2d4e3d2c5e4c3348552355f91a340438eb0f9e8a
Reviewed-on: https://gerrit.libreoffice.org/22850
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/configure.ac b/configure.ac
index e64c713..b6c14a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12876,7 +12876,10 @@ else
 # needed for msi packaging
 pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
 fi
-pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+# .NET 4.6 and higher don't have bin directory
+if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
+pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+fi
 pathmunge "$ASM_HOME" "before"
 pathmunge "$WINDOWS_SDK_HOME/bin" "before"
 pathmunge "$CSC_PATH" "before"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Firebird doesn't support MSVC 2015

[David Ostrovsky]

Hi Miklos,

On Wed Mar 2 08:56:14 UTC 2016, Miklos Vajna wrote:

>>On Wed, Mar 02, 2016 at 08:02:39AM +0100, David Ostrovsky wrote:
>> I see two options:
>> * Declare FB only supported on platforms, where it can be built with
>> current compiler toolchain that is used and decided by this project.
[...]

>What are the other blockers at the moment?

All problems (except FB) should be sorted out by now.

> The wiki states that 32-bit >build is broken, that sounds like a
>blocker as well. (Or is it just >that the wiki is outdated?
>configure.ac:5277 suggests it's up to date.)

Yes, wiki was outdated, should be fixed now. Thanks for noticing.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Firebird doesn't support MSVC 2015

[David Ostrovsky]

So, after fixing number of MSVC 14.0 related bugs in FB
module: [1], I filed this bug upstream: [2] and got there
this comment from Egor Pugin:

"I tried to compile fb with MSVC2015. 
After fixing macro issues, you'll see more errors and more serious. The
list of errors is almost endless. (Of course no, but it's huge.) 
There will be errors that can change the runtime behaviour. So, it's
better to coordinate your efforts with FB devs and not do all
yourself." 

I see two options:

* Declare FB only supported on platforms, where it can be built with
current compiler toolchain that is used and decided by this project. 
* Cancel MSVC 14.0 upgrade for now and wait until it's supported by FB
project

* [1] https://gerrit.libreoffice.org/22757
* [2] http://tracker.firebirdsql.org/browse/CORE-5120
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 3 commits - extensions/source RepositoryExternal.mk solenv/gbuild

[David Ostrovsky]

 RepositoryExternal.mk   |2 +-
 extensions/source/activex/SOActiveX.cxx |4 ++--
 extensions/source/activex/SODispatchInterceptor.cxx |1 -
 extensions/source/ole/oleobjw.cxx   |   17 +
 extensions/source/ole/unoconversionutilities.hxx|   12 ++--
 extensions/source/ole/unoobjw.cxx   |8 
 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 7 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 120586bb305f7bd763753a3f5a8d60e25ad3db8f
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Sat Feb 20 16:47:26 2016 +0100

Ole: Fix WaE

Change-Id: Ia6ccdc21608abcbd715bd9ff4aa2057f9f306e58
Reviewed-on: https://gerrit.libreoffice.org/22686
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
(cherry picked from commit 43cdf4b6284ba5f73f290027b9374353f7f47e1f)
Signed-off-by: Michael Stahl <mst...@redhat.com>

diff --git a/extensions/source/activex/SOActiveX.cxx 
b/extensions/source/activex/SOActiveX.cxx
index 09e3f26..bf93407 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -980,8 +980,8 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di )
 CComVariant dummyResult;
 CComVariant aPropVar;
 aPropVar.vt = VT_BOOL; aPropVar.boolVal = VARIANT_FALSE;
-HRESULT hr = ExecuteFunc( mpDispFrame, L"close", , 1, 
 );
-(void)hr;
+HRESULT hres = ExecuteFunc( mpDispFrame, L"close", , 
1,  );
+(void)hres;
 mpDispFrame = CComPtr();
 }
 
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx 
b/extensions/source/activex/SODispatchInterceptor.cxx
index ef15148..fe398a5 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -184,7 +184,6 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch 
FAR* aURL, SAFEARRAY FAR
 
 if( pValues[0].vt == VT_BSTR && pValues[1].vt == VT_BSTR )
 {
-USES_CONVERSION;
 if( !strncmp( OLE2T( pValues[0].bstrVal ), "URL", 3 ) )
 {
 EnterCriticalSection(  );
diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index ee81b48..40365b6 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1019,7 +1019,8 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const 
OUString& sFunctionName,
 CComVariant varResult;
 ExcepInfo   excepinfo;
 unsigned intuArgErr;
-DISPPARAMS dispparams= { pVarParams, NULL, parameterCount, 0};
+DISPPARAMS dispparams= { pVarParams, NULL, 
static_cast(parameterCount), 0};
+
 // Get the DISPID
 FuncDesc aDesc(getTypeInfo());
 getFuncDesc(sFunctionName, & aDesc);
@@ -1586,9 +1587,9 @@ TypeDescription 
IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
 {
 typelib_InterfaceMemberTypeDescription* pMember= NULL;
 //find the member description of the current call
-for( int i=0; i < pInterface->nAllMembers; i++)
+for( int j=0; j < pInterface->nAllMembers; j++)
 {
-typelib_TypeDescriptionReference* pTypeRefMember = 
pInterface->ppAllMembers[i];
+typelib_TypeDescriptionReference* pTypeRefMember = 
pInterface->ppAllMembers[j];
 typelib_TypeDescription* pDescMember= NULL;
 TYPELIB_DANGER_GET( , pTypeRefMember);
 
@@ -2008,9 +2009,9 @@ Any  
IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
 
 // allocate space for the out param Sequence and indices Sequence
 int outParamsCount= 0; // includes in/out parameter
-for (int i = 0; i < aFuncDesc->cParams; i++)
+for (int j = 0; j < aFuncDesc->cParams; j++)
 {
-if (aFuncDesc->lprgelemdescParam[i].paramdesc.wParamFlags &
+if (aFuncDesc->lprgelemdescParam[j].paramdesc.wParamFlags &
 PARAMFLAG_FOUT)
 outParamsCount++;
 }
@@ -2176,9 +2177,9 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const 
OUString & sFuncName,
 {
 // Fallback: DISPATCH_PROPERTYGET can mostly be called as
 // DISPATCH_METHOD
-ITypeInfo * pInfo = getTypeInfo();
-FuncDesc aDescPut(pInfo);
-VarDesc aVarDesc(pInfo);
+ITypeInfo * pTypeInfo = getTypeInfo();
+FuncDesc aDescPut(pTypeInfo);
+VarDesc aVarDesc(pTypeInfo);
 getPropDesc(sFuncName, & aFuncDesc, & aDescPut, &

[Libreoffice-commits] core.git: download.lst external/nss

[David Ostrovsky]

 download.lst|2 +-
 external/nss/ExternalProject_nss.mk |1 +
 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/clang-cl.patch.0   |   10 +-
 external/nss/nss.cygwin64.in32bit.patch |   14 ++
 external/nss/nss.patch  |   31 +++
 external/nss/nss.vs2015.patch   |   22 +++---
 external/nss/ubsan.patch.0  |   28 
 8 files changed, 69 insertions(+), 41 deletions(-)

New commits:
commit 486c91147c587febdacf3fa95d56633dbd703d5f
Author: David Ostrovsky <da...@ostrovsky.org>
Date:   Tue Feb 23 22:25:06 2016 +0100

Bump nss to 3.22.1 and nspr to 4.12

It seems like nss has activated -Werror, even though the code is not
warning free: [1].  This applies also to the additional patches that
would need to be patched to be a warning free patch, endless recursion.

To avoid messing around with something like that: [2], we disable
-Werror option for now. Also note, that [2] doesn't fix all warnings,
but only part of them so that we let with unsolved non-trivially to
fix warnings on different supported compilers if we would choose the
warning-free-compilation-path.

[1] 
https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion
[2] 
https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec

Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2
Reviewed-on: https://gerrit.libreoffice.org/22650
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>

diff --git a/download.lst b/download.lst
index 5f43b05..edc8c47 100644
--- a/download.lst
+++ b/download.lst
@@ -107,7 +107,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
+export NSS_TARBALL := 
d45f17e742acd490d1df7256cb4356b6-nss-3.22.1-with-nspr-4.12.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 17ea6f1..bd64971 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -22,6 +22,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
+   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
,,nss_configure.log)
 
 ifeq ($(OS),WNT)
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 38acfed..2d960b8 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-chromium-nss-static.patch \
 external/nss/nss-more-static.patch \
 external/nss/nss-ios.patch) \
+   $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
+   external/nss/nss.cygwin64.in32bit.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index bc90421..48f0ba8 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -32,17 +32,17 @@
  #include 
  #pragma intrinsic(_rotl, _rotr)
  #define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits)
 nss/lib/certdb/certdb.h
-+++ nss/lib/certdb/certdb.h
-@@ -31,7 +31,7 @@
+--- nss/lib/certdb/certdb.h2016-02-12 15:36:18.0 +0100
 nss/lib/certdb/certdb.h2016-02-23 21:08:34.607903348 +0100
+@@ -30,7 +30,7 @@
  #endif
- #define CERTDB_VALID_PEER  ((__CERTDB_VALID_PEER) CERTDB_TERMINAL_RECORD)
+ #define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER)CERTDB_TERMINAL_RECORD)
  #else
 -#ifdef _WIN32
 +#if defined _WIN32 && !defined __clang__
  #pragma deprecated(CERTDB_VALID_PEER)
  #endif
- #define CERTDB_VALID_PEER  CERTDB_TERMINAL_RECORD 
+ #define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
 --- nss/lib/util/pkcs11n.h
 +++ nss/lib/util/pkcs11n.h
 @@ -390,7 +390,7 @@
diff --git a/external/nss/nss.cygwin64.in32bit.patch 
b/external/nss/nss.cygwin64.in32bit.patch
new file mode 100755
index 000..b00761a
--- /d