external/boost/UnpackedTarball_boost.mk | 1 + external/boost/w4702.patch.0 | 10 ++++++++++ external/firebird/ExternalProject_firebird.mk | 2 +- external/libabw/ExternalProject_libabw.mk | 2 +- external/libcdr/ExternalProject_libcdr.mk | 2 +- external/libebook/ExternalProject_libebook.mk | 2 +- external/libetonyek/ExternalProject_libetonyek.mk | 2 +- external/libfreehand/ExternalProject_libfreehand.mk | 2 +- external/liblangtag/ExternalProject_langtag.mk | 2 +- external/libmspub/ExternalProject_libmspub.mk | 2 +- external/liborcus/ExternalProject_liborcus.mk | 2 +- external/libpagemaker/ExternalProject_libpagemaker.mk | 2 +- external/libvisio/ExternalProject_libvisio.mk | 2 +- external/libwpd/ExternalProject_libwpd.mk | 2 +- external/libwpg/ExternalProject_libwpg.mk | 2 +- external/nss/nss.windows.patch | 11 +++++++++++ vcl/win/source/gdi/gdiimpl.hxx | 2 +- vcl/win/source/gdi/salgdi.cxx | 2 -- 18 files changed, 36 insertions(+), 16 deletions(-)
New commits: commit 904f9284a2250e17ff4c25f2c5d7540430a0c020 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 13 16:50:36 2014 +0100 More passing of MAKE into external configure ...like 2fdf78109e815a64169fdab1a8175b63ef9c64d4 "Pass MAKE into external/poppler's configure" Change-Id: I4e2f1a13d120a7398fa81884710c589bb905714d diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index f557a361..ed802c3 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ ) \ " \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --without-editline \ --disable-superserver \ --with-system-icu --without-fbsample --without-fbsample-db \ diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index d45ef05..fd0b98a 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\ $(call gb_ExternalProject_get_state_target,libabw,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 67f79b6..fd9658d 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 1bc7f7c..5e7f2b0 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -27,7 +27,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 9f57a10..f5ea457 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ $(call gb_ExternalProject_get_state_target,libetonyek,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 39380e9..c2620c6 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ $(call gb_ExternalProject_get_state_target,libfreehand,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 8835bdf..15c78a9 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\ # Results in "cl : Command line error D8003 : missing source filename" $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ - ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ + MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index cac6c81..2bc2117 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -24,7 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ $(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index bd4abd9..85f1588 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -88,7 +88,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \ MDDS_CFLAGS='$(MDDS_CFLAGS)' \ MDDS_LIBS=' ' \ - ./configure \ + MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk index 73d06f8..f892d42 100644 --- a/external/libpagemaker/ExternalProject_libpagemaker.mk +++ b/external/libpagemaker/ExternalProject_libpagemaker.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libpagemaker,\ $(call gb_ExternalProject_get_state_target,libpagemaker,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 83eff11..db65a45 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index 88b7715..7aed651 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpd,\ $(call gb_ExternalProject_get_state_target,libwpd,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index 804a989..908af2c 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpg,\ $(call gb_ExternalProject_get_state_target,libwpg,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ commit 10a5a1511127fbc6fb1e13323ab6a77f77311747 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 13 16:48:12 2014 +0100 Work around InterlockedExchange not exported from kernel32.dll on x64 ...as reported in a comment on <http://msdn.microsoft.com/en-us/library/windows/ desktop/ms683590%28v=vs.85%29.aspx> "InterlockedExchange function" Change-Id: Ie71edd7a5ce8ff3c922d607e174a4c4d43c08c1d diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch index e94b3dd..9464bb1 100644 --- a/external/nss/nss.windows.patch +++ b/external/nss/nss.windows.patch @@ -20,3 +20,14 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) +--- a/a/nspr/pr/include/md/_win95.h ++++ b/b/nspr/pr/include/md/_win95.h +@@ -312,7 +312,7 @@ + #define _MD_ATOMIC_ADD(ptr,val) (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val) + #define _MD_ATOMIC_DECREMENT(x) InterlockedDecrement((PLONG)x) + #endif /* x86 */ +-#define _MD_ATOMIC_SET(x,y) InterlockedExchange((PLONG)x, (LONG)y) ++#define _MD_ATOMIC_SET(x,y) _InterlockedExchange((PLONG)x, (LONG)y) + + #define _MD_INIT_IO _PR_MD_INIT_IO + commit b3a6a93abb26e2c1ba987ed7dcd42923f2ef63ba Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 13 16:44:42 2014 +0100 external/boost: WaE Change-Id: Iffc69577f12020c60bf5db1f740ec3fec43c3d8e diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index a8bd12b..3a760fd 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -105,6 +105,7 @@ boost_patches += boost.wunused.patch boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost.signal2.Wshadow.warnings.patch boost_patches += boost.boost_static_assert_unused_attribute.patch.0 +boost_patches += w4702.patch.0 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/w4702.patch.0 b/external/boost/w4702.patch.0 new file mode 100644 index 0000000..74391fe --- /dev/null +++ b/external/boost/w4702.patch.0 @@ -0,0 +1,10 @@ +--- boost/signals2/detail/variadic_slot_invoker.hpp ++++ boost/signals2/detail/variadic_slot_invoker.hpp +@@ -115,7 +115,6 @@ + const void_type *) const + { + return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>()); +- return void_type(); + } + template<typename ConnectionBodyType> + result_type m_invoke(const ConnectionBodyType &connectionBody, ...) const commit 5f9969da4601855c66127f7977f7ce8d30abe5cd Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 13 16:44:13 2014 +0100 Remove unused #include Change-Id: Idbd1052355dc10795440fc71b5517b6594461c63 diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 9ef4793..ecbc851 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -39,8 +39,6 @@ #include <vcl/opengl/OpenGLHelper.hxx> -#include <officecfg/Office/Common.hxx> - #define DITHER_PAL_DELTA 51 #define DITHER_PAL_STEPS 6 #define DITHER_PAL_COUNT (DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS) commit 3bc78657cbbca66815073cdd1fad7324b0c65c95 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 13 16:43:50 2014 +0100 WaE Change-Id: If061fd4c228b5288173a045430608b34b138c178 diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx index b21f138..a1c781a 100644 --- a/vcl/win/source/gdi/gdiimpl.hxx +++ b/vcl/win/source/gdi/gdiimpl.hxx @@ -192,7 +192,7 @@ public: /** Render 32-bits bitmap with alpha channel */ virtual bool drawAlphaBitmap( const SalTwoRect&, - const SalBitmap& rBitmap ) SAL_OVERRIDE {return false;} + const SalBitmap& ) SAL_OVERRIDE {return false;} /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */ virtual bool drawTransformedBitmap( _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits