odfstudio: synchronize with LibreOffice upstream

.config/admin_java_and_deps.winget

@@ -68,9 +68,9 @@ properties:
         securityContext: elevated
       settings:
         DestinationPath: C:/Users/Public/Downloads
-        Uri: https://dlcdn.apache.org/ant/binaries/apache-ant-1.10.15-bin.zip
+        Uri: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.18-bin.zip
         ChecksumType: SHA256
-        Checksum: e59baf898dc5b6d1aa6cd57544715f7e0060b1fdc9e56f24f9898d56612a9e0b
+        Checksum: d3d2009bc815e8fe4808e3af2f2aa7019cd666a26d112a3d9ea5a45345edf236
     - resource: xPSDesiredStateConfiguration/xRemoteFile
       id: junit
       directives:

.config/user_steps.winget

@@ -18,7 +18,7 @@ properties:
         # the empty string element is so that each file can be specified with trailing comma
         TestScript: |
           $files = @(
-              "apache-ant-1.10.15-bin.zip",
+              "apache-ant-1.10.18-bin.zip",
               "clang-format-5.0.0-win.exe",
               "jom_1_1_4.zip",
               "junit-4.10.jar",
@@ -112,9 +112,9 @@ properties:
       directives:
         description: extract ant to the ~/lo directory
       settings:
-        TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
-        GetScript:  Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
-        SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.15-bin.zip" -Destination "$env:USERPROFILE/lo/"
+        TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.18/bin/ant"
+        GetScript:  Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.18/bin/ant"
+        SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.18-bin.zip" -Destination "$env:USERPROFILE/lo/"
     - resource: xPSDesiredStateConfiguration/xScript
       id: spp-extract
       dependsOn:
@@ -181,7 +181,7 @@ properties:
           --disable-online-update
           --with-external-tar=$env:USERPROFILE\lo\lo-externaltar
           --with-strawberry-perl-portable=$env:USERPROFILE\lo\spp
-          --with-ant-home=$env:USERPROFILE\lo\apache-ant-1.10.15
+          --with-ant-home=$env:USERPROFILE\lo\apache-ant-1.10.18
           --with-junit=$env:USERPROFILE\lo\junit-4.10.jar
           --with-doxygen=$env:USERPROFILE\lo\spp\c\bin\doxygen.exe
           #--enable-odk

.cspell/libreoffice.txt

@@ -48,7 +48,6 @@ libwebp
 libwps
 libzxing
 loplugin
-lpsolve
 MAKEFLAGS
 mergelibs
 msgfmt

.git-blame-ignore-revs

@@ -132,3 +132,5 @@ b53fa6344d033f8b8f03b9274dbdd811251c2c1a
 e02a7a55c23d23dd7afa2627a7e10c70e1cba001
 1c235c1343ed7b88a3e6b923b9b0d6e567054f1c
 5159de5febd02cd5a509e97c93df8ea26af0c65d
+05ba63c6fce1954e52399e01ffbde2ff4f55f19e
+ddb95685dda6b0935322c36fc648e3f4f46a62fe

Makefile.fetch

@@ -107,6 +107,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,BOOST,BOOST_TARBALL) \
 		$(call fetch_Optional,BOX2D,BOX2D_TARBALL) \
 		$(call fetch_Optional,BREAKPAD,BREAKPAD_TARBALL) \
+		$(call fetch_Optional,BROTLI,BROTLI_TARBALL) \
 		$(call fetch_Optional,BSH,BSH_TARBALL) \
 		$(call fetch_Optional,BZIP2,BZIP2_TARBALL) \
 		$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
@@ -134,6 +135,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
 		$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
 		$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
+		$(call fetch_Optional,HIGHWAY,HIGHWAY_TARBALL) \
 		$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \
 		$(call fetch_Optional,HUNSPELL,HUNSPELL_TARBALL) \
 		$(call fetch_Optional,HYPHEN,HYPHEN_TARBALL) \
