[Libreoffice-commits] core.git: Branch 'private/jmux/wasm-for-master' - 4 commits - avmedia/Library_avmedia.mk distro-configs/LibreOfficeWASM32.conf sal/Module_sal.mk solenv/Executable_lockfile.mk

[Thorsten Behrens (via logerrit)]

 avmedia/Library_avmedia.mk            |    4 ++++
 distro-configs/LibreOfficeWASM32.conf |    4 ++++
 sal/Module_sal.mk                     |    2 +-
 solenv/Executable_lockfile.mk         |    1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7ae50bad39df78b5739f1635c1ac0ee4945e2d56
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Wed May 26 17:35:09 2021 +0000
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed May 26 19:13:00 2021 +0200

    This needs boost headers, too
    
    Change-Id: Id377453f0eec23b005cddda5ede35d1c9736d60e

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index db85a2844328..fb91823c9152 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -28,6 +28,10 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/avmediadummy \
 ))
 
+$(eval $(call gb_Library_use_externals,avmedia,\
+    boost_headers \
+))
+
 else # AVMEDIA
 
 ifeq (,$(DISABLE_GUI))
commit 3f41348aef3013ba290aafadcdf6a4a8c65c65d8
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Wed May 26 16:41:32 2021 +0000
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed May 26 19:12:59 2021 +0200

    HACK remove Library_cppunitmain to get this to build
    
    Change-Id: If48a4ee1450f8fb99d3de58c7194f657355b3a5d

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 0d5299e033a9..3c3db9ed8f4a 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-    $(if $(or $(CROSS_COMPILING),$(DISABLE_DYNLOADING)),Library_cppunitmain,Executable_cppunittester) \
+    $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
commit 55b61409d8ae71f6bb1b451c81d485ddb483beb2
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Wed May 26 04:50:12 2021 +0000
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed May 26 19:12:59 2021 +0200

    Make SRCDIR != WORKDIR build again
    
    autoconf.h is not necessarily placed in SRCDIR
    
    Change-Id: I792ff168b9642cac4173c27cbaf473af6ea168a2

diff --git a/solenv/Executable_lockfile.mk b/solenv/Executable_lockfile.mk
index 3e82a52d273b..00f634c60adc 100644
--- a/solenv/Executable_lockfile.mk
+++ b/solenv/Executable_lockfile.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Executable_Executable,lockfile))
 
 $(eval $(call gb_Executable_set_include,lockfile, \
     -I$(SRCDIR)/solenv/lockfile \
+    -I$(BUILDDIR)/solenv/lockfile \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,lockfile, \
commit 6670983b5003ce2276afe9e114617a0354056454
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Wed May 26 04:10:34 2021 +0000
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed May 26 19:12:58 2021 +0200

    Why not hardcode platform plugin preferences
    
    Change-Id: Ib8fc8564fb93a5cd9675ae8106a93c18ca9cee21

diff --git a/distro-configs/LibreOfficeWASM32.conf b/distro-configs/LibreOfficeWASM32.conf
index b07419ba2e21..6bc92cfa0c71 100644
--- a/distro-configs/LibreOfficeWASM32.conf
+++ b/distro-configs/LibreOfficeWASM32.conf
@@ -29,3 +29,7 @@
 --without-junit
 --without-system-dicts
 --with-theme=no
+--disable-gtk3
+--disable-kf5
+--disable-gtk3-kde5
+--enable-qt5