from:"Don Lewis"

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source cui/source editeng/source filter/source sc/source svtools/source sw/source xmloff/source

2018-05-02 Thread Don Lewis

/filter/ww8/ww8atr.cxx  |4 -
 sw/source/filter/ww8/ww8glsy.cxx |2 
 sw/source/filter/ww8/ww8graf.cxx |   32 ++---
 sw/source/filter/ww8/ww8graf2.cxx|2 
 sw/source/filter/ww8/ww8par.cxx  |   18 +++
 sw/source/filter/ww8/ww8par2.cxx |4 -
 sw/source/filter/ww8/ww8par3.cxx |4 -
 sw/source/filter/ww8/ww8par5.cxx |8 +--
 sw/source/filter/ww8/ww8par6.cxx |   12 ++--
 sw/source/filter/ww8/ww8scan.cxx |   46 +--
 sw/source/filter/xml/xmlfmt.cxx  |2 
 sw/source/filter/xml/xmltexte.cxx|2 
 sw/source/ui/app/docsh.cxx   |2 
 sw/source/ui/app/docshini.cxx|4 -
 sw/source/ui/app/docstyle.cxx|   30 ++--
 sw/source/ui/dbui/dbinsdlg.cxx   |8 +--
 sw/source/ui/docvw/edtdd.cxx |2 
 sw/source/ui/docvw/edtwin.cxx|4 -
 sw/source/ui/fldui/fldmgr.cxx|2 
 sw/source/ui/fmtui/tmpdlg.cxx|2 
 sw/source/ui/shells/annotsh.cxx  |2 
 sw/source/ui/shells/drawsh.cxx   |2 
 sw/source/ui/shells/drformsh.cxx |2 
 sw/source/ui/shells/drwbassh.cxx |2 
 sw/source/ui/shells/drwtxtex.cxx |2 
 sw/source/ui/shells/drwtxtsh.cxx |6 +-
 sw/source/ui/shells/frmsh.cxx|2 
 sw/source/ui/shells/grfsh.cxx|4 -
 sw/source/ui/shells/listsh.cxx   |2 
 sw/source/ui/shells/tabsh.cxx|8 +--
 sw/source/ui/shells/textidx.cxx  |2 
 sw/source/ui/shells/textsh.cxx   |6 +-
 sw/source/ui/shells/textsh1.cxx  |2 
 sw/source/ui/shells/textsh2.cxx  |2 
 sw/source/ui/uiview/pview.cxx|2 
 sw/source/ui/uiview/view2.cxx|8 +--
 sw/source/ui/uiview/viewcoll.cxx |2 
 sw/source/ui/uiview/viewdlg.cxx  |2 
 sw/source/ui/uiview/viewling.cxx |6 +-
 sw/source/ui/uiview/viewprt.cxx  |2 
 sw/source/ui/uiview/viewtab.cxx  |4 -
 xmloff/source/forms/elementimport.cxx|2 
 xmloff/source/style/xmlbahdl.cxx |4 -
 xmloff/source/style/xmlexppr.cxx |4 -
 xmloff/source/text/txtparae.cxx  |4 -
 xmloff/source/text/txtparai.cxx  |2 
 xmloff/source/text/txtprhdl.cxx  |   10 ++--
 xmloff/source/transform/ChartOASISTContext.cxx   |2 
 xmloff/source/transform/ChartOOoTContext.cxx |2 
 xmloff/source/transform/ControlOASISTContext.cxx |2 
 xmloff/source/transform/CreateElemTContext.cxx   |2 
 xmloff/source/transform/DlgOASISTContext.cxx |2 
 xmloff/source/transform/EventOASISTContext.cxx   |2 
 xmloff/source/transform/EventOOoTContext.cxx |2 
 xmloff/source/transform/FormPropOASISTContext.cxx|2 
 xmloff/source/transform/FormPropOOoTContext.cxx  |2 
 xmloff/source/transform/FrameOASISTContext.cxx   |2 
 xmloff/source/transform/FrameOOoTContext.cxx |4 -
 xmloff/source/transform/MergeElemTContext.cxx|4 -
 xmloff/source/transform/OOo2Oasis.cxx|6 +-
 xmloff/source/transform/Oasis2OOo.cxx|4 -
 xmloff/source/transform/PersMixedContentTContext.cxx |6 +-
 xmloff/source/transform/StyleOASISTContext.cxx   |4 -
 xmloff/source/transform/StyleOOoTContext.cxx |8 +--
 xmloff/source/transform/TransformerBase.cxx  |4 -
 xmloff/source/transform/TransformerContext.cxx   |4 -
 145 files changed, 347 insertions(+), 347 deletions(-)

New commits:
commit 164b33838fd16ab9c626fd8441f98948a2139f8a
Author: Don Lewis <truck...@apache.org>
Date:   Wed May 2 09:50:12 2018 +

Don't use !this as an alias for a constant that evaluates to false in

unconditional asserts.  The former requires code to evaluate the
condition at runtime and also causes warnings from clang.

While here, translate the associated assert messages.

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dd5d60315712..9a15b93d0832 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -975,7 +975,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, 
const String& rBaseUR
 // Plausi!
 if(

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins

2018-05-01 Thread Don Lewis

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a76717559adcc05a2c47c2ce843b20708d0e9eb5
Author: Don Lewis <truck...@apache.org>
Date:   Wed May 2 01:36:10 2018 +

Fix build on Windows with precompiled headers.

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 90c52f3ab66d..906d646a5235 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
 
 #include "util.hxx"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source i18npool/source sdext/source store/source svl/inc svl/source unotools/source vcl/source vcl/unx vos/source

2018-05-01 Thread Don Lewis

 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |8 +-
 connectivity/source/commontools/dbexception.cxx|8 +-
 connectivity/source/drivers/adabas/BUser.cxx   |2 
 connectivity/source/drivers/file/FResultSet.cxx|8 +-
 connectivity/source/drivers/file/FStatement.cxx|   16 ++--
 connectivity/source/drivers/hsqldb/HUser.cxx   |2 
 connectivity/source/drivers/mysql/YUser.cxx|2 
 connectivity/source/inc/propertyids.hxx|2 
 connectivity/source/parse/PColumn.cxx  |   18 ++---
 connectivity/source/sdbcx/VCatalog.cxx |2 
 connectivity/source/sdbcx/VColumn.cxx  |   14 ++--
 connectivity/source/sdbcx/VIndex.cxx   |2 
 connectivity/source/sdbcx/VKey.cxx |8 +-
 connectivity/source/sdbcx/VKeyColumn.cxx   |2 
 connectivity/source/sdbcx/VTable.cxx   |8 +-
 connectivity/source/sdbcx/VView.cxx|8 +-
 i18npool/source/search/levdis.cxx  |4 -
 i18npool/source/search/textsearch.cxx  |4 -
 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx   |2 
 store/source/storcach.cxx  |4 -
 store/source/stortree.cxx  |6 -
 svl/inc/svl/cntnrsrt.hxx   |2 
 svl/inc/svl/svarray.hxx|8 +-
 svl/source/items/itemset.cxx   |2 
 svl/source/memtools/svarray.cxx|   10 +-
 svl/source/misc/inethist.cxx   |6 -
 svl/source/numbers/zforfind.cxx|   14 ++--
 svl/source/numbers/zformat.cxx |   32 -
 unotools/source/i18n/charclass.cxx |   12 +--
 vcl/source/gdi/bitmap4.cxx |2 
 vcl/source/gdi/pdfwriter_impl.cxx  |8 +-
 vcl/source/gdi/pdfwriter_impl.hxx  |6 -
 vcl/source/gdi/pdfwriter_impl2.cxx |6 -
 vcl/unx/generic/app/wmadaptor.cxx  |2 
 vcl/unx/generic/fontmanager/afm_hash.cpp   |   10 +-
 vcl/unx/generic/fontmanager/parseAFM.cxx   |   34 
+-
 vos/source/object.cxx  |2 
 37 files changed, 143 insertions(+), 143 deletions(-)

New commits:
commit 0ee87bc7c34f6caea6604d42354df2ea97d26b64
Author: Don Lewis <truck...@apache.org>
Date:   Tue May 1 18:46:30 2018 +

The register storage class is deprecated and is incompatible with C++17.

Modern compilers have mostly been ignoring it, probably other than to
forbid the use of the address-of operator.  Get ahead of the game and
delete it now.

Reported by clang 6.

diff --git a/i18npool/source/search/levdis.cxx 
b/i18npool/source/search/levdis.cxx
index 60581a170bcf..c4ffeca7ead6 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -93,7 +93,7 @@
 {   \
 if ( jj != ii ) \
 {   \
-register sal_Int32 k;   \
+sal_Int32 k;\
 if ( jj > 0 )   \
 for ( k=0; k < jj; k++ )\
 if ( cpPattern[k] == c )\
@@ -272,7 +272,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, 
sal_Int32 nStringLen )
 nSPMin = npDistance[0];
 int nReplacePos = -1;   // tristate Flag
 // fuer jede Patternspalte den String durchgehen
-for ( register sal_Int32 i=1; i <= nStringLen; i++ )
+for ( sal_Int32 i=1; i <= nStringLen; i++ )
 {
 d1 = d2;// WLD( X(i-1), Y(j-1) )
 d2 = npDistance[i]; // WLD( X(i)  , Y(j-1) )
diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index 7c716e8a2828..7d625ece3976 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -879,7 +879,7 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& 
searchStr,
 
 OUString aWTemp( searchStr );
 
-register sal_Int32 nStt, nEnd;
+sal_Int32 nStt, nEnd;
 
 Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
 aSrchPara.Locale,
@@ -926,7 +926,7 @@ SearchResult TextSearch::ApproxSrchBkwrd( const OUString& 
searchStr,

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/cpprt sal/rtl set_soenv.in solenv/gbuild solenv/inc

2018-04-27 Thread Don Lewis

 sal/cpprt/operators_new_delete.cxx |   12 
 sal/rtl/source/alloc_cache.c   |6 ++
 sal/rtl/source/alloc_global.c  |5 +
 sal/rtl/source/alloc_impl.h|6 ++
 set_soenv.in   |   11 ++-
 solenv/gbuild/platform/freebsd.mk  |2 +-
 solenv/gbuild/platform/linux.mk|2 +-
 solenv/gbuild/platform/macosx.mk   |2 +-
 solenv/gbuild/platform/os2.mk  |2 +-
 solenv/gbuild/platform/solaris.mk  |2 +-
 solenv/gbuild/platform/windows.mk  |2 +-
 solenv/gbuild/platform/winmingw.mk |2 +-
 solenv/inc/settings.mk |2 +-
 13 files changed, 47 insertions(+), 9 deletions(-)

New commits:
commit a3e1123456ebafe8aed405534557230a833460a0
Author: Don Lewis <truck...@apache.org>
Date:   Sat Apr 28 02:47:11 2018 +

Fix potential memory alignment issues on X86_64.

Clang version 4.0 and newer uses SSE instructions that require
16-byte alignment to zero memory allocated using the C++ new operator.
The internal memory allocator does not understand anything larger
than 8-byte alignment.  Modify it to be capable of doing 16-byte
alignment when necessary.

There is also a debug layer beneath the C++ new and delete operators
that is enabled by the --enable-debug configure option.  This layer
adds 8 to the requested size of any allocations before calling the
underlying allocator, adds a known signature to the start of the
memory block, and then adds an 8 byte offset to the pointer before
returning it to the caller.  The delete operator basically does the
reverse, checking for the proper signature.  Modify this code so
that it adds and subtracts a 16-byte offset on X86_64 so that a
properly aligned block from the underlying allocator does not cause
new to return a misaligned pointer.

Modify set_soenv.in so that it always requests 16-byte alignment
on X86_64 so that the ABI is the same independent of the toolchain.

diff --git a/sal/cpprt/operators_new_delete.cxx 
b/sal/cpprt/operators_new_delete.cxx
index abd4c73aa116..da05584da124 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -68,7 +68,11 @@ struct AllocatorTraits
 {
 n = std::max(n, std::size_t(1));
 #if OSL_DEBUG_LEVEL > 0
+# ifdef NEED_ALIGN16
+n += 2*sizeof(signature_type);
+# else
 n += sizeof(signature_type);
+# endif
 #endif  /* OSL_DEBUG_LEVEL  */
 return n;
 }
@@ -77,7 +81,11 @@ struct AllocatorTraits
 {
 #if OSL_DEBUG_LEVEL > 0
 memcpy (p, m_signature, sizeof(signature_type));
+# ifdef NEED_ALIGN16
+p = static_cast<char*>(p) + 2*sizeof(signature_type);
+# else
 p = static_cast<char*>(p) + sizeof(signature_type);
+# endif
 #endif  /* OSL_DEBUG_LEVEL */
 return p;
 }
@@ -85,7 +93,11 @@ struct AllocatorTraits
 void* fini (void * p) const SAL_THROW(())
 {
 #if OSL_DEBUG_LEVEL > 0
+# ifdef NEED_ALIGN16
+p = static_cast<char*>(p) - 2*sizeof(signature_type);
+# else
 p = static_cast<char*>(p) - sizeof(signature_type);
+# endif
 if (memcmp (p, m_signature, sizeof(signature_type)) != 0)
 {
 OSL_ENSURE(0, "operator delete mismatch");
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 7f026968ce9f..30c0d9f687c4 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -894,7 +894,13 @@ rtl_cache_activate (
 if (objalign == 0)
 {
 /* determine default alignment */
+#ifdef NEED_ALIGN16
+if (objsize >= RTL_MEMORY_ALIGNMENT_16)
+objalign = RTL_MEMORY_ALIGNMENT_16;
+else if (objsize >= RTL_MEMORY_ALIGNMENT_8)
+#else
 if (objsize >= RTL_MEMORY_ALIGNMENT_8)
+#endif
 objalign = RTL_MEMORY_ALIGNMENT_8;
 else
 objalign = RTL_MEMORY_ALIGNMENT_4;
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c
index f8c71284fffa..c525b77e7a30 100644
--- a/sal/rtl/source/alloc_global.c
+++ b/sal/rtl/source/alloc_global.c
@@ -75,8 +75,13 @@ static rtl_cache_type * 
g_alloc_caches[RTL_MEMORY_CACHED_SIZES] =
 0,
 };
 
+#ifdef NEED_ALIGN16
+#define RTL_MEMALIGN   16
+#define RTL_MEMALIGN_SHIFT 4
+#else
 #define RTL_MEMALIGN   8
 #define RTL_MEMALIGN_SHIFT 3
+#endif
 
 static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> 
RTL_MEMALIGN_SHIFT] =
 {
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index b6ee2d5ce504..866d1db30fa0 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -45,6 +45,12 @@ extern "C" {
 #define RTL_MEMORY_ALIGNMENT_8 sizeof(void*)
 #endif /* SAL_TYPES_ALIGNMENT8 */
 
+#if defined(SAL_TYPES_ALIGNMENT16) && SAL_TYPES_ALIGNMENT16 > 1
+#define RTL_MEMORY_

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild solenv/inc

2018-04-20 Thread Don Lewis

 solenv/gbuild/platform/freebsd.mk |8 
 solenv/inc/unxfbsdi.mk|8 
 2 files changed, 16 insertions(+)

New commits:
commit 6a278b92d1822a0e7dfde8fd87d005f00a855e54
Author: Don Lewis <truck...@apache.org>
Date:   Fri Apr 20 23:17:21 2018 +

Work around a bug in clang versions 3.6.x and 3.7.x on 32-bit Intel.

Using -Os optimization causes clang to generate bad DWARF CFI which
is needed for stack unwinding during exception handling.  See:
<https://llvm.org/bugs/show_bug.cgi?id=24792>
Instead of using -Os, optimize using "-O2 -fno-unroll-loops" as a
reasonably close substitute.

diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index d519cb8c2386..5f4bc943186e 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -146,7 +146,15 @@ ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 gb_COMPILEROPT1FLAGS := -O0
 else
+# Clang versions 3.6.x and 3.7.x generate bad DWARF CFI for stack unwinding
+# on 32-bit Intel when compiling with -Os optimization.  See
+# <https://llvm.org/bugs/show_bug.cgi?id=24792>
+# Work around this by using "-O2 -fno-unroll-loops" instead.
+ifeq ($(COM)$(CPUNAME)$(shell expr $(CCNUMVER) '>=' 00030006 '&' 
$(CCNUMVER) '<' 00030008),CLANGINTEL1)
+gb_COMPILEROPTFLAGS := -O2 -fno-unroll-loops
+else
 gb_COMPILEROPTFLAGS := -Os
+endif
 gb_COMPILEROPT1FLAGS := -O1
 endif
 
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 21703817605f..5d99f051c835 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -33,7 +33,15 @@ ARCH_FLAGS*=-mtune=pentiumpro
 
 # Compiler flags for enabling optimizations
 .IF "$(PRODUCT)"!=""
+# Clang versions 3.6.x and 3.7.x generate bad DWARF CFI for stack unwinding
+# on 32-bit Intel when compiling with -Os optimization.  See
+# <https://llvm.org/bugs/show_bug.cgi?id=24792>
+# Work around this by using "-O2 -fno-unroll-loops" instead.
+.IF "$(COM)"=="CLANG" && "$(CCNUMVER)">="00030006" && 
"$(CCNUMVER)"<="00030007"
+CFLAGSOPT=-O2 -fno-unroll-loops -fno-strict-aliasing   # optimizing for 
products
+.ELSE
 CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+.ENDIF
 .ELSE  # "$(PRODUCT)"!=""
 CFLAGSOPT= # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/Library_dbui.mk svx/Library_svxcore.mk

2018-04-17 Thread Don Lewis

 dbaccess/Library_dbui.mk |9 +
 svx/Library_svxcore.mk   |9 +
 2 files changed, 18 insertions(+)

New commits:
commit 943443f350b571beb4e9c932067456e415ffa8fb
Author: Don Lewis <truck...@apache.org>
Date:   Tue Apr 17 16:59:48 2018 +

Fix build with gcc 4.9 by tweaking optimization options for two files.

This is a workaround for:
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>

diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 7a0adb992bdc..885fcc5c6b05 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -286,6 +286,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 ))
 endif
 
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 00040009 '&' $(CCNUMVER) '<' 
0005),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   dbaccess/source/ui/uno/ColumnControl, \
+   $(gb_COMPILEROPTFLAGS) -fno-devirtualize 
-fno-devirtualize-speculatively \
+))
+endif
+
 $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 49f1101dee24..de5133ab6905 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -449,6 +449,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 ))
 endif
 
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 00040009 '&' $(CCNUMVER) '<' 
0005),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+svx/source/fmcomp/fmgridif, \
+$(gb_COMPILEROPTFLAGS) -fno-devirtualize -fno-devirtualize-speculatively \
+))
+endif
+
 $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
 
 $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in solenv/gbuild solenv/inc

