[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Tor Lillqvist (via logerrit)]

 static/README.wasm.md |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit b7bcd8b77006922e2df5388b67c0d73f3db72ce3
Author: Tor Lillqvist 
AuthorDate: Wed Dec 14 21:38:08 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 24 07:56:40 2023 +

Update Qt5 build instructions to use Allotropia's pre-patched repo

Change-Id: I4b739e36a008940705b32a2c83757520e2ae1add
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144196
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147562
Tested-by: Tor Lillqvist 

diff --git a/static/README.wasm.md b/static/README.wasm.md
index c0fe6354e1a5..2a8727a1a5aa 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -54,19 +54,14 @@ generally the Qt6 WASM documentation is much better, 
because it incorporated man
 information from the Qt Wiki.
 
 FWIW: Qt 5.15 LTS is not maintained publicly and Qt WASM has quite a few bugs. 
Most
-WASM fixes from Qt 6 are needed for Qt 5.15 too. They can mainly be 
cherry-picked from:
-- git log origin/dev src/plugins/platforms/wasm/
-- git log --grep wasm origin/dev
+WASM fixes from Qt 6 are needed for Qt 5.15 too. Allotropia offers a Qt 
repository
+with the necessary patches cherry-picked.
 
-We will probably offer our own Qt repository clone at some point.
-
-But even the public Qt 5.15 branch is still broken, so better start with the 
v5.15.2 tag.
-
-git clone https://github.com/qt/qt5.git
+git clone https://github.com/allotropia/qt5.git
 cd qt5
-git checkout v5.15.2
+git checkout v5.15.2+wasm
 ./init-repository --module-subset=qtbase
-./configure -xplatform wasm-emscripten -feature-thread -prefix 
$PWD/install-5.15.2
+./configure -xplatform wasm-emscripten -feature-thread -prefix 
 make -j module-qtbase
 
 Optionally you can add the configure flag "-compile-examples". But then you 
also have to

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Tor Lillqvist (via logerrit)]

 static/README.wasm.md |4 
 1 file changed, 4 insertions(+)

New commits:
commit 26ad026bdd2dc6397465f9acdf18248ad6201e93
Author: Tor Lillqvist 
AuthorDate: Mon Feb 13 11:04:30 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 23 18:32:48 2023 +

Mention that Emscripten 3.1.30 is known to work for COWASM

Change-Id: Id01004121a306dea953b908c32acc7f2c0e6841c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146857
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147533

diff --git a/static/README.wasm.md b/static/README.wasm.md
index 0ca4d3564413..c0fe6354e1a5 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -364,6 +364,10 @@ For instance, this autogen.input works for me:
 `--disable-gui`
 `--with-main-module=writer`
 
+For building LO core for use in COWASM, it is known to work to use
+Emscripten 3.1.30 (and not just 2.0.31 which is what the LO+Qt5 work
+has been using).
+
 ### That's all
 
 After all, in this case you are building LO core headless for it to be used by 
other software.

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Tor Lillqvist (via logerrit)]

 static/README.wasm.md |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1379b0adfb58eee93c2489cca71bfc83f1e1ffd1
Author: Tor Lillqvist 
AuthorDate: Mon Feb 13 10:56:36 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 23 18:32:31 2023 +

Don't overload the word 'module' unnecessarily

Change-Id: I10fb7d16192ddfb0802c976419c00302d4688c4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146856
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147532

diff --git a/static/README.wasm.md b/static/README.wasm.md
index b9085fa9617a..0ca4d3564413 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -1,6 +1,6 @@
 # Support for Emscripten Cross Build
 
-This module provides support for building LibreOffice as WASM, with the 
Emscripten toolchain.
+This subdirecctory provides support for building LibreOffice as WASM, with the 
Emscripten toolchain.
 
 You can build LibreOffice for WASM for two separate purposes: 1)
 Either to produce a WASM binary of LibreOffice as such, using Qt5 for

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Tor Lillqvist (via logerrit)]

 static/README.wasm.md |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit c9d40dcd1036fe84a10c2fe31e44f0a86f34bc4d
Author: Tor Lillqvist 
AuthorDate: Mon Feb 6 11:57:15 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 23 18:30:46 2023 +

Minor typo fixes and some additional information

Change-Id: Ic0b76ca37dce37f88df62d80495e111c4d50818e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146572
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147529

diff --git a/static/README.wasm.md b/static/README.wasm.md
index 8ef30f7605ac..b9085fa9617a 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -2,11 +2,11 @@
 
 This module provides support for building LibreOffice as WASM, with the 
Emscripten toolchain.
 
