chase
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 27 additions & 0 deletions b/‎Dockerfile‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 11 additions & 2 deletions b/‎README.md‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎VERSION‎
Lines changed: 1 addition & 1 deletion b/‎VERSION‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎…es/000-no_real_paths_file_packager.patch‎ ‎…l_paths_file_packager_and_vite_fix.patch‎emsdk-patches/000-no_real_paths_file_packager.patch renamed to emsdk-patches/000-no_real_paths_file_packager_and_vite_fix.patch
Lines changed: 17 additions & 16 deletions b/‎…es/000-no_real_paths_file_packager.patch‎ ‎…l_paths_file_packager_and_vite_fix.patch‎emsdk-patches/000-no_real_paths_file_packager.patch renamed to emsdk-patches/000-no_real_paths_file_packager_and_vite_fix.patch
Lines changed: 17 additions & 16 deletions
diff --git a/‎emsdk-patches/001-static_worker_options.patch‎
Lines changed: 13 additions & 5 deletions b/‎emsdk-patches/001-static_worker_options.patch‎
Lines changed: 13 additions & 5 deletions
diff --git a/‎emsdk-patches/002-emcc_should_use_clang_defaults.patch‎
Lines changed: 21 additions & 0 deletions b/‎emsdk-patches/002-emcc_should_use_clang_defaults.patch‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎emsdk-patches/002-vite_compilation_fix.patch‎
Lines changed: 0 additions & 27 deletions b/‎emsdk-patches/002-vite_compilation_fix.patch‎
Lines changed: 0 additions & 27 deletions
diff --git a/‎emsdk-patches/003-fix_datafile_prefix_file_packager.patch‎ b/‎emsdk-patches/003-fix_datafile_prefix_file_packager.patch‎
diff --git a/‎emsdk-patches/004-fix_missing_real_path_fix.patch‎
Lines changed: 13 additions & 0 deletions b/‎emsdk-patches/004-fix_missing_real_path_fix.patch‎
Lines changed: 13 additions & 0 deletions
@@ -6,6 +6,8 @@ libreoffice-core/diag.json
 libreoffice-core/vs-code-template.code-workspace
 libreoffice-core/.cache
 libreoffice-core/a.worker.js
+.cache
+.npm
 
 .DS_Store
 libreoffice-core/debug
 