2018-03-08 Thread Don Lewis

 set_soenv.in   |   33 +++-
 solenv/gbuild/platform/freebsd.mk  |2 
 solenv/gbuild/platform/linux.mk|2 
 solenv/gbuild/platform/macosx.mk   |2 
 solenv/gbuild/platform/os2.mk  |2 
 solenv/gbuild/platform/solaris.mk  |2 
 solenv/gbuild/platform/windows.mk  |2 
 solenv/gbuild/platform/winmingw.mk |2 
 solenv/inc/settings.mk |7 -
 solenv/inc/tg_compv.mk |  138 -
 10 files changed, 20 insertions(+), 172 deletions(-)

New commits:
commit ad3dba5fa877fab937d474bf18e63b0a010637de
Author: Don Lewis <truck...@apache.org>
Date:   Fri Mar 9 04:22:18 2018 +

#127664# $CCNUMVER from dmake to configure

Move the calculation of $CCNUMVER and some other variables from
main/solenv/inc/tg_compv.mk, where it is only usable by dmake, to
configure, where it can be used by both dmake and gbuild. This is
a requirement to upstream some compiler bug workaround patches from
the FreeBSD port.

A bit of logic from set_soenv is also moved into configure.  A bunch
more should probably be moved so that the configuration logic is
not spread across so many different places, but that can wait.
Something else to consider is that it would be nice to use a different
value of $COM for Apple's clang, maybe "ACLANG" or "APPLECLANG"
since it  has a different version numbering scheme that the open-source
version of clang and having a unique identifier would simplify
version checking when applying compiler bug workarounds.

Note: I think the old value of $CCNUMVER on the Mac is wrong.  It
should look something like 00080001 or 00070003, depending
on the installed version.

Change -DCPPU_ENV on the Mac from $(COMID) to $(COMNAME) for
consistency with the dmake side.  It shouldn't make a difference
in practice since both have the same value on the Mac.

diff --git a/set_soenv.in b/set_soenv.in
index b894a6935279..1ee2026213ed 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -74,7 +74,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG,
  $BUILD_SOSL_RELEASE, $RSC_ONCE );
 #
 # Platform dependent constant values.
-my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
+my ( $BIG_SVX, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
   $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
   $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
   $JRETOOLKITDIR, $JRETHREADDIR,
@@ -248,10 +248,8 @@ if ( $platform =~ m/solaris/ )
}
 
if ( $CC =~ "gcc") {
-   $COM= "GCC";
$CVER   = "C300";
} else {
-   $COM= "C52";
$CVER   = "C52";
$COMEX  = 4;
}
@@ -306,7 +304,6 @@ elsif ( $platform =~ m/netbsd/ )
   $OUTPATH= $OUTPATH."2";
# General NetBSD settings:
   $BIG_SVX= "TRUE";
-  $COM= "GCC";
   $COMPATH= '@COMPATH@'; 
   $GUI= "UNX";
   $GUIBASE= "unx";
@@ -320,7 +317,6 @@ elsif ( $platform =~ m/kfreebsd/ )
 # General GNU/kFreeBSD settings:
   $CVER   = "C341";
   $BIG_SVX= "TRUE";
-  $COM= "GCC";
   $COMPATH= '@COMPATH@'; 
   $GLIBC  = "2REDHAT60";
   $GUI= "UNX";