-You can build LibreOffice core for WASM for two separate purposes:
-Either to produce a WASM binary of LibreOffice as such, using Qt5 as
-the GUI, or just compiling the LibreOffice code to WASM libraries
-without any UI for use in other software that has the UI, like
-Collabora Online.
+You can build LibreOffice for WASM for two separate purposes: 1)
+Either to produce a WASM binary of LibreOffice as such, using Qt5 for
+its GUI, or 2) just compiling LibreOffice core ("LibreOffice
+Technology") to WASM without any UI for use in other software that
+provides the UI, like Collabora Online built as WASM.
 
 The first purpose was the original reason for the WASM port and this
 document was originally written with that in mind. For the second
@@ -350,7 +350,8 @@ Follow the instructions in the first part of this document.
 
 ### No Qt needed.
 
-You don't need any dependencies other than those that building LO normally 
downloads and compiled when building core.
+You don't need any dependencies other than those that normally are
+downloaded and compiled when building LibreOffice.
 
 ### Set up LO
 
@@ -366,3 +367,9 @@ For instance, this autogen.input works for me:
 ### That's all
 
 After all, in this case you are building LO core headless for it to be used by 
other software.
+
+Note that a soffice.wasm will be built, but that is just because of
+how the makefilery has been set up. We do need the soffice.data file
+that contains the in-memory file system needed by the LibreOffice
+Technology core code during run-time, though. That is at the moment
+built as a side-effect when building soffice.wasm.

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Andrea Gelmini (via logerrit)]

 static/README.wasm.md |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a53685beb7ea9dc68eda96a51669a03c448a129
Author: Andrea Gelmini 
AuthorDate: Fri Feb 3 11:46:18 2023 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Feb 23 18:30:30 2023 +

Fix typo

Change-Id: I48064f95fec07b414bd2addf0d65e2066aa1b42b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146540
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147528
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/static/README.wasm.md b/static/README.wasm.md
index d345edd51baf..8ef30f7605ac 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -3,7 +3,7 @@
 This module provides support for building LibreOffice as WASM, with the 
Emscripten toolchain.
 
 You can build LibreOffice core for WASM for two separate purposes:
-Either to produce a WASM binary of LibreOffice as suchn, using Qt5 as
+Either to produce a WASM binary of LibreOffice as such, using Qt5 as
 the GUI, or just compiling the LibreOffice code to WASM libraries
 without any UI for use in other software that has the UI, like
 Collabora Online.

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - static/README.wasm.md

[Tor Lillqvist (via logerrit)]

 static/README.wasm.md |   39 +--
 1 file changed, 37 insertions(+), 2 deletions(-)

New commits:
commit a9b8e9df244bc59111a922b21290331c9cafcb60
Author: Tor Lillqvist 
AuthorDate: Thu Feb 2 13:38:02 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 23 18:30:11 2023 +

Add instructions for when building headless LO core for WASM

Change-Id: Ic5fb943f8c26d21d94bafb815963960bdd2f26b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146497
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147527

diff --git a/static/README.wasm.md b/static/README.wasm.md
index 7bca790acf7a..d345edd51baf 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -1,8 +1,19 @@
 # Support for Emscripten Cross Build
 
-This module provides support for emscripten cross build
+This module provides support for building LibreOffice as WASM, with the 
Emscripten toolchain.
 
-## Status
+You can build LibreOffice core for WASM for two separate purposes:
+Either to produce a WASM binary of LibreOffice as suchn, using Qt5 as
+the GUI, or just compiling the LibreOffice code to WASM libraries
+without any UI for use in other software that has the UI, like
+Collabora Online.
+
+The first purpose was the original reason for the WASM port and this
+document was originally written with that in mind. For the second
+purpose, look towards the end of the document for the section
+"Building headless LibreOffice as WASM for use in another product".
+
+## Status of LibreOffice as WASM with Qt
 
 The build generates a Writer-only LO build. You should be able to run either
 
@@ -331,3 +342,27 @@ Emscripten supports standalone WASI binaries:
 - 

 - 
 
+## Building headless LibreOffice as WASM for use in another product
+
+### Set up Emscripten
+
+Follow the instructions in the first part of this document.
+
+### No Qt needed.
+
+You don't need any dependencies other than those that building LO normally 
downloads and compiled when building core.
+
+### Set up LO
+
+For instance, this autogen.input works for me:
+
+`--disable-debug`
+`--enable-sal-log`
+`--disable-crashdump`
+`--host=wasm32-local-emscripten`
+`--disable-gui`
+`--with-main-module=writer`
+
+### That's all
+
+After all, in this case you are building LO core headless for it to be used by 
other software.