@@ -0,0 +1,27 @@
+FROM emscripten/emsdk:3.1.73-arm64
+
+RUN apt update && apt-get install -y --no-install-recommends \
+  git \
+  build-essential \
+  zip \
+  nasm \
+  python3 \
+  python3-dev \
+  autoconf \
+  gperf \
+  xsltproc \
+  libxml2-utils \
+  bison \
+  flex \
+  pkg-config \
+  ccache \
+  openssh-server \
+  cmake \
+  locales \
+  libnss3 \
+  automake \
+  g++-12
+
+COPY emsdk-patches/ /emsdk-patches
+
+RUN cd /emsdk && for patch_file in /emsdk-patches/*.patch; do patch -p1 -i $patch_file; done
@@ -8,9 +8,18 @@ This project is not a part of the official LibreOffice project, nor endorsed by
 
 # Prerequisites
 
-You must use Linux on x64, otherwise the build will not work.
+## macOS
 
-On Ubuntu/Debian/Pop_OS!, you should install these packages:
+Install [OrbStack](https://orbstack.dev/download)
+
+Clone the repo and enter the dev environment:
+
+```bash
+git clone https://github.com/coparse-inc/lok-wasm
+./macos-docker
+```
+
+## Ubuntu/Debian/Pop_OS!
 
 ```bash
 apt-get install -y --no-install-recommends \
 
@@ -1 +1 @@
-v0.1.20
+v0.2.0
@@ -1,8 +1,8 @@
-diff --git a/./upstream/emscripten/tools/file_packager.orig.py b/./upstream/emscripten/tools/file_packager.py
-index 956ab8a..f3df191 100755
---- a/./upstream/emscripten/tools/file_packager.orig.py
+diff --git a/./upstream/emscripten/tools/file_packager.py.orig b/./upstream/emscripten/tools/file_packager.py
+index 281e636..005353a 100644
+--- a/./upstream/emscripten/tools/file_packager.py.orig
 +++ b/./upstream/emscripten/tools/file_packager.py
-@@ -739,7 +739,7 @@ def generate_js(data_target, data_files, metadata):
+@@ -740,7 +740,7 @@ def generate_js(data_target, data_files, metadata):
              DataRequest.prototype.requests[files[i].filename].onload();
            }'''
        use_data += ("          Module['removeRunDependency']('datafile_%s');\n"
@@ -20,21 +20,22 @@ index 956ab8a..f3df191 100755
 
      package_name = data_target
      remote_package_size = os.path.getsize(package_name)
-@@ -772,7 +772,7 @@ def generate_js(data_target, data_files, metadata):
-         Module['locateFile'] = Module['locateFilePackage'];
-         err('warning: you defined Module.locateFilePackage, that has been renamed to Module.locateFile (using your locateFilePackage for now)');
+@@ -767,8 +767,7 @@ def generate_js(data_target, data_files, metadata):
+         PACKAGE_PATH = encodeURIComponent(location.pathname.substring(0, location.pathname.lastIndexOf('/')) + '/');
        }
+       var PACKAGE_NAME = '%s';
+-      var REMOTE_PACKAGE_BASE = '%s';
 -      var REMOTE_PACKAGE_NAME = Module['locateFile'] ? Module['locateFile'](REMOTE_PACKAGE_BASE, '') : REMOTE_PACKAGE_BASE;\n''' % (js_manipulation.escape_for_js_string(data_target), js_manipulation.escape_for_js_string(remote_package_name))
-+      var REMOTE_PACKAGE_NAME = Module['locateFile'] ? Module['locateFile'](REMOTE_PACKAGE_BASE, '') : REMOTE_PACKAGE_BASE;\n''' % (js_manipulation.escape_for_js_string(remote_package_name), js_manipulation.escape_for_js_string(remote_package_name))
++      var REMOTE_PACKAGE_NAME = new URL('./%s', import.meta.url).href;\n''' % (js_manipulation.escape_for_js_string(remote_package_name), js_manipulation.escape_for_js_string(remote_package_name))
      metadata['remote_package_size'] = remote_package_size
      ret += '''var REMOTE_PACKAGE_SIZE = metadata['remote_package_size'];\n'''
 
-@@ -1022,7 +1022,7 @@ def generate_js(data_target, data_files, metadata):
-         var curr;
-         %s
-       };
--      Module['addRunDependency']('datafile_%s');\n''' % (use_data, js_manipulation.escape_for_js_string(data_target))
-+      Module['addRunDependency']('datafile_%s');\n''' % (use_data, js_manipulation.escape_for_js_string(remote_package_name))
-     # use basename because from the browser's point of view,
-     # we need to find the datafile in the same dir as the html file
+@@ -1116,7 +1115,7 @@ def generate_js(data_target, data_files, metadata):
 
+   function runMetaWithFS() {
+     Module['addRunDependency']('%(metadata_file)s');
+-    var metadataUrl = Module['locateFile'] ? Module['locateFile']('%(metadata_file)s', '') : '%(metadata_file)s';
++    var metadataUrl = new URL('./%(metadata_file)s', import.meta.url).href;
+     %(node_support_code)s
+     fetch(metadataUrl)
+       .then((response) => {
@@ -1,8 +1,8 @@
-diff --git a/./upstream/emscripten/src/library_pthread.js b/./upstream/emscripten/src/library_pthread.js
-index 79ec001..85d60a1 100644
---- a/./upstream/emscripten/src/library_pthread.js
+diff --git a/./upstream/emscripten/src/library_pthread.js.orig b/./upstream/emscripten/src/library_pthread.js
+index 1daa320..69a5966 100644
+--- a/./upstream/emscripten/src/library_pthread.js.orig
 +++ b/./upstream/emscripten/src/library_pthread.js
-@@ -421,21 +421,6 @@ var LibraryPThread = {
+@@ -393,25 +393,6 @@ var LibraryPThread = {
      // Creates a new web Worker and places it in the unused worker pool to wait for its use.
      allocateUnusedWorker() {
        var worker;
@@ -18,13 +18,17 @@ index 79ec001..85d60a1 100644
 -#if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
 -        // This is the way that we signal to the Web Worker that it is hosting
 -        // a pthread.
+-#if ASSERTIONS
+-        'name': 'em-pthread-' + PThread.nextWorkerID,
+-#else
 -        'name': 'em-pthread',
 -#endif
+-#endif
 -      };
  #if EXPORT_ES6 && USE_ES6_IMPORT_META
        // If we're using module output, use bundler-friendly pattern.
  #if PTHREADS_DEBUG
-@@ -457,7 +442,21 @@ var LibraryPThread = {
+@@ -433,7 +414,25 @@ var LibraryPThread = {
        // instead of just using new URL(import.meta.url) because bundler's only recognize
        // the first case in their bundling step. The latter ends up producing an invalid
        // URL to import from the server (e.g., for webpack the file:// path).
@@ -41,7 +45,11 @@ index 79ec001..85d60a1 100644
 +#if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
 +        // This is the way that we signal to the Web Worker that it is hosting
 +        // a pthread.
++//#if ASSERTIONS
++//        'name': 'em-pthread-' + PThread.nextWorkerID,
++//#else
 +        'name': 'em-pthread',
++//#endif
 +#endif
 +      });
  #else
 
@@ -0,0 +1,21 @@
+diff --git a/./upstream/emscripten/emcc.py.orig b/./upstream/emscripten/emcc.py
+index dfe088e..7c85358 100644
+--- a/./upstream/emscripten/emcc.py.orig
++++ b/./upstream/emscripten/emcc.py
+@@ -385,14 +385,8 @@ def get_clang_flags(user_args):
+     if '-mbulk-memory' not in user_args:
+       flags.append('-mbulk-memory')
+ 
+-  # In emscripten we currently disable bulk memory by default.
+-  # This should be removed/updated when we als update the default browser targets.
+-  if '-mbulk-memory' not in user_args and '-mno-bulk-memory' not in user_args:
+-    # Bulk memory may be enabled via threads or directly via -s.
+-    if not settings.BULK_MEMORY:
+-      flags.append('-mno-bulk-memory')
+-  if '-mnontrapping-fptoint' not in user_args and '-mno-nontrapping-fptoint' not in user_args:
+-    flags.append('-mno-nontrapping-fptoint')
++  flags.append('-mbulk-memory')
++  flags.append('-matomics')
+ 
+   if settings.RELOCATABLE and '-fPIC' not in user_args:
+     flags.append('-fPIC')
@@ -0,0 +1,13 @@
+diff --git a/./upstream/emscripten/tools/file_packager.py.orig b/./upstream/emscripten/tools/file_packager.py
+index a7e0b4d..0d860e2 100755
+--- a/./upstream/emscripten/tools/file_packager.py.orig
++++ b/./upstream/emscripten/tools/file_packager.py
+@@ -1020,7 +1020,7 @@ def generate_js(data_target, data_files, metadata):
+         var curr;
+         %s
+       };
+-      Module['addRunDependency']('datafile_%s');\n''' % (use_data, js_manipulation.escape_for_js_string(data_target))
++      Module['addRunDependency']('datafile_%s');\n''' % (use_data, js_manipulation.escape_for_js_string(os.path.basename(data_target)))
+     # use basename because from the browser's point of view,
+     # we need to find the datafile in the same dir as the html file
+