@@ -358,7 +354,6 @@ elsif ( $platform =~ m/kfreebsd/ )
 }
 elsif ( $platform =~ m/freebsd/ ) 
 { $BIG_SVX= "TRUE";
-  $COM= "@COM_IS@";
   $COMPATH= '@COMPATH@'; 
   $CVER   = "C300";
   $GUI= "UNX";
@@ -442,7 +437,6 @@ elsif ( $platform =~ m/linux/ )
 # General Linux settings:
   $CVER   = "C341";
   $BIG_SVX= "TRUE";
-  $COM= "@COM_IS@";
   $COMPATH= '@COMPATH@'; 
   $GLIBC  = "2REDHAT60";
   $GUI= "UNX";
@@ -661,7 +655,6 @@ elsif ( $platform =~ m/osf1/ )
 { print "Setting Tru64 specific values... ";
   $outfile= "Tru64AlphaEnv.Set"; 
   $BIG_SVX= "TRUE";
-  $COM= "CXX";
   $COMPATH= '@COMPATH@'; 
   $CPU= "A";
   $CPUNAME= "ALPHA_";
@@ -705,7 +698,6 @@ elsif ( $platform =~ m/cygwin/ )
   $outfile= "winmingw.set"; 
   $COMPATH= PathFormat('@COMPATH@/bin');
   $COMPATH=~ s/\/bin$//i;
-  $COM= "GCC";
   $CVER   = "C341";
   $OUTPATH= "wntgcci";
   $INPATH = $O

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - toolkit/inc toolkit/source

2018-02-05 Thread Don Lewis

 toolkit/inc/layout/layout.hxx|2 
 toolkit/source/layout/vcl/wbutton.cxx|   72 
 toolkit/source/layout/vcl/wcontainer.cxx |8 -
 toolkit/source/layout/vcl/wfield.cxx |   87 +--
 toolkit/source/layout/vcl/wrapper.cxx|  136 ++-
 toolkit/source/layout/vcl/wrapper.hxx|6 -
 6 files changed, 150 insertions(+), 161 deletions(-)

New commits:
commit 837bd0e46c8cb64362614bb6c548addee73f80fa
Author: Don Lewis <truck...@apache.org>
Date:   Mon Feb 5 18:20:47 2018 +

A number of methods in main/toolkit/source/layout/vcl/* use either

"!this" or "this" in a boolean context in order to detect being
called with a null object and exit early.  In a valid C++ program
"this" will never be null, so a compiler could legally optimize out
this comparision, which could potentially result in the method
dereferencing a null pointer later in the code.  This situation
could only happen if the caller is using a null object pointer to
call the method or is using a object ref to call the method that
was generated by dereferencing a null pointer, neither of which is
valid.  Resolve this by moving the checks out of the method and
into the caller.

Make this easier by changing the getImpl() method to return the
private *Impl pointer directly instead of deferencing the pointer
and returning a ref.  The latter is invalid if the pointer is null.
This allows GetImpl() to be called in a boolean contect to peform
the check.  It also allows a number of instances of "()"
calls in a boolean context to be fixed by changing them to "getImpl()".
The address of a ref will never be zero in a valid C++ program, so
the compiler could potentially optimize out those checks.

There does not appear to be any need for Control and ComboBox to
use customized versions of GetImpl() since these appear to behave
identically to the versions generated by the canned macro, so switch
them back to the macro version.

This commit should result in no functional changes.

It seems like all of these checks for a null implementation should
not be necessary, but that requires further investigation.

diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 01dbd2228610..69e38af00d55 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -102,7 +102,7 @@ public:
 t( Window *parent, WinBits nStyle = defaultWinBit ); \
 t (Window *parent, ResId const )
 #define DECL_GET_IMPL(t) \
-inline t##Impl () const
+inline t##Impl *getImpl() const
 
 #define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const
 #define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return 
dynamic_cast< ::cls*>( GetWindow() ); }
diff --git a/toolkit/source/layout/vcl/wbutton.cxx 
b/toolkit/source/layout/vcl/wbutton.cxx
index c769bdca736e..afdeca8a957b 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -140,35 +140,36 @@ String Button::GetStandardText (sal_uInt16 button_type)
 
 void Button::SetText( OUString const& rStr )
 {
-if ( !getImpl().mxButton.is() )
+if ( !getImpl()->mxButton.is() )
 return;
-getImpl().mxButton->setLabel( rStr );
+getImpl()->mxButton->setLabel( rStr );
 }
 
 void Button::SetClickHdl( const Link& link )
 {
-if ( () && getImpl().mxButton.is ())
-getImpl().SetClickHdl( link );
+if (getImpl() && getImpl()->mxButton.is ())
+getImpl()->SetClickHdl( link );
 }
 
 Link& Button::GetClickHdl ()
 {
-return getImpl().GetClickHdl ();
+return getImpl()->GetClickHdl ();
 }
 
 bool Button::SetModeImage (Image const& image)
 {
-return getImpl().SetModeImage (image.getImpl().mxGraphic);
+return getImpl() || getImpl()->SetModeImage (image.getImpl().mxGraphic);
 }
 
 bool Button::SetModeImage (::Image const& image, BmpColorMode mode)
 {
-return GetButton ()->SetModeImage (image, mode);
+return !GetButton () || GetButton ()->SetModeImage (image, mode);
 }
 
 void Button::SetImageAlign( ImageAlign eAlign )
 {
-getImpl().setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
+if ( getImpl() )
+getImpl()->setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
 }
 
 void Button::Click()
@@ -229,14 +230,15 @@ PushButton::~PushButton ()
 
 void PushButton::Check( bool bCheck )
 {
-getImpl().setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
+if ( getImpl() )
+getImpl()->setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
 // XButton doesn't have explicit toggle event
-getImpl().fireToggle();
+getImpl()->fireToggle();
 }
 
 bool Push

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

2018-01-30 Thread Don Lewis

 sw/source/filter/ww8/ww8scan.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 399cb9a456bc7d0da10b3b61d17ebf4460f7fc3c
Author: Don Lewis <truck...@apache.org>
Date:   Tue Jan 30 20:10:07 2018 +

Be slightly less tricky and change

do {
} while (!this);
to
do {
} while (0);

Computing !this must be done at runtime, whereas the intent is for
the loop to exit after the first iteration, which can be handled at
compile time when using a constant zero.  Also, "this" should always
be non-NULL in valid c++ code, but if ever happened to be NULL, then
this code could loop forever.

While here, translate nearby comments.

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index f2f1391592b3..679b735ebc9e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6197,12 +6197,12 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
 if ( 20 > nRead ) break;
 rSt >> ftcBi;
 
-// ggfs. den Rest ueberlesen
+// ggfs. Check the rest
 if( 20 < nRead )
 rSt.SeekRel( nRead-20 );
 }
-while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
-//   und kann vorzeitig per "break" verlassen werden.
+while( 0 ); // Trick: The above block is run through exactly once
+// and can be prematurely left by "break".
 
 if( 0 != rSt.GetError() )
 {
@@ -6255,19 +6255,19 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* 
pcbStd )
 if( 8 > nRead ) break;
 rSt >> pStd->bchUpe;
 
-// ab Ver8 sollten diese beiden Felder dazukommen:
+// from Ver8 these two fields should be added
 if(10 > nRead ) break;
 rSt >> a16Bit;
 pStd->fAutoRedef =   a16Bit & 0x0001   ;
 pStd->fHidden= ( a16Bit & 0x0002 ) >> 1;
 
-// man kann nie wissen: vorsichtshalber ueberlesen
-// wir eventuelle Fuellsel, die noch zum BASE-Part gehoeren...
+// you never know: as a precaution, we read over any
+// filler that still belongs to the BASE part...
 if( 10 < nRead )
 rSt.SeekRel( nRead-10 );
 }
-while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
-//   und kann vorzeitig per "break" verlassen werden.
+while( 0 ); // Trick: above block is run through exactly once and
+// can be prematurely left by "break".
 
 if( (0 != rSt.GetError()) || !nRead )
 DELETEZ( pStd );// per NULL den Error melden
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2018-01-08 Thread Don Lewis

 solenv/gbuild/Output.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 064e99cea6e96decb0fd508e930580fccb4c33bc
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jan 8 17:12:58 2018 +

Revert the part of r1818099 that changed the hardwired awk command

in main/solenv/gbuild/Output.mk with $(gb_AWK).  Unfortunately
$(gb_AWK) is not defined at this point, so this change caused
errors each time a gbuild makefile was invoked.  The definition
of $(gb_AWK) is in the platform gbuild files, which are included
after Output.mk.  Changing the order of the includes breaks the
Windows build due to other chicken vs. egg problems.  Fortunately
using hardwired awk works everywhere except Solaris, which we no
longer support.

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 62acd486201c..0431914b03f3 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -57,8 +57,11 @@ endif
 
 # disable for OS/2
 ifneq ($(OS),OS2)
-gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+# We can't use $(gb_AWK) here since that is defined in the platform files,
+# which are not included yet.  Reordering the includes causes other
+# problems.  Fortunately hardcoding awk works everywhere except Solaris.
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
 endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in sysui/desktop

2018-01-08 Thread Don Lewis

 set_soenv.in |   12 
 sysui/desktop/debian/makefile.mk |2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit eee1fb3486915a9182b5f24f9dd9c0fe8a8b959e
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jan 8 08:56:31 2018 +

Don't put "." in $PATH because it is somewhat inefficient

as well as hazardous, especially if a user does a manual build
and then continues to use the same shell session.

Fix on instance of a script in the current directory being
executed without a leading "./".

Remember to run "./bootstrap" as configure recommends.  With
this change "bootstrap" without the leading "./" will no longer
work.

diff --git a/set_soenv.in b/set_soenv.in
index a68924f65467..16d37ae9de8f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1118,8 +1118,7 @@ if ($platform =~ m/cygwin|os2/)
  
 # The general environment path.
 if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
-{  $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH  = '$SOLARENV'.$ds.'$INPATH'.$BIN.
 $ps.'$SOLARENV'.$BIN;
 
if ($platform =~ m/solaris/) {
@@ -1149,8 +1148,7 @@ elsif ($platform =~ m/cygwin/)
 
my ( $tmppath );
 
-   $PATH  = $cur_dir.
-$ps.CygFormat($SOLARENV).$ds."bin".
+   $PATH  = CygFormat($SOLARENV).$ds."bin".
 $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
 
if ( $JAVA_HOME ne "" )
@@ -1283,8 +1281,7 @@ elsif ($platform =~ m/os2/)
 {  # The PATH variable is completely created from scratch. Everything that is 
not
# needed is appended to the end.
 
-   $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds."bin".
+   $PATH  = '$SOLARENV'.$ds."bin".
 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
 
if ( $JAVA_HOME ne "" )
@@ -1315,8 +1312,7 @@ elsif ($platform =~ m/os2/)
 }
 
 elsif ($platform =~ m/darwin/)
-{  $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH  = '$SOLARENV'.$ds.'$INPATH'.$BIN.
 $ps.'$SOLARENV'.$BIN;
 
   # Append old PATH
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 96c630a9585a..06d6d7a477c4 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -57,7 +57,7 @@ ALLTAR : $(DEBFILES)
 %/DEBIAN/control : $$(@:f)
 @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
 ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
-/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && 
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh"
+/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && 
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr ./create_tree.sh"
 @cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.2//))/' > 
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.2//)
 echo "Package: $(*:f:s/_/ /:1:s/4.2//)" > $@
 cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ 
/:1:s/4.2//))/" >> $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

2018-01-07 Thread Don Lewis

 set_soenv.in |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d364c5bb7211ec60fadf8e065b2a1ffa830493fa
Author: Don Lewis <truck...@apache.org>
Date:   Sun Jan 7 19:51:56 2018 +

Use $CC_PATH (with the trailing slash removed) instead of $COMPATH

when setting $PATH.  The latter has the trailing /bin removed from
the path to the compiler executable and results in /usr being
incorrectly added to $PATH.

Remove an older, FreeBSD-specific workaround.

diff --git a/set_soenv.in b/set_soenv.in
index b8e19203b58b..a68924f65467 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ )
 elsif ( $platform =~ m/freebsd/ ) 
 { $BIG_SVX= "TRUE";
   $COM= "@COM_IS@";
-  $COMPATH= '@COMPATH@' . '/bin'; 
+  $COMPATH= '@COMPATH@'; 
   $CVER   = "C300";
   $GUI= "UNX";
   $GUIBASE= "unx";
@@ -1134,8 +1134,10 @@ if ($platform =~ 
m/linux|netbsd|odf1|freebsd|aix|solaris/)
} else {
   @javaBits = (); 
}
+   my $ccdir = "@CC_PATH@";
+   $ccdir =~ s/\/$//;
$PATH  = GetCorrectPath ($PATH,
-$COMPATH, $CC,
+$ccdir, $CC,
 $PERL_PATH, 'perl',
 @javaBits);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

2018-01-06 Thread Don Lewis

 set_soenv.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 092d339debd3b567e6bc4f5f659fbf0103eaf3e5
Author: Don Lewis <truck...@apache.org>
Date:   Sat Jan 6 08:48:47 2018 +

Don't add X11 include directory to compiler command line if it is

/usr/include since the compiler will look there automatically.

diff --git a/set_soenv.in b/set_soenv.in
index 8912b8b5719e..b8e19203b58b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1432,7 +1432,9 @@ if ($platform =~ m/linux/)
}
 #The tail, if needed
 if ($platform =~ m/linux|freebsd|netbsd/)
-{  $SOLARINC  .= $I.$XINC;
+{  if ($XINC ne $USR.$INCLUDE)
+   { $SOLARINC  .= $I.$XINC;
+   }
 }
 elsif ($platform =~ m/osf1/)
 {  $SOLARINC  .= $I.$XINC.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/setsdkenv_unix.sh.in odk/settings set_soenv.in solenv/doc solenv/gbuild solenv/inc ure/source

2018-01-05 Thread Don Lewis

 odk/setsdkenv_unix.sh.in  |   18 --
 odk/settings/settings.mk  |   12 ++--
 set_soenv.in  |8 +++-
 solenv/doc/gbuild/solenv/gbuild/gbuild.mk |1 -
 solenv/gbuild/gbuild.mk   |1 -
 solenv/gbuild/platform/freebsd.mk |5 -
 solenv/gbuild/platform/linux.mk   |5 -
 solenv/gbuild/platform/macosx.mk  |1 -
 solenv/gbuild/platform/os2.mk |5 -
 solenv/gbuild/platform/winmingw.mk|5 -
 solenv/inc/settings.mk|6 --
 ure/source/uretest/Makefile.pln   |9 +++--
 ure/source/uretest/README |4 
 13 files changed, 12 insertions(+), 68 deletions(-)

New commits:
commit 437a537883088da583bef724d744b9481c684228
Author: Don Lewis <truck...@apache.org>
Date:   Fri Jan 5 20:47:25 2018 +

Nothing uses GXX_INCLUDE_PATH, so remove it.  The uretest/README

file mentions is being needed by the STLport included in the URE,
but that does not appear to be true any longer, and it is not
used by boost.

diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 6c011700fedf..5a7fa6382f64 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -159,12 +159,6 @@ case ${sdk_platform} in
 ;;
 
   darwin*)
-if [ -n "$OO_SDK_CPP_HOME" ]
-then
-   SDK_GXX_INCLUDE_PATH=`echo "#include " | 
${OO_SDK_CPP_HOME}/clang++ -E -xc++ - | sed -n 
'/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-   export SDK_GXX_INCLUDE_PATH
-fi 
-
 directoryname=macosx
 comid=s5abi
 soext=dylib
@@ -176,12 +170,6 @@ case ${sdk_platform} in
 ;;
 
   linux-gnu)
-if [ -n "$OO_SDK_CPP_HOME" ]
-then
-   SDK_GXX_INCLUDE_PATH=`echo "#include " | 
${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | 
head -n 1`
-   export SDK_GXX_INCLUDE_PATH
-fi 
-
 directoryname=linux
 comid=gcc3
 soext=so
@@ -193,12 +181,6 @@ case ${sdk_platform} in
 ;;
 
   freebsd*)
-if [ -n "$OO_SDK_CPP_HOME" ]
-then
-   SDK_GXX_INCLUDE_PATH=`echo "#include " | 
${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | 
head -n 1`
-   export SDK_GXX_INCLUDE_PATH
-fi 
-
 directoryname=freebsd
 comid=gcc3
 soext=so
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 93b116306991..0976ec27b988 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -345,8 +345,8 @@ endif
 SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" 
-I"$(OO_SDK_JAVA_HOME)/include/linux"
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) 
-DHAVE_GCC_VISIBILITY_FEATURE
 
 # define for used compiler necessary for UNO
 #-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
@@ -464,8 +464,8 @@ endif
 SDK_JAVA_INCLUDES = 
-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers 
-I/System/Library/Frameworks/JavaVM.framework/Headers
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) 
-DHAVE_GCC_VISIBILITY_FEATURE
 
 CC_OUTPUT_SWITCH=-o
 
@@ -585,8 +585,8 @@ endif
 SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" 
-I"$(OO_SDK_JAVA_HOME)/include/freebsd"
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) 
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) 
-DHAVE_GCC_VISIBILITY_FEATURE
 
 CC_OUTPUT_SWITCH=-o
 
diff --git a/set_soenv.in b/set_soenv.in
index 6ec61c6be3c2..8912b8b5719e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -57,8 +57,8 @@ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, 
$newline, $comment,

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/Library_sts.mk canvas/Library_vclcanvas.mk dbaccess/Library_dbui.mk framework/Library_fwk.mk sc/Library_scfilt.mk sc/Library

2017-12-15 Thread Don Lewis

 automation/Library_sts.mk   |7 +--
 canvas/Library_vclcanvas.mk |   12 +
 dbaccess/Library_dbui.mk|   24 --
 framework/Library_fwk.mk|   12 +++--
 sc/Library_sc.mk|   99 +++-
 sc/Library_scfilt.mk|   10 +---
 sd/Library_sd.mk|   25 ---
 sd/Library_sdfilt.mk|   10 +---
 set_soenv.in|2 
 sfx2/Library_sfx.mk |   10 +---
 solenv/gbuild/LinkTarget.mk |8 +--
 svx/Library_svxcore.mk  |   13 ++---
 12 files changed, 96 insertions(+), 136 deletions(-)

New commits:
commit 53d9f415b2985f3784fabc9e72c3b486dad5efc8
Author: Don Lewis <truck...@apache.org>
Date:   Fri Dec 15 14:54:32 2017 +

Enhance gb_LinkTarget_set_*_optimization functions to allow multiple

targets to be specified.

Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_*_optimization.

There should be no functional change.

diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
index 16a4af320ca8..5c2bf76d454a 100644
--- a/automation/Library_sts.mk
+++ b/automation/Library_sts.mk
@@ -94,12 +94,11 @@ endif
 $(eval $(call gb_Library_add_exception_objects,sts,\
automation/source/server/XMLParser \
automation/source/server/server \
-))
-
-$(eval $(call gb_Library_add_cxxobjects,sts,\
automation/source/server/statemnt \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   automation/source/server/statement, $(gb_COMPILERNOOPTFLAGS) \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 0213ac0d1c82..3bcdffdefbb6 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
canvas/source/vcl/canvascustomsprite \
canvas/source/vcl/canvasfont \
canvas/source/vcl/canvashelper \
+   canvas/source/vcl/canvashelper_texturefill \
canvas/source/vcl/devicehelper \
canvas/source/vcl/impltools \
canvas/source/vcl/services \
@@ -80,14 +81,9 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
 ))
 
 # Solaris Sparc with Sun Compiler: noopt
-ifneq ($(strip($OS)),SOLARIS)
-$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ifeq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   canvas/source/vcl/canvashelper_texturefill, $(gb_COMPILERNOOPTFLAGS) \
 ))
 endif
 
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index e3e68cce0947..7a0adb992bdc 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/UserSettingsDlg \
dbaccess/source/ui/uno/admindlg \
dbaccess/source/ui/uno/composerdialogs \
+   dbaccess/source/ui/uno/copytablewizard \
dbaccess/source/ui/uno/dbinteraction \
dbaccess/source/ui/uno/textconnectionsettings_uno \
dbaccess/source/ui/uno/unoDirectSql \
@@ -276,6 +277,15 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/unosqlmessage \
 ))
 
+# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifneq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   dbaccess/source/ui/uno/copytablewizard, $(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
@@ -299,18 +309,4 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/ui/querydesign/TableFieldInfo \
 ))
 
-# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
-# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
-# the latter is currently not supported by gbuild and needs a fix here later
-ifeq ($(COM),$(filter-out GCC,$(COM)))
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 449800331fce..bfcf494d50e6

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

2017-12-12 Thread Don Lewis

 set_soenv.in |4 
 1 file changed, 4 insertions(+)

New commits:
commit 90ffe9bd128c98e558205d0699a2af8934c99da7
Author: Don Lewis <truck...@apache.org>
Date:   Wed Dec 13 00:17:48 2017 +

Unset $debug in the environment if configured without --enable-debug.

Without this, once you pass --enable-debug to configure, you will
continue to get debug builds after disabling debug unless you restart
the shell.

Similarly, unset $EXTERNAL_WARNINGS_NOT_ERRORS if configure is run with
--enable-werror.

diff --git a/set_soenv.in b/set_soenv.in
index b7184d24e313..6ec61c6be3c2 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1613,9 +1613,13 @@ ToFile( "NO_BSYMBOLIC",  $NO_BSYMBOLIC,  "e" );
 ToFile( "TF_FILTER", "TRUE", "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug", "true", "e" );
+} else {
+ToFile( "debug", "", "e" );
 }
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
+} else {
+ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "",  "e" );
 }
 ToFile( "PRODUCT",   "@PRODUCT@","e" );
 ToFile( "PROFULLSWITCH", "@PROFULLSWITCH@",  "e" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/Library_fwk.mk solenv/gbuild

2017-12-12 Thread Don Lewis

 framework/Library_fwk.mk  |   11 --
 solenv/gbuild/LinkTarget.mk   |   41 +-
 solenv/gbuild/platform/freebsd.mk |4 +++
 solenv/gbuild/platform/linux.mk   |4 +++
 solenv/gbuild/platform/macosx.mk  |5 
 solenv/gbuild/platform/os2.mk |4 +++
 solenv/gbuild/platform/solaris.mk |5 
 solenv/gbuild/platform/windows.mk |6 -
 8 files changed, 60 insertions(+), 20 deletions(-)

New commits:
commit 9a6267c4a54c7321b50196c7b47dd98118f595f3
Author: Don Lewis <truck...@apache.org>
Date:   Tue Dec 12 18:45:51 2017 +

Improvements to per-object optimization overrides in gbuild:

* Less Library.mk editing required to add an optimization exception
than what has been normally done to date.

* Add a variable to specify an override to -O1 instead of only
allowing -O0.

* Don't lose debug flags when overriding optimization.


Convert the recent Mac optimization override in framework/Library_fwk.mk
to the new style.


Improvements to Windows debug builds in gbuild:

* There are multiple dependency paths that trigger compiling a source
file.  Add a target specific $(PDBFILE) to the root of each so
that $(PDBFILE) is set properly when compiling.

Note: $(PDBFILE) is not getting set when compiling the sources
for the per-module (Google Test) tests.

* Don't inadvertantly disable the use of pre-compiled headers when
enabling debug (not specific to Windows).

Note: If both debug and pre-compiled headers are enabled, building
of modules that contain more than one library will fail due to
limitations of Visual Studio.  The problem is that when we
build the precompiled header, the output file(s) are based on the
module name.  Even though each Library_*.mk specifies the rule
to build the precompiled header, it is only built once for the
module.  Visual Studio requires that the $(PDBFILE) used when
compiling the sources match the $(PDBFILE) used when compiling
the precompiled header, but the value of $(PDBFILE) is specific
to each library.  The best fix would be to compile the headers
once for each library and stash the output in a per-library
specific place, but this requires some fairly extensive changes.
Another potential fix would be to use -Z7 optimization so that the
debug information is stored in the object files.

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index fd66cae227c7..449800331fce 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
 $(gb_STDLIBS) \
 ))
 
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ifeq ($(OS),MACOSX)
+$(call 
gb_LinkTarget_set_cxx_optimization,framework/source/loadenv/loadenv,$(gb_COMPILEROPT1FLAGS))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/accelerators/acceleratorcache \
 framework/source/accelerators/acceleratorconfiguration \
@@ -190,10 +195,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/xml/imagesdocumenthandler \
 ))
 
-# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
-ifeq ($(OS),MACOSX)
-$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
-T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) 
$(gb_COMPILERNOOPTFLAGS)
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 18e79404a1aa..faa7c2863ff8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -109,10 +109,10 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 define gb_CxxObject__set_pchflags
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(CXXFLAGS) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(CXXFLAGS) 
$$(DEFS)))
 $$@ : PCHFLAGS := $$(call 
gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
 $$(info No precompiled header available for $$*.)
@@ -333,12 +333,12 @@ $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) 
$(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/qa solenv/gbuild

2017-01-30 Thread Don Lewis

 sal/qa/osl/mutex/osl_Mutex.cxx|2 +-
 solenv/gbuild/LinkTarget.mk   |   13 -
 solenv/gbuild/gbuild.mk   |   14 ++
 solenv/gbuild/platform/windows.mk |6 --
 4 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 91eb929548955c5dfcda6d390e2883981fce0906
Author: Don Lewis <truck...@apache.org>
Date:   Tue Jan 31 05:31:55 2017 +

The clear_001 QA test fails sporadically with a 7 nSec mutex hold time

measurement.  The nominal hold time for the mutex is 5 seconds, but
because the mutex state is polled at 1 second intervals, the actual
measured time will probably be 6+ seconds.  If the nanoseconds field
of the starting timestamp is large, it is possible that it will have
wrapped to a small value at the poll time when the mutex is detected
as having been released.  If the time interval was calculated at
full precision by subtracting both the seconds and nanoseconds fields
of the before and after timestamps, an interval of just over 6
seconds could look like 7 seconds and a large negative number of
nanoseconds.  Since this test only subtracts the seconds field, it
can think the difference is 7 seconds and fail the "nSec < 7" assertion.
As a quick fix, change the assertion to "nSec <= 7".

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 1b1e46e..4261932 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -729,7 +729,7 @@ namespace osl_ClearableGuard
 
 myThread.join();
 
-ASSERT_TRUE(nSec < 7 && nSec > 1) << "ClearableGuard method: clear";
+ASSERT_TRUE(nSec <= 7 && nSec > 1) << "ClearableGuard method: clear";
 }
 
 TEST_F(clear, clear_002 )
commit 6e7960c2ed194344819e089eb0c3e39045dd0a0e
Author: Damjan Jovanovic <dam...@apache.org>
Date:   Tue Jan 31 05:05:11 2017 +

We need to pass "-DEBUG" to the linker on Windows for debugging to work.

Patch by: me
Tested by: pats

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 65caabd..b9c068e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -30,19 +30,6 @@
 # LDFLAGS
 
 # CFLAGS from environment override debug/optimization flags
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_DEBUGGING := TRUE
-endif
-
-ifeq ($(ENABLE_SYMBOLS),SMALL)
-gb_DEBUGGING := TRUE
-else ifeq ($(ENABLE_SYMBOLS),TRUE)
-gb_DEBUGGING := TRUE
-endif
-
-ifeq ($(ENABLE_CRASHDUMP),TRUE)
-gb_DEBUGGING := TRUE
-endif
 
 ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f7c6e76..b0ac8c1 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -92,6 +92,20 @@ gb_DEBUGLEVEL := 1
 endif
 endif
 
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUGGING := TRUE
+else ifeq ($(ENABLE_SYMBOLS),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_CRASHDUMP),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
 ifneq ($(strip $(ENABLE_PCH)),)
 gb_ENABLE_PCH := $(true)
 else
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index df85d20..ecdcf44 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -195,15 +195,17 @@ gb_LinkTarget_LDFLAGS := \
 
 gb_DEBUG_CFLAGS := -Zi
 
+ifeq ($(gb_DEBUGGING),TRUE)
+gb_LinkTarget_LDFLAGS += -DEBUG
+endif
+
 # this does not use CFLAGS so it is not overridable
 ifneq ($(ENABLE_CRASHDUMP),)
-gb_LinkTarget_LDFLAGS += -DEBUG
 gb_CFLAGS+=-Zi
 gb_CXXFLAGS+=-Zi
 endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_LDFLAGS += -DEBUG
 gb_COMPILEROPTFLAGS :=
 else
 gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - boost/boost_1_55_0.patch python/prj

2016-09-03 Thread Don Lewis

 boost/boost_1_55_0.patch |   21 +
 python/prj/d.lst |   28 ++--
 2 files changed, 35 insertions(+), 14 deletions(-)

New commits:
commit bd7f7dc8944333f3e18156d4bd446d1a240ef59c
Author: Don Lewis <truck...@apache.org>
Date:   Sat Sep 3 08:46:17 2016 +

Fix an error and update boost's logic for enabling the use of

variadic templates when compiling wth g++.  It was enabling them
unconditionally for g++ > 5.0.  g++ warns about the use of variadic
templates unless a non-default -std option is specified for any
version older than 6.1, which switched to C++14 as its default.

diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index a4ef939..6cec7bb 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -326,3 +326,24 @@ diff -ur 
misc/boost_1_55_0/boost/unordered/detail/unique.hpp misc/build/boost_1_
  }
  
  

+diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp 
misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp
+--- misc/boost_1_55_0/boost/config/compiler/gcc.hpp2013-09-17 
09:55:51.0 -0700
 misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp  2016-09-02 
19:15:48.775411000 -0700
+@@ -137,7 +137,7 @@
+ 
+ // C++0x features in 4.3.n and later
+ //
+-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && 
defined(__GXX_EXPERIMENTAL_CXX0X__)
++#if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && 
defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6) || (__GNUC__ == 6 && 
__GNUC_MINOR__ > 0)
+ // C++0x features are only enabled when -std=c++0x or -std=gnu++0x are
+ // passed on the command line, which in turn defines
+ // __GXX_EXPERIMENTAL_CXX0X__.
+@@ -153,7 +153,7 @@
+ 
+ // Variadic templates compiler:
+ //   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
+-#  if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && 
(__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
++#  if defined(__VARIADIC_TEMPLATES) || ((__GNUC__ > 4 || (__GNUC__ == 4 && 
__GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6) 
|| (__GNUC__ == 6 && __GNUC_MINOR__ > 0)
+ #define BOOST_HAS_VARIADIC_TMPL
+ #  else
+ #define BOOST_NO_CXX11_VARIADIC_TEMPLATES
commit deabc0e0c42a6fac90cef69fe698279094612246
Author: Don Lewis <truck...@apache.org>
Date:   Sat Sep 3 08:38:49 2016 +

Tweak some of the source paths in the python d.lst file so that all

the necessary files are copied to solver to unbreak the Windows build.

diff --git a/python/prj/d.lst b/python/prj/d.lst
index de8d24b..157aca8 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -95,20 +95,20 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 
%_DEST%\lib%_EXT%\libpython2.7.so
 
 # WINDOWS ONLY !
 ..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python.exe 
%_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python27.dll 
%_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python27.lib 
%_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_socket.pyd 
%_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_ssl.pyd 
%_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\select.pyd 
%_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\unicodedata.pyd 
%_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\winsound.pyd 
%_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\pyexpat.pyd 
%_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_testcapi.pyd 
%_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_multiprocessing.pyd 
%_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_msi.pyd 
%_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_elementtree.pyd 
%_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_ctypes.pyd 
%_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\python.exe 
%_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\python27.dll 
%_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\python27.lib 
%_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\_socket.pyd 
%_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\_ssl.pyd 
%_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PC\VS9.0\select.pyd 
%_DEST%\lib%_EXT%\p

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst python/makefile.mk python/prj python/python-2.7.12-mingw.patch python/python-2.7.12-nohardlink.patch python/python-2.

2016-09-02 Thread Don Lewis

 external_deps.lst |6 
 python/makefile.mk|6 
 python/prj/d.lst  |  108 +-
 python/python-2.7.12-mingw.patch  |  571 +++
 python/python-2.7.12-nohardlink.patch |   11 
 python/python-2.7.12-pcbuild.patch| 1710 ++
 python/python-2.7.12-sysbase.patch|   14 
 python/python-2.7.9-mingw.patch   | 1056 
 python/python-2.7.9-nohardlink.patch  |   11 
 python/python-2.7.9-pcbuild.patch | 1710 --
 python/python-2.7.9-sysbase.patch |   14 
 python/python-freebsd.patch   |   50 
 python/python-md5.patch   |6 
 python/python-solaris.patch   |4 
 python/python-solver-before-std.patch |   21 
 python/python-ssl.patch   |   18 
 python/pyversion.mk   |2 
 sal/inc/sal/types.h   |   14 
 sc/inc/compiler.hxx   |8 
 19 files changed, 2433 insertions(+), 2907 deletions(-)

New commits:
commit 329c887b5c4639585b93709f5ea8b181faffefd0
Author: Don Lewis <truck...@apache.org>
Date:   Sat Sep 3 01:44:05 2016 +

In the SAL_UNUSED macro, __attribute((__unused__)) should be

__attribute__((__unused__)), but both clang and gcc seem to understand
both.

Since __attribute__((__unused__)) can preceed the variable name, just
like __pragma(warning(suppress:4100;suppress:4101)) for Visual Studio,
so de-parameterize the SAL_UNUSED macro.

Gcc whines if __attribute__((__unused__)) is used for a struct member,
so create a separate define, SAL_UNUSED_MEMBER, which is empty for
gcc, to handle struct members.

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 2bad6d6..1f4a0fe 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -235,12 +235,18 @@ typedef void *   sal_Handle;
 #   define SAL_MAX_ENUM 0x7fff
 #endif
 
-#if defined(__GNUC__) || defined(__clang__)
-#define SAL_UNUSED(__x__)   __x__ __attribute((__unused__))
+#if defined(__clang__)
+#define SAL_UNUSED  __attribute__((__unused__))
+#define SAL_UNUSED_MEMBER   __attribute__((__unused__))
+#elif defined(__GNUC__)
+#define SAL_UNUSED  __attribute__((__unused__))
+#define SAL_UNUSED_MEMBER
 #elif defined(_MSC_VER)
-#define SAL_UNUSED(__x__)   __pragma(warning(suppress:4100;suppress:4101)) 
__x__
+#define SAL_UNUSED  __pragma(warning(suppress:4100;suppress:4101))
+#define SAL_UNUSED_MEMBER   __pragma(warning(suppress:4100;suppress:4101))
 #else
-#define SAL_UNUSED(__x__)   __x__
+#define SAL_UNUSED
+#define SAL_UNUSED_MEMBER
 #endif
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index bd05000..dd9fec0 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -117,10 +117,10 @@ struct ScDoubleRawToken
 {
 private:
 // SC_TOKEN_FIX_MEMBERS
-OpCode   SAL_UNUSED(eOp);
-formula::StackVar SAL_UNUSED(eType);
-sal_uInt16   SAL_UNUSED(nRefCnt);
-sal_Bool SAL_UNUSED(bRaw);
+OpCode  SAL_UNUSED_MEMBER   eOp;
+formula::StackVar SAL_UNUSED_MEMBER eType;
+sal_uInt16 SAL_UNUSED_MEMBERnRefCnt;
+sal_Bool SAL_UNUSED_MEMBER  bRaw;
 public:
 union
 {   // union only to assure alignment identical to ScRawToken
commit df064208c16be6690cbbff2803a9b122e4da541a
Author: Pedro Giffuni <p...@apache.org>
Date:   Sat Sep 3 01:35:21 2016 +

Update Python to version 2.7.12.

This is the latest bugfix release in the 2.7.x series (Released 2016-06-28).

We expect this to be the best release that still guarantees some
compatibility with previous versions while still letting us use some of
the features in newer language versions.

It is also easier to keep up to date with upstream and with newer
compilers.

Tested on FreeBSD, but shouldn't have problems on other platforms.

diff --git a/external_deps.lst b/external_deps.lst
index 3e4fe10..876c6af 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = 5eebcaa0030dc4061156d3429657fb83
-name = Python-2.7.9.tgz
-URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz
+MD5 = 88d61f82e3616a4be952828b3694109d
+name = Python-2.7.12.tgz
+URL1 = http://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 5ab7893..5580971 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83
+TARFILE_MD5=88d61f82e3616a4be952828b3694109d
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
@@ -109,7 +109,9 @@ BUILD_ACTION=$(ENV_BUILD)

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - python/python-2.7.9-pcbuild.patch

2016-09-02 Thread Don Lewis

 python/python-2.7.9-pcbuild.patch |   60 ++
 1 file changed, 10 insertions(+), 50 deletions(-)

New commits:
commit 9f2b8afd1c765042a3fec30f79105755f6fa9039
Author: Don Lewis <truck...@apache.org>
Date:   Fri Sep 2 11:07:49 2016 +

Add missing quotes to .vcproj file to unbreak python build on Windows.

diff --git a/python/python-2.7.9-pcbuild.patch 
b/python/python-2.7.9-pcbuild.patch
index 5cd80b5..3c2a0a5 100644
--- a/python/python-2.7.9-pcbuild.patch
+++ b/python/python-2.7.9-pcbuild.patch
@@ -592,8 +592,8 @@ diff -u misc/Python-2.7.9/PCbuild/_sqlite3.vcproj 
misc/build/Python-2.7.9/PCbuil






 +  AdditionalOptions="/SAFESEH /NXCOMPAT 
/DYNAMICBASE"
-+  AdditionalDependencies="ws2_32.lib crypt32.lib 
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib 
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
-   
-@@ -296,7 +299,7 @@
-   />
-   
-   

-+  AdditionalOptions="/SAFESEH /NXCOMPAT 
/DYNAMICBASE"
-+  AdditionalDependencies="ws2_32.lib crypt32.lib 
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib />
-   
-@@ -360,7 +363,7 @@
-   />
-   
-   



 +  AdditionalOptions="/SAFESEH /NXCOMPAT 
/DYNAMICBASE"
-+  AdditionalDependencies="ws2_32.lib crypt32.lib 
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib />
-   
-@@ -488,7 +491,7 @@
-   />
-   
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst more_fonts/fonts more_fonts/prj sal/osl

2016-09-02 Thread Don Lewis

 external_deps.lst|7 +++
 more_fonts/fonts/ttf_gentium/makefile.mk |8 
 more_fonts/prj/d.lst |4 ++--
 sal/osl/unx/pipe.c   |   16 +++-
 4 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 6a5f06057202ea1f9a9aa2f3a35f087b28f3
Author: Don Lewis <truck...@apache.org>
Date:   Fri Sep 2 07:31:31 2016 +

Update Gentium font.

Patch-by: Pedro Giffuni <p...@apache.org>

diff --git a/external_deps.lst b/external_deps.lst
index 8012615..3e4fe10 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -287,10 +287,9 @@ if (WITH_CATB_FONTS==YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATB_FONTS == YES)
-MD5 = 35efabc239af896dfb79be7ebdd6e6b9
-name = gentiumbasic-fonts-1.10.zip
-# This seems to be the original host, but the MD5 sum does not match.
-# URL1 = 
http://scripts.sil.org/cms/scripts/render_download.php?format=file_id=GentiumBasic_110=GentiumBasic_110.zip
+MD5 = 1725634df4bb3dcb1b2c91a6175f8789
+name = GentiumBasic_1102.zip
+URL1 = http://software.sil.org/downloads/gentium/GentiumBasic_1102.zip
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
diff --git a/more_fonts/fonts/ttf_gentium/makefile.mk 
b/more_fonts/fonts/ttf_gentium/makefile.mk
index 0178d46..970e986 100644
--- a/more_fonts/fonts/ttf_gentium/makefile.mk
+++ b/more_fonts/fonts/ttf_gentium/makefile.mk
@@ -39,9 +39,9 @@ TARGET=ttf_gentium
 
 # --- Files 
 
-TARFILE_NAME=gentiumbasic-fonts-1.10
-TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
-TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
+TARFILE_NAME=GentiumBasic_1102
+TARFILE_MD5=1725634df4bb3dcb1b2c91a6175f8789
+TARFILE_ROOTDIR=GentiumBasic_1102
 
 PATCH_FILES=
 
@@ -62,4 +62,4 @@ BUILD_FLAGS=
 .INCLUDE : tg_ext.mk
 .ENDIF
 
-.ENDIF
\ No newline at end of file
+.ENDIF
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 1bb7e3d..0a2ba3b 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -6,5 +6,5 @@ mkdir: %COMMON_DEST%\pck%_EXT%
 ..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf   
%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt  
%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
+..\%__SRC%\misc\build\GentiumBasic_1102\*.ttf  
%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\GentiumBasic_1102\OFL.txt
%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
commit f717de8ec6762949fd4cd7bfc4a761f9fe70e923
Author: Don Lewis <truck...@apache.org>
Date:   Fri Sep 2 07:14:17 2016 +

Fix improper usage of strncat() and snprintf().  Flagged by -Wstrncat-size

compiler warning from clang.

diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index d1db9ce..eb48dae 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -35,8 +35,8 @@
 #define PIPEDEFAULTPATH "/tmp"
 #define PIPEALTERNATEPATH   "/var/tmp"
 
-#define PIPENAMEMASK"OSL_PIPE_%s"
-#define SECPIPENAMEMASK "OSL_PIPE_%s_%s"
+#define PIPENAMEMASK"%s/OSL_PIPE_%s"
+#define SECPIPENAMEMASK "%s/OSL_PIPE_%s_%s"
 
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char 
*pszIdent, sal_uInt32 nMax);
 oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, 
oslPipeOptions Options, oslSecurity Security);
@@ -166,20 +166,18 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char 
*pszPipeName, oslPipeOptions
 struct sockaddr_un addr;
 
 sal_Char name[PATH_MAX + 1];
+const sal_Char   *pPath;
 oslPipe  pPipe;
 
 if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
 {
-strncpy(name, PIPEDEFAULTPATH, sizeof(name));
+pPath = PIPEDEFAULTPATH;
 }
 else
 {
-strncpy(name, PIPEALTERNATEPATH, sizeof(name));
+pPath = PIPEALTERNATEPATH;
 }
 
-
-strncat(name, "/", sizeof(name));
-
 if (Security)
 {
 sal_Char Ident[256];
@@ -188,11 +186,11 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char 
*pszPipeName, oslPipeOptions
 
 OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident)));
 
-snprintf([strlen(name)], sizeof(name), SECPIPENAMEMASK, Ident, 
pszPipeName);
+snprintf(name, sizeof(name), SECPIPENAMEMASK, pPath, Ident, 
pszPipeName);
 }
 else
 {
-snprintf([strlen(name)], sizeof(name), PIPENAMEMASK, pszPipeName);
+snprintf(name, sizeof(name), PIPENAMEMASK, pPath, pszPipeName);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source

2016-09-01 Thread Don Lewis

 filter/source/xsltfilter/containerhelper.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9c219419475f35bc4535ad82b67121dd90a38883
Author: Don Lewis <truck...@apache.org>
Date:   Fri Sep 2 02:16:21 2016 +

Fix typos in forEachMem() template functions.

diff --git a/filter/source/xsltfilter/containerhelper.hxx 
b/filter/source/xsltfilter/containerhelper.hxx
index 4c7fba0..8b52c4b 100644
--- a/filter/source/xsltfilter/containerhelper.hxx
+++ b/filter/source/xsltfilter/containerhelper.hxx
@@ -73,13 +73,13 @@ public:
 template
 inline void forEachMem(FuncType pFunc, ParamType1 aParam1, ParamType2 
aParam2) const
 {
-forEach( ::boost::bind(pFunc, -1, aParam1, aParam2 ));
+forEach( ::boost::bind(pFunc, _1, aParam1, aParam2 ));
 }
 
 template
-inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 
aParam2, ParamType3 aParam3 ) const
+inline void forEachMem(FuncType pFunc, ParamType1 aParam1, ParamType2 
aParam2, ParamType3 aParam3 ) const
 {
-forEach( ::boost::bind(pFunc, _1, aParam2, aParam2, aParam3 ));
+forEach( ::boost::bind(pFunc, _1, aParam1, aParam2, aParam3 ));
 }
 
 template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source sd/source svx/inc svx/source sw/source

2016-09-01 Thread Don Lewis

 sc/source/ui/drawfunc/fudraw.cxx  |2 +-
 sc/source/ui/drawfunc/futext.cxx  |2 +-
 sd/source/ui/animations/motionpathtag.cxx |6 +++---
 sd/source/ui/func/fupoor.cxx  |2 +-
 sd/source/ui/func/fusel.cxx   |4 ++--
 svx/inc/svx/svdmrkv.hxx   |4 ++--
 svx/source/dialog/graphctl.cxx|2 +-
 sw/source/ui/ribbar/drawbase.cxx  |4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit d8e7261d2d1992eb7e36ff9fbb58b26688168bf3
Author: Don Lewis <truck...@apache.org>
Date:   Thu Sep 1 22:08:51 2016 +

Fix by far the largest source of -Wtautological-undefined-compare

compile warnings.

The class definition for SdrMarkView in svx/inc/svx/svdmrkv.hxx
contains two inline methods that take a reference argument and
perform an  == NULL test on it.  The compiler warns that this
condition should always be false because dereferencing a NULL pointer
to generate a reference is not valid in C++ and a valid reference will
never be at address 0.  Warnings are generated every time this header
is included in a .cxx file.

It turns out that there are no callers for the IsGluePoint() method,
so just comment out its definition.

It also turns out that all the callers of IsPointMarked() pass it
a dereferenced pointer, so convert IsPointMarked() to take a pointer
argument and modify all the callers to pass a pointer without
dereferencing it first.

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index fb17aa1..26c6c1d 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -637,7 +637,7 @@ sal_Bool __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
 sal_uInt32 nPol(pHdl->GetPolyNum());
 sal_uInt32 nPnt(pHdl->GetPointNum());
 
-if(pView->IsPointMarked(*pHdl))
+if(pView->IsPointMarked(pHdl))
 {
 if(rKEvt.GetKeyCode().IsShift())
 {
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index d14e6ec..404fce3 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -163,7 +163,7 @@ sal_Bool __EXPORT FuText::MouseButtonDown(const MouseEvent& 
rMEvt)
 {
 if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
 {
-sal_Bool bPointMarked=pView->IsPointMarked(*pHdl);
+sal_Bool bPointMarked=pView->IsPointMarked(pHdl);
 
 if ( rMEvt.IsShift() )
 {
diff --git a/sd/source/ui/animations/motionpathtag.cxx 
b/sd/source/ui/animations/motionpathtag.cxx
index 1fc0f66..71010a4 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -552,7 +552,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& 
rMEvt, SmartHdl& rHdl )
 else
 {
 SmartHdl* pHdl = 
-if (!mrView.IsPointMarked(*pHdl) || rMEvt.IsShift())
+if (!mrView.IsPointMarked(pHdl) || rMEvt.IsShift())
 {
 if (!rMEvt.IsShift())
 {
@@ -561,7 +561,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& 
rMEvt, SmartHdl& rHdl )
 }
 else
 {
-if (mrView.IsPointMarked(*pHdl) )
+if (mrView.IsPointMarked(pHdl) )
 {
 mrView.UnmarkPoint(*pHdl);
 pHdl = NULL;
@@ -698,7 +698,7 @@ bool MotionPathTag::OnMarkHandle( const KeyEvent& rKEvt )
 sal_uInt32 nPol(pHdl->GetPolyNum());
 sal_uInt32 nPnt(pHdl->GetPointNum());
 
-if(mrView.IsPointMarked(*pHdl))
+if(mrView.IsPointMarked(pHdl))
 {
 if(rKEvt.GetKeyCode().IsShift())
 {
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 9c042d4..eb0da7b 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -596,7 +596,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
 sal_uInt32 nPol(pHdl->GetPolyNum());
 sal_uInt32 nPnt(pHdl->GetPointNum());
 
-if(mpView->IsPointMarked(*pHdl))
+if(mpView->IsPointMarked(pHdl))
 {
 if(rKEvt.GetKeyCode().IsShift())
 {
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 617f666..7ed3d92 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fuse

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc sc/inc

2016-09-01 Thread Don Lewis

 sal/inc/sal/types.h |8 
 sc/inc/compiler.hxx |6 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit cc9823f5bde6f49eb75e4ad0e8f8a162bf341f34
Author: Don Lewis <truck...@apache.org>
Date:   Thu Sep 1 06:47:05 2016 +

Fix -Wunused-private-field errors in sc/inc/compiler.hxx.  The structure

ScDoubleRawToken contains four unused private fields.  Mark these as
unused to eliminate the warning message.  We can't delete these fields
because we want the layout of this structure to match ScRawToken.

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 8f829d3..2bad6d6 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -235,6 +235,14 @@ typedef void *   sal_Handle;
 #   define SAL_MAX_ENUM 0x7fff
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#define SAL_UNUSED(__x__)   __x__ __attribute((__unused__))
+#elif defined(_MSC_VER)
+#define SAL_UNUSED(__x__)   __pragma(warning(suppress:4100;suppress:4101)) 
__x__
+#else
+#define SAL_UNUSED(__x__)   __x__
+#endif
+
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #   define SAL_DLLPUBLIC_EXPORT__declspec(dllexport)
 #if defined(_MSC_VER)
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index ffb2cab..bd05000 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -116,7 +116,11 @@ class ScTokenArray;
 struct ScDoubleRawToken
 {
 private:
-SC_TOKEN_FIX_MEMBERS
+// SC_TOKEN_FIX_MEMBERS
+OpCode   SAL_UNUSED(eOp);
+formula::StackVar SAL_UNUSED(eType);
+sal_uInt16   SAL_UNUSED(nRefCnt);
+sal_Bool SAL_UNUSED(bRaw);
 public:
 union
 {   // union only to assure alignment identical to ScRawToken
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basebmp/inc formula/inc vcl/source

2016-08-31 Thread Don Lewis

 basebmp/inc/basebmp/packedpixeliterator.hxx |2 +-
 formula/inc/formula/grammar.hxx |4 ++--
 vcl/source/gdi/bmpfast.cxx  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6aaac1afdebb39de5b5c43760c13bb64b429f1c8
Author: Don Lewis <truck...@apache.org>
Date:   Thu Sep 1 00:14:50 2016 +

Fix -Wshift-negative-value compiler warnings.  The result of shifting

negative integer values is undefined, so change the operand to be
unsigned.

diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx 
b/basebmp/inc/basebmp/packedpixeliterator.hxx
index 18bfaea..a06b092 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -51,7 +51,7 @@ inline value_type get_mask( difference_type d )
 const unsigned int nIntraWordPositions( sizeof(value_type)*8 / 
bits_per_pixel );
 
 //  create bits_per_pixel 1s  shift to intra-word position
-return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
+return ((~(~0u << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
  
(nIntraWordPositions-1 - (d % nIntraWordPositions)) :
  (d % 
nIntraWordPositions)));
 }
diff --git a/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx
index 05debbd..65f97fb 100644
--- a/formula/inc/formula/grammar.hxx
+++ b/formula/inc/formula/grammar.hxx
@@ -56,9 +56,9 @@ public:
 // Room for 32k hypothetical languages plus EXTERNAL.
 static const int kConventionShift  = 16;
 // Room for 256 reference conventions.
-static const int kEnglishBit   = (1 << (kConventionShift + 8));
+static const int kEnglishBit   = (1u << (kConventionShift + 8));
 // Mask off all non-language bits.
-static const int kFlagMask = ~((~int(0)) << kConventionShift);
+static const int kFlagMask = ~((~0u) << kConventionShift);
 
 /** Values encoding the formula language plus address reference convention
 plus English parsing/formatting
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 5cd4bcf..9d7ea9c 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -354,7 +354,7 @@ inline void ImplBlendPixels( const 
TrueColorPixelPtr& rDst,
 {
 if( !nAlphaVal )
 ImplConvertPixel( rDst, rSrc );
-else if( nAlphaVal != ~(~0 << ALPHABITS) )
+else if( nAlphaVal != ~(~0u << ALPHABITS) )
 {
 static const unsigned nAlphaShift = (ALPHABITS > 8) ? 8 : ALPHABITS;
 if( ALPHABITS > nAlphaShift )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/StaticLibrary_basegfx_s.mk

2016-08-31 Thread Don Lewis

 basegfx/StaticLibrary_basegfx_s.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6e3596887a07e85cf0b821baf748980ba86e7d25
Author: Don Lewis <truck...@apache.org>
Date:   Wed Aug 31 18:16:14 2016 +

Add a missing file to the basegfx static library to unbreak the

pdf import extension build.

diff --git a/basegfx/StaticLibrary_basegfx_s.mk 
b/basegfx/StaticLibrary_basegfx_s.mk
index e355e36..17c646f 100755
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -62,6 +62,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/tools/unopolypolygon \
CustomTarget/basegfx/source/tools/tools \
CustomTarget/basegfx/source/tools/b2dclipstate \
+   CustomTarget/basegfx/source/tools/stringconversiontools \
CustomTarget/basegfx/source/numeric/ftools \
CustomTarget/basegfx/source/tuple/b3ituple \
CustomTarget/basegfx/source/tuple/b3dtuple \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cpputools/source crashrep/source extensions/source fpicker/source icc/makefile.mk icc/SampleICC-1.3.2.format-security.patch icu/icu-for

2016-08-31 Thread Don Lewis

 cpputools/source/unoexe/unoexe.cxx|4 +-
 crashrep/source/unx/main.cxx  |4 +-
 extensions/source/logging/consolehandler.cxx  |4 +-
 fpicker/source/unx/gnome/SalGtkFilePicker.cxx |1 
 icc/SampleICC-1.3.2.format-security.patch |   21 ++
 icc/makefile.mk   |2 -
 icu/icu-format-security.patch |   12 
 icu/makefile.mk   |3 +-
 rsc/source/prj/start.cxx  |2 -
 svtools/bmpmaker/bmp.cxx  |2 -
 svtools/bmpmaker/bmpsum.cxx   |2 -
 svtools/bmpmaker/g2g.cxx  |2 -
 vcl/source/fontsubset/cff.cxx |4 +-
 vcl/source/fontsubset/sft.cxx |   38 +-
 vcl/unx/generic/plugadapt/salplug.cxx |2 -
 15 files changed, 69 insertions(+), 34 deletions(-)

New commits:
commit 7204bffa5c633d7bc2064e3c643dbacfab79e281
Author: Don Lewis <truck...@apache.org>
Date:   Wed Aug 31 16:12:32 2016 +

Fix -Wformat-security warnings.

There are a number of instances where the code calls *printf() to
print arbitrary strings and the string is passed as the format
argument to *printf().  Since these strings might contain %
conversion sequences, this is a security hazard.  Fix the problem
by printing the strings with a "%s" format.

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index 34c237b..a842676 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -127,7 +127,7 @@ static sal_Bool s_quiet = false;
 static inline void out( const sal_Char * pText )
 {
 if (! s_quiet)
-fprintf( stderr, pText );
+fprintf( stderr, "%s", pText );
 }
 
//--
 static inline void out( const OUString & rText )
@@ -135,7 +135,7 @@ static inline void out( const OUString & rText )
 if (! s_quiet)
 {
 OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
-fprintf( stderr, aText.getStr() );
+fprintf( stderr, "%s", aText.getStr() );
 }
 }
 
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 28c4052..52505b3 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -364,7 +364,7 @@ bool SendHTTPRequest(
 if ( g_bDebugMode )
 {
 printf( "*** Sending HTTP request ***\n\n" );
-printf( buffer );
+printf( "%s", buffer );
 }
 
 if ( SOCKET_ERROR != send( s, buffer, strlen(buffer), 0 ) )
@@ -401,7 +401,7 @@ bool SendHTTPRequest(
 if ( g_bDebugMode )
 do
 {
-printf( buffer );
+printf( "%s", buffer );
 memset( buffer, 0, sizeof(buffer) );
 } while ( 0 < recv( s, buffer, sizeof(buffer), 0 ) 
);
 }
diff --git a/extensions/source/logging/consolehandler.cxx 
b/extensions/source/logging/consolehandler.cxx
index d2c0877..60440bd 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -245,9 +245,9 @@ namespace logging
 return sal_False;
 
 if ( _rRecord.Level >= m_nThreshold )
-fprintf( stderr, sEntry.getStr() );
+fprintf( stderr, "%s", sEntry.getStr() );
 else
-fprintf( stdout, sEntry.getStr() );
+fprintf( stdout, "%s", sEntry.getStr() );
 
 return sal_True;
 }
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 
b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index e613d71..d9e42ed 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -1047,6 +1047,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( 
uno::RuntimeException )
 GTK_DIALOG_MODAL,
 GTK_MESSAGE_QUESTION,
 GTK_BUTTONS_YES_NO,
+  "%s",
   OUStringToOString(
 aResProvider.getResString( 
FILE_PICKER_OVERWRITE ),
 RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/icc/SampleICC-1.3.2.format-security.patch 
b/icc/SampleICC-1.3.2.format-security.patch
new file mode 100644
index 000..d6bd7f8
--- /dev/null
+++ b/icc/SampleICC-1.3.2.format-security.patch
@@ -0,0 +1,21 @@
+diff -ur misc/SampleICC-1.3.2/IccProfLib/IccProfile

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cppuhelper/source starmath/inc sw/source

2016-08-31 Thread Don Lewis

 cppuhelper/source/exc_thrower.cxx |2 +-
 starmath/inc/smcommands.h |2 +-
 sw/source/core/inc/txtfrm.hxx |2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1adcdc2d7895f8e873f6fbd1530b65ff1156e3f5
Author: Don Lewis <truck...@apache.org>
Date:   Wed Aug 31 16:00:16 2016 +

Get rid of the inline version of FindFtnRef() that just calls itself,

which causes infinite recursion.  Callers should just use the external
method.

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 4c84cff..d0a0f4b 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -432,8 +432,6 @@ public:
 const xub_StrLen nLen = STRING_LEN );
 inline SwTwips GetFtnFrmHeight() const;
 SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn );
-inline const SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ) const
-{ return FindFtnRef( pFtn ); }
 void ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine );
 
 // Wenn wir eine Ftn sind, die auf ihre Referenz zu waechst...
commit b21a60bf36456a800fb862c4302480c82e639f7e
Author: Don Lewis <truck...@apache.org>
Date:   Wed Aug 31 15:51:05 2016 +

Fix a typo on a header guard.

The other instances of the -Wheader-guard warning are in ext_sources code.

diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
index c742f58..0019542 100644
--- a/starmath/inc/smcommands.h
+++ b/starmath/inc/smcommands.h
@@ -20,7 +20,7 @@
  */
 
 
-#ifndef SM_SNCOMMANDS_HRC
+#ifndef SM_SMCOMMANDS_HRC
 #define SM_SMCOMMANDS_HRC
 
 #define CMD_SID_ADJUST  ".uno:Adjust"
commit 92afbd9a164db8616dce4b8947b8f37fc96d4d43
Author: Don Lewis <truck...@apache.org>
Date:   Wed Aug 31 15:48:05 2016 +

In ExceptionThrower::throwException(), call ::cppu::throwException()

instead of recursing infinitely.

diff --git a/cppuhelper/source/exc_thrower.cxx 
b/cppuhelper/source/exc_thrower.cxx
index 01908aa..c295ec5 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -166,7 +166,7 @@ void ExceptionThrower::release() throw ()
 void ExceptionThrower::throwException( Any const & exc ) throw (Exception)
 {
 OSL_ENSURE( 0, "unexpected!" );
-throwException( exc );
+::cppu::throwException( exc );
 }
 
 
//__
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxml2/libxml2-c99.patch libxml2/libxml2-configure.patch libxml2/libxml2-long-path.patch libxml2/makefile.mk

2016-08-28 Thread Don Lewis

 external_deps.lst   |4 +--
 libxml2/libxml2-c99.patch   |   48 
 libxml2/libxml2-configure.patch |   12 +-
 libxml2/libxml2-long-path.patch |4 +--
 libxml2/makefile.mk |7 +++--
 5 files changed, 62 insertions(+), 13 deletions(-)

New commits:
commit a8ee4f315bbd286c6efcc271e4289c4abb220a77
Author: Don Lewis <truck...@apache.org>
Date:   Sun Aug 28 20:42:46 2016 +

Upgrade bundled libxml2 from version 2.9.3 to version 2.9.4 to fix:

CVE-2016-1762
CVE-2016-1833
CVE-2016-1834
CVE-2016-1835
CVE-2016-1836
CVE-2016-1837
CVE-2016-1838
CVE-2016-1839
CVE-2016-1840
CVE-2016-3627
CVE-2016-3705
CVE-2016-4449
CVE-2016-4483
It is not known whether any of these affect OpenOffice.

Import a post-2.9.4 patch from the upstream git repo to fix a build
problem on systems with pre-C99 compilers.

diff --git a/external_deps.lst b/external_deps.lst
index 2c7e376..bfbaaf1 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -174,8 +174,8 @@ if ( true )
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXML != YES)
-MD5 = daece17e045f1c107610e137ab50c179
-name = libxml2-2.9.3.tar.gz
+MD5 = ae249165c173b1ff386ee8ad676815f5
+name = libxml2-2.9.4.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxml2/libxml2-c99.patch b/libxml2/libxml2-c99.patch
new file mode 100644
index 000..7ce8f80
--- /dev/null
+++ b/libxml2/libxml2-c99.patch
@@ -0,0 +1,48 @@
+From d77e5fc4bcdb7da748c9cca116a601ae4df60d21 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchun...@src.gnome.org>
+Date: Tue, 31 May 2016 21:04:50 +0800
+Subject: relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers
+
+Make sure that the variables are declared at the top of the block.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767063
+ ---
+ relaxng.c| 3 ++-
+ xmlschemas.c | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/relaxng.c b/relaxng.c
+index 56a3344..3d3e69c 100644
+diff -ur misc/libxml2-2.9.4/relaxng.c misc/build/libxml2-2.9.4/relaxng.c
+--- misc/libxml2-2.9.4/relaxng.c   2016-05-23 00:25:25.0 -0700
 misc/build/libxml2-2.9.4/relaxng.c 2016-08-28 00:37:26.017097000 -0700
+@@ -2088,6 +2088,7 @@
+  const xmlChar * arg2)
+ {
+ char msg[1000];
++xmlChar *result;
+ 
+ if (arg1 == NULL)
+ arg1 = BAD_CAST "";
+@@ -2215,7 +2216,7 @@
+ snprintf(msg, 1000, "Unknown error code %d\n", err);
+ }
+ msg[1000 - 1] = 0;
+-xmlChar *result = xmlCharStrdup(msg);
++result = xmlCharStrdup(msg);
+ return (xmlEscapeFormatString());
+ }
+ 
+diff -ur misc/libxml2-2.9.4/xmlschemas.c misc/build/libxml2-2.9.4/xmlschemas.c
+--- misc/libxml2-2.9.4/xmlschemas.c2016-05-23 00:25:25.0 -0700
 misc/build/libxml2-2.9.4/xmlschemas.c  2016-08-28 00:37:26.025519000 
