bin/update_pch.sh | 2 ++ configure.ac | 3 +++ external/liblangtag/ExternalProject_langtag.mk | 4 +++- external/openssl/ExternalProject_openssl.mk | 2 +- sc/source/filter/inc/xiescher.hxx | 3 ++- solenv/gbuild/platform/com_MSC_class.mk | 6 ++++-- solenv/gcc-wrappers/g++.cxx | 4 +++- solenv/gcc-wrappers/gcc.cxx | 4 +++- sw/source/core/doc/docnew.cxx | 1 + xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 1 - 10 files changed, 22 insertions(+), 8 deletions(-)
New commits: commit 3078f0e3ffeb431308df7741b3f75951459003b0 Author: Michael Stahl <[email protected]> Date: Thu Aug 14 17:59:16 2014 +0200 sw: initialize SwDoc::mbCopyIsMove (regression from 5494954b269267f6ee3bdd5ac73e7513fa69978f) Change-Id: I8bc2e0e079cbf86449ef0ce9c046eedb624127f2 diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 0b2c0d1..c5ec7fe 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -260,6 +260,7 @@ SwDoc::SwDoc() mReferenceCount(0), mbGlossDoc(false), mbDtor(false), + mbCopyIsMove(false), mbInReading(false), mbInXMLImport(false), mbUpdateTOX(false), commit 26eca5a184269281823f92aa64b962202712da78 Author: Michael Stahl <[email protected]> Date: Thu Aug 14 17:54:15 2014 +0200 sc: stupid auto_ptr deprecation Change-Id: I7ef7de18c2f03d6dc825c12f14f3607fb64008cf diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index d4da2dc..0a936ef 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -28,6 +28,7 @@ #include "xiroot.hxx" #include "xistring.hxx" #include <boost/shared_ptr.hpp> +#include <boost/scoped_ptr.hpp> #include <oox/ole/olehelper.hxx> #include <rtl/ustring.hxx> @@ -1229,7 +1230,7 @@ public: void FillToItemSet( SfxItemSet& rItemSet ) const; private: - typedef ::std::auto_ptr< SvMemoryStream > SvMemoryStreamPtr; + typedef ::boost::scoped_ptr<SvMemoryStream> SvMemoryStreamPtr; SvMemoryStream maDummyStrm; /// Dummy DGG stream for DFF manager. XclImpSimpleDffConverter maDffConv; /// DFF converter used to resolve palette colors. commit 8848f4e8c203e35f14a4f20919b826e2d667b757 Author: Michael Stahl <[email protected]> Date: Thu Aug 14 16:19:25 2014 +0200 xmlsecurity: remove NSS cert.h from PCH nssrenam.h is another horror... Change-Id: I166ac2ab1414e89d5cd4beae543670fdfa389adb diff --git a/bin/update_pch.sh b/bin/update_pch.sh index 09ffd08..0d0b8f6 100755 --- a/bin/update_pch.sh +++ b/bin/update_pch.sh @@ -133,6 +133,7 @@ function filter_ignore() # - sores.hxx provides BMP_PLUGIN, which is redefined # - some sources play ugly #define tricks with editeng/eeitemid.hxx # - objbase.h and oledb.h break ado +# - NSS cert.h may need to be mangled by nssrenam.h # - xmlreader.h breaks cppuhelper # - jerror.h and jpeglib.h are not self-contained # - service1.hxx/service2.hxx are inside comments in frameworks/ @@ -147,6 +148,7 @@ function filter_ignore() grep -v -F -e '#include <service2.hxx>' | \ grep -v -F -e '#include <objbase.h>' | \ grep -v -F -e '#include <oledb.h>' | \ + grep -v -F -e '#include <cert.h>' | \ grep -v -F -e '#include <xmlreader/xmlreader.hxx>' | \ grep -v -F -e '#include "jerror.h"' | \ grep -v -F -e '#include "jpeglib.h"' diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 7925c4c..6afc266 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -17,7 +17,6 @@ #include "libxml/parserInternals.h" #include <boost/noncopyable.hpp> #include <boost/scoped_array.hpp> -#include <cert.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd Author: Michael Stahl <[email protected]> Date: Fri Aug 8 14:58:08 2014 +0200 fdo#82430: configure: MSVC build: avoid using SSE2 instructions MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD 32-bit CPU, neither on Intel Pentium III. http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e diff --git a/configure.ac b/configure.ac index e20f112..89d80e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3773,6 +3773,9 @@ if test "$_os" = "WINNT"; then COMPATH=`echo $VC_PRODUCT_DIR` fi fi + if test "$BITNESS_OVERRIDE" = ""; then + CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2 + fi export INCLUDE=`cygpath -d "$COMPATH/Include"` PathFormat "$COMPATH" diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index c3d4115..8835bdf 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -31,7 +31,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ - && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \ + && $(if $(filter WNTMSC,$(OS)$(COM)),\ + REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))") \ $(if $(VERBOSE)$(verbose),V=1) \ $(gb_Helper_set_ld_path) \ $(MAKE) \ diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 12c7576..ea5f8b2 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export CC="$(shell cygpath -w $(CC))" \ + export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ && export PERL="$(shell cygpath -w $(PERL))" \ && export LIB="$(ILIB)" \ && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index f619aa7..67bd4a5 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -506,9 +506,11 @@ endef # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe gb_AUTOCONF_WRAPPERS = \ - REAL_CC="$(shell cygpath -w $(CC))" \ + REAL_CC="$(shell cygpath -w $(filter-out -%,$(CC)))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))" \ CC="$(call gb_Executable_get_target,gcc-wrapper)" \ - REAL_CXX="$(shell cygpath -w $(CXX))" \ + REAL_CXX="$(shell cygpath -w $(filter-out -%,$(CXX)))" \ + REAL_CXX_FLAGS="$(filter -%,$(CXX))" \ CXX="$(call gb_Executable_get_target,g++-wrapper)" \ LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx index d2ee3d5..289d919 100644 --- a/solenv/gcc-wrappers/g++.cxx +++ b/solenv/gcc-wrappers/g++.cxx @@ -13,8 +13,10 @@ int main(int argc, char *argv[]) { vector<string> rawargs(argv + 1, argv + argc); string command=getexe("REAL_CXX"); + string flags=getexe("REAL_CXX_FLAGS"); - string args=processccargs(rawargs); + string args=flags.empty() ? string() : flags + " "; + args += processccargs(rawargs); setupccenv(); diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx index b8983cf..8ff8148 100644 --- a/solenv/gcc-wrappers/gcc.cxx +++ b/solenv/gcc-wrappers/gcc.cxx @@ -13,8 +13,10 @@ int main(int argc, char *argv[]) { vector<string> rawargs(argv + 1, argv + argc); string command=getexe("REAL_CC"); + string flags=getexe("REAL_CC_FLAGS"); - string args=processccargs(rawargs); + string args=flags.empty() ? string() : flags + " "; + args += processccargs(rawargs); setupccenv(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