@@ -160,6 +162,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \
 		$(call fetch_Optional,LIBFFI,LIBFFI_TARBALL) \
 		$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
+		$(call fetch_Optional,LIBJXL,LIBJXL_TARBALL) \
 		$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
 		$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
 		$(call fetch_Optional,LIBNUMBERTEXT,LIBNUMBERTEXT_TARBALL) \
@@ -170,7 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
 		$(call fetch_Optional,XMLSEC,XMLSEC_TARBALL) \
 		$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
-		$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
 		$(call fetch_Optional,LXML,LXML_TARBALL) \
 		$(call fetch_Optional,LZMA,LZMA_TARBALL) \
 		$(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
@@ -205,13 +207,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
 		$(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
 		$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_AGDASIMA_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_BACASIME_ANTIQUE_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_BELANOSIMA_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_CAPRASIMO_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_LUGRASIMO_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_LUMANOSIMO_TARBALL) \
-		$(call fetch_Optional,MORE_FONTS,FONT_LUNASIMA_TARBALL) \
 		$(call fetch_Optional,MESON,MESON_TARBALL) \
 		$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
 		$(call fetch_Optional,MWAW,MWAW_TARBALL) \
@@ -228,6 +223,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,POPPLER,POPPLER_DATA_TARBALL) \
 		$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
 		$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
+		$(if $(filter WNT,$(OS)),PYTHON_BOOTSTRAP_TARBALL) \
+		$(call fetch_Optional,QUICKJS,QUICKJS_TARBALL) \
 		$(call fetch_Optional,QXP,QXP_TARBALL) \
 		$(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \
 		$(call fetch_Optional,REDLAND,RASQAL_TARBALL) \

Makefile.in

@@ -207,10 +207,10 @@ ifneq ($(CROSS_COMPILING),)
 ifeq ($(OS),ANDROID)
 	rm -fr $(BUILDDIR)/android/obj
 	rm -fr $(BUILDDIR)/android/jniLibs
-	rm -fr $(SRCDIR)/android/source/build
-	rm -fr $(SRCDIR)/android/source/assets
-	rm -fr $(SRCDIR)/android/source/assets_strippedUI
-	rm -fr $(SRCDIR)/android/source/res_generated
+	rm -fr $(SRCDIR)/android/app/build
+	rm -fr $(SRCDIR)/android/app/assets
+	rm -fr $(SRCDIR)/android/app/assets_strippedUI
+	rm -fr $(SRCDIR)/android/app/res_generated
 endif
 endif
 

README.cross

@@ -165,7 +165,7 @@ And here is an (quite old) autogen.input for Android on X86:
 --with-distro=LibreOfficeAndroidX86
 
 A LibreOffice app for Android is being developed progress in the
-android/source directory.
+android/app directory.
 
 To run the app, do "make install" followed by either "make run" or
 starting it from Android itself. You most likely want to have an "adb logcat"

README.md

@@ -50,7 +50,7 @@ run and compile LibreOffice, also used by the TDF builds:
     * Build: 13 or later + Xcode 14.3 or later (using latest version available for a given version of macOS)
 * Linux:
     * Runtime: RHEL 9 or CentOS 9 and comparable
-    * Build: either GCC 12; or Clang 18 with libstdc++ 11
+    * Build: either GCC 13; or Clang 18 with libstdc++ 11
 * iOS (only for LibreOfficeKit):
     * Runtime: 14.5 (only support for newer i devices == 64 bit)
     * Build: Xcode 12.5 and iPhone SDK 14.5

Repository.mk

@@ -168,7 +168,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
 	$(call gb_Helper_optional,FUZZERS,mmlfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
-	$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,eotfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,dbffuzzer) \
 	$(call gb_Helper_optional,FUZZERS,webpfuzzer) \
@@ -364,7 +363,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(filter WNT,$(OS)),directx9canvas) \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
 	$(if $(filter WNT,$(OS)),gdipluscanvas) \