-0700
+@@ -3168,8 +3168,8 @@
+   "valid.");
+   }
+   if (expected) {
+-  msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+   xmlChar *expectedEscaped = xmlCharStrdup(expected);
++  msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+   msg = xmlStrcat(msg, xmlEscapeFormatString());
+   FREE_AND_NULL(expectedEscaped);
+   msg = xmlStrcat(msg, BAD_CAST "'.\n");
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 8d5437f..bc5bea2 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,6 +1,6 @@
-diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3/include/libxml/xmlversion.h
 misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
-+++ misc/build/libxml2-2.9.3/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
+diff -ur misc/libxml2-2.9.4/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.4/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.4/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
 misc/build/libxml2-2.9.4/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
 @@ -273,7 +273,7 @@
   *
   * Whether iconv support is available
@@ -19,9 +19,9 @@ diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3
  #define LIBXML_DEBUG_ENABLED
  #endif
  
-diff -ur misc/libxml2-2.9.3/xml2-config.in 
misc/build/libxml2-2.9.3/xml2-config.in
 misc/libxml2-2.9.3/xml2-config.in  2015-05-06 05:04:36.0 -0700
-+++ misc/build/libxml2-2.9.3/xml2-config.in2016-03-26 10:00:17.756184000 
-0700
+diff -ur misc/libxml2-2.9.4/xml2-config.in 
misc/build/libxml2-2.9.4/xml2-config.in
+--- misc/libxml2-2.9.4/xml2-config.in  2015-05-06 05:04:36.0 -0700
 misc/build/libxml2-2.9.4/xml2-config.in2016-03-2

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2016-08-28 Thread Don Lewis

 solenv/gbuild/LinkTarget.mk|3 ---
 solenv/gbuild/platform/os2.mk  |4 +++-
 solenv/gbuild/platform/windows.mk  |4 +++-
 solenv/gbuild/platform/winmingw.mk |2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9491ff38f520bda897c8425eb642bace41702682
Author: Don Lewis <truck...@apache.org>
Date:   Sun Aug 28 05:41:36 2016 +

Follow up to r1758061.  Only pass -DPRECOMPILED_HEADERS to the compiler

when the precompiled header is actually going to be used.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b875846..0bc6d59 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -717,14 +717,11 @@ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
 $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call 
gb_PrecompiledHeader_get_target,$(3)).obj $(call 
gb_NoexPrecompiledHeader_get_target,$(3)).obj
 
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
-$(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
 ifeq ($(gb_FULLDEPS),$(true))
 -include \
$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) 
-DPRECOMPILED_HEADERS
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(3)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
 endif
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index b3bfffb..f5df15a 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -201,7 +201,7 @@ endef
 
 # PrecompiledHeader class
 
-gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+gb_PrecompiledHeader_get_enableflags = -DPRECOMPILED_HEADERS -Yu$(1).hxx \
   
-Fp$(call gb_PrecompiledHeader_get_target,$(1))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -236,6 +236,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(6) \
-c $(3) \
+   -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call 
gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
@@ -277,6 +278,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(6) \
-c $(3) \
+   -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call 
gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 5bca80d..447ccab 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -309,7 +309,7 @@ endef
 
 # PrecompiledHeader class
 
-gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+gb_PrecompiledHeader_get_enableflags = -DPRECOMPILED_HEADERS -Yu$(1).hxx \
   
-Fp$(call gb_PrecompiledHeader_get_target,$(1))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -344,6 +344,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(6) \
-c $(3) \
+   -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call 
gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
@@ -385,6 +386,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(6) \
-c $(3) \
+   -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call 
gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
diff --git a/solenv/gbuild/platform/winmingw.mk 
b/solenv/gbuild/platform/winmingw.mk
index 0ae71ad..f921c7a 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -312,6 +312,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-x c++-header \
$(4) $(5) \
-I$(dir $(3)) \
+   -DPRECOMPILED_HEADERS \
$(6) \
-c $(3) \
-o$(1))
@@ -355,6 +356,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-x c++-header \
$(4) $(5) \
-I$(dir $(3)) \
+   -DPRECOMPILED_HEADERS \
$(6) \
-c $(3) \
-o$(1))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2016-08-27 Thread Don Lewis

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

