Library_merged.mk | 26
++-
Makefile.top | 2
Module_tail_build.mk | 1
RepositoryExternal.mk | 17 ++
RepositoryModule_ooo.mk | 1
android/experimental/DocumentLoader/Makefile | 8 -
android/experimental/LibreOffice4Android/Makefile | 11 -
android/qa/desktop/Makefile | 11 -
android/qa/sc/Makefile | 7
android/qa/simple/Makefile | 4
basebmp/Library_basebmp.mk | 2
basebmp/prj/build.lst | 2
config_host.mk.in | 1
configure.in | 3
formula/source/core/api/services.cxx | 2
formula/util/for.component | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component | 2
lingucomponent/source/languageguessing/guesslang.component | 2
lingucomponent/source/languageguessing/guesslang.cxx | 2
lingucomponent/source/spellcheck/spell/spell.component | 2
lingucomponent/source/spellcheck/spell/sreg.cxx | 2
lingucomponent/source/thesaurus/libnth/lnth.component | 2
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 2
ooo.lst.in | 2
shell/source/backends/desktopbe/desktopbackend.cxx | 2
shell/source/backends/desktopbe/desktopbe1.component | 2
shell/source/backends/localebe/localebe1.component | 2
shell/source/backends/localebe/localebecdef.cxx | 3
solenv/gbuild/extensions/pre_MergedLibsList.mk | 12 +
tail_build/prj/build.lst | 2
vigra/Makefile | 7
vigra/Module_vigra.mk | 20 ++
vigra/UnpackedTarball_vigra.mk | 21 ++
vigra/makefile.mk | 80
----------
vigra/prj/d.lst | 3
36 files changed, 128 insertions(+), 144 deletions(-)
New commits:
commit 54a06c6820e13cae1401302c031cd15bd961eb7a
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Aug 25 01:29:00 2012 +0200
vigra: convert to gbuild
Change-Id: Ie5f050bf5f672a35d9629dcfb039d9fff7470cab
diff --git a/Makefile.top b/Makefile.top
index 9c65046..643bcbb 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -158,6 +158,7 @@ ure\
uui\
vbahelper\
vcl\
+vigra\
wizards\
writerfilter\
writerperfect\
@@ -245,7 +246,6 @@ stax\
stlport\
sysui\
tomcat\
-vigra\
xpdf\
xsltml\
zlib\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ec8e709..b3c2424 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -141,6 +141,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
uui \
vbahelper \
vcl \
+ vigra \
wizards \
writerfilter \
writerperfect \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a2f165e..cf41f69 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -92,6 +92,23 @@ endef
endif
+ifeq ($(SYSTEM_VIGRA),YES)
+
+gb_LinkTarget__use_vigra_headers :=
+
+else
+
+define gb_LinkTarget__use_vigra_headers
+$(call gb_LinkTarget_use_unpacked,$(1),vigra)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,vigra/include) \
+ $$(INCLUDE) \
+)
+
+endef
+
+endif
+
# External libraries
ifeq ($(SYSTEM_CPPUNIT),YES)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 52c5b8c..3a41413 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -157,6 +157,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
uui \
vbahelper \
vcl \
+ vigra \
wizards \
writerfilter \
writerperfect \
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 756840b..95230ba 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
$(eval $(call gb_Library_use_sdk_api,basebmp))
+$(eval $(call gb_Library_use_external,basebmp,vigra_headers))
+
$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
sal \
diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst
index 2b0fa1e..6da46bb 100644
--- a/basebmp/prj/build.lst
+++ b/basebmp/prj/build.lst
@@ -1,2 +1,2 @@
-bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL
+bx basebmp : sal vigra basegfx BOOST:boost NULL
bx basebmp\prj nmake
- all bx_prj NULL
diff --git a/config_host.mk.in b/config_host.mk.in
index 2653e31..c6ffc88 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -573,6 +573,7 @@ export UUIDGEN=@UUIDGEN@
export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
export VERBOSE=@VERBOSE@
+export VIGRA_TARBALL=@VIGRA_TARBALL@
export VISIO_CFLAGS=@VISIO_CFLAGS@
export VISIO_LIBS=@VISIO_LIBS@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
diff --git a/configure.in b/configure.in
index 1cd763e..fa24279 100644
--- a/configure.in
+++ b/configure.in
@@ -7738,10 +7738,11 @@ if test "$with_system_vigra" = "yes"; then
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE VIGRA"
+ VIGRA_TARBALL=ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
SYSTEM_VIGRA=NO
fi
AC_SUBST(SYSTEM_VIGRA)
+AC_SUBST(VIGRA_TARBALL)
dnl ===================================================================
dnl Check for system odbc
diff --git a/ooo.lst.in b/ooo.lst.in
index 17e6842..93a0395 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -46,7 +46,7 @@
e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
-ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+@VIGRA_TARBALL@
dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7fc74f2..ffca1aa 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker
CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib
GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools
JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub
LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps
LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes
NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra
XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt
jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino
ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader
xsltml N
ULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker
CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib
GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools
JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub
LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps
LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes
NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf
ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess
jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal
salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/vigra/Makefile b/vigra/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/vigra/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/Module_vigra.mk b/vigra/Module_vigra.mk
new file mode 100644
index 0000000..af2369f
--- /dev/null
+++ b/vigra/Module_vigra.mk
@@ -0,0 +1,20 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_Module_Module,vigra))
+
+ifeq ($(SYSTEM_VIGRA),NO)
+
+$(eval $(call gb_Module_add_targets,vigra,\
+ UnpackedTarball_vigra \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/UnpackedTarball_vigra.mk b/vigra/UnpackedTarball_vigra.mk
new file mode 100644
index 0000000..72e6209
--- /dev/null
+++ b/vigra/UnpackedTarball_vigra.mk
@@ -0,0 +1,21 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,vigra,\
+ vigra/vigra1.4.0.patch \
+ $(if $(filter GCC,$(COM)), \
+ vigra/vigra1.4.0-unused-parameters.patch) \
+ vigra/vigra1.4.0-enumwarn.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
deleted file mode 100644
index ff35173..0000000
--- a/vigra/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# dmake create_clean -- just unpacks
-# dmake patch -- unpacks and applies patch file
-# dmake create_patch -- creates a patch file
-
-PRJ=.
-
-PRJNAME=vigra
-TARGET=vigra
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_VIGRA)" == "YES"
-all:
- @echo "An already available installation of vigra should exist on your
system."
- @echo "Therefore the version provided here does not need to be built in
addition."
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=vigra1.4.0
-TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a
-PATCH_FILES=$(TARFILE_NAME).patch
-
-# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
-.IF "$(COM)" == "GCC"
-PATCH_FILES += vigra1.4.0-unused-parameters.patch
-.END
-
-# At least GCC 4.7 treats more correctly now the type of enumerators prior to
-# the closing brace of the enum-specifier (see [dcl.enum] in the C++ 2003
-# Standard), leading to "comparison between <enum1> and <enum2> [-Werror=enum-
-# compare]" and "enumeral mismatch in conditional expression [-Werror]"
-# warnings (included upstream as <https://github.com/ukoethe/vigra/commit/
-# e0dcd31c76bb13c98920e21544b309ca47bb3c5c> "added explicit cast (gcc 4.7
-# compatibility patch by Stephan Bergmann)"):
-PATCH_FILES += vigra1.4.0-enumwarn.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
index ddf8faf..e69de29 100644
--- a/vigra/prj/d.lst
+++ b/vigra/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\vigra
-
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/vigra/prj/dmake b/vigra/prj/dmake
deleted file mode 100644
index e69de29..0000000
commit 3f750f8e7b4e79282202aa2d2027922bd1fe3bdd
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Aug 25 12:13:29 2012 +0200
merge more, mostly small libraries for android
Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0
diff --git a/Library_merged.mk b/Library_merged.mk
index 1a5b6c3..2a53b60 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -54,6 +54,20 @@ $(eval $(call gb_Library_use_externals,merged,\
zlib \
))
+# This would be needed on all platforms but only on android we merge libraries
from lingucomponent
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Library_use_externals,merged,\
+ hunspell \
+))
+$(eval $(call gb_Library_use_static_libraries,merged,\
+ ulingu \
+))
+$(eval $(call gb_Library_add_libs,merged,\
+ $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+ $(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \
+))
+endif
+
ifeq ($(ENABLE_GRAPHITE),TRUE)
$(eval $(call gb_Library_use_externals,merged,\
graphite \
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 9a8fb44..1253992 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -62,8 +62,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- forlo \
- foruilo \
frmlo \
gcc3_uno \
hwplo \
@@ -120,7 +118,6 @@ copy-stuff:
xmlreader \
xmlsecurity \
xslt \
- xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
done
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index a784f12..20253ac 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -35,12 +35,9 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- forlo \
- foruilo \
frmlo \
gcc3_uno \
hwplo \
- hyphenlo \
i18nisolang1gcc3 \
icudatalo \
icui18nlo \
@@ -53,7 +50,6 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
libotouchlo \
- lnthlo \
lo-bootstrap \
localedata_en \
localedata_es \
@@ -73,7 +69,6 @@ copy-stuff:
sdlo \
sddlo \
smdlo \
- spelllo \
stocservices.uno \
store \
svgfilterlo \
@@ -102,7 +97,6 @@ copy-stuff:
xmlsecurity \
xoflo \
xslt \
- xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
done
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 5e74d68..3adc9ee 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -98,10 +98,7 @@ copy-stuff: buildrcs
cppcanvaslo \
embobj \
expwrap.uno \
- forlo \
- foruilo \
gcc3_uno \
- hyphenlo \
i18nisolang1gcc3 \
icudatalo \
icui18nlo \
@@ -111,7 +108,6 @@ copy-stuff: buildrcs
jvmfwk \
libotouchlo \
introspection.uno \
- lnthlo \
localedata_en \
localedata_es \
localedata_euro \
@@ -121,7 +117,6 @@ copy-stuff: buildrcs
ooxlo \
reflection.uno \
reg \
- spelllo \
stocservices.uno \
store \
test \
@@ -139,7 +134,6 @@ copy-stuff: buildrcs
xmlreader \
xmlsecurity \
xslt \
- xstor \
\
swlo \
swuilo \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3cc0a64..5c2de66 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -67,8 +67,6 @@ copy-stuff:
datelo \
expwrap.uno \
fastsax.uno \
- forlo \
- foruilo \
frmlo \
gcc3_uno \
i18nisolang1gcc3 \
@@ -106,7 +104,6 @@ copy-stuff:
vbahelperlo \
xml2 \
xmlreader \
- xstor \
); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3fe296b..5b2f6a8 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -71,8 +71,14 @@ gb_MERGEDLIBS += $(if $(filter
TRUE,$(ENABLE_TELEPATHY)),tubes)
ifeq ($(OS),ANDROID)
gb_MERGEDLIBS += \
fileacc \
+ for \
+ forui \
fwl \
fwm \
+ hyphen \
+ lnth \
+ spell \
+ xstor \
endif
commit 0ba9114c12e50acdde52e89408bffbca7dac49e5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Aug 25 11:48:05 2012 +0200
prefix more components
Change-Id: I9bf304a791b62f6b96711eb058f302cadfdb276a
diff --git a/formula/source/core/api/services.cxx
b/formula/source/core/api/services.cxx
index 90bfc8a..de97b4f 100644
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -43,7 +43,7 @@ cppu::ImplementationEntry entries[] = {
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL for_component_getFactory(
char const * implName, void * serviceManager, void * registryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/formula/util/for.component b/formula/util/for.component
index 53bccad..0d8c8a5 100644
--- a/formula/util/for.component
+++ b/formula/util/for.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="for"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="simple.formula.FormulaOpCodeMapperObj">
<service name="com.sun.star.sheet.FormulaOpCodeMapper"/>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
index d0f6102..c213cc6 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
@@ -50,7 +50,7 @@ extern void * SAL_CALL Hyphenator_getFactory(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL hyphen_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = Hyphenator_getFactory(
diff --git
a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
index aeae4c5..bff11d1 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="hyphen"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.lingu.LibHnjHyphenator">
<service name="com.sun.star.linguistic2.Hyphenator"/>
diff --git a/lingucomponent/source/languageguessing/guesslang.component
b/lingucomponent/source/languageguessing/guesslang.component
index 633a489..c5a18e5 100644
--- a/lingucomponent/source/languageguessing/guesslang.component
+++ b/lingucomponent/source/languageguessing/guesslang.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="guesslang"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.lingu2.LanguageGuessing">
<service name="com.sun.star.linguistic2.LanguageGuessing"/>
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index ecbf7ab..d3df37a 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -424,7 +424,7 @@ static struct ::cppu::ImplementationEntry
s_component_entries [] =
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL guesslang_component_getFactory(
sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
registry::XRegistryKey * xRegistry )
{
diff --git a/lingucomponent/source/spellcheck/spell/spell.component
b/lingucomponent/source/spellcheck/spell/spell.component
index 9f951a8..5a7359f 100644
--- a/lingucomponent/source/spellcheck/spell/spell.component
+++ b/lingucomponent/source/spellcheck/spell/spell.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="spell"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.lingu.MySpellSpellChecker">
<service name="com.sun.star.linguistic2.SpellChecker"/>
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx
b/lingucomponent/source/spellcheck/spell/sreg.cxx
index 93bcbe6..d5ed66f 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -48,7 +48,7 @@ extern void * SAL_CALL SpellChecker_getFactory(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL spell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = NULL;
diff --git a/lingucomponent/source/thesaurus/libnth/lnth.component
b/lingucomponent/source/thesaurus/libnth/lnth.component
index bea91b9..0b2c990 100644
--- a/lingucomponent/source/thesaurus/libnth/lnth.component
+++ b/lingucomponent/source/thesaurus/libnth/lnth.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="lnth"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="org.openoffice.lingu.new.Thesaurus">
<service name="com.sun.star.linguistic2.Thesaurus"/>
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index 0efe46e..f09aace 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
@@ -50,7 +50,7 @@ extern void * SAL_CALL Thesaurus_getFactory(
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL lnth_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = Thesaurus_getFactory(
commit 4d7b9557052a31319b0583b46340fbc64de056c5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Aug 12 18:06:31 2012 +0200
libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
diff --git a/Library_merged.mk b/Library_merged.mk
index b793544..1a5b6c3 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -34,19 +34,17 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nisolang1 \
- i18nutil \
jvmfwk \
sal \
salhelper \
- sax \
tl \
ucbhelper \
- utl \
xmlreader \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,merged,\
+ icui18n \
icule \
icuuc \
jpeg \
@@ -118,6 +116,7 @@ $(eval $(call gb_Library_use_externals,merged,\
carbon \
cocoa \
corefoundation \
+ coreservices \
quicktime \
))
endif
@@ -164,4 +163,11 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
+ifeq ($(ENABLE_LIBLANGTAG),YES)
+$(eval $(call gb_Library_use_externals,merged,\
+ glib \
+ liblangtag \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 063bef2..9a8fb44 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -68,8 +68,6 @@ copy-stuff:
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
- i18npool.uno \
- i18nutilgcc3 \
icudatalo \
icui18nlo \
iculelo \
@@ -82,7 +80,6 @@ copy-stuff:
jvmfwk \
libotouchlo \
lo-bootstrap \
- localebe1.uno \
localedata_en \
localedata_others \
lwpftlo \
@@ -92,7 +89,6 @@ copy-stuff:
ooxlo \
reflection.uno \
reg \
- saxlo \
sclo \
scdlo \
scfiltlo \
@@ -115,7 +111,6 @@ copy-stuff:
uno_cppuhelpergcc3 \
unordflo \
unoxmllo \
- utllo \
vbahelperlo \
vbaswobj.uno \
wpftdrawlo \
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index baeabdf..a784f12 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -42,8 +42,6 @@ copy-stuff:
hwplo \
hyphenlo \
i18nisolang1gcc3 \
- i18npool.uno \
- i18nutilgcc3 \
icudatalo \
icui18nlo \
iculelo \
@@ -57,7 +55,6 @@ copy-stuff:
libotouchlo \
lnthlo \
lo-bootstrap \
- localebe1.uno \
localedata_en \
localedata_es \
localedata_euro \
@@ -69,7 +66,6 @@ copy-stuff:
ooxlo \
reflection.uno \
reg \
- saxlo \
sclo \
sclo \
scdlo \
@@ -96,7 +92,6 @@ copy-stuff:
uno_cppuhelpergcc3 \
unordflo \
unoxmllo \
- utllo \
vbahelperlo \
vbaswobj.uno \
wpftdrawlo \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 734cb56..5e74d68 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -103,8 +103,6 @@ copy-stuff: buildrcs
gcc3_uno \
hyphenlo \
i18nisolang1gcc3 \
- i18npool.uno \
- i18nutilgcc3 \
icudatalo \
icui18nlo \
iculelo \
@@ -114,7 +112,6 @@ copy-stuff: buildrcs
libotouchlo \
introspection.uno \
lnthlo \
- localebe1.uno \
localedata_en \
localedata_es \
localedata_euro \
@@ -124,7 +121,6 @@ copy-stuff: buildrcs
ooxlo \
reflection.uno \
reg \
- saxlo \
spelllo \
stocservices.uno \
store \
@@ -138,7 +134,6 @@ copy-stuff: buildrcs
unordflo \
unotest \
unoxmllo \
- utllo \
vbahelperlo \
xml2 \
xmlreader \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a455939..3cc0a64 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -72,8 +72,6 @@ copy-stuff:
frmlo \
gcc3_uno \
i18nisolang1gcc3 \
- i18npool.uno \
- i18nutilgcc3 \
icudatalo \
icui18nlo \
iculelo \
@@ -90,7 +88,6 @@ copy-stuff:
ooxlo \
reflection.uno \
reg \
- saxlo \
sclo \
scfiltlo \
stocservices.uno \
@@ -106,7 +103,6 @@ copy-stuff:
unoexceptionprotector \
unotest \
unoxmllo \
- utllo \
vbahelperlo \
xml2 \
xmlreader \
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index fa97425..2ce7bd3 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -66,12 +66,12 @@ copy-stuff:
comphelpgcc3 \
gcc3_uno \
i18nisolang1gcc3 \
- i18nutilgcc3 \
icudatalo \
icui18nlo \
icuuclo \
localedata_en \
localedata_others \
+ mergedlo \
reg \
store \
ucbhelper4gcc3 \
@@ -82,7 +82,7 @@ copy-stuff:
xml2 \
xmlreader \
bootstrap.uno \
- i18npool.uno); do \
+ ); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
#
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx
b/shell/source/backends/desktopbe/desktopbackend.cxx
index e84e096..8f05182 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -249,7 +249,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
desktopbe1_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/shell/source/backends/desktopbe/desktopbe1.component
b/shell/source/backends/desktopbe/desktopbe1.component
index 9ef1421..9b1df73 100644
--- a/shell/source/backends/desktopbe/desktopbe1.component
+++ b/shell/source/backends/desktopbe/desktopbe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="desktopbe1"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation
name="com.sun.star.comp.configuration.backend.DesktopBackend">
<service name="com.sun.star.configuration.backend.DesktopBackend"/>
diff --git a/shell/source/backends/localebe/localebe1.component
b/shell/source/backends/localebe/localebe1.component
index 7236a61..8391382 100644
--- a/shell/source/backends/localebe/localebe1.component
+++ b/shell/source/backends/localebe/localebe1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="localebe1"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.comp.configuration.backend.LocaleBackend">
<service name="com.sun.star.configuration.backend.LocaleBackend"/>
diff --git a/shell/source/backends/localebe/localebecdef.cxx
b/shell/source/backends/localebe/localebecdef.cxx
index ee7b1ed..b10d791 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -59,7 +59,8 @@ static const cppu::ImplementationEntry
kImplementations_entries[] =
//------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const
sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory(
+ const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 1c4519c..3fe296b 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -34,6 +34,7 @@ gb_MERGEDLIBS := \
configmgr \
cppcanvas \
deploymentmisc \
+ desktopbe1 \
drawinglayer \
editeng \
filterconfig \
@@ -41,8 +42,12 @@ gb_MERGEDLIBS := \
fwe \
fwi \
fwk \
+ i18npool \
+ i18nutil \
lng \
+ localebe1 \
package2 \
+ sax \
sb \
sfx \
sofficeapp \
@@ -55,6 +60,7 @@ gb_MERGEDLIBS := \
tk \
ucb1 \
ucpfile1 \
+ utl \
uui \
vcl \
xmlscript \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
