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

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

2023-06-13 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/odr.patch |   30 ++
 2 files changed, 31 insertions(+)

New commits:
commit 0408e5344b5c43bc3384c264588e1d49770fd2dc
Author: Stephan Bergmann 
AuthorDate: Tue Jun 13 20:40:53 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 14 07:24:36 2023 +0200

external/coinmap: Address ODR violations

...since 2193650b3373ee1889961cfb72d1fe97f73e2c23 "external/coinmp: Update 
to
CoinMP 1.8.4", as reported by 
,

> ==25531==ERROR: AddressSanitizer: odr-violation (0x7f3df9756e40):
>   [1] size=4 'CbcOrClpEnvironmentIndex' 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/coinmp/Clp/src/CbcOrClpParam.cpp:1236:5
>   [2] size=4 'CbcOrClpEnvironmentIndex' CbcOrClpParam.cpp:1236:5
> These globals were registered at these points:
>   [1]:
> #0 0x43e508 in __asan_register_globals.part.13 
/home/tdf/lode/packages/llvm-llvmorg-12.0.1.src/compiler-rt/lib/asan/asan_globals.cpp:360
> #1 0x7f3df9252a6b in asan.module_ctor 
(/instdir/program/libCbcSolver.so.3+0x21fa6b)
> LLVMSymbolizer: error reading file: No such file or directory
> #2 0x7ffda20d8279  ([stack]+0x32279)
>
>   [2]:
> #0 0x43e508 in __asan_register_globals.part.13 
/home/tdf/lode/packages/llvm-llvmorg-12.0.1.src/compiler-rt/lib/asan/asan_globals.cpp:360
> #1 0x7f3df4973a4b in asan.module_ctor 
(/instdir/program/libClpSolver.so.1+0x127a4b)
> #2 0x7ffda20d8279  ([stack]+0x32279)

and similarly for CbcOrClpRead_mode and CbcOrClpReadCommand.

There's code using those three extern variables in both libCbcSolver.so.3 
and
libClpSolver.so.1, and some of it is duplicated (in
workdir/UnpackedTarball/coinmp/Clp/src/CbcOrClpParam.cpp, which is also 
included
from workdir/UnpackedTarball/coinmp/Cbc/src/CbcCbcParam.cpp).  Those 
libraries
do not appear to make any use of symbol visibility hiding, and it is 
completely
unclear to me how all that code is actually meant to work.  But it also 
smells
like all that code is only used within standalone programs (see main in
workdir/UnpackedTarball/coinmp/Cbc/src/CoinSolve.cpp and
workdir/UnpackedTarball/coinmp/Clp/src/ClpMain.cpp).  So lets try to get 
away
with properly sharing those three extern variables across those two 
libraries.
Except on Windows, where linking the one library wouldn't find the extern
variables from the other library (and I'm not sure whether that's a general
issue on Windows, or is due to how 2193650b3373ee1889961cfb72d1fe97f73e2c23
modified external/coinmp/windows.build.patch.1).

(This also appears to be fixed on recent upstream;
 no longer mentions any of those three 
extern
variables.  Maybe a new tarball will eventually appear at
 that includes a proper fix 
of
these ODR violations.)

Change-Id: I953c7dc31f8e35315c59dc2bedd3fdf780579638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153001
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 75fa5aaf653a..83ebfca80193 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/pedantic-errors.patch \
external/coinmp/bind2nd.patch.1 \
external/coinmp/clang-with-path.patch \
+   external/coinmp/odr.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/odr.patch b/external/coinmp/odr.patch
new file mode 100644
index ..6e91c86415d2
--- /dev/null
+++ b/external/coinmp/odr.patch
@@ -0,0 +1,30 @@
+--- Cbc/src/CbcSolver.cpp
 Cbc/src/CbcSolver.cpp