New commits:
commit 9ebe53ffa5e53bd40917de9db539f63abb32a634
Author: Don Lewis <truck...@apache.org>
Date:   Sat Aug 27 18:17:29 2016 +

#i117845#  [gbuild] invalid link-target dep-files can be generated

Fix the Windows build performance regression with precompiled headers
introduced by the fix for #i117845# that was merged from
branches/gbuild-reintegration by r1755455.

The use of precompiled headers is triggered by the use of two compiler
flags, -DPRECOMPILED_HEADERS which triggers the inclusion of a special
header for the library that includes all of the include files needed
for any source file in the library, and -Yu[headername] which tells the
the Microsoft compiler to use the precompiled version of this header.

It would be nice if these two flags were added to the compiler flags
at the same time, but they are not.  The -DPRECOMPILED_HEADERS flag
is always added if the library is configured to use precompiled
headers, but the -Yu flag is only added conditionally if the flags
for building  a particular source file match those that were used to
precompile the header.  A further condition is the presence of
$(PCH_NAME), which is set as a target-specific variable on the
library, and which is supposed to be inherited by its dependencies
to be used when compiling the source files for the library.
Unfortunately the fix for #i117845 caused the source and object
files to be dependencies of a different target, which did not
have $(PCH_NAME) set.  They did not inherit $(PCH_NAME), so they
were compiled with -DPRECOMPILED_HEADERS, but not -Yu, causing the
compiler to do more work than in the case where the precompiled
header option is disabled resulting in longer builds with the  use
of this option.

Fix by setting a target-specific $(PCH_NAME) for the new target.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0190683..b875846 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -725,6 +725,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
 $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) 
-DPRECOMPILED_HEADERS
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(3)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst redland/prj redland/raptor redland/rasqal redland/redland redland/redlandversion.mk scp2/source

2016-08-26 Thread Don Lewis

 external_deps.lst  |   18 
 redland/prj/d.lst  |   16 
 redland/raptor/makefile.mk |   31 -
 redland/raptor/raptor-1.4.18.patch.autotools   |  217 -
 redland/raptor/raptor-1.4.18.patch.dmake   |  121 -
 redland/raptor/raptor-1.4.18.patch.fixes   |   42 -
 redland/raptor/raptor-1.4.18.patch.ooo_build   |   43 -
 redland/raptor/raptor-1.4.18.patch.win32   |   78 ---
 redland/raptor/raptor2-2.0.15.patch.dmake  |  136 +
 redland/raptor/raptor2-2.0.15.patch.win32  |  487 
 redland/rasqal/makefile.mk |   21 
 redland/rasqal/rasqal-0.9.16.patch.autotools   |  211 
 redland/rasqal/rasqal-0.9.16.patch.dmake   |  100 
 redland/rasqal/rasqal-0.9.16.patch.ooo_build   |   56 --
 redland/rasqal/rasqal-0.9.16.patch.win32   |   43 -
 redland/rasqal/rasqal-0.9.33.patch.dmake   |  153 ++
 redland/rasqal/rasqal-0.9.33.patch.ooo_build   |   14 
 redland/rasqal/rasqal-0.9.33.patch.win32   |  398 
 redland/redland/makefile.mk|   46 +
 redland/redland/redland-1.0.17.patch.autotools |   21 
 redland/redland/redland-1.0.17.patch.dmake |  122 +
 redland/redland/redland-1.0.17.patch.ooo_build |   32 +
 redland/redland/redland-1.0.17.patch.win32 |  598 +
 redland/redland/redland-1.0.8.patch.autotools  |  229 -
 redland/redland/redland-1.0.8.patch.dmake  |  119 
 redland/redland/redland-1.0.8.patch.ooo_build  |   22 
 redland/redland/redland-1.0.8.patch.win32  |  154 --
 redland/redlandversion.mk  |4 
 scp2/source/ooo/file_library_ooo.scp   |4 
 29 files changed, 2046 insertions(+), 1490 deletions(-)

New commits:
commit 59b7d113bc939c00e8a2b8c395d1cfcb3e51b38b
Author: Don Lewis <truck...@apache.org>
Date:   Fri Aug 26 07:13:14 2016 +

Upgrade bundled raptor from raptor-1.4.18 to raptor2-2.0.15 to get the

fix for CVE-2012-0037.  It is not know whether this vulnerability
affects OpenOffice.

Also upgrade rasqal from version 0.9.16 to version 0.9.33 and redland
from version 1.0.8 to version 1.0.17 since all three packages are
closely related parts of the OpenOffice redland module for handling RDF.

OpenDocument version 1.2 documents contain an RDF metadata blob for
things like bookmarks and OLE objects.

diff --git a/external_deps.lst b/external_deps.lst
index 744f055..2de3b62a 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -89,21 +89,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = 284e768eeda0e2898b0d5bf7e26a016e
-name = raptor-1.4.18.tar.gz
-URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
+MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd
+name = raptor2-2.0.15.tar.gz
+URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = ca66e26082cab8bb817185a116db809b
-name = redland-1.0.8.tar.gz
-URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
+MD5 = e5be03eda13ef68aabab6e42aa67715e
+name = redland-1.0.17.tar.gz
+URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
-name = rasqal-0.9.16.tar.gz
-URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
+MD5 = 1f5def51ca0026cd192958ef07228b52
+name = rasqal-0.9.33.tar.gz
+URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (GUI!=UNX || SYSTEM_ZLIB!=YES)
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index f96f3a5..4311b2a 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,13 +1,13 @@
 mkdir: %_DEST%\inc%_EXT%\external
 ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0
+symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so
+..\%__SRC%\lib\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.0.dylib
+symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib 
%_DEST%\lib%_EXT%\libraptor2.dylib
+..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst LICENSE openssl/makefile.mk openssl/openssl-0.9.8zh-clang.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/open

2016-08-19 Thread Don Lewis

 LICENSE |2 
 external_deps.lst   |6 
 openssl/makefile.mk |   42 
 openssl/openssl-0.9.8zh-clang.patch |   11 
 openssl/openssl.patch   |  170 -
 openssl/openssllnx.patch| 3823 
 openssl/opensslmacosx.patch | 3751 ---
 openssl/version.mk  |4 
 set_soenv.in|   11 
 9 files changed, 136 insertions(+), 7684 deletions(-)

New commits:
commit cd952b405afd18a7c938b5c92e2e99f1c895e3f0
Author: Don Lewis <truck...@apache.org>
Date:   Fri Aug 19 18:28:06 2016 +

Update the bundled version of OpenSSL from 0.9.8zh to 1.0.2h which

fixes many vulnerabiliies and adds support for newer, more secure
ciphers and versions of the protocol.

Note: OpenSSL version 1.0.2h contains two known minor vulnerabilites,
CVE-2016-2177 and CVE-2016-2178, which will be fixed in the next
OpenSSL release.  Their potential impact is low enough that that
various Linux distros have chosen not to apply the upstream patches
to the versions that they distribute.

On Windows, there is an optional new dependency on NASM,
<http://www.nasm.us/>.  If NASM is not available, then the C
implementations of the low-level crypto code will be used instead
of the optimized assembly language versions.  Since OpenOffice is
not a heavy user of this code, the impact should be minor.  If NASM
is installed, but its location is not in $PATH, the directory
containing nasm.exe should be passed to configure using --with-nasm-home.

The fallback to the C crypto implementation also happens on Linux
if the version of gcc is sufficently old to indicate that the
toolchain is likely to not support the some of the instructions in
the assembly language versions of the code.

diff --git a/LICENSE b/LICENSE
index 47c911b..e724dd0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1222,7 +1222,7 @@ OpenSSL License
 ---
 
 
-Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/external_deps.lst b/external_deps.lst
index 1123895..744f055 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -155,9 +155,9 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
-MD5 = c813c065dd53d7bd0a560a870ddd0af5
-name = openssl-0.9.8zh.tar.gz
-URL1 = http://www.openssl.org/source/openssl-0.9.8zh.tar.gz
+MD5 = 9392e65072ce4b614c1392eefc1f23d0
+name = openssl-1.0.2h.tar.gz
+URL1 = http://www.openssl.org/source/openssl-1.0.2h.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index d67449e..6762f64 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -42,17 +42,17 @@ TARGET=openssl
 @echo "openssl disabled"
 .ENDIF
 
-OPENSSL_NAME=openssl-0.9.8zh
+OPENSSL_NAME=openssl-1.0.2h
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5
+TARFILE_MD5=9392e65072ce4b614c1392eefc1f23d0
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
 CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared 
 
 BUILD_DIR=.
-BUILD_ACTION=make CC='$(CC)'
+BUILD_ACTION=make CC='$(CC)' build_libs
 
 OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