-	simplecanvas \
 	vclcanvas \
 ))
 endif
@@ -436,12 +434,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	i18npool \
 	i18nsearch \
 	$(if $(ENABLE_JAVA),jdbc) \
+	$(if $(ENABLE_QUICKJS),jsuno) \
 	$(if $(filter WNT,$(OS)),jumplist) \
 	$(if $(ENABLE_LDAP),ldapbe2) \
 	$(if $(filter WNT,$(OS)),WinUserInfoBe) \
 	localebe1 \
 	log \
 	lng \
+	$(call gb_Helper_optional,SCRIPTING,$(if $(ENABLE_QUICKJS),jsprov)) \
 	$(if $(filter $(OS),MACOSX),macbe1) \
 	$(if $(MERGELIBS),merged) \
 	migrationoo2 \
@@ -470,6 +470,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	sd \
 	sdd \
 	sfx \
+	singleprov \
 	slideshow \
 	sot \
 	$(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \
@@ -846,7 +847,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 ))
 endif
 
-# 'test_unittest' is only package delivering to workdir.
+# 'test_unittest' is the only package delivering to workdir.
 # Other packages could be potentially autoinstalled.
 $(eval $(call gb_Helper_register_packages, \
 	test_unittest \
@@ -918,6 +919,9 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 		odk_javadoc \
 		odk_uno_loader_classes \
 	) \
+	$(if $(ENABLE_DOTNET), \
+		odk_dotnet \
+	) \
 	odk_scripts \
 ))
 
@@ -1048,7 +1052,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 	extras_fonts \
-	$(if $(USING_X11)$(DISABLE_GUI)$(filter FONTCONFIG,$(BUILD_TYPE))$(filter ANDROID EMSCRIPTEN,$(OS)), \
+	$(if $(USE_HEADLESS_CODE)$(USING_X11)$(DISABLE_GUI)$(filter FONTCONFIG,$(BUILD_TYPE))$(filter ANDROID EMSCRIPTEN,$(OS)), \
 		postprocess_fontconfig) \
 	$(call gb_Helper_optional,MORE_FONTS,\
 		fonts_alef \
@@ -1077,13 +1081,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 		fonts_noto_serif_lao \
 		fonts_reem \
 		fonts_scheherazade \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_agdasima,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_bacasime_antique,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_belanosima,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_caprasimo,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_lugrasimo,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_lumanosimo,) \
-		$(if $(WITH_DOCREPAIR_FONTS),fonts_lunasima,) \
 	) \
 ))
 
@@ -1211,7 +1208,6 @@ $(eval $(call gb_Helper_register_mos,\
 	$(call gb_Helper_optional,SCRIPTING,sb) \
 	sc \
 	sca \
-	scc \
 	sd \
 	sdext \
 	sfx \

RepositoryExternal.mk

@@ -137,7 +137,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 $(call gb_LinkTarget_use_libraries,$(1),skia)
 $(call gb_LinkTarget_add_defs,$(1),\
-	-DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
+	-DSK_USER_CONFIG_HEADER="<config_skia.h>" \
 	-DSKIA_DLL \
 )
 endef
@@ -513,6 +513,42 @@ else
   endef
 endif
 
+ifneq ($(filter HIGHWAY,$(BUILD_TYPE)),)
+
+define gb_LinkTarget__use_highway
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(gb_UnpackedTarball_workdir)/highway \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),highway)
+
+endef
+
+define gb_ExternalProject__use_highway
+$(call gb_ExternalProject_use_static_libraries,$(1),highway)
+
+endef
+
+endif # HIGHWAY
+
+ifneq ($(filter BROTLI,$(BUILD_TYPE)),)
+
+define gb_LinkTarget__use_brotli
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(gb_UnpackedTarball_workdir)/brotli/c \
+	-I$(gb_UnpackedTarball_workdir)/brotli/c/include \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),brotli)
+
+endef
+
+define gb_ExternalProject__use_brotli
+$(call gb_ExternalProject_use_static_libraries,$(1),brotli)
+
+endef
+
+endif # BROTLI
 
 ifneq ($(SYSTEM_LIBJPEG),)
 
