[Libreoffice-commits] core.git: 4 commits - external/icu filter/source RepositoryExternal.mk sal/osl stoc/Library_javaloader.mk stoc/source
Michael Stahl
mstahl at redhat.com
Wed Jul 23 15:40:57 PDT 2014
RepositoryExternal.mk | 4 +++
external/icu/ExternalPackage_icu.mk | 4 ---
external/icu/ExternalPackage_icu_ure.mk | 33 ++++++++++++++++++++++++++++++++
external/icu/Module_icu.mk | 1
filter/source/svg/svgfilter.hxx | 13 ------------
sal/osl/w32/procimpl.cxx | 5 ++++
stoc/Library_javaloader.mk | 2 +
stoc/source/javaloader/javaloader.cxx | 8 ++++---
8 files changed, 50 insertions(+), 20 deletions(-)
New commits:
commit 057613c6864204ac5c09260e93a8f14cc9768b90
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jul 24 00:22:51 2014 +0200
icu: un-break installation of Java extensions on Windows (rel. fdo#63756)
Linking libxml2 against ICU libraries has a nasty side effect:
The URE library javavm.dll links against URE libxml2.dll, which
is now linked against OOO icuuc53.dll; when a URE program, like
uno.exe, tries to load javavm.dll it fails because the OOO layer
"program" dir is not on PATH; this breaks the installation of Java
extensions.
Fix that by splitting up ICU libraries and putting the required ones
into URE layer.
(regression from 7515b1a90fac9e31733c0fdcc1156adadf0e6f99)
Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8a2ab1f..15bd09b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1393,6 +1393,10 @@ endef
else # !SYSTEM_ICU
+$(eval $(call gb_Helper_register_packages_for_install,ure, \
+ icu_ure \
+))
+
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
icu \
))
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk
index be3a1d8..4c90d8f 100644
--- a/external/icu/ExternalPackage_icu.mk
+++ b/external/icu/ExternalPackage_icu.mk
@@ -18,14 +18,10 @@ ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\
- source/lib/icudt$(ICU_MAJOR).dll \
- source/lib/icuuc$(ICU_MAJOR).dll \
source/lib/icuin$(ICU_MAJOR).dll \
))
else
$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\
- source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
- source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
))
endif # $(COM)
diff --git a/external/icu/ExternalPackage_icu_ure.mk b/external/icu/ExternalPackage_icu_ure.mk
new file mode 100644
index 0000000..a016c8c
--- /dev/null
+++ b/external/icu/ExternalPackage_icu_ure.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# libxml2 is in URE and depends on icuuc*.dll on Windows - extra package needed
+$(eval $(call gb_ExternalPackage_ExternalPackage,icu_ure,icu))
+
+$(eval $(call gb_ExternalPackage_use_external_project,icu_ure,icu))
+
+ifneq ($(DISABLE_DYNLOADING),TRUE)
+ifeq ($(OS),WNT)
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\
+ source/lib/icudt$(ICU_MAJOR).dll \
+ source/lib/icuuc$(ICU_MAJOR).dll \
+))
+else
+$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\
+ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
+ source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
+))
+endif # $(COM)
+
+endif # $(OS)
+endif # DISABLE_DYNLOADING
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/icu/Module_icu.mk b/external/icu/Module_icu.mk
index 258c26e..5c99b93 100644
--- a/external/icu/Module_icu.mk
+++ b/external/icu/Module_icu.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,icu))
$(eval $(call gb_Module_add_targets,icu,\
UnpackedTarball_icu \
ExternalPackage_icu \
+ ExternalPackage_icu_ure \
ExternalProject_icu \
))
commit 73b2ef39fc5e748e80dca72268b67e5a0d6da8ff
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 23 21:12:55 2014 +0200
sal: avoid STL asserts in create_merged_environment
"Assertion failed: sequence not ordered" printed when running smoketest
Change-Id: Id9b7541f43342adf62137718dc332c0187c32f57
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index bccda26..e560a7b 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -129,6 +129,11 @@ namespace /* private */
p += l + 1;
}
FreeEnvironmentStrings(env);
+
+ // it is apparently possible that the environment is not completely
+ // sorted; Cygwin may append entries, which breaks the equal_range
+ std::stable_sort(environment->begin(), environment->end(),
+ less_environment_variable());
}
/* the environment list must be sorted, new values
commit 1d36d91d0a1814ba209e683f74658a92e167a73f
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 23 22:58:49 2014 +0200
use BOOST_STATIC_ASSERT for sizeof check
Change-Id: Iad00aa47ef65fe163eff407549c26eb3590ab132
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 3d191f9..cce32f8 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Library_Library,javaloader))
+$(eval $(call gb_Library_use_external,javaloader,boost_headers))
+
$(eval $(call gb_Library_use_udk_api,javaloader))
$(eval $(call gb_Library_use_libraries,javaloader,\
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 335356a..477ffa5 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -18,6 +18,9 @@
*/
#include <cstdarg>
+
+#include <boost/static_assert.hpp>
+
#include <osl/diagnose.h>
#include <osl/process.h>
@@ -155,9 +158,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
// as long as our reference to the XJavaVM service lasts), and
// convert the non-refcounted pointer into a refcounted one
// immediately:
- OSL_ENSURE(sizeof (sal_Int64)
- >= sizeof (jvmaccess::UnoVirtualMachine *),
- "Pointer cannot be represented as sal_Int64");
+ BOOST_STATIC_ASSERT(sizeof (sal_Int64)
+ >= sizeof (jvmaccess::UnoVirtualMachine *));
sal_Int64 nPointer = reinterpret_cast< sal_Int64 >(
static_cast< jvmaccess::UnoVirtualMachine * >(0));
javaVM_xJavaVM->getJavaVM(processID) >>= nPointer;
commit 23c5a5362b12b2cf6bbd49e43e0bbf6c8848fc14
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 23 22:49:59 2014 +0200
remove some unused headers from svgfilter.hxx
Change-Id: Ide1319b0b3504f8084d2dfb999b5ece35b95be8f
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 0435ef7..e41a3dc 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -38,18 +38,9 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/presentation/AnimationEffect.hpp>
-#include <com/sun/star/presentation/AnimationSpeed.hpp>
-#include <com/sun/star/presentation/ClickAction.hpp>
-#include <com/sun/star/presentation/FadeEffect.hpp>
#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/java/XJavaVM.hpp>
-#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/xml/sax/XWriter.hpp>
#include <boost/unordered_set.hpp>
@@ -62,15 +53,12 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/tempfile.hxx>
-#include <unotools/localfilehelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/metaact.hxx>
#include <svtools/grfmgr.hxx>
-#include <svx/unomodel.hxx>
#include <svx/unoapi.hxx>
#include <svx/svdxcgv.hxx>
#include <svx/svdobj.hxx>
@@ -85,7 +73,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::java;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::style;
More information about the Libreoffice-commits
mailing list