@@ -60,25 +60,32 @@ OUT2INC += include/openssl/*
 
 UNAME=$(shell uname)
 
+.IF "$(COM)"=="GCC" && "$(CCNUMVER)">="00040006" || "$(OS)"=="WNT" && 
"$(NASM_PATH)"=="NO_NASM_HOME"
+  NO_ASM="no-asm"
+.ELSE
+  NO_ASM=
+.ENDIF
+
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
 PATCH_FILES=openssllnx.patch
-ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8zh.map \
-libssl_OOo_0_9_8zh.map
 .IF "$(CPU)" == "I"
 .IF "$(UNAME)" == "GNU/kFreeBSD"
-CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+CONFIGURE_ACTION=Configure debian-kfreebsd-i386 no-dso no-shared 
$(NO_ASM)
+.ELIF "$(UNAME)" == "FreeBSD"
+CONFIGURE_ACTION=Configure BSD-x86-elf no-dso no-shared $(NO_ASM)
 .ELSE
-CONFIGURE_ACTION=Configure linux-elf
+CONFIGURE_ACTION=Configure linux-generic32 no-dso no-shared 
$(NO_ASM)
 .ENDIF
 .ELIF "$(BUILD64)" == "1"
 .IF "$(UNAME)" == "GNU/kFreeBSD&qu

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxslt/libxslt-configure.patch libxslt/libxslt-CVE-2015-7995.patch libxslt/libxslt-internal-symbols.patch libxslt/libxsltversion

2016-08-13 Thread Don Lewis

 external_deps.lst  |4 -
 libxslt/libxslt-CVE-2015-7995.patch|   24 --
 libxslt/libxslt-configure.patch|   74 +
 libxslt/libxslt-internal-symbols.patch |   18 
 libxslt/libxslt-win_manifest.patch |6 +-
 libxslt/libxsltversion.mk  |2 
 libxslt/makefile.mk|5 --
 7 files changed, 30 insertions(+), 103 deletions(-)

New commits:
commit 8bec619aefa8913e08f10878cd6ae98340e37e21
Author: Don Lewis <truck...@apache.org>
Date:   Fri Aug 12 22:37:50 2016 +

Upgrade bundled libxslt from version 1.1.28 to version 1.1.29 to fix:

CVE-2016-1683
CVE-2016-1684
Whether any of these affect the OpenOffice usage of libxslt is not known.
OpenOffice uses libxslt for help, document signing and encryption, and
for RDF.

libxslt-CVE-2015-7995.patch is no longer needed because this issue
has been fixed upstream.

Re-roll the other patches, some of which got simplified because of
upstream fixes.

diff --git a/external_deps.lst b/external_deps.lst
index d81dec1..1123895 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -179,8 +179,8 @@ if (SYSTEM_LIBXML != YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXSLT != YES)
-MD5 = 9667bf6f9310b957254fdcf6596600b7
-name = libxslt-1.1.28.tar.gz
+MD5 = a129d3c44c022de3b9dcf6d6f288d72e
+name = libxslt-1.1.29.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxslt/libxslt-CVE-2015-7995.patch 
b/libxslt/libxslt-CVE-2015-7995.patch
deleted file mode 100644
index 59a6fbf..000
--- a/libxslt/libxslt-CVE-2015-7995.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veill...@redhat.com>
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace

- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
 misc/libxslt-1.1.28/libxslt/preproc.c  2012-09-11 22:59:42.0 
-0700
-+++ misc/build/libxslt-1.1.28/libxslt/preproc.c2016-03-26 
11:04:43.636524000 -0700
-@@ -2245,7 +2245,8 @@
-   } else if (IS_XSLT_NAME(inst, "attribute")) {
-   xmlNodePtr parent = inst->parent;
- 
--  if ((parent == NULL) || (parent->ns == NULL) ||
-+  if ((parent == NULL) ||
-+  (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
-   ((parent->ns != inst->ns) &&
-(!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
-   (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 4b82fa3..24567a6 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,36 +1,18 @@
-diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh
 misc/libxslt-1.1.28/ltmain.sh  2012-11-20 23:21:48.0 -0800
-+++ misc/build/libxslt-1.1.28/ltmain.sh2016-03-27 11:14:40.564087000 
-0700
-@@ -7331,13 +7331,13 @@
- #
- case $version_type in
- # correct linux to gnu/linux during the next big refactor
--darwin|linux|osf|windows|none)
-+darwin|freebsd-elf|linux|osf|windows|none)
-   func_arith $number_major + $number_minor
-   current=$func_arith_result
-   age="$number_minor"
-   revision="$number_revision"
-   ;;
--freebsd-aout|freebsd-elf|qnx|sunos)
-+freebsd-aout|qnx|sunos)
-   current="$number_major"
-   revision="$number_minor"
-   age="0"
-@@ -7414,8 +7414,8 @@
- ;;
+diff -ur misc/libxslt-1.1.29/configure misc/build/libxslt-1.1.29/configure
+--- misc/libxslt-1.1.29/configure  2016-05-23 18:49:13.0 -0700
 misc/build/libxslt-1.1.29/configure2016-08-11 11:06:10.448691000 
-0700
+@@ -6691,7 +6691,7 @@
  
-   freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.$(($current - $age))
-+versuffix="$major.$age.$revision"
- ;;
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
  
-   irix | nonstopux)
-diff -ur misc/libxslt-1.1.28/xslt-config.in 
misc/build/libxslt-1.1.28/xslt-config.in
 misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - graphite/graphite-2.3.1.patch

2016-08-05 Thread Don Lewis

 graphite/graphite-2.3.1.patch |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 5b6c4bddf6134f377a61446d8bcf1be2f096aad1
Author: Don Lewis <truck...@apache.org>
Date:   Fri Aug 5 05:49:46 2016 +

Fix --enable-debug build with clang as the compiler.

Clang warns about this expression in graphite:
if (!m_srAttachTo == 0)
Operator precedence rules require this to be evaluated as:
if ((!m_srAttachTo) == 0)
but clang worries that the author might have intended this to mean:
if (!(m_srAttachTo == 0))
Fortunately these two are equivalent, as is:
if (m_srAttachTo != 0)
and the latter is much easier for humans to understand.

For some reason, --enable-debug adds -Werror to the graphite CFLAGS even
though its makefile.mk specifies:
EXTERNAL_WARNINGS_NOT_ERRORS := TRUE

diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch
index 85a8aa3..768c139 100644
--- a/graphite/graphite-2.3.1.patch
+++ b/graphite/graphite-2.3.1.patch
@@ -2452,3 +2452,15 @@
bool operator!=(const GlyphSetIterator & rhs) const throw() { 
return !(*this == rhs); }
  
// Random access iterator requirements
+diff -ur misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 
misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h
+--- misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h2009-01-27 
18:01:29.0 -0800
 misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h  
2016-08-02 17:22:26.300396000 -0700
+@@ -481,7 +481,7 @@
+   {
+   Assert(false);  // Should have already been set in 
HandleModifiedPosition,
+   // but just in case.
+-  if (!m_srAttachTo == 0)
++  if (m_srAttachTo != 0)
+   return 0;
+   else
+   m_mAttachAtX = 0; // attach on the right
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - curl/curl-7.19.7.patch curl/curl-7.19.7_win.patch curl/curl-7.49.1_win.patch curl/makefile.mk curl/prj external_deps.lst LICENSE

2016-07-28 Thread Don Lewis

 LICENSE|   11 +--
 curl/curl-7.19.7.patch |  148 -
 curl/curl-7.19.7_win.patch |   19 -
 curl/curl-7.49.1_win.patch |   35 ++
 curl/makefile.mk   |   16 ++--
 curl/prj/d.lst |4 -
 external_deps.lst  |6 -
 7 files changed, 54 insertions(+), 185 deletions(-)

New commits:
commit 67579b01b47d10f5b835dcb7f8bcce415ff9e221
Author: Don Lewis <truck...@apache.org>
Date:   Thu Jul 28 21:29:05 2016 +

#i126896#:  bundled curl version 7.19.7 has many vulnerabilities

Upgrade bundled curl to version 7.49.1.

Delete most of the curl patches since they are no longer necessary.
The only needed patch is to produce a library with the expected name
when building on Windows.

Update the curl copyright info in LICENSE.

These curl CVEs have been fixed since 7.19.7:
CVE-2010-0734
CVE-2011-2192
CVE-2013-2174
CVE-2014-3143
CVE-2014-3144
CVE-2014-3145
CVE-2014-3148
CVE-2014-8150
CVE-2015-3153
CVE-2016-0755
Whether any of these affect the OpenOffice usage of curl is not known.
OpenOffice only uses curl to access ftp:// URLs, which is likely to be
only rarely done.

diff --git a/LICENSE b/LICENSE
index 939a109..011304e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1003,14 +1003,15 @@ 
 For integration of the library curl - built in main/curl/
 - license like MIT license
 
-Copyright (c) 1996 - 2011, Daniel Stenberg, <dan...@haxx.se>.
- 
+Copyright (c) 1996 - 2016, Daniel Stenberg, <dan...@haxx.se>, and many
+contributors, see the THANKS file.
+
 All rights reserved.
- 
+
 Permission to use, copy, modify, and distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright
 notice and this permission notice appear in all copies.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
@@ -1018,7 +1019,7 @@ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
- 
+
 Except as contained in this notice, the name of a copyright holder shall not
 be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization of the copyright holder.
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
deleted file mode 100644
index fc8a38e..000
--- a/curl/curl-7.19.7.patch
+++ /dev/null
@@ -1,148 +0,0 @@
 misc/curl-7.19.7/configure 2009-11-04 13:26:02.0 +0100
-+++ misc/build/curl-7.19.7/configure   2015-09-04 11:58:00.33121 +0100
-@@ -2735,8 +2735,8 @@
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-@@ -3783,8 +3783,8 @@
-   ac_save_CPPFLAGS="$CPPFLAGS"
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
name with args.
-@@ -4434,15 +4434,15 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--CFLAGS="-g -O2"
-+CFLAGS="$ADDCFLAGS -g -O2"
-   else
--CFLAGS="-g"
-+CFLAGS="$ADDCFLAGS -g"
-   fi
- else
-   if test "$GCC" = yes; then
--CFLAGS="-O2"
-+CFLAGS="$ADDCFLAGS -O2"
-   else
--CFLAGS=
-+CFLAGS="$ADDCFLAGS"
-   fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept 
ISO C89" >&5
-@@ -11276,7 +11276,7 @@
-   hardcode_shlibpath_var=no
-   ;;
- 
--freebsd1*)
-+freebsd1.*)
-   ld_shlibs=no
-   ;;
- 
-@@ -11292,7 +11292,7 @@
-   ;;
- 
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--freebsd2*)
-+freebs

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst nss/makefile.mk scp2/source

2016-07-25 Thread Don Lewis

 external_deps.lst|6 ++
 nss/makefile.mk  |2 +-
 scp2/source/ooo/file_library_ooo.scp |2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 422a9e11481f7e6a20e5142ef9d016df64370be2
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jul 25 09:04:56 2016 +

Now that https downloads on the buildbots are fixed, switch OOO_EXTRAS

back to the main SourceForge site instead of an individual mirror.
Change the nss download URL back to https.

diff --git a/external_deps.lst b/external_deps.lst
index ae6cc38..553d6ab 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -26,9 +26,7 @@
 
 # The primary fallback site.
 # OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
-# OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
-# Use a specific mirror to avoid HTTPS redirections.
-OOO_EXTRAS=http://pilotfiber.dl.sourceforge.net/project/oooextras.mirror/
+OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 
 # Must not fallback to svn
 # 
SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
@@ -315,7 +313,7 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && 
ENABLE_JAVASCRIPT==YES)
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
 MD5 = 4ec9a36c0f7c9360b149491c013b8d50
 name = nss-3.25-with-nspr-4.12.tar.gz
-URL1 = 
http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
+URL1 = 
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && 
SOLAR_JAVA==TRUE)
commit e0667bfaf22f7535bb4b73d33039cc53ea1e4426
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jul 25 08:21:28 2016 +

The nss upgrade in r1753163 broke packaging on Windows (if nss is

enabled, which it is not by default) and Mac (not actually verified).
These two platforms do not build a separate libfreeblpriv3.so (or
Windows equivalent) but instead bundle it into libfreebl3.so.  Since a
separate libfreeblpriv3.so is only required on Linux (see #i105566# and
moz#513024#), only attempt to package this library on Linux.  Since a
separate libfreeblpriv3.so does not seem to be required on FreeBSD,
don't build it there.

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 5d7ee14..eb9aaa5 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -73,7 +73,7 @@ PATCH_FILES+=nss_linux.patch
 .ENDIF
 
 .IF "$(OS)"=="FREEBSD"
-BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
+BUILD_ACTION+=NSS_DISABLE_GTESTS=1
 .ENDIF
 
 
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 1958563..50902a9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1643,7 +1643,9 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #ifdef BUNDLE_NSS_LIBS
 
 STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
+#ifdef LINUX
 STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
+#endif
 STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
 STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
 STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - external_deps.lst nss/makefile.mk nss/nss_freebsd.patch nss/nss_linux.patch nss/nss_macosx.patch nss/nss.patch nss/prj scp2/source

2016-07-18 Thread Don Lewis

 external_deps.lst|6 
 nss/makefile.mk  |   74 +-
 nss/nss.patch|  241 +++
 nss/nss_freebsd.patch|5 
 nss/nss_linux.patch  |   38 ++---
 nss/nss_macosx.patch |   21 ---
 nss/prj/d.lst|3 
 scp2/source/ooo/file_library_ooo.scp |1 
 8 files changed, 227 insertions(+), 162 deletions(-)

New commits:
commit 65e38169a7edff860082509a596105deaf4afb7c
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jul 18 07:09:58 2016 +

#i126891# bundled nss-3.14.4-with-nspr-4.9.5 has many security

vulnerabilities

Upgrade bundled nss-3.14.4-with-nspr-4.9.5 to nss-3.25-with-nspr-4.12.
These CVEs have been fixed since nss-3.14.4 was released:
CVE-2014-1533
CVE-2014-1534
CVE-2014-1536
CVE-2014-1537
CVE-2014-1540
CVE-2014-1541
CVE-2014-1542
CVE-2014-1543
CVE-2014-1544
CVE-2014-1545
CVE-2014-1547
CVE-2014-1548
CVE-2014-1549
CVE-2014-1550
CVE-2014-1551
CVE-2014-1552
CVE-2014-1555
CVE-2014-1556
CVE-2014-1557
CVE-2014-1558
CVE-2014-1559
CVE-2014-1560
CVE-2014-1561
CVE-2014-1568
CVE-2014-1569
CVE-2014-1587
CVE-2014-1588
CVE-2014-1589
CVE-2014-1590
CVE-2014-1591
CVE-2014-1592
CVE-2014-1593
CVE-2014-1594
CVE-2014-1595
CVE-2015-4513
CVE-2015-4514
CVE-2015-4515
CVE-2015-4518
CVE-2015-7181
CVE-2015-7182
CVE-2015-7183
CVE-2015-7185
CVE-2015-7186
CVE-2015-7187
CVE-2015-7188
CVE-2015-7189
CVE-2015-7190
CVE-2015-7191
CVE-2015-7192
CVE-2015-7193
CVE-2015-7194
CVE-2015-7195
CVE-2015-7196
CVE-2015-7197
CVE-2015-7198
CVE-2015-7199
CVE-2015-7200
CVE-2015-7575
CVE-2016-1938
CVE-2016-1950
CVE-2016-1978
CVE-2016-1979
Whether any of these actually impacts OpenOffice is not known.

Rebase the nss patches to the new version and move any non-conflicting
changes from the platform-specific patch files to nss.patch.  The
nss.patch.mingw file was already out of date and was not updated.

Disable nss tests which require at least partial c++11 (-stdc++0x)
support because they use nullptr.  This reportedly requires at least
gcc 4.6, which is newer that some of what is provided by some of
our supported platforms.

Fix build issue on FreeBSD 11.0 and other platforms with picky compilers.
The result of shifting a negative signed value is undefined in C and C++.
The generated code does the expected thing in my experience and this
construct just generates a compiler warning, but
nss-3.24/nss/lib/zlib/inflate.c is compiled with -Werror, which breaks
the build.  Fix the issue by doing the calculations using the equivalent
unsigned type.  The function return should probably also be changed, but
that is more invasive.

Patch pratom.h to no include  inside an extern "C" block
because it breaks the build on Windows.

Recent versions of nss include a new shared library, libfreeblpriv3.so,
so package it so that it gets installed.

Temporarily change nss download URL from https to http to avoid breaking
bootstrap on the buildbots.

diff --git a/external_deps.lst b/external_deps.lst
index 6d85e10..ae6cc38 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -313,9 +313,9 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && 
ENABLE_JAVASCRIPT==YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
-MD5 = 067a04150b1d8b64f7da3019688a7547
-name = nss-3.14.4-with-nspr-4.9.5.tar.gz
-URL1 = 
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_4_RTM/src/$(name)
+MD5 = 4ec9a36c0f7c9360b149491c013b8d50
+name = nss-3.25-with-nspr-4.12.tar.gz
+URL1 = 
http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && 
SOLAR_JAVA==TRUE)
diff --git a/nss/makefile.mk b/nss/makefile.mk
index c14dc47..5d7ee14 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -39,9 +39,9 @@ all:
 
 .ELSE
 
-TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5
-TARFILE_MD5=067a04150b1d8b64f7da3019688a7547
-TARFILE_ROOTDIR=nss-3.14.4
+TARFILE_NAME=nss-3.25-with-nspr-4.12
+TARFILE_MD5=4ec9a36c0f7c9360b149491c013b8d50
+TARFILE_ROOTDIR=nss-3.25
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
@@ -50,10 +50,6 @@ MACOS_SDK_DIR=$(SDK_PATH)
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
 
-.IF "$(OS)"=="FREEBSD"
-PATCH_FILES+=nss_freebsd.patch
-.ENDIF
-
 .IF "$(debug)" != ""
 .ELSE
 BUILD_OPT=1
@@

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-07-15 Thread Don Lewis

 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d82c7a031e0ba8e36fd9a3db756336025bc4cd12
Author: Don Lewis <truck...@apache.org>
Date:   Fri Jul 15 06:33:53 2016 +

#i126892# The iweb sourceforge mirror appears to have been removed from

rotation, switch to the pilotfiber mirror.

diff --git a/external_deps.lst b/external_deps.lst
index 722850d..6d85e10 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -28,7 +28,7 @@
 # OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
 # OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 # Use a specific mirror to avoid HTTPS redirections.
-OOO_EXTRAS=http://iweb.dl.sourceforge.net/project/oooextras.mirror/
+OOO_EXTRAS=http://pilotfiber.dl.sourceforge.net/project/oooextras.mirror/
 
 # Must not fallback to svn
 # 
SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source

2016-06-16 Thread Don Lewis

 vcl/source/glyphs/graphite_layout.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 633d5013b37fd89f5e91bad10b82accc9dfd4775
Author: Don Lewis <truck...@apache.org>
Date:   Thu Jun 16 08:00:20 2016 +

#i126999#: fix vcl/source/glyphs/graphite_layout.cxx compile with libc++ 
3.8.0

Rename local inline function round() to round2long() to avoid ambiguity
with libc++ round() function and better describe its functionality.  This
fixes a compile error when building with libc++ version 3.8.0, which
was first observed with FreeBSD 11.0.

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 7ecd164..002dad8 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -107,7 +107,7 @@ namespace
 typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator>   
glyph_range_t;
 typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> 
glyph_set_range_t;
 
-inline long round(const float n) {
+inline long round2long(const float n) {
 return long(n + (n < 0 ? -0.5 : 0.5));
 }
 
@@ -294,8 +294,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, 
ImplLayoutArgs ,
 fMinX = std::min(aBounds.first, fMinX);
 fMaxX = std::max(aBounds.second, fMaxX);
 }
-long nXOffset = round(fMinX * fScaling);
-rWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset;
+long nXOffset = round2long(fMinX * fScaling);
+rWidth = round2long(fMaxX * fScaling) - nXOffset + nDxOffset;
 if (rWidth < 0)
 {
 // This can happen when there was no base inside the range
@@ -406,7 +406,7 @@ std::pair<float,float> 
GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
 if (j + nDelta >= nGlyphs || j + nDelta < 0) // at rhs ltr,rtl
 {
 fNextOrigin = fSegmentAdvance;
-nNextOrigin = round(fSegmentAdvance * fScaling + rDXOffset);
+nNextOrigin = round2long(fSegmentAdvance * fScaling + rDXOffset);
 aBounds.second = std::max(fSegmentAdvance, aBounds.second);
 }
 else
@@ -414,7 +414,7 @@ std::pair<float,float> 
GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
 gr::GlyphInfo aNextGlyph = *(iGlyphs.first + j + nDelta);
 fNextOrigin = std::max(aNextGlyph.attachedClusterBase()->origin(), 
aNextGlyph.origin());
 aBounds.second = std::max(fNextOrigin, aBounds.second);
-nNextOrigin = round(fNextOrigin * fScaling + rDXOffset);
+nNextOrigin = round2long(fNextOrigin * fScaling + rDXOffset);
 }
 aBounds.first = std::min(aGlyph.origin(), aBounds.first);
 if ((signed)aGlyph.firstChar() < rArgs.mnEndCharPos &&
@@ -432,8 +432,8 @@ std::pair<float,float> 
GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
 // the origin of the first glyph of the next cluster ltr
 // rtl it is the origin of the 1st glyph of the cluster
 long nXPos = (bRtl)?
-round(aFirstGlyph.attachedClusterBase()->origin() * fScaling) + 
rDXOffset :
-round(aBounds.second * fScaling) + rDXOffset;
+round2long(aFirstGlyph.attachedClusterBase()->origin() * fScaling) + 
rDXOffset :
+round2long(aBounds.second * fScaling) + rDXOffset;
 // force the last char in range to have the width of the cluster
 if (bRtl)
 {
@@ -474,7 +474,7 @@ GraphiteLayout::Glyphs::append(gr::Segment , 
ImplLayoutArgs , gr::G
 }
 long glyphId = gi.glyphID();
 long deltaOffset = 0;
-int glyphWidth = round(nextOrigin * scaling) - round(gi.origin() * 
scaling);
+int glyphWidth = round2long(nextOrigin * scaling) - round2long(gi.origin() 
* scaling);
 #ifdef GRLAYOUT_DEBUG
 fprintf(grLog(),"c%d g%d gWidth%d x%f ", firstChar, 
(int)gi.logicalIndex(), glyphWidth, nextOrigin);
 #endif
@@ -513,11 +513,11 @@ GraphiteLayout::Glyphs::append(gr::Segment , 
ImplLayoutArgs , gr::G
 nGlyphFlags |= (gi.directionLevel() & 0x1)? GlyphItem::IS_RTL_GLYPH : 0;
 GlyphItem aGlyphItem(size(),//gi.logicalIndex(),
 glyphId,
-Point(round(gi.origin() * scaling + rDXOffset),
-round((-gi.yOffset() * scaling) - segment.AscentOffset()* 
scaling)),
+Point(round2long(gi.origin() * scaling + rDXOffset),
+round2long((-gi.yOffset() * scaling) - segment.AscentOffset()* 
scaling)),
 nGlyphFlags,
 glyphWidth);
-aGlyphItem.mnOrigWidth = round(gi.advanceWidth() * scaling);
+aGlyphItem.mnOrigWidth = round2long(gi.advanceWidth() * scaling);
 push_back(aGlyphItem);
 
 // update the offset if this glyph was dropped
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxml2/libxml2-configure.patch libxml2/libxml2-fixes.patch libxml2/libxml2-long-path.patch libxml2/libxml2-runtest.patch libxml2

2016-06-15 Thread Don Lewis

 external_deps.lst   |8 +--
 libxml2/libxml2-configure.patch |   71 ++
 libxml2/libxml2-fixes.patch |   41 ---
 libxml2/libxml2-long-path.patch |   45 +++--
 libxml2/libxml2-runtest.patch   |   11 -
 libxml2/libxml2-testapi.patch   |   20 -
 libxml2/makefile.mk |   13 ++
 libxslt/libxslt-CVE-2015-7995.patch |   24 +++
 libxslt/libxslt-bsd.patch   |   26 
 libxslt/libxslt-configure.patch |   74 +---
 libxslt/libxslt-win_manifest.patch  |5 +-
 libxslt/libxsltversion.mk   |2 
 libxslt/makefile.mk |9 +---
 13 files changed, 114 insertions(+), 235 deletions(-)

New commits:
commit c1173fdcf0046593b6b2783eb423601eb6f47b20
Author: Don Lewis <truck...@apache.org>
Date:   Wed Jun 15 05:36:41 2016 +

#i126893#: Upgrade bundled libxml2 version to 2.9.3 and libxslt to 1.1.28

These security vulnerabilities have been fixed since the release of
libxml2-2.7.8 which is bundled with OpenOffice:
CVE-2011-3202
CVE-2011-3919
CVE-2013-0338
CVE-2013-0339
CVE-2013-2877
CVE-2014-0191
CVE-2014-3660
CVE-2015-1819
CVE-2015-5312
CVE-2015-7497
CVE-2015-7498
CVE-2015-7499
CVE-2015-7500
CVE-2015-7941
CVE-2015-7942
CVE-2015-8035
CVE-2015-8241
CVE-2015-8242

This vulnerability has been fixed since the release of libxslt-1.1.26:
CVE-2015-7995

Upgrade libxml2 to version 2.9.3 which has no publicly disclosed
vulnerabilities at this time.

Rebase libxml2-configure.patch to the new version of libxml2.  The
freebsd-elf change to ltmain.sh is no longer necessary and is eliminated
from the patch.  The fixes in libxml2-fixes.patch were either fixed
upstream or don't seem to apply anymore, so this patch file was deleted.
The fixes in libxml2-testapi.patch and libxml2-runtest.patch are in now
in the upstream source, so these patch files have been deleted.
The libxml2-mingw.patch and Solaris-specific libxml2-global-symbols.patch
were not updated and are disconnected from the build.  Several of the
fixes in libxml2-long-path.patch are now fixed upstream.

Upgrade libxslt to version 1.1.28 and add libxslt-CVE-2015-7995.patch,
which is imported from the FreeBSD port and which appears to have been
cherry picked from upstream.

Rebase libxslt-configure.patch to the new version of libxslt, with
the libtool-related changes coming from the libxslt port to FreeBSD.
The fixes in libxslt-bsd.patch are now present in the upstream
source, so this patch was deleted.

Tested by:  kschenk

diff --git a/external_deps.lst b/external_deps.lst
index 61bd7a5..722850d 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -175,14 +175,14 @@ if ( true )
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXML != YES)
-MD5 = 8127a65e8c3b08856093099b52599c86
-name = libxml2-2.7.8.tar.gz
+MD5 = daece17e045f1c107610e137ab50c179
+name = libxml2-2.9.3.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXSLT != YES)
-MD5 = e61d0364a30146aaa3001296f853b2b9
-name = libxslt-1.1.26.tar.gz
+MD5 = 9667bf6f9310b957254fdcf6596600b7
+name = libxslt-1.1.28.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index b396b55..8d5437f 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,19 +1,7 @@
 misc/libxml2-2.7.8/ltmain.sh   2009-10-06 17:39:54.0 +0100
-+++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.0 +
-@@ -6599,8 +6599,8 @@
- ;;
- 
-   freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.`expr $current - $age`
-+versuffix=".$major.$age.$revision";
- ;;
- 
-   irix | nonstopux)
 misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 
11:45:19.0 +
-+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h   2009-12-17 
11:45:36.0 +
-@@ -264,7 +264,7 @@
+diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
 misc/build/libxml2-2.9.3/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
+@@ -273,7 +273,7 @@
   *
   * Whether iconv support is available
   */