@@ -548,6 +584,48 @@ endef
 
 endif # SYSTEM_LIBJPEG
 
+ifneq ($(SYSTEM_LIBJXL),)
+
+define gb_LinkTarget__use_libjxl
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(LIBJXL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBJXL_LIBS))
+
+endef
+
+gb_ExternalProject__use_libjxl :=
+
+else # !SYSTEM_LIBJXL
+
+define gb_LinkTarget__use_libjxl
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DJXL_INTERNAL_LIBRARY_BUILD \
+	-DJXL_THREADS_INTERNAL_LIBRARY_BUILD \
+	-Djxl_cms_EXPORTS \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(gb_UnpackedTarball_workdir)/libjxl/lib/include \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),libjxl)
+$(call gb_LinkTarget_use_externals,$(1),\
+	highway \
+	brotli \
+	lcms2 \
+)
+
+endef
+
+define gb_ExternalProject__use_libjxl
+$(call gb_ExternalProject_use_static_libraries,$(1),libjxl)
+
+endef
+
+endif # SYSTEM_LIBJXL
+
 ifneq ($(SYSTEM_MYTHES),)
 
 define gb_LinkTarget__use_mythes
@@ -2534,50 +2612,6 @@ endef
 endif # ANDROID
 endif # SYSTEM_LCMS2
 
-ifneq ($(ENABLE_LPSOLVE),)
-
-ifneq ($(SYSTEM_LPSOLVE),)
-
-define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_LPSOLVE \
-)
-
-endef
-
-else # !SYSTEM_LPSOLVE
-
-define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_use_package,$(1),lpsolve)
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55/lpsolve55.lib \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-	-L$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55 -llpsolve55 \
-)
-endif
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(gb_UnpackedTarball_workdir)/lpsolve \
-	$$(INCLUDE) \
-)
-
-endef
-
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-	lpsolve \
-))
-
-endif # SYSTEM_LPSOLVE
-
-else
-
-gb_LinkTarget__use_lpsolve :=
-
-endif # ENABLE_LPSOLVE
-
 ifneq ($(ENABLE_COINMP),)
 
 ifneq ($(SYSTEM_COINMP),TRUE)
@@ -3363,6 +3397,28 @@ endef
 endif # ENABLE_QT6
 
 
+# QuickJS
+ifeq ($(SYSTEM_QUICKJS),TRUE)
+define gb_LinkTarget__use_quickjs
+$(call gb_LinkTarget_set_include,$(1),\
+        $(QUICKJS_CFLAGS) \
+        $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(QUICKJS_LIBS))
+endef
+else
+define gb_LinkTarget__use_quickjs
+$(call gb_LinkTarget_use_external_project,$(1),quickjs,full)
+$(call gb_LinkTarget_set_include,$(1),\
+       -I$(gb_UnpackedTarball_workdir)/quickjs \
+       $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+       quickjs \
+)
+endef
+endif
+
 # PYTHON
 # extra python_headers external because pyuno wrapper must not link python
 ifneq ($(SYSTEM_PYTHON),)
@@ -3415,15 +3471,8 @@ $(call gb_LinkTarget_use_package,$(1),python3)
 endif
 
 ifeq ($(OS),WNT)