+@@ -970,8 +970,13 @@
+   this set of calls thread-safe.
+ */
+ 
++#if defined _MSC_VER
+ int CbcOrClpRead_mode = 1;
+ FILE * CbcOrClpReadCommand = stdin;
++#else
++extern int CbcOrClpRead_mode;
++extern FILE * CbcOrClpReadCommand;
++#endif
+ extern int CbcOrClpEnvironmentIndex;
+ 
+ int callCbc1(const char * input2, CbcModel & model,
+--- Clp/src/CbcOrClpParam.cpp
 Clp/src/CbcOrClpParam.cpp
+@@ -1233,7 +1233,11 @@
+ static char line[1000];
+ static char * where = NULL;
+ extern int CbcOrClpRead_mode;
++#if defined _MSC_VER || !defined COIN_HAS_CBC
+ int CbcOrClpEnvironmentIndex = -1;
++#else
++extern int CbcOrClpEnvironmentIndex;
++#endif
+ static size_t fillEnv()
+ {
+ #if defined(_MSC_VER) || defined(__MSVCRT__)

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

2022-09-16 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/bind2nd.patch.1   |   87 ++
 2 files changed, 88 insertions(+)

New commits:
commit b97e8b9d13ef0f57f7cf0badbefcb038a8bbd137
Author: Stephan Bergmann 
AuthorDate: Wed Sep 14 14:36:40 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 16 15:54:14 2022 +0200

external/coinmp: Adapt to std::bind2nd gone from C++17

...which started to be an issue when building with recent Clang 16 trunk 
after


"C++/ObjC++: switch to gnu++17 as the default standard" against libc++.  
(Recent
versions of GCC similarly default to C++17, but libstdc++ by default still
provides bind2nd even for C++17.)  Alternatively, we could define
_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS to work around this.  But as these 
appear
to be the only leftover occurrence of bind2nd across all of the code base, 
and
all but one of them have already been addressed upstream, lets address it 
for
good with this little patch.  (Where the last remaining occurrence not yet
addressed upstream is fixed in the same way as the other upstream fixes, 
using a
loop rather than e.g. a lambda that would force us to start to pass
CXXFLAGS_CXX11 into ExternalProejct_coinmp.)

Change-Id: Iddc22ea4c6d537b64bf2cf0b887d11da162f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139931
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 0764d428aace..b874f2b290f3 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/register.patch \
external/coinmp/configure-exit.patch \
external/coinmp/pedantic-errors.patch \
+   external/coinmp/bind2nd.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/bind2nd.patch.1 b/external/coinmp/bind2nd.patch.1
new file mode 100644
index ..5b3222eea9a0
--- /dev/null
+++ b/external/coinmp/bind2nd.patch.1
@@ -0,0 +1,87 @@
+--- a/Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp
 b/Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp
+@@ -1313,8 +1313,8 @@
+   int rows_to_delete_arr[] = { 0 } ;
+   si->deleteRows(1,rows_to_delete_arr) ;
+ 
+-  std::transform(objective,objective+4,objective,
+-   std::bind2nd(std::plus(),0.15)) ;
++  for (int i = 0; i != 4; ++i)
++objective[i] += 0.15;
+   si->setObjective(objective) ;
+   si->resolve() ;
+   OSIUNITTEST_ASSERT_ERROR(si->isProvenOptimal(),  return false, *si, 
"test16SebastianNowozin second resolve");
+
+The below is an excerpt from
+
 "make c++17
+compatible":
+
+diff --git a/CoinUtils/src/CoinPackedMatrix.cpp 
b/CoinUtils/src/CoinPackedMatrix.cpp
+index c7631289..0b103159 100644
+--- a/CoinUtils/src/CoinPackedMatrix.cpp
 b/CoinUtils/src/CoinPackedMatrix.cpp
+@@ -1490,11 +1490,11 @@ CoinPackedMatrix::minorAppendSameOrdered(const 
CoinPackedMatrix& matrix)
+ 
+// now insert the entries of matrix
+for (i = majorDim_ - 1; i >= 0; --i) {
+-  const int l = matrix.length_[i];
+-  std::transform(matrix.index_ + matrix.start_[i],
+-  matrix.index_ + (matrix.start_[i] + l),
+-  index_ + (start_[i] + length_[i]),
+-  std::bind2nd(std::plus(), minorDim_));
++  int l = matrix.length_[i];
++  CoinBigIndex put = start_[i]+length_[i];
++  const CoinBigIndex get = matrix.start_[i];
++  for (int j=0;j(), value) );
++  for (int i=0 ; i < nElements_; i++)
++elements_[i] += value;
+ }
+ 
+ 
//-
+@@ -293,8 +293,8 @@ CoinPackedVector::operator+=(double value)
+ void
+ CoinPackedVector::operator-=(double value) 
+ {
+-   std::transform(elements_, elements_ + nElements_, elements_,
+-std::bind2nd(std::minus(), value) );
++  for (int i=0 ; i < nElements_; i++)
++elements_[i] -= value;
+ }
+ 
+ 
//-
+@@ -302,8 +302,8 @@ CoinPackedVector::operator-=(double value)
+ void
+ CoinPackedVector::operator*=(double value) 
+ {
+-   std::transform(elements_, elements_ + nElements_, elements_,
+-std::bind2nd(std::multiplies(), value) );
++  for (int i=0 ; i < nElements_; i++)
++elements_[i] *= value;
+ }
+ 
+ 
//-
+@@ -311,8 +311,8 @@ CoinPackedVector::operator*=(double value)
+ void
+ CoinPackedVector::operator/=(double value) 
+ {
+-   std::transform(elements_, elements_ + nElements_, elements_,
+-

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

2022-05-17 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/pedantic-errors.patch |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 4417c30d6aa8d415f1f63364bb5dedcd44ae5562
Author: Stephan Bergmann 
AuthorDate: Tue May 17 15:06:40 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 17 18:34:39 2022 +0200

external/coinmp: Avoid -Werror,-Wc++2b-extensions

> ClpSimplex.cpp:6038:2: error: use of a '#elifdef' directive is a C++2b 
extension [-Werror,-Wc++2b-extensions]
> #elifdef COIN_HAS_MUMPS
>  ^

seen with Clang 15 trunk since


"Warn if using `elifdef` & `elifndef` in not C2x & C++2b mode" (and which is
turned into an error because External_coinmp builds with --pedantic-errors)

Change-Id: I1db213aec91bc17c720fd58270eab452b2e4e0f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134478
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 0784bbde1ac1..0764d428aace 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/Wnon-c-typedef-for-linkage.patch \
external/coinmp/register.patch \
external/coinmp/configure-exit.patch \
+   external/coinmp/pedantic-errors.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/pedantic-errors.patch 
b/external/coinmp/pedantic-errors.patch
new file mode 100644
index ..2cf86b7e0ef4
--- /dev/null
+++ b/external/coinmp/pedantic-errors.patch
@@ -0,0 +1,11 @@
+--- Clp/src/ClpSimplex.cpp
 Clp/src/ClpSimplex.cpp
+@@ -6035,7 +6035,7 @@
+  assert (!doKKT);
+  ClpCholeskyTaucs * cholesky = new ClpCholeskyTaucs();
+  barrier.setCholesky(cholesky);
+-#elifdef COIN_HAS_MUMPS
++#elif defined COIN_HAS_MUMPS
+  if (!doKKT) {
+   ClpCholeskyMumps * cholesky = new ClpCholeskyMumps();
+   barrier.setCholesky(cholesky);

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

2020-10-01 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/configure-exit.patch  |   33 ++
 2 files changed, 34 insertions(+)

New commits:
commit 762aacc4e055fffbc605be81f66f2274dccb4be8
Author: Stephan Bergmann 
AuthorDate: Thu Oct 1 11:50:40 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 1 14:11:11 2020 +0200

exteranl/coinmp: Fix build with recent GCC 11 trunk

It had started to fail for me now with

>  ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I. -O -MT CoinFinite.lo 
-MD -MP -MF .deps/CoinFinite.Tpo -c CoinFinite.cpp  -fPIC -DPIC -o 
.libs/CoinFinite.o
> CoinFinite.cpp: In function 'bool CoinFinite(double)':
> CoinFinite.cpp:38:19: error: 'DBL_MAX' was not declared in this scope
>38 | return val != DBL_MAX && val != -DBL_MAX;
>   |   ^~~
> CoinFinite.cpp:8:1: note: 'DBL_MAX' is defined in header ''; did 
you forget to '#include '?
> 7 | #include "CoinUtilsConfig.h"
>   +++ |+#include 
> 8 |

because of a missing -DCOINUTILS_BUILD.  Which in turn was caused by
workdir/UnpackedTarball/coinmp/CoinUtils/configure (see
workdir/UnpackedTarball/coinmp/CoinUtils/config.log), which first tries to
determine an ac_declaration that would apparently be a suitable declaration 
of
`exit` without actually including  in a C++ file.  It settles on

> configure:3551: ~/gcc/trunk/inst/bin/g++ -c -g -O2  conftest.cc >&5
> conftest.cc:15:17: warning: 'void std::exit(int)' has not been declared 
within 'std'
>15 | extern "C" void std::exit (int) throw (); using std::exit;
>   | ^~~
> : note: only here as a 'friend'
> configure:3557: $? = 0

(which generates a warning, but no error with the given g++ invocation).  
The
determined ac_declaration value is then included in confdefs.h, causing the
later

> configure:4014: ~/gcc/trunk/inst/bin/g++ -o conftest -O3 -pipe -DNDEBUG 
-pedantic-errors -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith 
-Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long   
-DCOINUTILS_BUILD  -Wl,-z,origin -Wl,-rpath,\$$ORIGIN conftest.cc  >&5
> conftest.cc:15:17: error: 'void std::exit(int)' has not been declared 
within 'std'
>15 | extern "C" void std::exit (int) throw (); using std::exit;
>   | ^~~
> : note: only here as a 'friend'
> configure:4020: $? = 1
> configure: failed program was:
> | /* confdefs.h.  */
> |
> | #define PACKAGE_NAME "CoinUtils"
> | #define PACKAGE_TARNAME "coinutils"
> | #define PACKAGE_VERSION "2.9.11"
> | #define PACKAGE_STRING "CoinUtils 2.9.11"
> | #define PACKAGE_BUGREPORT "http://projects.coin-or.org/CoinUtils;
> | #define COINUTILS_VERSION "2.9.11"
> | #define COINUTILS_VERSION_MAJOR 2
> | #define COINUTILS_VERSION_MINOR 9
> | #define COINUTILS_VERSION_RELEASE 11
> | #define COIN_COINUTILS_VERBOSITY 0
> | #define COIN_COINUTILS_CHECKLEVEL 0
> | #ifdef __cplusplus
> | extern "C" void std::exit (int) throw (); using std::exit;
> | #endif
> | /* end confdefs.h.  */
> |
> | int
> | main ()
> | {
> | int i=0; i++;
> |   ;
> |   return 0;
> | }
> configure:4045: WARNING: The flags CXXFLAGS="-O3 -pipe -DNDEBUG 
-pedantic-errors -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith 
-Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long   
-DCOINUTILS_BUILD" do not work.  I will now just try '-O', but you might want 
to set CXXFLAGS manually.

to fail, because its g++ invocation including -pedantic-errors turns that

> 'void std::exit(int)' has not been declared within 'std'

warning into an error.

There were similar build failures in the Cgl,

>  ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I. 
-I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src -DCOIN_HAS_CLP -O -MT 
ClpCholeskyDense.lo -MD -MP -MF .deps/ClpCholeskyDense.Tpo -c 
ClpCholeskyDense.cpp  -fPIC -DPIC -o .libs/ClpCholeskyDense.o
> In file included from ClpCholeskyDense.cpp:11:
> ClpHelperFunctions.hpp:16:4: error: #error "don't have header file for 
math"
>16 | #  error "don't have header file for math"
>   |^
> In file included from ClpCholeskyDense.cpp:11:
> ClpHelperFunctions.hpp: In function 'double CoinSqrt(double)':
> ClpHelperFunctions.hpp:81:13: error: 'sqrt' was not declared in this scope
>81 |  return sqrt(x);
>   | ^~~~

and Clp,

>  ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I. -I.. -I./.. 
-I./../CglGomory -I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src 
-I~/lo/core/workdir/UnpackedTarball/coinmp/Osi/src/Osi 
-I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src

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

2020-07-20 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/register.patch|  369 ++
 2 files changed, 370 insertions(+)

New commits:
commit ad607d898f9826c6fa144783c93541a10ad4740c
Author: Stephan Bergmann 
AuthorDate: Mon Jul 20 16:23:18 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Jul 20 17:44:45 2020 +0200

external/coinmp: C++17 no longer supports "register"

...and GCC 11 trunk g++ now defaults to C++17, so compilation started to 
fail
with that compiler

Change-Id: I792e4c7ff59ad88e5571163d5b2362fdb349667d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 997c6c9d4fc8..260bde164b4b 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
external/coinmp/Wnon-c-typedef-for-linkage.patch \
+   external/coinmp/register.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/register.patch b/external/coinmp/register.patch
new file mode 100644
index ..cf4ca4d06c01
--- /dev/null
+++ b/external/coinmp/register.patch
@@ -0,0 +1,369 @@
+--- CoinUtils/src/CoinHelperFunctions.hpp
 CoinUtils/src/CoinHelperFunctions.hpp
+@@ -41,7 +41,7 @@
+ handled correctly. */
+ 
+ template  inline void
+-CoinCopyN(register const T* from, const int size, register T* to)
++CoinCopyN(const T* from, const int size, T* to)
+ {
+ if (size == 0 || from == to)
+   return;
+@@ -52,10 +52,10 @@
+   "CoinCopyN", "");
+ #endif
+ 
+-register int n = (size + 7) / 8;
++int n = (size + 7) / 8;
+ if (to > from) {
+-  register const T* downfrom = from + size;
+-  register T* downto = to + size;
++  const T* downfrom = from + size;
++  T* downto = to + size;
+   // Use Duff's device to copy
+   switch (size % 8) {
+   case 0: do{ *--downto = *--downfrom;
+@@ -99,7 +99,7 @@
+ the difference down to int.  -- lh, 100823 --
+ */
+ template  inline void
+-CoinCopy(register const T* first, register const T* last, register T* to)
++CoinCopy(const T* first, const T* last, T* to)
+ {
+ CoinCopyN(first, static_cast(last-first), to);
+ }
+@@ -114,7 +114,7 @@
+ Note JJF - the speed claim seems to be false on IA32 so I have added 
+ CoinMemcpyN which can be used for atomic data */
+ template  inline void
+-CoinDisjointCopyN(register const T* from, const int size, register T* to)
++CoinDisjointCopyN(const T* from, const int size, T* to)
+ {
+ #ifndef _MSC_VER
+ if (size == 0 || from == to)
+@@ -135,7 +135,7 @@
+   throw CoinError("overlapping arrays", "CoinDisjointCopyN", "");
+ #endif
+ 
+-for (register int n = size / 8; n > 0; --n, from += 8, to += 8) {
++for (int n = size / 8; n > 0; --n, from += 8, to += 8) {
+   to[0] = from[0];
+   to[1] = from[1];
+   to[2] = from[2];
+@@ -167,8 +167,8 @@
+ are copied at a time. The source array is given by its first and "after
+ last" entry; the target array is given by its first entry. */
+ template  inline void
+-CoinDisjointCopy(register const T* first, register const T* last,
+-   register T* to)
++CoinDisjointCopy(const T* first, const T* last,
++   T* to)
+ {
+ CoinDisjointCopyN(first, static_cast(last - first), to);
+ }
+@@ -256,7 +256,7 @@
+ alternative coding if USE_MEMCPY defined*/
+ #ifndef COIN_USE_RESTRICT
+ template  inline void
+-CoinMemcpyN(register const T* from, const int size, register T* to)
++CoinMemcpyN(const T* from, const int size, T* to)
+ {
+ #ifndef _MSC_VER
+ #ifdef USE_MEMCPY
+@@ -296,7 +296,7 @@
+   throw CoinError("overlapping arrays", "CoinMemcpyN", "");
+ #endif
+ 
+-for (register int n = size / 8; n > 0; --n, from += 8, to += 8) {
++for (int n = size / 8; n > 0; --n, from += 8, to += 8) {
+   to[0] = from[0];
+   to[1] = from[1];
+   to[2] = from[2];
+@@ -343,8 +343,8 @@
+ are copied at a time. The source array is given by its first and "after
+ last" entry; the target array is given by its first entry. */
+ template  inline void
+-CoinMemcpy(register const T* first, register const T* last,
+- register T* to)
++CoinMemcpy(const T* first, const T* last,
++ T* to)
+ {
+ CoinMemcpyN(first, static_cast(last - first), to);
+ }
+@@ -358,7 +358,7 @@
+ Note JJF - the speed claim seems to be false on IA32 so I have added 
+ CoinZero to allow for memset. */
+ template  inline void
+-CoinFillN(register T* to, const int size, register const T value)
++CoinFillN(T* to, const int size, const T value)
+ {
+ if (size == 0)
+   return;
+@@ -369,7 +369,7 @@
+

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

2020-02-10 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f99c76c2e8e885ca1fcc635be7cf2481830eb379
Author: Stephan Bergmann 
AuthorDate: Mon Feb 10 11:27:34 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 10 14:06:21 2020 +0100

Mark external/coinmp/Wnon-c-typedef-for-linkage.patch as upstreamed

Change-Id: I8c2a7ce17d1c406563aca234aa6ea606414c9f71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88363
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 0b0af2c868df..997c6c9d4fc8 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,9 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,coinmp,\
Osi \
 ))
 
+# * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at
+#   
 
"[Coin-discuss]
+#   Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp":
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/osi_cuts_iterator.patch.0 \
external/coinmp/no-binaries.patch.1 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-09 Thread Stephan Bergmann (via logerrit)

 external/coinmp/UnpackedTarball_coinmp.mk|1 +
 external/coinmp/Wnon-c-typedef-for-linkage.patch |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit 4188c7e2132ec3f1c3e879c179e92ff75c86d24f
Author: Stephan Bergmann 
AuthorDate: Sun Feb 9 23:29:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 10 08:03:34 2020 +0100

external/coinmp: -Werror,-Wnon-c-typedef-for-linkage

...with recent Clant trunk, see 
 "Implement P1766R1: diagnose 
giving
non-C-compatible classes a typedef name for linkage purposes."

Change-Id: I3c72f0e4c2f04dd197fb8af1581cd03f465cd87d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88352
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 35cfbfcdbae8..0b0af2c868df 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
+   external/coinmp/Wnon-c-typedef-for-linkage.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/Wnon-c-typedef-for-linkage.patch 
b/external/coinmp/Wnon-c-typedef-for-linkage.patch
new file mode 100644
index ..ace749d2347b
--- /dev/null
+++ b/external/coinmp/Wnon-c-typedef-for-linkage.patch
@@ -0,0 +1,14 @@
+--- Clp/src/Clp_C_Interface.h
 Clp/src/Clp_C_Interface.h
+@@ -12,9 +12,9 @@
+ #include "Coin_C_defines.h"
+ 
+ #if defined (CLP_EXTERN_C)
+-typedef struct {
++struct Clp_Solve {
+   ClpSolve options;
+-} Clp_Solve;
++};
+ #else
+ typedef void Clp_Solve;
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-12-11 Thread Libreoffice Gerrit user

 external/coinmp/rpath.patch |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 1e58f623c3ef0cc1da2f60ec8cf437622495a0ec
Author: Stephan Bergmann 
AuthorDate: Tue Dec 11 10:56:33 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 11 17:31:01 2018 +0100

Extend libtool RPATH outsmarting hack to external/coinmp's CoinUtils

(See 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1 "Fix Linux RPATH of various
external modules" for the original external/coinmp/rpath.patch missing a 
patch
for CoinUtils/configure.)  This is a blind fix attempt for


> 
/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/instdir/program/libCoinUtils.so.3
 has unexpected RPATH  0x001d (RUNPATH)Library runpath: 
[/opt/rh/devtoolset-7/root/usr/lib/../lib64:$ORIGIN]
> 
/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/postprocess/CustomTarget_check_dynamic_objects.mk:20:
 recipe for target 
'/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/workdir/CustomTarget/postprocess/check_dynamic_objects/check.done'
 failed

after ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238 "Enabling Developer Toolset 
7 for
Jenkins' remaining GCC master jobs" enabled GCC 8 at gandalf's
/opt/rh/devtoolset-7/root/ (which is at the same location as a CentOS 
Developer
Toolset 7 special GCC 7, but is actually a plain GCC 8, cf.


"Re: Compiler baselines") for the lo_daily_update_gandalf job.  Presumably
libtool added to RPATH a path to find that GCC 8 installation's
/opt/rh/devtoolset-7/root/usr/lib64/libstdc++.so.6.

Change-Id: I37c98faffe3e6c014e321b756a18a8468c32877c
Reviewed-on: https://gerrit.libreoffice.org/64942
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/rpath.patch b/external/coinmp/rpath.patch
index b60bd188de45..50a2acde2b3a 100644
--- a/external/coinmp/rpath.patch
+++ b/external/coinmp/rpath.patch
@@ -38,6 +38,16 @@
  ;;
lynxos*)
  # FIXME: insert proper C++ library support
+--- CoinUtils/configure
 CoinUtils/configure
+@@ -13939,6 +13939,7 @@
+   output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED 
"s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in 
conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; echo $list'
+   ;;
+ esac
++hardcode_libdir_flag_spec_CXX=
+ ;;
+   lynxos*)
+ # FIXME: insert proper C++ library support
 --- Osi/configure
 +++ Osi/configure
 @@ -12453,6 +12453,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp external/firebird external/icu external/liborcus external/libwpd external/libwpg external/libxslt external/nss external/redland

2017-10-28 Thread David Tardon

 external/coinmp/ExternalProject_coinmp.mk |   16 
 external/firebird/ExternalProject_firebird.mk |4 ++--
 external/icu/ExternalProject_icu.mk   |6 +++---
 external/liborcus/ExternalProject_liborcus.mk |4 ++--
 external/libwpd/ExternalProject_libwpd.mk |2 +-
 external/libwpg/ExternalProject_libwpg.mk |2 +-
 external/libxslt/ExternalProject_libxslt.mk   |2 +-
 external/nss/ExternalProject_nss.mk   |   22 +++---
 external/redland/ExternalProject_rasqal.mk|2 +-
 external/redland/ExternalProject_redland.mk   |2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 193b6c2287557af08055ac3858d0855ca1c40550
Author: David Tardon 
Date:   Fri Oct 27 22:33:24 2017 +0200

use predefined workdir path

Change-Id: Ia14aaba92e5d36064bc6a77dbc63463a833d8745
Reviewed-on: https://gerrit.libreoffice.org/43969
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index db3b71a82b12..07cb9e248bd6 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -40,14 +40,14 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
-   
$(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbc.3.8.8.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/Cgl/src/.libs/libCgl.1.8.5.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/Clp/src/.libs/libClp.1.12.6.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \
-   
$(gb_Package_SOURCEDIR_coinmp)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \
+   $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.8.8.dylib \
+   
$(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \
+   $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.8.5.dylib \
+   $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.12.6.dylib \
+   
$(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \
+   
$(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \
+   
$(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \
+   
$(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \
)
 
 endif
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 988a24b5ed74..17d4f55c6641 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -30,8 +30,8 @@ MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/
 
 MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
-   $(gb_Package_SOURCEDIR_firebird)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \
-   $(gb_Package_SOURCEDIR_firebird)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0)
+   $(EXTERNAL_WORKDIR)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \
+   $(EXTERNAL_WORKDIR)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0)
 
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index 4528d62f1d45..1a9c5ff90602 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -77,11 +77,11 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(if $(filter MACOSX,$(OS)), \
&& $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \
URELIB \
-   
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)
 \
-   
$(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)
 \
+   
$(EXTERNAL_WORKDIR)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \
+

[Libreoffice-commits] core.git: external/coinmp external/firebird external/libabw external/libcdr external/libebook external/libetonyek external/libfreehand external/libmspub external/libmwaw external

2017-10-04 Thread David Tardon

 external/coinmp/UnpackedTarball_coinmp.mk   |   14 
 external/coinmp/automake.patch  |17577 
 external/coinmp/iOS.patch.1 |  189 
 external/firebird/UnpackedTarball_firebird.mk   |6 
 external/firebird/automake.patch| 1969 -
 external/libabw/UnpackedTarball_libabw.mk   |6 
 external/libabw/iOS.patch.0 |   20 
 external/libcdr/UnpackedTarball_libcdr.mk   |5 
 external/libcdr/iOS.patch   |   20 
 external/libebook/UnpackedTarball_libebook.mk   |6 
 external/libebook/iOS.patch.0   |   21 
 external/libetonyek/UnpackedTarball_libetonyek.mk   |3 
 external/libetonyek/iOS.patch.0 |   20 
 external/libfreehand/UnpackedTarball_libfreehand.mk |5 
 external/libfreehand/iOS.patch  |   20 
 external/libmspub/UnpackedTarball_libmspub.mk   |6 
 external/libmspub/automake.patch|  942 
 external/libmspub/iOS.patch.0   |   20 
 external/libmwaw/UnpackedTarball_libmwaw.mk |3 
 external/libmwaw/iOS.patch.0|   20 
 external/libodfgen/UnpackedTarball_libodfgen.mk |3 
 external/libodfgen/iOS.patch.0  |   21 
 external/liborcus/UnpackedTarball_liborcus.mk   |3 
 external/liborcus/iOS.patch |   20 
 external/libpagemaker/UnpackedTarball_libpagemaker.mk   |6 
 external/libpagemaker/iOS.patch.0   |   20 
 external/libqxp/UnpackedTarball_libqxp.mk   |3 
 external/libqxp/iOS.patch.1 |   21 
 external/libstaroffice/UnpackedTarball_libstaroffice.mk |3 
 external/libstaroffice/iOS.patch.0  |   20 
 external/libvisio/UnpackedTarball_libvisio.mk   |6 
 external/libvisio/iOS.patch.0   |   20 
 external/libwpd/UnpackedTarball_libwpd.mk   |6 
 external/libwpd/iOS.patch.0 |   21 
 external/libwpg/UnpackedTarball_libwpg.mk   |6 
 external/libwpg/iOS.patch.0 |   21 
 external/libwps/UnpackedTarball_libwps.mk   |3 
 external/libwps/iOS.patch.0 |   20 
 external/libxslt/UnpackedTarball_libxslt.mk |3 
 external/libxslt/iOS.patch.0|   20 
 external/libzmf/UnpackedTarball_libzmf.mk   |3 
 external/libzmf/iOS.patch   |   20 
 external/mythes/UnpackedTarball_mythes.mk   |3 
 external/mythes/iOS.patch.0 |   20 
 external/openldap/UnpackedTarball_openldap.mk   |6 
 external/openldap/automake.patch| 3654 ---
 46 files changed, 60 insertions(+), 24764 deletions(-)

New commits:
commit f2db08b28e99c61c44bc057d03de926ac33d93b7
Author: David Tardon 
Date:   Fri Sep 29 13:11:20 2017 +0200

use the new gbuild way to update config.*

Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6
Reviewed-on: https://gerrit.libreoffice.org/42941
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 865c0f2b43e4..35cfbfcdbae8 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -17,6 +17,18 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\
+   BuildTools \
+   Cbc \
+   Cgl \
+   Clp \
+   CoinMP \
+   CoinUtils \
+   Data/Sample \
+   Osi \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/osi_cuts_iterator.patch.0 \
external/coinmp/no-binaries.patch.1 \
@@ -28,8 +40,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
-   external/coinmp/automake.patch \
-   external/coinmp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/automake.patch b/external/coinmp/automake.patch
deleted file mode 100644
index 05f978d759ff..
--- a/external/coinmp/automake.patch
+++ /dev/null
@@ -1,17577 +0,0 @@
 BuildTools/config.guess
-+++ BuildTools/config.guess
-@@ -1,14 +1,12 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#

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

2017-09-06 Thread jan Iversen

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/iOS.patch.1   |  189 ++
 2 files changed, 190 insertions(+)

New commits:
commit ac38af2bb850abab0039d7c9e35644752cf4feb1
Author: jan Iversen 
Date:   Wed Sep 6 17:42:37 2017 +0200

corrected commit 397e2f0cfb310ac606705c74e5907195e5ca7872

that commit removed all iOS patches for CoinMP, they are
still needed.

Updated the iOS.patch.1 to the patches config.sub(s)

Change-Id: Id69b436c85d5f3b7113522404f47872559896dd6

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index b36d328e239b..865c0f2b43e4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
external/coinmp/automake.patch \
+   external/coinmp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
new file mode 100644
index ..3a34a89a1c66
--- /dev/null
+++ b/external/coinmp/iOS.patch.1
@@ -0,0 +1,189 @@
+diff -Naur coinmp/BuildTools/config.sub coinmp_new/BuildTools/config.sub
+--- coinmp/BuildTools/config.sub   2017-09-06 17:32:53.0 +0200
 coinmp_new/BuildTools/config.sub   2017-09-06 17:37:36.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Cbc/config.sub coinmp_new/Cbc/config.sub
+--- coinmp/Cbc/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Cbc/config.sub  2017-09-06 17:38:09.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Cgl/config.sub coinmp_new/Cgl/config.sub
+--- coinmp/Cgl/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Cgl/config.sub  2017-09-06 17:38:32.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Clp/config.sub coinmp_new/Clp/config.sub
+--- coinmp/Clp/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Clp/config.sub  2017-09-06 17:38:54.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   |

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

2017-09-06 Thread Stephan Bergmann

 external/coinmp/UnpackedTarball_coinmp.mk |4 
 external/coinmp/android.build.patch.1 |  143 
 external/coinmp/automake.patch|17577 ++
 external/coinmp/iOS.patch.1   |  190 
 external/coinmp/macosx.build.patch.1  |  315 
 5 files changed, 17578 insertions(+), 651 deletions(-)

New commits:
commit 397e2f0cfb310ac606705c74e5907195e5ca7872
Author: Stephan Bergmann 
Date:   Wed Sep 6 12:48:44 2017 +0200

external/coinmp: Update config.{guess,sub}

...with versions of those files from the latest
.

The current versions failed for a Flathub aarch64 test build, see
.

Some existing patches already did local modifications to those
config.{guess,sub} files, apparently to address build issues on Android, 
iOS,
and macOS.  I removed all of them, hoping that the latest versions of the 
files
already address all those issues.

Change-Id: I13e58479d4e3a0598a00c69674885ca540092b53
Reviewed-on: https://gerrit.libreoffice.org/41987
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index c6836e20748d..b36d328e239b 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -19,18 +19,16 @@ $(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 \
external/coinmp/werror-undef.patch.0 \
external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
-   $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
external/coinmp/werror-format-pedantic.patch.0 \
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
-   external/coinmp/iOS.patch.1 \
+   external/coinmp/automake.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/android.build.patch.1 
b/external/coinmp/android.build.patch.1
deleted file mode 100644
index 3d8897bb8a3b..
--- a/external/coinmp/android.build.patch.1
+++ /dev/null
@@ -1,143 +0,0 @@
-# -*- Mode: Diff -*-
-# Patch to make the CoinMP configury recognize Android
-#
 coinmp/config.sub
-+++ coinmp/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 coinmp/CoinUtils/config.sub
-+++ coinmp/CoinUtils/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

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

2017-07-13 Thread Stephan Bergmann

 external/coinmp/ExternalProject_coinmp.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 268ce31604eb04d6ec49fe6054ed0e7162dca4f4
Author: Stephan Bergmann 
Date:   Thu Jul 13 17:00:20 2017 +0200

Pass verbose=true into external/coinmp

Change-Id: If8e0d3e7205737a1e15c563527d3845c7ae93dc1

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index ead6c6d1506c..db3b71a82b12 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -28,6 +28,7 @@ else
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
+$(call gb_ExternalProject_run,build,\
./configure COIN_SKIP_PROJECTS="Data/Sample" \
+   $(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING),--disable-shared) \
--disable-bzlib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-11 Thread jan Iversen

 external/coinmp/iOS.patch.1 |   21 ++---
 1 file changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 23f9afdce0ff244481345171cdff54fe807a212e
Author: jan Iversen 
Date:   Sun Jun 11 13:02:29 2017 +0200

iOS, solved coinmp buildbreaker

Patch was added in wrong sequence.

Change-Id: I4d700d0f9591dbb43c738ef69f823488b9c3162c

diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
index 740156a11ec8..a61004b488a2 100644
--- a/external/coinmp/iOS.patch.1
+++ b/external/coinmp/iOS.patch.1
@@ -169,21 +169,12 @@ diff -ur CoinMP.org/Osi/config.sub CoinMP/Osi/config.sub
 diff -ur CoinMP.org/config.sub CoinMP/config.sub
 --- CoinMP.org/config.sub  2013-11-21 05:36:29.0 +0100
 +++ CoinMP/config.sub  2017-06-11 12:07:15.0 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
 @@ -241,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
| am33_2.0 \
 -  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 \
-+  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 | arm64  \
++  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 
| avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -196,12 +187,4 @@ diff -ur CoinMP.org/config.sub CoinMP/config.sub
| avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-05-02 Thread Stephan Bergmann

 external/coinmp/UnpackedTarball_coinmp.mk   |1 
 external/coinmp/libtool.patch   |  162 
 external/redland/UnpackedTarball_raptor.mk  |1 
 external/redland/UnpackedTarball_rasqal.mk  |1 
 external/redland/UnpackedTarball_redland.mk |1 
 external/redland/raptor/libtool.patch   |   27 
 external/redland/rasqal/libtool.patch   |   27 
 external/redland/redland/libtool.patch  |   27 
 8 files changed, 247 insertions(+)

New commits:
commit 69578399e2a7192f55834e133b5d4f119b9cc5ad
Author: Stephan Bergmann 
Date:   Tue May 2 22:48:11 2017 +0200

Make some externals' libtool copies cope with -mllvm

...as needed e.g. for  
"r294897 +
NewGVN cause build failure with LibreOffice", by applying
 "libtool: Discard '-mllvm 
$arg'
options when linking."

Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 0bf3f8cfb60b..b643b8e5d7d4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/werror-format-pedantic.patch.0 \
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
+   external/coinmp/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/libtool.patch b/external/coinmp/libtool.patch
new file mode 100644
index ..ca1716f5fdb2
--- /dev/null
+++ b/external/coinmp/libtool.patch
@@ -0,0 +1,162 @@
+--- Cbc/ltmain.sh
 Cbc/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Cgl/ltmain.sh
 Cgl/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Clp/ltmain.sh
 Clp/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- CoinMP/ltmain.sh
 CoinMP/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- CoinUtils/ltmain.sh
 CoinUtils/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Osi/ltmain.sh
 Osi/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+

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

2017-02-21 Thread 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 
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 
Reviewed-by: David Ostrovsky 

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:AdditionalIncludeDirectories=$(subst 
$(WHITESPACE),;,$(subst /,\,$(strip

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

2017-02-21 Thread Stephan Bergmann

 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 9116e05c56f220d41a72dfc4c2daafbcd5f3ab61
Author: Stephan Bergmann 
Date:   Mon Feb 20 18:08:54 2017 +0100

Fix check for non-empty UCRTVERSION

...introduced with b862cbdd345ec57c2595629ded6a3969e1e65d56 "Support MSVC 
15.0",
but $(filter ...,) always expands to the empty string, and this is probably 
what
was intended.

Change-Id: I5865ea13ba3c3d52402bcba48f4f770f6c2b8862
Reviewed-on: https://gerrit.libreoffice.org/34482
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index a09f266..3e7f0cc 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 $(filter 
$(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
,CoinMP/MSVisualStudio/v9)
 
 else
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index 6722a27..ac84aca 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 $(filter 
$(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
+   $(if 
$(UCRTVERSION),/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 b54b368..a6f03f3 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 $(filter 
$(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if 
$(UCRTVERSION),/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 94e20b6..047e90d 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 $(filter 
$(UCRTVERSION),),,/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+   $(if 
$(UCRTVERSION),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \

[Libreoffice-commits] core.git: external/coinmp external/harfbuzz external/libcmis external/liblangtag external/liborcus external/nss external/python33 external/redland extras/source icon-themes/galax

2016-11-17 Thread Tor Lillqvist

 0 files changed

New commits:
commit c6ec65395c34394171ada7bd052ecd2bc1c98cf5
Author: Tor Lillqvist 
Date:   Thu Nov 17 12:04:52 2016 +0200

chmod -x

Change-Id: Ie07ef2f9e9f6d0b31b513afa913b79d9c641e4f1

diff --git a/external/coinmp/osi_cuts_iterator.patch.0 
b/external/coinmp/osi_cuts_iterator.patch.0
old mode 100755
new mode 100644
diff --git a/external/harfbuzz/clang-cl.patch b/external/harfbuzz/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/external/libcmis/libcmis-google-2FA-implementation.patch 
b/external/libcmis/libcmis-google-2FA-implementation.patch
old mode 100755
new mode 100644
diff --git a/external/liblangtag/clang-cl.patch.0 
b/external/liblangtag/clang-cl.patch.0
old mode 100755
new mode 100644
diff --git a/external/liborcus/windows-constants-hack.patch 
b/external/liborcus/windows-constants-hack.patch
old mode 100755
new mode 100644
diff --git a/external/nss/nss.cygwin64.in32bit.patch 
b/external/nss/nss.cygwin64.in32bit.patch
old mode 100755
new mode 100644
diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch
old mode 100755
new mode 100644
diff --git a/external/nss/nss.vs2015.pdb.patch 
b/external/nss/nss.vs2015.pdb.patch
old mode 100755
new mode 100644
diff --git a/external/python33/clang-cl.patch.0 
b/external/python33/clang-cl.patch.0
old mode 100755
new mode 100644
diff --git a/external/redland/rasqal/clang-cl.patch 
b/external/redland/rasqal/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/external/redland/redland/clang-cl.patch 
b/external/redland/redland/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/extras/source/autocorr/lang/pt/SentenceExceptList.xml 
b/extras/source/autocorr/lang/pt/SentenceExceptList.xml
old mode 100755
new mode 100644
diff --git a/extras/source/autocorr/lang/pt/WordExceptList.xml 
b/extras/source/autocorr/lang/pt/WordExceptList.xml
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/lc_insertcolumnsafter.png 
b/icon-themes/galaxy/cmd/lc_insertcolumnsafter.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/lc_insertcolumnsbefore.png 
b/icon-themes/galaxy/cmd/lc_insertcolumnsbefore.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/lc_insertrowsafter.png 
b/icon-themes/galaxy/cmd/lc_insertrowsafter.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/lc_insertrowsbefore.png 
b/icon-themes/galaxy/cmd/lc_insertrowsbefore.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/sc_insertcolumnsafter.png 
b/icon-themes/galaxy/cmd/sc_insertcolumnsafter.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/sc_insertcolumnsbefore.png 
b/icon-themes/galaxy/cmd/sc_insertcolumnsbefore.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/sc_insertrowsafter.png 
b/icon-themes/galaxy/cmd/sc_insertrowsafter.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/cmd/sc_insertrowsbefore.png 
b/icon-themes/galaxy/cmd/sc_insertrowsbefore.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/svx/res/cropmarkers.png 
b/icon-themes/galaxy/svx/res/cropmarkers.png
old mode 100755
new mode 100644
diff --git a/icon-themes/hicontrast/svx/res/cropmarkers.png 
b/icon-themes/hicontrast/svx/res/cropmarkers.png
old mode 100755
new mode 100644
diff --git a/sd/qa/unit/data/odp/cellspan.odp b/sd/qa/unit/data/odp/cellspan.odp
old mode 100755
new mode 100644
diff --git a/sd/qa/unit/data/odp/preset-shapes-export.odp 
b/sd/qa/unit/data/odp/preset-shapes-export.odp
old mode 100755
new mode 100644
diff --git a/sd/qa/unit/data/odp/tdf93883.odp b/sd/qa/unit/data/odp/tdf93883.odp
old mode 100755
new mode 100644
diff --git a/sw/qa/core/data/ooxml/pass/tdf93284.docx 
b/sw/qa/core/data/ooxml/pass/tdf93284.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/odfexport/data/border_types.odt 
b/sw/qa/extras/odfexport/data/border_types.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/odfimport/data/tdf41542_borderlessPadding.odt 
b/sw/qa/extras/odfimport/data/tdf41542_borderlessPadding.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/odfimport/data/tdf76322_columnBreakInHeader.docx 
b/sw/qa/extras/odfimport/data/tdf76322_columnBreakInHeader.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/indents.docx 
b/sw/qa/extras/ooxmlexport/data/indents.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/protectedform.docx 
b/sw/qa/extras/ooxmlexport/data/protectedform.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/tdf41542_imagePadding.odt 
b/sw/qa/extras/ooxmlexport/data/tdf41542_imagePadding.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/tdf64372_continuousBreaks.docx 
b/sw/qa/extras/ooxmlexport/data/tdf64372_continuousBreaks.docx
old mode 100755
new mode 100644
diff --git

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

2016-03-03 Thread 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 
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 
Tested-by: Jenkins 

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: external/coinmp external/cppunit external/freetype external/glew external/lcms2 external/libgltf external/python3

2015-09-09 Thread Michael Stahl

 external/coinmp/ExternalProject_coinmp.mk |1 -
 external/cppunit/ExternalProject_cppunit.mk   |2 --
 external/freetype/ExternalProject_freetype.mk |1 -
 external/glew/ExternalProject_glew.mk |2 --
 external/lcms2/ExternalProject_lcms2.mk   |1 -
 external/libgltf/ExternalProject_libgltf.mk   |1 -
 external/python3/ExternalProject_python3.mk   |2 --
 7 files changed, 10 deletions(-)

New commits:
commit 2ada1d6e4828ead6092186d5e42068c6d4ca8cf2
Author: Michael Stahl 
Date:   Wed Sep 9 16:01:50 2015 +0200

externals: remove various obsolete MSVC2012 specific flags

Change-Id: I8848d042a008c21e407d9610161b5c67d2137a18

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index 7b6cd07..714171b 100755
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(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) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index cea7c7a..730d17c 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -18,8 +18,6 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
-   /p:VisualStudioVersion=11.0) \
$(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)" \
&& msbuild.exe cppunit_dll.vcxproj 
/p:Configuration=$${PROFILEFLAGS}  \
diff --git a/external/freetype/ExternalProject_freetype.mk 
b/external/freetype/ExternalProject_freetype.mk
index 0c1c513..2353030 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -18,7 +18,6 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
cd ../builds/win32/vc2010/ && \
msbuild.exe freetype.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,objs)
 else
 $(call gb_ExternalProject_get_state_target,freetype,build) :
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 852c7b6..bb78dce 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -18,11 +18,9 @@ $(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) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,build/vc12) \
$(call gb_ExternalProject_run,build,\
msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,build/vc12)
 
 else
diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index e58ce61e..7b9f7a4 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -21,7 +21,6 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if

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

2015-09-02 Thread David Ostrovsky

 external/coinmp/ExternalProject_coinmp.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c214802883054df349650835f86f9ea9468b778a
Author: David Ostrovsky 
Date:   Fri Jul 24 21:25:30 2015 +0200

Fix coinmp on MSVC 14.0

Change-Id: I59372b51ce4aef2e4a923787db61e20cfd96a9fa
Reviewed-on: https://gerrit.libreoffice.org/17342
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
old mode 100644
new mode 100755
index d8bfaac..7b6cd07
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(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) \
,CoinMP/MSVisualStudio/v9)
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-02 Thread Stephan Bergmann

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

New commits:
commit c8346d77e73bdbe82a1eb73dd83c34ada8c68b17
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 2 17:35:20 2015 +0200

external/coinmp: -fsanitize=nonnull-attribute

Change-Id: I487e772395defa9aae2ce3eb040b8c7d92720cb2

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 635deff..aad0cd3 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
external/coinmp/werror-format-pedantic.patch.0 \
+   external/coinmp/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/ubsan.patch.0 b/external/coinmp/ubsan.patch.0
new file mode 100644
index 000..1573329
--- /dev/null
+++ b/external/coinmp/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- Clp/src/ClpParameters.hpp
 Clp/src/ClpParameters.hpp
+@@ -81,7 +81,7 @@
+ template class T inline void
+ ClpDisjointCopyN( const T * array, const int size, T * newArray)
+ {
+- memcpy(reinterpret_castvoid * (newArray), array, size * sizeof(T));
++ if (size != 0) memcpy(reinterpret_castvoid * (newArray), array, size * 
sizeof(T));
+ }
+ /// And set
+ template class T inline void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-16 Thread Stephan Bergmann

 external/coinmp/UnpackedTarball_coinmp.mk  |1 +
 external/coinmp/werror-format-pedantic.patch.0 |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit 9fb3182b7ac95fe827142a8dba4238aa5f39caa0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 16 12:55:25 2015 +0100

external/coinmp: Work around -Werror,-Wformat-pedantic

Clang trunk since r231211 with -pedantic-errors now emits
Cbc_C_Interface.cpp:379:55: error: format specifies type 'void *' but the
argument has type 'char *' [-Werror,-Wformat-pedantic]

Change-Id: I5d410068f1cd82334f26148df30a45dbc9eabd0a

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 95e40e7..635deff 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
$(if $(filter 
120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \
) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
+   external/coinmp/werror-format-pedantic.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/werror-format-pedantic.patch.0 
b/external/coinmp/werror-format-pedantic.patch.0
new file mode 100644
index 000..a604c43
--- /dev/null
+++ b/external/coinmp/werror-format-pedantic.patch.0
@@ -0,0 +1,10 @@
+--- Cbc/configure
 Cbc/configure
+@@ -3780,7 +3780,6 @@
+   *-darwin*)
+ ;;
+   *)
+-coin_warn_cxxflags=-pedantic-errors $coin_warn_cxxflags
+ ;;
+ esac
+ esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-08 Thread David Ostrovsky

 RepositoryExternal.mk |   12 ++--
 external/coinmp/ExternalPackage_coinmp.mk |5 -
 external/coinmp/ExternalProject_coinmp.mk |2 +-
 external/coinmp/windows.build.patch.1 |   16 
 4 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 152e2a2eb7ccd63900d8cfbd8ada47fa75891cbb
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sun Nov 30 18:26:01 2014 +0100

coinmp: Don't hard code Win32 platform on Windows

Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef
Reviewed-on: https://gerrit.libreoffice.org/13231
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 06088c8..5799da2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -27,6 +27,14 @@
 # in the system case, no libraries should be registered, but the target-local
 # variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
 
+
+ifeq ($(CPUNAME),X86_64)
+wnt_arch_subdir_optional=x64/
+wnt_arch_subdir_mandatory=x64
+else ifeq ($(CPUNAME),INTEL)
+wnt_arch_subdir_mandatory=Win32
+endif
+
 # External headers
 
 ifneq ($(SYSTEM_MESA_HEADERS),)
@@ -262,7 +270,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \
+   $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/$(wnt_arch_subdir_mandatory)/glew32d.lib,Release/$(wnt_arch_subdir_mandatory)/glew32.lib)
 \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -2320,7 +2328,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
+   $(call 
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index 694a886..23fbb10 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,10 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
 $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
+ifeq ($(CPUNAME),X86_64)
+coinmp_arch_subdir=x64/
+endif
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(coinmp_arch_subdir)$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
 else ifneq ($(DISABLE_DYNLOADING),)
 # Just use the static archives from workdir. See bin/lo-all-static-libs
 else ifeq ($(OS),MACOSX)
diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index c140d0e..4a7122d 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
$(call gb_ExternalProject_run,build,\
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   /p:Platform=Win32 \
+   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/coinmp/windows.build.patch.1 
b/external/coinmp/windows.build.patch.1
index 560f9ba..e2e292e 100644
--- a/external/coinmp/windows.build.patch.1
+++ b/external/coinmp/windows.build.patch.1
@@ -2150,6 +2150,22 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln 
coinmp/CoinMP/MSVisualS
  EndProject
  Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+@@ -121,6 +123,7 @@
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.ActiveCfg = 
Debug|Win32
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.Build.0 = 
Debug|Win32
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.ActiveCfg = 
Debug|x64
++  {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.Build.0 = 
Debug|x64
+   {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Any 
CPU.ActiveCfg = Release|Win32
+

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

2014-11-19 Thread Robert Antoni Buj i Gelonch

 external/coinmp/UnpackedTarball_coinmp.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b943150fe84a0158546b6a00ee330ea503c02359
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Sun Oct 19 16:27:58 2014 +0200

coinmp: conditional patch

Change-Id: I33927632173d422d04771f550721dba1767cded5
Reviewed-on: https://gerrit.libreoffice.org/12040
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index ef70c5c..95e40e7 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -21,9 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/werror-format-security.patch.0 \
external/coinmp/werror-undef.patch.0 \
external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
-   $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
+   $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \
+   $(if $(filter 
120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \
+   ) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
-   $(if $(filter MSC,$(COM)),$(if $(filter 
120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp external/freetype external/glew external/icu external/lcms2 external/libgltf external/libxml2 external/libxmlsec external/libxslt external/nss external/

2014-10-02 Thread Michael Stahl

 external/coinmp/UnpackedTarball_coinmp.mk|1 
 external/coinmp/coinmp-msvc-disable-sse2.patch.1 |   10 +++
 external/freetype/UnpackedTarball_freetype.mk|1 
 external/freetype/freetype-msvc-disable-sse2.patch.1 |   26 +++
 external/glew/UnpackedTarball_glew.mk|1 
 external/glew/glew-msvc-disable-sse2.patch.1 |   10 +++
 external/icu/ExternalProject_icu.mk  |2 -
 external/lcms2/UnpackedTarball_lcms2.mk  |1 
 external/lcms2/lcms2-msvc-disable-sse2.patch.1   |   10 +++
 external/libgltf/UnpackedTarball_libgltf.mk  |1 
 external/libgltf/libgltf-msvc-disable-sse2.patch.1   |   10 +++
 external/libxml2/libxml2-vc10.patch  |2 -
 external/libxmlsec/xmlsec1-vc.patch  |2 -
 external/libxslt/libxslt-vc10.patch  |2 -
 external/nss/ExternalProject_nss.mk  |2 -
 external/python3/UnpackedTarball_python3.mk  |1 
 external/python3/python-msvc-disable-sse2.patch.1|   12 
 17 files changed, 89 insertions(+), 5 deletions(-)

New commits:
commit cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 1 23:15:26 2014 +0200

fdo#82430: MSVC build: avoid using SSE2 instructions in some externals

Hopefully this should fix up the most important external libraries.

Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 1dd103a..ef70c5c 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
external/coinmp/werror-undef.patch.0 \
+   external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
$(if $(filter MSC,$(COM)),$(if $(filter 
120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \
diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 
b/external/coinmp/coinmp-msvc-disable-sse2.patch.1
new file mode 100644
index 000..0f518d6
--- /dev/null
+++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1
@@ -0,0 +1,10 @@
+--- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig2014-10-02 
14:22:21.497268171 +0200
 coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 
14:22:30.193267497 +0200
+@@ -6,6 +6,7 @@
+   ItemDefinitionGroup
+ ClCompile
+   StringPoolingtrue/StringPooling
++  
EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet
+ /ClCompile
+   /ItemDefinitionGroup
+   ItemGroup /
diff --git a/external/freetype/UnpackedTarball_freetype.mk 
b/external/freetype/UnpackedTarball_freetype.mk
index 6001851..769d39a 100644
--- a/external/freetype/UnpackedTarball_freetype.mk
+++ b/external/freetype/UnpackedTarball_freetype.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,freetype,\
external/freetype/freetype-2.4.8.patch \
+   external/freetype/freetype-msvc-disable-sse2.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/freetype-msvc-disable-sse2.patch.1 
b/external/freetype/freetype-msvc-disable-sse2.patch.1
new file mode 100644
index 000..2e4b440
--- /dev/null
+++ b/external/freetype/freetype-msvc-disable-sse2.patch.1
@@ -0,0 +1,26 @@
+--- freetype/builds/win32/vc2010/freetype.vcxproj.orig 2014-10-02 
15:41:17.712900843 +0200
 freetype/builds/win32/vc2010/freetype.vcxproj  2014-10-02 
15:41:59.059897637 +0200
+@@ -105,6 +105,7 @@
+   ItemDefinitionGroup 
Condition='$(Configuration)|$(Platform)'=='Release|Win32'
+ ClCompile
+   OptimizationMaxSpeed/Optimization
++  
EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet
+   InlineFunctionExpansionOnlyExplicitInline/InlineFunctionExpansion
+   
AdditionalIncludeDirectories..\..\..\include;%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories
+   
PreprocessorDefinitionsNDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)/PreprocessorDefinitions
+@@ -130,6 +131,7 @@
+   ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Release 
Multithreaded|Win32'
+ ClCompile
+   OptimizationMaxSpeed/Optimization
++  
EnableEnhancedInstructionSetStreamingSIMDExtensions/EnableEnhancedInstructionSet
+   InlineFunctionExpansionOnlyExplicitInline/InlineFunctionExpansion
+   
AdditionalIncludeDirectories..\..\..\include;%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories
+

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

2014-08-09 Thread Thomas Arnhold

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

New commits:
commit 0b684fa3e919dea3a482f85580c1266b81598f70
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sat Aug 9 16:06:09 2014 +0200

VS2013: Override ToolsVersion setting

Otherwise those external projects will fail, because with only VS2013 
installed
there is no ToolsVersion 4.0 (which is set inside the VC projects files).

http://msdn.microsoft.com/en-us/library/bb383985.aspx

Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index c5f181d..3c54e42 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
-   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0) \
+   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
 
 else
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index 5c62c96..b5b7f8a 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
PROFILEFLAGS=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
-   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0) \
+   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
 msbuild.exe cppunit_dll.vcxproj 
/p:Configuration=$${PROFILEFLAGS}  \
 cd ../DllPlugInTester \
 msbuild.exe DllPlugInTester.vcxproj 
/p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index cd84dcd..c402e59 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0) \
+   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index cabff00..21a3f11 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \
-   /p:VisualStudioVersion=12.0) \
+   /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) 
\
,PCBuild)
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-07 Thread Douglas Mencken

 external/coinmp/ExternalPackage_coinmp.mk |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6c4de449094048465b81abf93139bb5950fa12c9
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Tue Jul 29 11:24:38 2014 -0400

fix external/coinmp on OSX: bad symlinking

instdir/LibreOfficeDev.app/Contents/MacOS/libCbc.3.dylib - 
libCbc.3.8.8.dylib
(which does not exist)

See also: 9f339a89453808b917177a3ee675a76385758902

Change-Id: I398d649c2e918b496c9b92364189da4796682653
Reviewed-on: https://gerrit.libreoffice.org/10614
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index b0d29c2..694a886 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -16,14 +16,14 @@ $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,C
 else ifneq ($(DISABLE_DYNLOADING),)
 # Just use the static archives from workdir. See bin/lo-all-static-libs
 else ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.8.8.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.8.8.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.8.5.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.12.6.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.7.6.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.11.5.dylib))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.so.3,Cbc/src/.libs/libCbc.so.3.8.8))
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.so.3,Cbc/src/.libs/libCbcSolver.so.3.8.8))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-29 Thread Tor Lillqvist

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/coinmp-vs2013.patch.1 |  352 ++
 2 files changed, 353 insertions(+)

New commits:
commit 1e03324c2edc205dd5a729aea12c29aad9b4aa14
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jul 29 20:21:42 2014 +0300

Make coinmp build with VS2013

Add a patch to mangle the project files a bit so that they work better
on a machine with only VS2013 installed. At least in my case. But why
we still need to *also* have those /p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 in the ExternalProject_coinmp.mk I don't
know.

Change-Id: Ieebd729c3ba89cf22231fb943f3739d6be5c7acd

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 5937f16..1dd103a 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/werror-undef.patch.0 \
$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
+   $(if $(filter MSC,$(COM)),$(if $(filter 
120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/coinmp-vs2013.patch.1 
b/external/coinmp/coinmp-vs2013.patch.1
new file mode 100644
index 000..2b06c15
--- /dev/null
+++ b/external/coinmp/coinmp-vs2013.patch.1
@@ -0,0 +1,352 @@
+-*- Mode:Diff -*-
+--- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
 coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
+@@ -1,5 +1,5 @@
+ ï»¿?xml version=1.0 encoding=utf-8?
+-Project DefaultTargets=Build ToolsVersion=4.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
++Project DefaultTargets=Build ToolsVersion=12.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+   ItemGroup Label=ProjectConfigurations
+ ProjectConfiguration Include=Debug|Win32
+   ConfigurationDebug/Configuration
+@@ -25,25 +25,25 @@
+   Import Project=$(VCTargetsPath)\Microsoft.Cpp.Default.props /
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ UseOfMfcfalse/UseOfMfc
+ CharacterSetMultiByte/CharacterSet
+   /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Debug|Win32' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ UseOfMfcfalse/UseOfMfc
+ CharacterSetMultiByte/CharacterSet
+   /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|x64' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ UseOfMfcfalse/UseOfMfc
+ CharacterSetMultiByte/CharacterSet
+   /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Debug|x64' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ UseOfMfcfalse/UseOfMfc
+ CharacterSetMultiByte/CharacterSet
+   /PropertyGroup
+--- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
 coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
+@@ -1,5 +1,5 @@
+ ï»¿?xml version=1.0 encoding=utf-8?
+-Project DefaultTargets=Build ToolsVersion=4.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
++Project DefaultTargets=Build ToolsVersion=12.0 
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+   ItemGroup Label=ProjectConfigurations
+ ProjectConfiguration Include=Debug|Win32
+   ConfigurationDebug/Configuration
+@@ -26,27 +26,27 @@
+   Import Project=$(VCTargetsPath)\Microsoft.Cpp.Default.props /
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ CharacterSetUnicode/CharacterSet
+ CLRSupportfalse/CLRSupport
+ WholeProgramOptimizationfalse/WholeProgramOptimization
+   /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Debug|Win32' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset
++PlatformToolsetv120/PlatformToolset
+ CharacterSetUnicode/CharacterSet
+ CLRSupportfalse/CLRSupport
+   /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|x64' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+-PlatformToolsetv110/PlatformToolset

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

2014-07-14 Thread rbuj

 external/coinmp/UnpackedTarball_coinmp.mk |3 
 external/coinmp/macosx.build.patch.1  |  315 ++
 2 files changed, 317 insertions(+), 1 deletion(-)

New commits:
commit 2729671e358bf713048a393c1343054339876460
Author: rbuj robert@gmail.com
Date:   Fri Jul 11 12:35:03 2014 +0200

coinmp: macosx.build.patch

Fix UNAME_PROCESSOR detection in Mac OS X.

Add a filter expression before to apply a platform-specific patch.

Change-Id: I9fc4cf790f16255f4e807e070dbae0e5a1f28781
Reviewed-on: https://gerrit.libreoffice.org/10227
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index d2d9f0c..5937f16 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -20,7 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
external/coinmp/werror-undef.patch.0 \
-   external/coinmp/windows.build.patch.1 \
+   $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
+   $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/macosx.build.patch.1 
b/external/coinmp/macosx.build.patch.1
new file mode 100644
index 000..8130836
--- /dev/null
+++ b/external/coinmp/macosx.build.patch.1
@@ -0,0 +1,315 @@
+--- coinmp/BuildTools/config.guess
 coinmp/BuildTools/config.guess
+@@ -1232,9 +1232,31 @@
+   exit ;;
+ *:Darwin:*:*)
+   UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++  eval $set_cc_for_build
++  if test $UNAME_PROCESSOR = unknown ; then
++  UNAME_PROCESSOR=powerpc
++  fi
++  if test `echo $UNAME_RELEASE | sed -e 's/\..*//'` -le 10 ; then
++  if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
++  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') 
| \
++  (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
++  grep IS_64BIT_ARCH /dev/null
++  then
+   case $UNAME_PROCESSOR in
+-  unknown) UNAME_PROCESSOR=powerpc ;;
++  i386) UNAME_PROCESSOR=x86_64 ;;
++  powerpc) UNAME_PROCESSOR=powerpc64 ;;
+   esac
++  fi
++  fi
++  elif test $UNAME_PROCESSOR = i386 ; then
++  # Avoid executing cc on OS X 10.9, as it ships with a stub
++  # that puts up a graphical alert prompting to install
++  # developer tools.  Any system running Mac OS X 10.7 or
++  # later (Darwin 11 and later) is required to have a 64-bit
++  # processor. This is not true of the ARM version of Darwin
++  # that Apple uses in portable devices.
++  UNAME_PROCESSOR=x86_64
++  fi
+   echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+   exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+--- coinmp/Cbc/config.guess
 coinmp/Cbc/config.guess
+@@ -1232,9 +1232,31 @@
+   exit ;;
+ *:Darwin:*:*)
+   UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++  eval $set_cc_for_build
++  if test $UNAME_PROCESSOR = unknown ; then
++  UNAME_PROCESSOR=powerpc
++  fi
++  if test `echo $UNAME_RELEASE | sed -e 's/\..*//'` -le 10 ; then
++  if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
++  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') 
| \
++  (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
++  grep IS_64BIT_ARCH /dev/null
++  then
+   case $UNAME_PROCESSOR in
+-  unknown) UNAME_PROCESSOR=powerpc ;;
++  i386) UNAME_PROCESSOR=x86_64 ;;
++  powerpc) UNAME_PROCESSOR=powerpc64 ;;
+   esac
++  fi
++  fi
++  elif test $UNAME_PROCESSOR = i386 ; then
++  # Avoid executing cc on OS X 10.9, as it ships with a stub
++  # that puts up a graphical alert prompting to install
++  # developer tools.  Any system running Mac OS X 10.7 or
++  # later (Darwin 11 and later) is required to have a 64-bit
++  # processor. This is not true of the ARM version of Darwin
++  # that Apple uses in portable devices.
++  UNAME_PROCESSOR=x86_64
++  fi
+   echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+   exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+--- coinmp/Cgl/config.guess
 coinmp/Cgl/config.guess
+@@ -1232,9 +1232,31 @@
+   exit ;;
+ *:Darwin:*:*)
+   UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++  eval $set_cc_for_build
++  if test $UNAME_PROCESSOR = unknown ; then
++  UNAME_PROCESSOR=powerpc
++  fi
++  if test `echo $UNAME_RELEASE | sed

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

2014-07-11 Thread David Ostrovsky

 external/coinmp/ExternalProject_coinmp.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83cfe896973075a2b07453d9de548f625511fa63
Author: David Ostrovsky da...@ostrovsky.org
Date:   Tue Jul 8 23:43:41 2014 +0200

VS2013: Adjust coinmp to 12.0 vcproj version

Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0
Reviewed-on: https://gerrit.libreoffice.org/10158
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index b483d45..c5f181d 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0) \
,CoinMP/MSVisualStudio/v9)
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp RepositoryExternal.mk sccomp/source

2014-06-06 Thread Caolán McNamara

 RepositoryExternal.mk |1 +
 external/coinmp/UnpackedTarball_coinmp.mk |1 +
 external/coinmp/werror-undef.patch.0  |   11 +++
 sccomp/source/solver/CoinMPSolver.cxx |   11 ++-
 4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 67b4b34cce4abf745b24c858d533a25c291b5093
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jun 6 14:32:09 2014 +0100

coverity#1202902 Uncaught CoinError exception

Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 640452d..443ea6f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2217,6 +2217,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 endif
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src \
+   -I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinUtils/src \
$$(INCLUDE) \
 )
 
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 831f65f..d2d9f0c 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
+   external/coinmp/werror-undef.patch.0 \
external/coinmp/windows.build.patch.1 \
 ))
 
diff --git a/external/coinmp/werror-undef.patch.0 
b/external/coinmp/werror-undef.patch.0
new file mode 100644
index 000..a9b80f2
--- /dev/null
+++ b/external/coinmp/werror-undef.patch.0
@@ -0,0 +1,11 @@
+--- CoinUtils/src/config_coinutils_default.h   2014-06-06 14:28:06.872113540 
+0100
 CoinUtils/src/config_coinutils_default.h   2014-06-06 14:28:29.400294129 
+0100
+@@ -26,7 +26,7 @@
+   all of this inside the guard for MSC_VER = 1200. If you're reading this
+   and have been developing in MSVS long enough to know, fix it.  -- lh, 
100915 --
+ */
+-#if _MSC_VER = 1200
++#if defined _MSC_VER  _MSC_VER = 1200
+ # include BaseTsd.h
+ # define COIN_INT64_T INT64
+ # define COIN_UINT64_T UINT64
diff --git a/sccomp/source/solver/CoinMPSolver.cxx 
b/sccomp/source/solver/CoinMPSolver.cxx
index f1ee10b..7a016b1 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -18,6 +18,7 @@
  */
 
 #include CoinMP.h
+#include CoinError.hpp
 
 #include SolverComponent.hxx
 #include solver.hrc
@@ -313,7 +314,15 @@ void SAL_CALL CoinMPSolver::solve() 
throw(uno::RuntimeException, std::exception)
 // solve model
 
 nResult = CoinCheckProblem( hProb );
-nResult = CoinOptimizeProblem( hProb, 0 );
+
+try
+{
+nResult = CoinOptimizeProblem( hProb, 0 );
+}
+catch (const CoinError e)
+{
+throw std::runtime_error(e.message());
+}
 
 mbSuccess = ( nResult == SOLV_CALL_SUCCESS );
 if ( mbSuccess )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-26 Thread Michael Stahl

 external/coinmp/ExternalProject_coinmp.mk |2 +-
 external/cppunit/ExternalProject_cppunit.mk   |4 +++-
 external/freetype/ExternalProject_freetype.mk |2 +-
 external/glew/ExternalProject_glew.mk |2 +-
 external/lcms2/ExternalProject_lcms2.mk   |2 +-
 external/python3/ExternalProject_python3.mk   |3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c
Author: Michael Stahl mst...@redhat.com
Date:   Mon May 26 11:39:06 2014 +0200

externals: do not use v110_xp when building with MSVC 2012 and SDK 8.0

Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index 71e1982..b483d45 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 
/p:VisualStudioVersion=10.0) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,CoinMP/MSVisualStudio/v9)
 
 else
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index 30a5905..2f3217d 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
 ifeq ($(OS)$(COM),WNTMSC)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
-   PROFILEFLAGS=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if 
$(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) 
\
+   PROFILEFLAGS=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
+   /p:VisualStudioVersion=11.0) \
 msbuild.exe cppunit_dll.vcxproj 
/p:Configuration=$${PROFILEFLAGS}  \
 cd ../DllPlugInTester \
 msbuild.exe DllPlugInTester.vcxproj 
/p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/freetype/ExternalProject_freetype.mk 
b/external/freetype/ExternalProject_freetype.mk
index 17f2a5d..0c1c513 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
cd ../builds/win32/vc2010/  \
msbuild.exe freetype.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,objs)
 else
 $(call gb_ExternalProject_get_state_target,freetype,build) :
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 79b4a58..918d275 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,7 +17,7 @@ ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe glew_shared.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,build/vc10)
 
 else
diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 1636bae..82664ae 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \

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

2014-05-22 Thread Matúš Kukan

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

New commits:
commit 197f2016e3164702db168e11f98f42042092e68e
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Thu May 22 08:09:14 2014 +0200

fdo#77313: coinmp: error: format not a string literal and no format 
arguments

Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index d27d46c..831f65f 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_add_patches,coinmp,\
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
+   external/coinmp/werror-format-security.patch.0 \
external/coinmp/windows.build.patch.1 \
 ))
 
diff --git a/external/coinmp/werror-format-security.patch.0 
b/external/coinmp/werror-format-security.patch.0
new file mode 100644
index 000..90c116b
--- /dev/null
+++ b/external/coinmp/werror-format-security.patch.0
@@ -0,0 +1,12 @@
+diff -ur coinmp.org/CoinUtils/src/CoinMessageHandler.cpp 
coinmp/CoinUtils/src/CoinMessageHandler.cpp
+--- CoinUtils/src/CoinMessageHandler.cpp   2014-05-21 23:14:01.384874167 
+0200
 CoinUtils/src/CoinMessageHandler.cpp   2014-05-21 23:14:47.708874712 
+0200
+@@ -820,7 +820,7 @@
+ sprintf(messageOut_,g_format_,doublevalue);
+ if (next != format_+2) {
+   messageOut_+=strlen(messageOut_);
+-  sprintf(messageOut_,format_+2);
++  sprintf(messageOut_,%s,format_+2);
+ }
+   }
+   messageOut_+=strlen(messageOut_);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-20 Thread Tor Lillqvist

 external/coinmp/UnpackedTarball_coinmp.mk |2 
 external/coinmp/android.build.patch.1 |  143 ++
 external/coinmp/no-binaries.patch.1   |   25 +
 3 files changed, 170 insertions(+)

New commits:
commit 63bc29b2a80e746a439f248c1bb8daa3d516370c
Author: Tor Lillqvist t...@collabora.com
Date:   Tue May 20 17:04:59 2014 +0300

Make CoinMP build for Android

(No idea whether it works, of course.)

Patch the config.sub files to recognize arm-linux-androideabi.

Don't build any binary programs as that fails for Android becuase we don't
pass in the right C++ library to use anyway. (And those programs aren't 
really
useful to us anyway, on any platform, I guess?)

Change-Id: I70c7a527db41081a51548ce6983b6a9ae8a08bc7

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 5daf123..d27d46c 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
+   external/coinmp/android.build.patch.1 \
+   external/coinmp/no-binaries.patch.1 \
external/coinmp/windows.build.patch.1 \
 ))
 
diff --git a/external/coinmp/android.build.patch.1 
b/external/coinmp/android.build.patch.1
new file mode 100644
index 000..3d8897b
--- /dev/null
+++ b/external/coinmp/android.build.patch.1
@@ -0,0 +1,143 @@
+# -*- Mode: Diff -*-
+# Patch to make the CoinMP configury recognize Android
+#
+--- coinmp/config.sub
 coinmp/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1218,7 +1218,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+--- coinmp/CoinUtils/config.sub
 coinmp/CoinUtils/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1218,7 +1218,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+--- coinmp/Osi/config.sub
 coinmp/Osi/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1218,7 +1218,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* |

[Libreoffice-commits] core.git: external/coinmp external/cppunit external/freetype external/glew external/lcms2 external/openssl external/python3

2014-05-19 Thread Christian Lohmaier

 external/coinmp/ExternalProject_coinmp.mk  |2 
 external/cppunit/ExternalProject_cppunit.mk|4 
 external/freetype/ExternalProject_freetype.mk  |2 
 external/glew/ExternalProject_glew.mk  |2 
 external/lcms2/ExternalProject_lcms2.mk|2 
 external/openssl/UnpackedTarball_openssl.mk|1 
 external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 |   20 ++
 external/python3/ExternalProject_python3.mk|2 
 external/python3/UnpackedTarball_python3.mk|2 
 external/python3/python-3.3.3-msvc2012-winxp.patch.1   |  117 +
 external/python3/python-3.3.3-py17797.patch.1  |   44 ++
 11 files changed, 191 insertions(+), 7 deletions(-)

New commits:
commit e175eb3cedded28909247f4d46f2c17ff2f58be2
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Mon May 19 19:48:35 2014 +0200

fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012

VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP

Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index 422cc94..22769e3 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 
/p:VisualStudioVersion=10.0) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
,CoinMP/MSVisualStudio/v9)
 
 else
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index 8e74259..9a163e7 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -18,10 +18,10 @@ ifeq ($(OS)$(COM),WNTMSC)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe cppunit_dll.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
 cd ../DllPlugInTester \
 msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
,src/cppunit)
 else
 
diff --git a/external/freetype/ExternalProject_freetype.mk 
b/external/freetype/ExternalProject_freetype.mk
index 464a221..17f2a5d 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
cd ../builds/win32/vc2010/  \
msbuild.exe freetype.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
,objs)
 else
 $(call gb_ExternalProject_get_state_target,freetype,build) :
diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index 97ad954..79b4a58 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,7 +17,7 @@ ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe glew_shared.vcxproj /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp 
/p:VisualStudioVersion=11.0) \
,build/vc10)
 
 else
diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 80472f5..1636bae 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,7 @@ $(call

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

2014-04-11 Thread Stephan Bergmann

 external/coinmp/ExternalProject_coinmp.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cce49ccd002af788a7b025be6dc8bded933cf3a3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Apr 11 10:00:40 2014 +0200

Don't even dare check for Fortran

...which can lead to problems when e.g. building against a local trunk GCC
(requiring LD_LIBRARY_PATH) that was configured to build only C/C++ 
compilers,
so CoinMP's configuration would try to blend that with the system's 
gfortran.

Change-Id: I9f237df0887e06e50b9e76f3a09cfebb6f22dc20

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index c18f2d5..422cc94 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -27,7 +27,7 @@ else
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
+$(call gb_ExternalProject_run,build,\
./configure COIN_SKIP_PROJECTS=Data/Sample \
-   --enable-dependency-linking \
+   --enable-dependency-linking F77=unavailable \
 $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-05 Thread Tomofumi Yagi

 RepositoryExternal.mk |2 +-
 external/coinmp/ExternalPackage_coinmp.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cddbec75d402e260d6997ad69377346a8aa5774a
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Apr 5 12:02:38 2014 +0900

Fix Windows build(external/coinmp)

This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.

Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Tested-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f6a4e2b..2892a71 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2032,7 +2032,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+   $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index de01822..bbea3dd 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
 $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-04 Thread Michael Stahl

 external/coinmp/ExternalProject_coinmp.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6731f6c36faf64ab4522f0ffe2045c794849fabe
Author: Michael Stahl mst...@redhat.com
Date:   Fri Apr 4 18:12:16 2014 +0200

coinmp: actually link the libraries

Several people named Chris report failures in the solver unit test, and
apparently the CoinMP libraries have loads of unresolved symbols
because they don't have NEEDED entries, i.e. were not linked properly;
let's see if this fixes it.

Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0
Reviewed-on: https://gerrit.libreoffice.org/8850
Reviewed-by: Chris Laplante mostthings...@gmail.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index b66e877..c18f2d5 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -27,6 +27,7 @@ else
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
+$(call gb_ExternalProject_run,build,\
./configure COIN_SKIP_PROJECTS=Data/Sample \
+   --enable-dependency-linking \
 $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

39 matches

Mail list logo