@@ -22,7 +10,7 @@
  #define LIBXML_ICONV_ENABLED
  #endif
  
-@@ -291,7 +291,7 @@
+@@ -300,7 +300,7 @@
   *
   * Whether Debugging module is configured in
   */
@@ -31,26 +19,9 @@
  #define LIBXML_DEBUG_E

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - boost/boost_1_55_0.patch

2016-06-06 Thread Don Lewis

 boost/boost_1_55_0.patch |  225 +++
 1 file changed, 170 insertions(+), 55 deletions(-)

New commits:
commit 34aa1d4ae4620182702659d3461739d666d2d63d
Author: Don Lewis <truck...@apache.org>
Date:   Mon Jun 6 14:32:23 2016 +

#i126888#:  bundled boost headers generate an excessive number of

warnings when building with modern compilers

When building OpenOffice with modern compilers, the bundled boost
headers generate an excessive number of warnings.  This is especially
bad with recent versions of clang, which generates very verbose
warning messages.

The attached patch updates the current boost_1_55_0.patch with
additional changes cherry picked from upstream boost, up through
version 1.60.  These additional changes have been used with the
FreeBSD boost 1.55.0 port for a while.

This patch greatly reduces the number of warnings and size of the
OpenOffice build log.  Compiling trunk r1735889 on FreeBSD 11.0
with clang 3.8, the number of warnings is reduced from 53260 to
13741, and the size of the build log is reduced from 117 MB to 44
MB.

Tested by:  kschenk

diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 3f7f6f6..a4ef939 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -1,5 +1,167 @@
 misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp2012-12-05 
23:06:57.0 +0100
-+++ misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp  
2014-01-07 10:33:59.550621750 +0100
+diff -ur misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp 
misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp
+--- misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp  2013-10-26 
16:25:53.0 -0700
 misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp2016-03-23 
01:11:12.425434000 -0700
+@@ -87,6 +87,14 @@
+ handle_ = ::SSL_CTX_new(::SSLv2_server_method());
+ break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++  case context::sslv3:
++  case context::sslv3_client:
++  case context::sslv3_server:
++boost::asio::detail::throw_error(
++boost::asio::error::invalid_argument, "context");
++break;
++#else // defined(OPENSSL_NO_SSL3)
+   case context::sslv3:
+ handle_ = ::SSL_CTX_new(::SSLv3_method());
+ break;
+@@ -96,6 +104,7 @@
+   case context::sslv3_server:
+ handle_ = ::SSL_CTX_new(::SSLv3_server_method());
+ break;
++#endif // defined(OPENSSL_NO_SSL3)
+   case context::tlsv1:
+ handle_ = ::SSL_CTX_new(::TLSv1_method());
+ break;
+diff -ur 
misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp 
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
+--- misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
2013-05-20 05:32:20.0 -0700
 
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp   
   2016-03-23 01:11:12.426497000 -0700
+@@ -85,6 +85,13 @@
+   impl = ::SSL_CTX_new(::SSLv2_server_method());
+   break;
+ #endif // defined(OPENSSL_NO_SSL2)
++#if defined(OPENSSL_NO_SSL3)
++case context_base::sslv3:
++case context_base::sslv3_client:
++case context_base::sslv3_server:
++  boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
++  break;
++#else // defined(OPENSSL_NO_SSL3)
+ case context_base::sslv3:
+   impl = ::SSL_CTX_new(::SSLv3_method());
+   break;
+@@ -94,6 +101,7 @@
+ case context_base::sslv3_server:
+   impl = ::SSL_CTX_new(::SSLv3_server_method());
+   break;
++#endif // defined(OPENSSL_NO_SSL3)
+ case context_base::tlsv1:
+   impl = ::SSL_CTX_new(::TLSv1_method());
+   break;
+diff -ur misc/boost_1_55_0/boost/bind/arg.hpp 
misc/build/boost_1_55_0/boost/bind/arg.hpp
+--- misc/boost_1_55_0/boost/bind/arg.hpp   2007-11-25 10:07:19.0 
-0800
 misc/build/boost_1_55_0/boost/bind/arg.hpp 2016-03-23 01:11:12.42153 
-0700
+@@ -33,8 +33,7 @@
+ 
+ template< class T > arg( T const & /* t */ )
+ {
+-// static assert I == is_placeholder::value
+-typedef char T_must_be_placeholder[ I == is_placeholder::value? 1: 
-1 ];
++BOOST_STATIC_ASSERT( I == is_placeholder::value );
+ }
+ };
+ 
+diff -ur misc/boost_1_55_0/boost/concept/detail/general.hpp 
misc/build/boost_1_55_0/boost/concept/detail/general.hpp
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08 
12:31:13.0 -0700
 misc/build/boost_1_55_0/boost/concept/detail/general.hpp   2016-03-23 
01:11:12.388374000 -0700
+@@ -65,10 +65,19 @@
+   
+ # endif
+ 
++// Version check from https://svn.boost.org/trac/boost/changeset/82886
++// (boost/static_assert.hpp)
++#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && 
(__GNUC_MINOR__ >= 7))) || defined(__clang__)
++#define BOOST_CONCEPT_UNUSED_T

43 matches

Mail list logo