Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Later on build, error for missing file losessioninstall.component.
I had to patch Module_shell by duplicating Linux part for Solaris.
Is this correct?
--- libreoffice-4.1.0.1/shell/Module_shell.mk   Fri Jul 19 08:27:41 2013
+++ libreoffice-4.1.0.1/shell/Module_shell.mk   Fri Jul 19 08:27:28 2013
@@ -22,6 +22,14 @@
endif
endif
+ifeq ($(OS),SOLARIS)
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Module_add_targets,shell,\
+       Library_losessioninstall \
+))
+endif
+endif
+
ifeq ($(ENABLE_GCONF),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_gconfbe \
Da:
Gabriele Bulfon
A:
Kohei Yoshida
Cc:
libreoffice-dev
Data:
18 luglio 2013 16.23.49 CEST
Oggetto:
Re: Error building sc on XStreamOS/illumos
Great! Worked, and I had also to patch this:
--- libreoffice-4.1.0.1/sc/source/core/tool/scmatrix.cxx        Thu Jul 18 16:19:54 2013
+++ libreoffice-4.1.0.1/sc/source/core/tool/scmatrix.cxx        Thu Jul 18 16:19:47 2013
@@ -89,7 +89,7 @@
}
}
-        static void delete_block(mdds::mtv::base_element_block* p)
+        static void delete_block(const mdds::mtv::base_element_block* p)
{
if (!p)
return;
----------------------------------------------------------------------------------
Da: Kohei Yoshida
A: Gabriele Bulfon
Cc: libreoffice-dev
Data: 18 luglio 2013 14.11.02 CEST
Oggetto: Re: Error building sc on XStreamOS/illumos
On 07/18/2013 03:12 AM, Gabriele Bulfon wrote:
Hi,
building went on after setup_native, and I got an error while building sc:
In file included from
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/inc/column.hxx:28,
from
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/inc/table.hxx:28,
from
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/source/core/data/bcaslot.cxx:30:
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/inc/mtvelements.hxx:66:
error: wrong number of template arguments (2, should be 1)
/usr/include/mdds/multi_type_vector_custom_func1.hpp:40: error:
provided for 'template
struct mdds::mtv::custom_block_func1'
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/inc/mtvelements.hxx:66:
error: invalid type in declaration before ';' token
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/sc/inc/mtvelements.hxx:70:
error: wrong number of template arguments (2, should be 1)
/usr/include/mdds/multi_type_vector_custom_func1.hpp:40: error:
provided for 'template
struct mdds::mtv::custom_block_func1'
what's wrong?
You are probably using mdds 0.9.0 to build the 4.1 branch.  You need to
either downgrade it to 0.8.1 (which you can easily by specifying
--without-system-mdds), or patch mtvelements.hxx to get it to build with
mdds 0.9.0.  Patching should be easy; all you have to do is to remove
the block type ID's from the template arguments i.e. making the
following change
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 1628381..037ec6b 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -63,11 +63,11 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(SvtBroadcaster, sc::element_type_broadcast
namespace sc {
// Broadcaster storage container
-typedef mdds::mtv::custom_block_func1
BCBlkFunc;
+typedef mdds::mtv::custom_block_func1
BCBlkFunc;
typedef mdds::multi_type_vector
BroadcasterStoreType;
// Cell text attribute container.
-typedef mdds::mtv::custom_block_func1
CTAttrFunc;
+typedef mdds::mtv::custom_block_func1
CTAttrFunc;
typedef mdds::multi_type_vector
CellTextAttrStoreType;
/**
should make the 4.1 branch build with 0.9.0.
HTH,
Kohei
--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.
_______________________________________________LibreOffice mailing 
listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.