-ifeq ($(CPUNAME),X86_64)
-python_arch_subdir=amd64/
-else ifeq ($(CPUNAME),AARCH64)
-python_arch_subdir=arm64/
-else
-python_arch_subdir=win32/
-endif
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(gb_UnpackedTarball_workdir)/python3/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+	$(gb_UnpackedTarball_workdir)/python3/PCbuild/$(if $(filter AARCH64,$(CPUNAME)),arm64,$(if $(filter X86_64,$(CPUNAME)),amd64,win32))/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -4395,8 +4444,8 @@ $(call gb_LinkTarget_use_unpacked,$(1),afdko)
 $(call gb_LinkTarget_set_include,$(1),\
        -I$(gb_UnpackedTarball_workdir)/afdko/c/shared/include \
        -I$(gb_UnpackedTarball_workdir)/afdko/c/shared/resource \
-       -I$(gb_UnpackedTarball_workdir)/afdko/c/makeotf/include \
-       -I$(gb_UnpackedTarball_workdir)/afdko/c/makeotf/source \
+       -I$(gb_UnpackedTarball_workdir)/afdko/c/addfeatures/include \
+       -I$(gb_UnpackedTarball_workdir)/afdko/c/addfeatures \
        $$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),afdko)
@@ -4492,6 +4541,7 @@ define gb_LinkTarget__use_zxcvbn-c
 $(call gb_LinkTarget_set_include,$(1),\
 	-DSYSTEM_ZXCVBN \
 	$$(INCLUDE) \
+	$(ZXCVBN_CFLAGS) \
 )
 $(call gb_LinkTarget_add_libs,$(1),-lzxcvbn)
 endef

RepositoryModule_host.mk

@@ -53,7 +53,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 ))
 endif
 
-
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	android \
     $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
@@ -104,6 +103,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	instsetoo_native \
 	io \
 	javaunohelper \
+	$(if $(ENABLE_QUICKJS),jsuno) \
 	jurt \
 	jvmaccess \
 	jvmfwk \
@@ -140,7 +140,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(if $(ENABLE_WASM_STRIP_CALC),, \
 	sc \
 	scaddins \
-	sccomp \
 	) \
 	$(call gb_Helper_optional,DESKTOP,scp2) \
 	scripting \

UnoControls/source/inc/OConnectionPointHelper.hxx

@@ -96,7 +96,7 @@ private:
 
     ::osl::Mutex&                                                     m_aSharedMutex;
     css::uno::WeakReference< css::lang::XConnectionPointContainer >   m_oContainerWeakReference;   // Reference to container-class!. Don't use Reference<...>
-                                                                                            // It is a ring-reference => and must be a wekreference!
+                                                                                            // It is a ring-reference => and must be a weak-reference!
     OConnectionPointContainerHelper*                                  m_pContainerImplementation;
     css::uno::Type                                                    m_aInterfaceType;
     css::uno::Reference< css::uno::XInterface >                       m_xLock;

android/.gitignore

@@ -2,14 +2,14 @@
 /.gradle
 /.idea
 /local.properties
-/source/assets/
-/source/assets_strippedUI/
-/source/build/
-/source/captures/
-/source/jni/Application.mk
-/source/res_generated
+/app/assets/
+/app/assets_strippedUI/
+/app/build/
+/app/captures/
+/app/jni/Application.mk
+/app/res_generated
 /jniLibs/
-/source/liboSettings.gradle.kts
-/source/native-code.cxx
+/app/liboSettings.gradle.kts
+/app/native-code.cxx
 /obj/
-/source/source.iml
+/app/source.iml

android/CustomTarget_lo_android.mk

@@ -8,7 +8,7 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3))
 
-loandroid3_DIR := $(gb_CustomTarget_workdir)/android/source
+loandroid3_DIR := $(gb_CustomTarget_workdir)/android/app
 
 $(call gb_CustomTarget_get_target,android/loandroid3) : \
 	$(loandroid3_DIR)/done
@@ -17,18 +17,18 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK)
 	cd $(SRCDIR)/android && $(MAKE) local.properties
-	cd $(SRCDIR)/android/source && $(MAKE) all
+	cd $(SRCDIR)/android/app && $(MAKE) all
 ifeq ($(ENABLE_JAVA),TRUE)
 # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
 	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
+	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/app/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK)
 endif
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
-	cd $(SRCDIR)/android/source && $(MAKE) clean
+	cd $(SRCDIR)/android/app && $(MAKE) clean
 
 # vim: set noet sw=4 ts=4:

android/Makefile

@@ -12,7 +12,7 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk
 
 .PHONY: sign
 
-SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.apk
+SIGNED_APK := $(BUILDDIR)/android/app/bin/LibreOfficeViewer.apk
 RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> key=<key_name> release-apk"
 
 local.properties: $(BUILDDIR)/config_host.mk
@@ -26,8 +26,8 @@ release-apk: build
 	rm -f $(SIGNED_APK)
 
 	# the actual signing
-	jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key)
-	$(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK)
+	jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key)
+	$(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK)
 
 	@echo
 	@echo "Resulting signed apk: $(SIGNED_APK)"

android/README.md

@@ -6,7 +6,7 @@ Contains common code for all projects on Android to bootstrap LibreOffice. In
 addition it is a home to `LibreOfficeKit` (LOK - see `libreofficekit/README.md`) JNI
 classes.
 
-## Stuff in Source Directory
+## Stuff in App Directory
 
 LibreOffice Android application - the code is based on Fennec (Firefox for Android).
 It uses OpenGL ES 2 for rendering of the document tiles which are gathered from
@@ -163,7 +163,7 @@ For instructions on how to build for Android, see `README.cross`.
 
 Attach your device, so 'adb devices' shows it. Then run:
 
-        cd android/source
+        cd android/app
         make install
         adb logcat
 
@@ -236,7 +236,7 @@ Using `lldb` from within Android Studio is more comfortable though and works lik
 - open `android` directory in Android Studio via File|Open...
 - make sure you select the right build variant (`strippedUIDebug` is what you want)
 - use Run|Edit Configurations to create a new configuration of type "Android Native"
-	- on tab "General" pick module "source"
+	- on tab "General" pick module "app"
 	- on tab "Native Debugger" add `android/obj/local/<hostarch>` to
 	the Symbol directories
 	- on the LLDB startup commands tab add
@@ -323,7 +323,7 @@ heavy lifting.
 
 ## Triple-T metadata for F-Droid
 
-The subdirectory `source/src/main/play` contains data in the Triple-T
+The subdirectory `app/src/main/play` contains data in the Triple-T
 structure that F-Droid evaluates to extract metadata.
 
 More information:

android/app/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="${installLocation}">
+    android:installLocation="auto">
 
     <!-- App requires OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />

android/app/build.gradle.kts

@@ -46,7 +46,7 @@ base {
 
 android {
     namespace = "org.libreoffice"
-    compileSdk = 35
+    compileSdk = 36
 
     ndkPath = androidNdkPath
     ndkVersion = androidNdkVersion
@@ -84,7 +84,7 @@ android {
 
     defaultConfig {
         // minSdkVersion is set in liboSettings.gradle.kts
-        targetSdk = 35
+        targetSdk = 36
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -92,11 +92,8 @@ android {
         debug {
             // make android studio happy...
             isJniDebuggable = true
-            // would work just fine with external, but setting emulator up is a little more work
-            manifestPlaceholders["installLocation"] = "auto"
         }
         release {
-            manifestPlaceholders["installLocation"] = "preferExternal"
         }
     }
 
@@ -152,7 +149,7 @@ android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some extent)
  */
 
 // Assets that are unpacked at run-time into the app's data directory. These
-// are files read by non-LO code, fontconfig and freetype for now, that doesn't
+// are files read by non-LO code, fontconfig and freetype for now, that don't
 // understand "/assets" paths.
 tasks.register<Copy>("copyUnpackAssets") {
     description = "copies assets that need to be extracted on the device"