core.git: Branch 'distro/collabora/co-25.04' - configure.ac external/cairo external/fontconfig external/freetype vcl/Library_vcl.mk

2026-01-06 Thread Tor Lillqvist (via logerrit) 
 configure.ac|5 
 external/cairo/Library_cairo.mk |1 
 external/fontconfig/StaticLibrary_fontconfig.mk |6 
 external/fontconfig/configs/wnt_fonts.conf  |1 
 external/fontconfig/windowsfonts.patch  |  202 +++-
 external/freetype/StaticLibrary_freetype.mk |2 
 external/freetype/UnpackedTarball_freetype.mk   |1 
 external/freetype/windows.patch |   23 ++
 vcl/Library_vcl.mk  |1 
 9 files changed, 238 insertions(+), 4 deletions(-)

New commits:
commit 6accaf11b8b5b714c781f360ab21696348f22afc
Author: Tor Lillqvist 
AuthorDate: Tue Dec 30 16:25:06 2025 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 6 21:21:29 2026 +0100

Make also fonts installed from the Microsoft Store show up in CODA-W

This was much more complicated than expected. Most of that thanks to
the inscrutability of fontconfig.

Fonts from the Microsoft Store get installed in a separate folder per
product, under the WindowsApps folder. Each such font product folder
contains one or several TrueType font files, and metadata files, and
preview images, etc.

Add a C++ source file to fontconfig that uses DirectWrite to enumerate
the available fonts. Take only those with a source type of
DWRITE_FONT_SOURCE_TYPE_APPX_PACKAGE into account. Other fonts are
found as before, looking in the system fonts folder (typically
C:\Windows\Fonts) and in the per-user fonts folder (typically
C:\Users\username\AppData\Local\Microsoft\Windows\Fonts).

This C++ code requires headers from the winrt tree in the Windows SDK,
so add that to SOLARINC.

Sadly, thanks to the way fontconfig works (scanning directories for
font files), I need to let it scan the folders of font products from
the Microsoft Store to find the font files, even if the DirectWrite
API would already give us the font file names directly. But I didn't
want to modify fontconfig too much, so oh well.

There was something weird in how fontconfig calculates the hash for
directory names to be used in its cache files. It ended up creating
more and more cache files for the same directories each time CODA-W
was run. I could not understand what was going on, but in any case,
just making sure that FcConfigMapFontPath() and FcConfigMapSalt()
don't do anything on Windows seems to help.

Also change the way freetype is built so that only the special
FT_Done_MM_Var is exported, not all public functions. This was
necessary because for some unknown reason, when linking the vcl DLL I
started getting errors for the freetype symbols that happen to be
linked into also the cairo DLL. If we eventually can switch to
building all of core statically for CODA-W this problem will go away.

Also stop defining FT_DEBUG_LOGGING, such logging will not show up
anywhere for end-users, and fixing problems in freetype on Windows
will have to be done by reproducing and debugging in the VS debugger
anyway.

There is still much to do to make fontconfig (and probably freetype
and cairo) work really correctly on Windows. The most obvious thing is
that the file name handling is broken. This is perhaps understandable
as the port of that code to Windows is from over 20 years ago, I
think.

It works for file and folder names in ASCII, but most likely not for
others. At least the user profile directory, under which per-user font
files are stored, will definitely have non-ASCII in many cases. We
should modify the code to use , so that all file
system access is done using proper wide character (UTF-16)
APIs. Pathnames that these libraries handle will then be in UTF-8. The
opendir() etc emulation in fontconfig should also be replaced by
adding such to UnixWrappers.h instead.

Signed-off-by: Tor Lillqvist 
Change-Id: I4bc6e32dcc32ff74b79679edacee1aecebd774c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196336
Reviewed-by: Stephan Bergmann 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 89d8fe3302d2..fa35b8148446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7298,6 +7298,11 @@ the  Windows SDK are installed.])
 elif test -d "$WINDOWS_SDK_HOME_unix/Include/$winsdklibsubdir/um"; then
 SOLARINC="$SOLARINC 
-I$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/um 
-I$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/shared"
 fi
+if test "$USE_HEADLESS_CODE" = "TRUE"; then
+if test -d 
"$WINDOWS_SDK_HOME_unix/Include/$winsdklibsubdir/winrt"; then
+SOLARINC="$SOLARINC 
-I$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/winrt"
+fi
+fi
 fi
 
 dnl TODO: solenv/bin/modules/installer/windows/msiglobal.pm wants to use a
diff --git a/external/c

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-20 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4707e8f40c57a72103708b585263239fb211ef82
Author: Andras Timar 
AuthorDate: Sat Dec 20 11:24:46 2025 +0100
Commit: Andras Timar 
CommitDate: Sat Dec 20 11:24:46 2025 +0100

Bump version 25.04.9.0

Change-Id: Ib725a57c6dab7cbacbf1a4f0d0d66947b1d8a069

diff --git a/configure.ac b/configure.ac
index 17fb7895cc48..89d8fe3302d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.8.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.9.0],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-16 Thread Andras Timar (via logerrit) 
 configure.ac |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 774642bdb6f0a9310d4cb1019c30c53268c3e686
Author: Andras Timar 
AuthorDate: Mon Dec 15 18:53:11 2025 +0100
Commit: Michael Stahl 
CommitDate: Tue Dec 16 09:12:19 2025 +0100

typo 'ENBALE', but we don't use them anyway

Change-Id: Icec2cafd8fc55817cc131c3f963bcb8cda81c872
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195681
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index d88f4af0d4fc..17fb7895cc48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1271,8 +1271,6 @@ if test "$using_freetype_fontconfig" = yes; then
 # We build them, don't do any pkg-config checks
 test_fontconfig=no
 test_freetype=no
-ENBALE_FONTCONFIG=TRUE
-ENBALE_FREETYPE=TRUE
 BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
 fi
 else

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-14 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 489cb5d73b8880799dd18955ad43c07773c59de3
Author: Andras Timar 
AuthorDate: Sun Dec 14 11:56:00 2025 +0100
Commit: Andras Timar 
CommitDate: Sun Dec 14 11:56:00 2025 +0100

Bump version to 25.05.8.1

Change-Id: I1bc7f11a31d7eb7f6ed9c5388d9389f10dde2637

diff --git a/configure.ac b/configure.ac
index f24776311313..d88f4af0d4fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.8.0],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.8.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac distro-configs/CODAWindows.conf

2025-12-02 Thread Andras Timar (via logerrit) 
 configure.ac|   11 ++-
 distro-configs/CODAWindows.conf |7 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit b0965d1cc07bc79447b888a0f858327028695007
Author: Andras Timar 
AuthorDate: Sun Nov 23 00:24:58 2025 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 2 16:57:09 2025 +0100

CODA-W: more tweaks to build config

Change-Id: I1900d19d95e27a9a47ad2c17715ffba5b4eadd99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194614
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index dbdd67a0c211..f24776311313 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2191,6 +2191,11 @@ AC_ARG_ENABLE(opencl,
 [Disable OpenCL support.]),
 ,enable_opencl=yes)
 
+AC_ARG_ENABLE(opengl,
+AS_HELP_STRING([--disable-opengl],
+[Disable OpenGL support.]),
+,enable_opengl=yes)
+
 libo_FUZZ_ARG_ENABLE(librelogo,
 AS_HELP_STRING([--disable-librelogo],
 [Do not build LibreLogo.]),
@@ -12755,9 +12760,13 @@ AC_SUBST(GSTREAMER_1_0_CFLAGS)
 AC_SUBST(GSTREAMER_1_0_LIBS)
 AC_SUBST(ENABLE_GSTREAMER_1_0)
 
+dnl =
+dnl Check whether to build with OpenGL support.
+dnl =
+
 ENABLE_OPENGL_TRANSITIONS=
 ENABLE_OPENGL_CANVAS=
-if test $_os = iOS -o $_os = Android -o "$ENABLE_FUZZERS" = "TRUE"; then
+if test $_os = iOS -o $_os = Android -o "$ENABLE_FUZZERS" = "TRUE" -o 
"$enable_opengl" != "yes"; then
: # disable
 elif test "$_os" = "Darwin"; then
 # We use frameworks on macOS, no need for detail checks
diff --git a/distro-configs/CODAWindows.conf b/distro-configs/CODAWindows.conf
index bcae85b35ef5..22ad22929dc0 100644
--- a/distro-configs/CODAWindows.conf
+++ b/distro-configs/CODAWindows.conf
@@ -11,6 +11,10 @@
 --without-java
 --enable-symbols
 
+# Branding (unused, but...)
+--disable-community-flavor
+--with-branding=icon-themes/galaxy/brand_cp
+
 # Features
 --disable-breakpad
 --disable-firebird-sdbc
@@ -24,6 +28,7 @@
 --enable-headless
 --enable-mergelibs
 --disable-opencl
+--disable-opengl
 --without-galleries
 
 # Sensible font bundling settings for desktop
@@ -33,7 +38,9 @@
 
 # MPLv2 subset
 --with-theme=colibre
+--disable-mariadb-sdbc
 --disable-postgresql-sdbc
 --disable-lotuswordpro
 --disable-lpsolve
 --disable-poppler
+--disable-gpgmepp

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-02 Thread Tor Lillqvist (via logerrit) 
 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 27edc0027ee2ebdb00cbe4f3d50fba77f6dc1fdc
Author: Tor Lillqvist 
AuthorDate: Mon Apr 21 15:14:21 2025 +0300
Commit: Tomaž Vajngerl 
CommitDate: Tue Dec 2 09:59:25 2025 +0100

Accept Homebrew pkg-config also on an Intel Macs

On Intel Macs, Homebrew sadly uses the installation prefix /usr/local
and not /opt/homebrew.

Change-Id: I96a15dc69292799168cb67514b841a977dc353ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194588
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 299004028d03..dbdd67a0c211 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7000,7 +7000,9 @@ if test $_os = Darwin; then
 if test -n "$PKG_CONFIG"; then
 if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l 
/usr/bin/pkg-config | $GREP -q Mono.framework; then
 AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please 
remove or hide $PKG_CONFIG])
-elif test "$PKG_CONFIG" = "/opt/homebrew/bin/pkg-config"; then
+elif test `uname -m` = "arm64" -a "$PKG_CONFIG" = 
"/opt/homebrew/bin/pkg-config"; then
+AC_MSG_RESULT([yes, from Homebrew. This is OK.])
+elif [[[ `uname -m` == "x86_64" && "$PKG_CONFIG" == 
"/usr/local/bin/pkg-config" && `readlink "$PKG_CONFIG"` == 
../Cellar/pkgconf/*/bin/pkg-config ]]]; then
 AC_MSG_RESULT([yes, from Homebrew. This is OK.])
 else
 if test "$enable_bogus_pkg_config" = "yes"; then

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-02 Thread Tor Lillqvist (via logerrit) 
 configure.ac |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit a24b48577df4782e8428bbaddbd7692e15c8f3ad
Author: Tor Lillqvist 
AuthorDate: Mon Jan 20 09:37:08 2025 +0200
Commit: Michael Stahl 
CommitDate: Tue Dec 2 09:47:36 2025 +0100

_FORTIFY_SOURCE has a meaning only in glibc

Change-Id: Ia087324841e4019d414d5ae3c845e80c7a7d1b73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194566
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 88f983a1423d..299004028d03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7810,17 +7810,19 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 [AC_MSG_RESULT([no])])
 CFLAGS=$save_CFLAGS
 
-AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2])
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"
-if test "$ENABLE_OPTIMIZED" = TRUE; then
-CFLAGS="$CFLAGS -O2"
+if test "$_os" = "Linux"; then
+AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"
+if test "$ENABLE_OPTIMIZED" = TRUE; then
+CFLAGS="$CFLAGS -O2"
+fi
+AC_LINK_IFELSE(
+[AC_LANG_PROGRAM([[#include ]], [[return 0;]])],
+[AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS 
-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"],
+[AC_MSG_RESULT([no])])
+CFLAGS=$save_CFLAGS
 fi
-AC_LINK_IFELSE(
-[AC_LANG_PROGRAM([[#include ]], [[return 0;]])],
-[AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS 
-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"],
-[AC_MSG_RESULT([no])])
-CFLAGS=$save_CFLAGS
 
 AC_MSG_CHECKING([whether $CC_BASE supports -D_GLIBCXX_ASSERTIONS])
 save_CFLAGS=$CFLAGS

core.git: Branch 'distro/collabora/co-25.04' - configure.ac external/libxml2

2025-12-02 Thread Tor Lillqvist (via logerrit) 
 configure.ac|   12 +++-
 external/libxml2/ExternalProject_libxml2.mk |2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit e03956dc648b0c40734725a636f99bada0302e28
Author: Tor Lillqvist 
AuthorDate: Tue Apr 8 16:58:59 2025 +0300
Commit: Caolán McNamara 
CommitDate: Tue Dec 2 09:35:19 2025 +0100

Add --enable-msvc-debug-runtime to use that even without dbgutil

Adapt libxml2 build accordingly. It's MSVC_USE_DEBUG_RUNTIME we should
check to see whether the ICU libraries have a 'd' suffix in their
names, not ENABLE_DBGUTIL.

Change-Id: Ic817e3c15e7164478ae557627047d3793e3a88c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194584
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index ae1a9ceca39b..88f983a1423d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1665,6 +1665,12 @@ AC_ARG_ENABLE(avahi,
 [Determines whether to use Avahi to advertise Impress to remote 
controls.])
 )
 
+AC_ARG_ENABLE(msvc-debug-runtime,
+AS_HELP_STRING([--enable-msvc-debug-runtime],
+[Determines whether to use the Microsoft Visual Studio debugging 
runtime.
+ Automatically turned on by --enable-dbgutil but not by 
--enable-debug])
+)
+
 AC_ARG_ENABLE(msvc-analyze,
 AS_HELP_STRING([--enable-msvc-analyze],
 [Determines whether to enable the Microsoft Visual Studio /analyze 
flag to provide additional warnings.])
@@ -4937,7 +4943,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != 
"no"; then
 fi
 else
 ENABLE_DBGUTIL=""
-MSVC_USE_DEBUG_RUNTIME=""
+if test "$enable_msvc_debug_runtime" = "yes"; then
+MSVC_USE_DEBUG_RUNTIME="TRUE"
+else
+MSVC_USE_DEBUG_RUNTIME=""
+fi
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DBGUTIL)
diff --git a/external/libxml2/ExternalProject_libxml2.mk 
b/external/libxml2/ExternalProject_libxml2.mk
index 26005343d24a..e42cc4797477 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
-   $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
+   $(if $(filter 
TRUE,$(MSVC_USE_DEBUG_RUNTIME)),debug=yes) \
&& nmake \
,win32)
$(call gb_Trace_EndRange,libxml2,EXTERNAL)

core.git: Branch 'distro/collabora/co-25.04' - configure.ac desktop/source include/vcl RepositoryExternal.mk Repository.mk solenv/gbuild vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/s

2025-12-02 Thread Tor Lillqvist (via logerrit) 
 Repository.mk  |2 -
 RepositoryExternal.mk  |   41 +
 configure.ac   |   19 ++-
 desktop/source/lib/init.cxx|5 +--
 include/vcl/virdev.hxx |2 -
 solenv/gbuild/CppunitTest.mk   |2 -
 vcl/Library_vcl.mk |   12 +++
 vcl/Module_vcl.mk  |2 -
 vcl/headless/svpframe.cxx  |2 -
 vcl/headless/svpinst.cxx   |4 +-
 vcl/inc/sft.hxx|3 +
 vcl/inc/unx/freetype_glyphcache.hxx|1 
 vcl/inc/unx/freetypetextrender.hxx |2 -
 vcl/inc/unx/genprn.h   |7 
 vcl/inc/unx/glyphcache.hxx |3 +
 vcl/source/fontsubset/sft.cxx  |   25 ++-
 vcl/unx/generic/fontmanager/fontmanager.cxx|4 +-
 vcl/unx/generic/fontmanager/helper.cxx |7 ++--
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |   23 +++---
 vcl/unx/generic/print/genprnpsp.cxx|3 -
 vcl/unx/generic/print/genpspgraphics.cxx   |5 ---
 21 files changed, 117 insertions(+), 57 deletions(-)

New commits:
commit 2275d6ff2ffbcec6bf0053ad3553977b3b98835e
Author: Tor Lillqvist 
AuthorDate: Tue Feb 25 19:52:15 2025 +0200
Commit: Caolán McNamara 
CommitDate: Tue Dec 2 09:32:28 2025 +0100

Make --enable-headless possible also on Windows, for CODA-W

We variously look at both ENABLE_HEADLESS and USE_HEADLESS_CODE to
check for the --enable-headless case. Are both really needed?

In the --enable-headless case, freetype, fontconfig and cairo are
built. For now, cairo is built as a Library (DLL), but fontconfig and
freetype as StaticLibrary. Possibly should change these to DLLs,
too. (See preceding commits.) Do not build the vclplug_win.

Windows-specific fixes to the headless vcl code, and headless-specific
fixes to some Win32 vcl code. Use  where
appropriate instead of , , etc.

fontconfig already has code for Windows, but likely things will break
on machines with a non-ASCII name for the Windows fonts directory, or
for funky font names. Should eventually make it use the new
.

Change-Id: Id3a1313083b1c7c44b0b26819c1ffb5138e15bc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194573
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 

diff --git a/Repository.mk b/Repository.mk
index 805e362a96ad..799f8de6003d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -529,7 +529,7 @@ $(eval $(call 
gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \
 icg \
 sdui \
 $(if $(ENABLE_GEN),vclplug_gen) \
-$(if $(filter $(OS),WNT),vclplug_win) \
+$(if $(filter $(OS)-$(USE_HEADLESS_CODE),WNT-),vclplug_win) \
 $(if $(filter $(OS),MACOSX),vclplug_osx) \
 ))
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c075418c55c7..80f0fdee37dc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1214,13 +1214,33 @@ endef
 
 else # !SYSTEM_CAIRO
 
-ifneq ($(filter-out MACOSX$(ENABLE_HEADLESS) WNT,$(OS)),)
+ifneq ($(filter-out MACOSX$(ENABLE_HEADLESS) WNT$(ENABLE_HEADLESS),$(OS)),)
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
cairo \
 pixman \
 ))
 
+ifeq ($(COM)-$(ENABLE_HEADLESS),MSC-TRUE)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   cairo \
+   pixman \
+))
+
+define gb_LinkTarget__use_pixman
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+   pixman \
+)
+
+endef
+
+endif
+
 define gb_LinkTarget__use_cairo
 $(call gb_LinkTarget_use_package,$(1),cairo)
 $(call gb_LinkTarget_use_package,$(1),pixman)
@@ -1234,9 +1254,14 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
$(if $(filter EMSCRIPTEN,$(OS)), \
$(gb_UnpackedTarball_workdir)/cairo/src/.libs/libcairo.a \
-   
$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs/libpixman-1.a, \
-   -L$(gb_UnpackedTarball_workdir)/cairo/src/.libs -lcairo \
-   -L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs -lpixman-1) 
\
+   $(gb_UnpackedTarball_workdir)/pixman/pixman/.libs/libpixman-1.a 
\
+   , \
+   $(if $(filter WNT,$(OS)), \
+   $(WORKDIR)/LinkTarget/Library/icairo.lib \
+   , \
+   -L$(gb_UnpackedTarball_workdir)/cairo/src/.libs -lcairo 
\
+   -L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs 
-lpixman-1) \
+   ) \
 )
 
 endef
@@ -1323,7 +1348,11 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTa

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-02 Thread Tor Lillqvist (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a71f8cc5cf1b78a7cd70352ac2a63eb07346897
Author: Tor Lillqvist 
AuthorDate: Mon Feb 24 15:00:53 2025 +0200
Commit: Caolán McNamara 
CommitDate: Tue Dec 2 09:24:01 2025 +0100

Fix typo in --enable-cairo-rgba help string

Change-Id: Ib14c05419d3f165d4917bc074de042479cc35b8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194567
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/configure.ac b/configure.ac
index be46fe02fa18..47d8b8b8a2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2670,7 +2670,7 @@ AC_ARG_WITH(system-hunspell,
 
 libo_FUZZ_ARG_ENABLE(cairo-rgba,
 AS_HELP_STRING([--enable-cairo-rgba],
-[Use RGBA order, instead of default BRGA. Not possible with 
--with-system-cairo]))
+[Use RGBA order, instead of default BGRA. Not possible with 
--with-system-cairo]))
 
 libo_FUZZ_ARG_ENABLE(zxing,
 AS_HELP_STRING([--disable-zxing],

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-01 Thread Jan Holesovsky (via logerrit) 
 configure.ac |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 54b81f8e6c6b4578a57571b57f56a4e4c84c2e97
Author: Jan Holesovsky 
AuthorDate: Mon Oct 21 10:02:59 2024 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Dec 2 08:45:46 2025 +0100

pkg-config from Homebrew seems not to cause trouble

Change-Id: I26e00cffe1eead5b6313bcf471aeecbfddba3388
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194561
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 4e83ec170c8b..be46fe02fa18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6978,6 +6978,8 @@ if test $_os = Darwin; then
 if test -n "$PKG_CONFIG"; then
 if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l 
/usr/bin/pkg-config | $GREP -q Mono.framework; then
 AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please 
remove or hide $PKG_CONFIG])
+elif test "$PKG_CONFIG" = "/opt/homebrew/bin/pkg-config"; then
+AC_MSG_RESULT([yes, from Homebrew. This is OK.])
 else
 if test "$enable_bogus_pkg_config" = "yes"; then
 AC_MSG_RESULT([yes, user-approved from unknown origin.])

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-12-01 Thread Tor Lillqvist (via logerrit) 
 configure.ac |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3af85546675a2e61fcfd43ff3ac68e558c2d9dd6
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 13:20:57 2024 +0300
Commit: Miklos Vajna 
CommitDate: Tue Dec 2 08:38:52 2025 +0100

Add missing double quotes and drop pointless assignment

The first assignment to PRODUCTNAME was immeditately replaced by the
one on the following line.

Change-Id: Icee223cbad3e864362abe8831cd1a4d5592499ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194557
Reviewed-by: Michael Stahl 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 42535c8432c9..4e83ec170c8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,8 +504,7 @@ if test -n "$with_product_name" -a "$with_product_name" != 
no; then
 PRODUCTNAME="$with_product_name"
 fi
 if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
-PRODUCTNAME="${PRODUCTNAME}Dev"
-PRODUCTNAME=AC_PACKAGE_NAME
+PRODUCTNAME="AC_PACKAGE_NAME"
 fi
 AC_MSG_RESULT([$PRODUCTNAME])
 AC_SUBST(PRODUCTNAME)

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-11-05 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e2a4a275a30639ed9b05d944e649ebbc2d199518
Author: Andras Timar 
AuthorDate: Wed Nov 5 15:03:39 2025 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 5 15:03:39 2025 +0100

Bump version to 25.04.8.0

Change-Id: I08f0774e927d3127f857943976871b8b9beaaac2

diff --git a/configure.ac b/configure.ac
index f6d924bb4aa8..42535c8432c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.7.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.8.0],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-10-31 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2de99b028a589f230d7fec9098e28cd8ea95c82
Author: Andras Timar 
AuthorDate: Fri Oct 31 12:22:03 2025 +0100
Commit: Andras Timar 
CommitDate: Fri Oct 31 12:22:03 2025 +0100

Bump version to 25.04.7.1

Change-Id: I0b8abb572f706795f46e5b4fa3442a64c18ed643

diff --git a/configure.ac b/configure.ac
index d93612e1fe93..f6d924bb4aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.7.0],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.7.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac README.md

2025-10-18 Thread Michael Weghorn (via logerrit) 
 README.md|2 +-
 configure.ac |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 827b59a93302ff2c32e0481c97a19ed5591482cb
Author: Michael Weghorn 
AuthorDate: Thu Feb 20 16:41:21 2025 +0100
Commit: Skyler Grey 
CommitDate: Thu Oct 9 12:11:55 2025 +0200

android: Update minimum NDK version to 27

As discussed in today's ESC meeting [1], bump the
minimum NDK version for Android builds from 23 to 27,
which is used in CI since

commit b8e51e8a26b8b8faf63e457ba0c03651dd864d95
Author: Christian Lohmaier 
Date:   Tue Feb 18 16:57:39 2025 +0100

bump android ndk to 27.2.12479018 on CI

and has better support for C++20 features.

[1] 
https://lists.freedesktop.org/archives/libreoffice/2025-February/093032.html

Change-Id: Ib7d7d355868ef38e7b92a5067ac0045a3b3f494c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181956
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192037
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Skyler Grey 

diff --git a/README.md b/README.md
index 8e39324cbd95..55e17dcde799 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
 * Build: Xcode 9.3 and iPhone SDK 11.4
 * Android:
-* Build: NDK r23 and SDK 30.0.3
+* Build: NDK 27 and SDK 30.0.3
 * Emscripten / WASM:
 * Runtime: a browser with SharedMemory support (threads + atomics)
 * Build: Qt 5.15 with Qt supported Emscripten 1.39.8
diff --git a/configure.ac b/configure.ac
index 27f00752121f..740eaf6bb1f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -772,16 +772,16 @@ if test -n "$with_android_ndk"; then
 fi
 case $ANDROID_NDK_VERSION in
 r9*|r10*)
-AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
+AC_MSG_ERROR([Building for Android requires NDK version >= 27.*])
 ;;
-11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*)
-AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
+
11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*|23.*|24.*|25.*|26.*)
+AC_MSG_ERROR([Building for Android requires NDK version >= 27.*])
 ;;
-23.*|24.*|25.*|26.*|27.*|28.*)
+27.*|28.*)
 ;;
 *)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 28.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 28.* have been used successfully. Proceed at your own risk."
+AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk.])
+add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk."
 ;;
 esac

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-10-17 Thread Michael Weghorn (via logerrit) 
 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c9b618eeface40b156eac672d8bf5f47d80d224b
Author: Michael Weghorn 
AuthorDate: Wed Feb 19 14:34:15 2025 +0100
Commit: Skyler Grey 
CommitDate: Wed Oct 8 11:49:33 2025 +0200

tdf#162769 android: Declare support for NDK versions up to 28

With previous commits

Change-Id: Icd45abee58e13a2fc77d78d12e823a8045272b4f
Author: Michael Weghorn 
Date:   Wed Feb 19 13:44:55 2025 +0100

android: Drop linker flag for libandroid_support

and

Change-Id: I759c5213b5f5873fc097a6ca0e0f0f85962e421b
Author: Michael Weghorn 
Date:   Wed Feb 19 14:00:33 2025 +0100

tdf#162769 android nss/nspr: Drop '-D_PR_NO_LARGE_FILES=1'

, Android Viewer builds with NDK versions up to the latest
version 28.0.13004108 now work fine, so add them to the list
of supported versions so autogen no longer warns when
they are used.

Change-Id: I210a2783e88898e58031826c21f09349f5217a2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181900
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192022
Reviewed-by: Skyler Grey 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 0c5dd042a558..80234cd82b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -784,11 +784,11 @@ if test -n "$with_android_ndk"; then
 11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*)
 AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
 ;;
-23.*|24.*|25.*)
+23.*|24.*|25.*|26.*|27.*|28.*)
 ;;
 *)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 25.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 25.* have been used successfully. Proceed at your own risk."
+AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 28.* have been used successfully. Proceed at your own risk.])
+add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 23.* to 28.* have been used successfully. Proceed at your own risk."
 ;;
 esac

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-10-17 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1942b5e6e9a7fd36bf8aebea96351f8442131ce3
Author: Andras Timar 
AuthorDate: Wed Oct 1 17:39:08 2025 +0200
Commit: Andras Timar 
CommitDate: Wed Oct 1 17:39:08 2025 +0200

Bump version to 25.04.6.1

Change-Id: I72b1b385ee009896d5673152478d49dbcebafd1e

diff --git a/configure.ac b/configure.ac
index 03febbf5cc67..50615a50a64b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.6.0],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.6.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-10-09 Thread Michael Weghorn (via logerrit) 
 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2ce02e409207e681992b39ed03544e643d6abbb6
Author: Michael Weghorn 
AuthorDate: Wed Jul 9 15:03:26 2025 +0200
Commit: Skyler Grey 
CommitDate: Thu Oct 9 15:48:22 2025 +0200

android: Declare support for NDK 29

A build using NDK 29.0.13599879 works fine for me
and Android Viewer works fine in a quick test (with an additional
local revert of commit 9d1e76f7da12353afc3d9479d3b2ecddbb2a71e6
to prevent a deadlock when opening documents that is unrelated
to this change here).

Change-Id: Ia82d3daa00c299cb3d244e973b9da3ceb840f4b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187577
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192038
Reviewed-by: Skyler Grey 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 740eaf6bb1f2..25cfa8c7b51e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,11 +777,11 @@ if test -n "$with_android_ndk"; then
 
11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*|23.*|24.*|25.*|26.*)
 AC_MSG_ERROR([Building for Android requires NDK version >= 27.*])
 ;;
-27.*|28.*)
+27.*|28.*|29.*)
 ;;
 *)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 28.* have been used successfully. Proceed at your own risk."
+AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 29.* have been used successfully. Proceed at your own risk.])
+add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 27.* to 29.* have been used successfully. Proceed at your own risk."
 ;;
 esac

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-10-03 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67771a6e06d7a0e00f9561f1f52a049dda8b2913
Author: Andras Timar 
AuthorDate: Fri Oct 3 15:34:27 2025 +0200
Commit: Andras Timar 
CommitDate: Fri Oct 3 15:34:27 2025 +0200

Bump version to 25.04.7.0

Change-Id: I27e9fcc6f3b500bfd7de4fa1e868b2a17f79570f

diff --git a/configure.ac b/configure.ac
index 50615a50a64b..0c5dd042a558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.6.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.7.0],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac download.lst external/afdko external/Module_external.mk Makefile.fetch readlicense_oo/license RepositoryExternal.mk solenv/flatpak-manifest.

2025-09-26 Thread Caolán McNamara (via logerrit) 
 Makefile.fetch  |2 
 RepositoryExternal.mk   |   21 ++
 configure.ac|6 
 download.lst|   10 +
 external/Module_external.mk |1 
 external/afdko/Makefile |7 
 external/afdko/Module_afdko.mk  |   17 +
 external/afdko/README   |3 
 external/afdko/StaticLibrary_afdko.mk   |  280 +
 external/afdko/UnpackedTarball_afdko.mk |   27 ++
 external/afdko/extern_makeotf.patch |  302 
 external/afdko/extern_mergefonts.patch  |  107 +++
 external/afdko/extern_tx.patch  |   85 +
 external/afdko/warnings.patch   |   20 ++
 readlicense_oo/license/license.xml  |   33 +++
 solenv/flatpak-manifest.in  |   14 +
 16 files changed, 935 insertions(+)

New commits:
commit 3d13970f18c6c578a6edd8f9669874ff96ae0143
Author: Caolán McNamara 
AuthorDate: Fri Sep 19 14:17:55 2025 +0100
Commit: Miklos Vajna 
CommitDate: Fri Sep 26 10:28:10 2025 +0200

add afdko

for conversion of Type 1 fonts to OTF, see:
https://github.com/adobe-type-tools/afdko

Requires antlr4-cpp-runtime, see:
https://github.com/antlr

Change-Id: Id5845e8f62d09055e140fd987dc2545c7fc0c48d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191202
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Stahl 

diff --git a/Makefile.fetch b/Makefile.fetch
index 15f5d3d6854d..cc59884a1a85 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -101,6 +101,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
@date >> $(fetch_LOGFILE)
$(foreach item, \
$(call fetch_Optional,ABW,ABW_TARBALL) \
+   $(call fetch_Optional,AFDKO,AFDKO_TARBALL) \
+   $(call fetch_Optional,AFDKO,ANTLR4CPPRUNTIME_TARBALL) \
$(call fetch_Optional,ARGON2,ARGON2_TARBALL) \
$(call fetch_Optional,BOOST,BOOST_TARBALL) \
$(call fetch_Optional,BOX2D,BOX2D_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 073c2c6039a7..ff8adde5f289 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4299,6 +4299,27 @@ endef
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
pdfium \
 ))
+
+define gb_LinkTarget__use_afdko
+$(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 \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   afdko \
+)
+
+endef
+
+define gb_ExternalProject__use_afdko
+$(call gb_ExternalProject_use_static_libraries,$(1),afdko)
+
+endef
+
 endif
 
 ifneq ($(SYSTEM_DRAGONBOX),)
diff --git a/configure.ac b/configure.ac
index 9b0201737d80..b21b082a5bf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12825,6 +12825,12 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
 else
 AC_MSG_RESULT([internal])
 fi
+
+# Only used by the pdf import code that uses pdfium
+# which doesn't currently have --with-system support
+if test "$ENABLE_PDFIMPORT" = "TRUE"; then
+BUILD_TYPE="$BUILD_TYPE AFDKO"
+fi
 fi
 AC_SUBST(SYSTEM_OPENJPEG2)
 AC_SUBST(SYSTEM_ABSEIL)
diff --git a/download.lst b/download.lst
index 8d0be269a66f..0a54265cb57b 100644
--- a/download.lst
+++ b/download.lst
@@ -631,6 +631,16 @@ PDFIUM_TARBALL := pdfium-7012.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+AFDKO_SHA256SUM := 
e1a31e871e83dd022635b852297c433c8e9c9d9d4f0c0f634e8d55dde28ad930
+AFDKO_TARBALL := afdko-4.0.2.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+ANTLR4CPPRUNTIME_SHA256SUM := 
0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4
+ANTLR4CPPRUNTIME_TARBALL := antlr4-cpp-runtime-4.13.2-source.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 PIXMAN_SHA256SUM := 
ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
 PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 0688f376fdb6..decbe0bd9106 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -16,6 +16,7 @@ endif
 $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XMLSEC,xmlsec) \
$(call gb_Helper_optional,ABW,libabw) \
+   $(call gb_Helper_optional,AFDKO,afdko) \
$(call gb_Helper_optional,ARGON2,argon2) \
$(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,BOX2D,box2d) \
diff --gi

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-08-22 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9181b9a419072ec8e4d6c732c948e783d8d2e498
Author: Andras Timar 
AuthorDate: Fri Aug 22 15:59:47 2025 +0200
Commit: Andras Timar 
CommitDate: Fri Aug 22 15:59:47 2025 +0200

Bump version to 25.04.5.1

Change-Id: Ib2be48eb93fed45aae3ef78bf2fb1b3d474c09d7

diff --git a/configure.ac b/configure.ac
index ed70d0c79d44..ca8e6bfddb56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.5.0],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.5.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-08-19 Thread Michael Stahl (via logerrit) 
 configure.ac |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit db867ee5d6b6a239a7d822233ad022d18962ccd4
Author: Michael Stahl 
AuthorDate: Mon Aug 18 13:08:40 2025 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 19 11:34:56 2025 +0200

rhbz#2354168 configure: workaround bogus "dbus-1" libs

DBUS_LIBS contains -L/usr/lib64/pkgconfig/../../lib64 which eventually
causes link failure:
  desktop/source/lib/init.cxx:6451: error: undefined reference to 
'ublock_getCode_77'

Reportedly realpath(1) is available even on macOS now so use it to
resolve these paths.

Change-Id: I754447ad23982918d6f8e80f839112db22b75205
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189864
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 457872f8cac849b319ad4f88a94c8390aa9e3df7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189879
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index af83b5c638b2..ed70d0c79d44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,11 +60,18 @@ FilterLibs()
 else
 for f in $1; do
 case "$f" in
-# let's start with Fedora's paths for now
-
-L/lib|-L/lib/|-L/lib64|-L/lib64/|-L/usr/lib|-L/usr/lib/|-L/usr/lib64|-L/usr/lib64/)
-# ignore it: on UNIXoids it is searched by default anyway
-# but if it's given explicitly then it may override other 
paths
-# (on macOS it would be an error to use it instead of SDK)
+-L*)
+case `realpath "${f#-L}"` in
+# let's start with Fedora's paths for now
+
/lib|/lib/|/lib64|/lib64/|/usr/lib|/usr/lib/|/usr/lib64|/usr/lib64/)
+# ignore it: on UNIXoids it is searched by default 
anyway
+# but if it's given explicitly then it may override 
other paths
+# (on macOS it would be an error to use it instead of 
SDK)
+;;
+*)
+filteredlibs="$filteredlibs $f"
+;;
+esac
 ;;
 *)
 filteredlibs="$filteredlibs $f"

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-07-23 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd16df55d3a0bb5b2ea535bc0b2df995d49545ba
Author: Andras Timar 
AuthorDate: Wed Jul 23 19:13:57 2025 +0200
Commit: Andras Timar 
CommitDate: Wed Jul 23 19:13:57 2025 +0200

Bump version to 25.04.5.0

Change-Id: Ib69ff23309c3853c4e96835fa5856d8434be23cc

diff --git a/configure.ac b/configure.ac
index 441b4fcd5f9d..af83b5c638b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.4.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.5.0],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac instsetoo_native/CustomTarget_emscripten-install.mk solenv/gbuild

2025-07-18 Thread Stephan Bergmann (via logerrit) 
 configure.ac|2 +-
 instsetoo_native/CustomTarget_emscripten-install.mk |4 +++-
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk  |8 +---
 solenv/gbuild/platform/unxgcc.mk|2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 3d3ffd12bdf672634b855eb536e418c520b7e30c
Author: Stephan Bergmann 
AuthorDate: Wed Jul 16 11:14:05 2025 +0200
Commit: Michael Stahl 
CommitDate: Fri Jul 18 14:35:11 2025 +0200

Emscripten: Put back -gseparate-dwarf

...which had been replaced with -gsplit-dwarf in
8ecdff7ac3e867b3e0e43a0df24695785abc5962 "Modernize wasm debug symbol
generation".  But -gseparate-dwarf and -gsplit-dwarf are apparently 
orthogonal:

-gseparate-dwarf adds a supplementary *.wasm.debug.wasm (whose relative URL 
is
recorded in an external_debug_info section in the original *.wasm), and the
original *.wasm and the supplementary *.wasm.debug.wasm have exactly the 
same
content, except that only the supplementary *.wasm.debug.wasm contains any 
of
the .debug_* sections (and only the original *.wasm contains the
external_debug_info section).  That way, the original *.wasm stays small (so
that it does not exceed any limits of the browser's JS WebAssembly 
instantiation
machinery), while the browser's debugger (like Chrome's "C/C++ DevTools 
Support
(DWARF)" extension) uses the supplementary *.wasm.debug.wasm.  This is
especially relevant when building LO with e.g. -fsanitize=address, where the
resulting soffice.wasm would otherwise easily grow too large.

-gsplit-dwarf, on the other hand, leaves certain debug information in 
.debug_*
sections in the original *.wasm and offloads further debug data to an 
auxiliary
*.wasm.dwp (which the browser's debugger will then load and use in addition 
to
using the original *.wasm's debug information).  When combined with
-gseparate-dwarf, there's an overall three files now: the original *.wasm 
(used
by the browser's JS WebAssembly instantiation machinery; lacking any debug
information), the supplementary *.wasm.debug.wasm (used by the browser's
debugger; containing some debug information), and the auxiliary
*.wasm.debug.wasm.dwp (used by the browser's debugger; containing further 
debug
information).  (One might assume that when using -gseparate-dwarf there 
would be
no benefit from additionally using -gsplit-dwarf.  But when I tried that 
with at
least Chrome version 138.0.7204.100 and the "C/C++ DevTools Support (DWARF)"
extension version 0.2.5854.1, it would still sometimes fail with

> [C/C++ DevTools Support (DWARF)] Loading debug symbols for 
http://localhost:6931/soffice.wasm (via soffice.wasm.debug.wasm)…
> [C/C++ DevTools Support (DWARF)] Failed to load debug symbols for 
http://localhost:6931/soffice.wasm (TypeError: Failed to fetch)

and the emrun server reporting

> 127.0.0.1 - - [15/Jul/2025 22:41:58] code 404, message File not found: 
/home/sberg/cowasm/core/workdir/installation/LibreOffice/emscripten/soffice.wasm.debug.wasm.dwp
> 127.0.0.1 - - [15/Jul/2025 22:41:58] "GET /soffice.wasm.debug.wasm.dwp 
HTTP/1.1" 404 -

making it look like it wanted to access a non-existing auxiliary
soffice.wasm.debug.wasm.dwp for some unclear reason.  So, at least for now, 
it
looks better to just use a setup that provides that auxiliary file anyway.)

Change-Id: I72352479c864c8d89cc63cc228aa676c7c2d8ccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187953
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e4b24dba07c54c1957df8c42a19392bd01fc01e2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188025
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 148f261b4927..441b4fcd5f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5109,7 +5109,7 @@ if test "$enable_split_debug" != no; then
 fi
 if test -n "$use_split_debug"; then
 if test "$_os" = "Emscripten"; then
-TEST_CC_FLAG='-gsplit-dwarf -gpubnames'
+TEST_CC_FLAG='-gseparate-dwarf -gsplit-dwarf -gpubnames'
 else
 TEST_CC_FLAG=-gsplit-dwarf
 fi
diff --git a/instsetoo_native/CustomTarget_emscripten-install.mk 
b/instsetoo_native/CustomTarget_emscripten-install.mk
index 6f89d5e37fe4..607217742413 100644
--- a/instsetoo_native/CustomTarget_emscripten-install.mk
+++ b/instsetoo_native/CustomTarget_emscripten-install.mk
@@ -19,7 +19,9 @@ emscripten_install_files := \
 soffice.js \
 soffice.wasm \
 $(if $(EMSCRIPTEN_WORKERJS),soffice.worker.js) \
-$(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
+$(if $(ENABLE_SYMBOLS_FOR), \
+soffice.wasm.debug.wasm \
+soffice.wasm.debug.wasm.dwp) \
 $(if $(DISABLE_GUI),, \

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-07-15 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9ffc2c8b5bfb3145cf676698b939fcbf90b7516
Author: Andras Timar 
AuthorDate: Wed Jul 16 07:28:45 2025 +0200
Commit: Andras Timar 
CommitDate: Wed Jul 16 07:28:45 2025 +0200

Bump version to 25.04.4.1

Change-Id: I95945cbea183a552edb8ae2f9e6a521b38d6feed

diff --git a/configure.ac b/configure.ac
index de8350fe9f6c..148f261b4927 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.3.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.4.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-06-17 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 531aea4c7d77542af7803c02dd62362e5ef4f882
Author: Andras Timar 
AuthorDate: Tue Jun 17 22:27:08 2025 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 17 22:27:08 2025 +0200

Bump version to 25.04.3.1

Change-Id: Icb9f5277bdcf73c9a611eed05af7626c4aaad5bc

diff --git a/configure.ac b/configure.ac
index f1ad2ac6b721..d081bd5011a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.2.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.3.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-06-12 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9f56f8191ca3907a4fbeffed75369d6ba222dfb
Author: Andras Timar 
AuthorDate: Thu Jun 12 12:46:06 2025 +0200
Commit: Andras Timar 
CommitDate: Thu Jun 12 12:46:06 2025 +0200

Bump version to 25.04.2.3

Change-Id: I09b83c9ec9e49080fbbb3ccc6a52d347bd2469b6

diff --git a/configure.ac b/configure.ac
index b76a3bb6c781..f1ad2ac6b721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.2.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.2.3],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-05-28 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b678ed74695d64e638db9eb734e86703ad84516d
Author: Andras Timar 
AuthorDate: Wed May 28 22:24:47 2025 +0200
Commit: Andras Timar 
CommitDate: Wed May 28 22:24:47 2025 +0200

Bump version to 25.04.2.2

Change-Id: I776ab4c02f5b2bd25f6f0451d375afca73264b4a

diff --git a/configure.ac b/configure.ac
index 6ee6bbf87690..0cdc7c4a2be5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.2.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.2.2],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-05-12 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03f921c7c8923ff95ebb0256ddf04511f0e0112c
Author: Andras Timar 
AuthorDate: Mon May 12 14:20:56 2025 +0200
Commit: Andras Timar 
CommitDate: Mon May 12 14:20:56 2025 +0200

Bump version to 25.04.2.1

Change-Id: I4b0354a909b2344b80a86a9f39cf6c9a86ce9cb5

diff --git a/configure.ac b/configure.ac
index 6e7849dc92e2..6ee6bbf87690 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.1.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.2.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac external/libeot RepositoryExternal.mk

2025-05-09 Thread Tomaž Vajngerl (via logerrit) 
 RepositoryExternal.mk  |   12 ++
 configure.ac   |2 -
 external/libeot/0001-remove-unused-err.h.patch |   24 
 external/libeot/ExternalProject_libeot.mk  |2 -
 external/libeot/Module_libeot.mk   |   11 -
 external/libeot/StaticLibrary_libeot.mk|   47 +
 external/libeot/UnpackedTarball_libeot.mk  |9 
 7 files changed, 103 insertions(+), 4 deletions(-)

New commits:
commit 48ae2e1ba3d58b60fa1cfcc7f823930e232bad10
Author: Tomaž Vajngerl 
AuthorDate: Fri May 9 00:06:19 2025 +0900
Commit: Miklos Vajna 
CommitDate: Fri May 9 10:32:30 2025 +0200

make libeot compile on Windows

Compile for Windows with LO infrastructure (not the only external lib
where we do this).

Remove unneeded include of  in libeot.c that isn't used, but
Windows doesn't have  - it's a BSD / Linux thing.

Only compile libeot.la and not the eot2ttf binary (which uses err.h so
it doesn't compile on Windows).

Change-Id: I26afb2b7bcf0bdf0d2ce0bdbcfceb10599d599e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185057
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185075
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4d582e96d821..959c9976f5a8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3445,9 +3445,21 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(gb_UnpackedTarball_workdir)/libeot/inc \
$$(INCLUDE) \
 )
+
+ifeq ($(COM),MSC)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   libeot \
+)
+
+else
+
 $(call gb_LinkTarget_add_libs,$(1),\

$(gb_UnpackedTarball_workdir)/libeot/.libs/libeot$(gb_StaticLibrary_PLAINEXT) \
 )
+
+endif
+
 $(call gb_LinkTarget_use_external_project,$(1),libeot)
 
 endef
diff --git a/configure.ac b/configure.ac
index c23ce6c80fdd..6e7849dc92e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1881,7 +1881,7 @@ libo_FUZZ_ARG_ENABLE(gstreamer-1-0,
 ,test "${enable_gstreamer_1_0+set}" = set || enable_gstreamer_1_0=yes)
 
 # Enable by default on Linux and macOS only
-if test $_os = Darwin -o $_os = Linux; then
+if test $_os = Darwin -o $_os = Linux -o $_os = WINNT; then
 libo_FUZZ_ARG_ENABLE([eot],
 [AS_HELP_STRING([--disable-eot],
 [Disable support for Embedded OpenType fonts.])],
diff --git a/external/libeot/0001-remove-unused-err.h.patch 
b/external/libeot/0001-remove-unused-err.h.patch
new file mode 100644
index ..826bf12135c0
--- /dev/null
+++ b/external/libeot/0001-remove-unused-err.h.patch
@@ -0,0 +1,24 @@
+From cc2fbd324a2b3b014914ae253513d546e4076320 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= 
+Date: Fri, 9 May 2025 09:55:23 +0900
+Subject: [PATCH] remove unused err.h
+
+---
+ src/libeot.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/libeot.c b/src/libeot.c
+index 8bac0c0..dce12ba 100644
+--- a/src/libeot.c
 b/src/libeot.c
+@@ -6,7 +6,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include 
+ 
+-- 
+2.49.0
+
diff --git a/external/libeot/ExternalProject_libeot.mk 
b/external/libeot/ExternalProject_libeot.mk
index c8f1b3b8b122..95b5128a9d63 100644
--- a/external/libeot/ExternalProject_libeot.mk
+++ b/external/libeot/ExternalProject_libeot.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) :
--disable-shared \
--disable-debug \
$(gb_CONFIGURE_PLATFORMS) \
-   && $(MAKE) $(if $(verbose),V=1) \
+   && $(MAKE) $(if $(verbose),V=1) libeot.la \
)
$(call gb_Trace_EndRange,libeot,EXTERNAL)
 
diff --git a/external/libeot/Module_libeot.mk b/external/libeot/Module_libeot.mk
index 128b255d1b90..6d39a68c2ce3 100644
--- a/external/libeot/Module_libeot.mk
+++ b/external/libeot/Module_libeot.mk
@@ -10,8 +10,15 @@
 $(eval $(call gb_Module_Module,libeot))
 
 $(eval $(call gb_Module_add_targets,libeot,\
-   ExternalProject_libeot \
UnpackedTarball_libeot \
 ))
-
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,libeot,\
+   StaticLibrary_libeot \
+))
+else
+$(eval $(call gb_Module_add_targets,libeot,\
+   ExternalProject_libeot \
+))
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libeot/StaticLibrary_libeot.mk 
b/external/libeot/StaticLibrary_libeot.mk
new file mode 100644
index ..4e185e4edef0
--- /dev/null
+++ b/external/libeot/StaticLibrary_libeot.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at ht

core.git: Branch 'distro/collabora/co-25.04' - configure.ac external/libeot

2025-05-09 Thread Tomaž Vajngerl (via logerrit) 
 configure.ac  |   18 ++
 external/libeot/ExternalProject_libeot.mk |1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 77833b757348f226a412801f9805ba4f2a68f87d
Author: Tomaž Vajngerl 
AuthorDate: Wed May 7 22:20:47 2025 +0900
Commit: Miklos Vajna 
CommitDate: Fri May 9 10:30:00 2025 +0200

make libeot enabled by default on Linux and macOS

Instead of explicitly enabling the library with --enable-eot,
there is now --disable-eot to disable using libeot, which is now
enabled by default, but only on Linux and macOS.

libeot is needed to support reading embedded fonts from PPTX files,
which use to store the fonts in (compressed or not) EOT format and
without this library, it is a compatibility problem.

Change-Id: I5ab733fb411cb81137be6834cc970b3034426330
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184697
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185045
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/configure.ac b/configure.ac
index 9d6f411515c6..c23ce6c80fdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1880,10 +1880,20 @@ libo_FUZZ_ARG_ENABLE(gstreamer-1-0,
 [Disable building with the gstreamer 1.0 avmedia backend.]),
 ,test "${enable_gstreamer_1_0+set}" = set || enable_gstreamer_1_0=yes)
 
-libo_FUZZ_ARG_ENABLE([eot],
-[AS_HELP_STRING([--enable-eot],
-[Enable support for Embedded OpenType fonts.])],
-,test "${enable_eot+set}" = set || enable_eot=no)
+# Enable by default on Linux and macOS only
+if test $_os = Darwin -o $_os = Linux; then
+libo_FUZZ_ARG_ENABLE([eot],
+[AS_HELP_STRING([--disable-eot],
+[Disable support for Embedded OpenType fonts.])],
+,test "${enable_eot+set}" = set || enable_eot=yes)
+else
+libo_FUZZ_ARG_ENABLE([eot],
+[AS_HELP_STRING([--enable-eot],
+[Enable support for Embedded OpenType fonts.])],
+,test "${enable_eot+set}" = set || enable_eot=no)
+fi
+
+
 
 libo_FUZZ_ARG_ENABLE(cve-tests,
 AS_HELP_STRING([--disable-cve-tests],
diff --git a/external/libeot/ExternalProject_libeot.mk 
b/external/libeot/ExternalProject_libeot.mk
index 6e5f465333cc..c8f1b3b8b122 100644
--- a/external/libeot/ExternalProject_libeot.mk
+++ b/external/libeot/ExternalProject_libeot.mk
@@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) :
--enable-static \
--disable-shared \
--disable-debug \
+   $(gb_CONFIGURE_PLATFORMS) \
&& $(MAKE) $(if $(verbose),V=1) \
)
$(call gb_Trace_EndRange,libeot,EXTERNAL)

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-05-04 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce275e4d5b20ac516ecd99ee0c5d1b05ef69e955
Author: Andras Timar 
AuthorDate: Tue Apr 29 21:12:54 2025 +0200
Commit: Andras Timar 
CommitDate: Sun May 4 21:17:01 2025 +0200

Bump version to 25.04.1.1

Change-Id: I52e244c6399f96023d2202b60331086660504369

diff --git a/configure.ac b/configure.ac
index 774c0710eb4e..46ea63ca378f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.0.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.1.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-04-10 Thread Andras Timar (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68ed7f8686a9821d66bcadc0772924c10bea34ae
Author: Andras Timar 
AuthorDate: Thu Apr 10 12:47:49 2025 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 10 12:47:49 2025 +0200

Bump version to 25.04.0.2

Change-Id: I3f1ac73b1bb9bdd148a56432acdc3d17fa214707

diff --git a/configure.ac b/configure.ac
index 8941e61f8a8f..d6307e905c3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[25.04.0.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[25.04.0.2],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'distro/collabora/co-25.04' - configure.ac

2025-03-14 Thread Miklos Vajna (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44d00285126142cead6eb163e215a4e4d039b469
Author: Miklos Vajna 
AuthorDate: Fri Feb 14 13:46:09 2025 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 14 15:05:12 2025 +0100

configure: fix --disable-skia build of pdfium

A problem since commit 6007fbef5c2e4a0b80a4c0031ff36117aa41e63f (Update
pdfium to 7012, 2025-02-13), it's one thing that pdfium needs to be
built with clang-cl on Windows (similar to Skia), but our configure
didn't configure clang-cl when skia was off. So do it when either skia
or pdfium is enabled.

Reported at

.

(cherry picked from commit 1f725b2c2afae70d7886b89a2936ab9ced53b599)

Change-Id: I261b98511b664182d46a4a11ecbb40ad91663c41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182918
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 865d872702be..13022d5693a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12833,7 +12833,7 @@ LO_CLANG_CXXFLAGS_INTRINSICS_FMA=
 LO_CLANG_VERSION=
 HAVE_LO_CLANG_DLLEXPORTINLINES=
 
-if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
+if test \( "$ENABLE_SKIA" = TRUE -o "$ENABLE_PDFIUM" = TRUE \) -a 
"$COM_IS_CLANG" != TRUE; then
 if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
 AC_MSG_CHECKING([for Clang])
 AC_MSG_RESULT([$LO_CLANG_CC / $LO_CLANG_CXX])

core.git: Branch 'distro/collabora/co-25.04' - configure.ac connectivity/source external/iODBC external/unixODBC readlicense_oo/license RepositoryExternal.mk solenv/clang-format

2025-02-08 Thread Andras Timar (via logerrit) 
 RepositoryExternal.mk   |2 
 configure.ac|1 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 
 connectivity/source/drivers/odbc/OTools.cxx |4 
 external/iODBC/README   |1 
 external/iODBC/inc/odbc/iodbcunix.h |  160 
 external/iODBC/inc/odbc/sql.h   | 1187 +++
 external/iODBC/inc/odbc/sqlext.h| 2573 
 external/iODBC/inc/odbc/sqltypes.h  |  429 ++
 external/iODBC/inc/odbc/sqlucode.h  |  818 +
 external/unixODBC/README|1 
 external/unixODBC/inc/odbc/sql.h|  824 -
 external/unixODBC/inc/odbc/sqlext.h | 2122 -
 external/unixODBC/inc/odbc/sqltypes.h   |  470 --
 external/unixODBC/inc/odbc/sqlucode.h   |  789 
 readlicense_oo/license/license.xml  |   37 
 solenv/clang-format/excludelist |8 
 17 files changed, 5210 insertions(+), 4218 deletions(-)

New commits:
commit 7ed9c5d7ffd79f858fe3b98a4cd092eeaa9fb2a7
Author: Andras Timar 
AuthorDate: Tue Nov 30 12:45:40 2021 +0100
Commit: Andras Timar 
CommitDate: Sat Feb 8 14:13:24 2025 +0100

Replace unixODBC to iODBC that is BSD licensed

Change-Id: Ia794fd97bb70b1e33385517971a174430d11cab7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126117
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23e397263254..4d582e96d821 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -50,7 +50,7 @@ else # !SYSTEM_ODBC_HEADERS
 
 define gb_LinkTarget__use_odbc_headers
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(SRCDIR)/external/unixODBC/inc \
+   -I$(SRCDIR)/external/iODBC/inc \
$$(INCLUDE) \
 )
 
diff --git a/configure.ac b/configure.ac
index 2dbf5a2875d4..31ea8e86568a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11194,6 +11194,7 @@ elif test "$enable_database_connectivity" = no; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_ODBC_HEADERS=
+BUILD_TYPE="$BUILD_TYPE IODBC"
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index b382b34e9eb5..fcbd127f29e2 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -301,7 +301,7 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
  * ODBC Programmer's reference > Developing Applications > Programming 
Considerations > Unicode >  Unicode Function Arguments
  *http://support.microsoft.com/kb/294169
  *
- * UnixODBC can be configured at compile-time so that the "W" variants 
expect
+ * iODBC can be configured at compile-time so that the "W" variants 
expect
  * UTF-16 or UTF-32 encoded strings, and character lengths are number 
of codepoints.
  * However, UTF-16 is the default, what all/most distributions do
  * and the established API that most drivers implement.
diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index 0909b03f14b2..a5f7a6a75d85 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -65,7 +65,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 return sizeof(SQLBIGINT);
 case SQL_C_UBIGINT:
 return sizeof(SQLUBIGINT);
-/* UnixODBC gives this the same value as SQL_C_UBIGINT
+/* iODBC gives this the same value as SQL_C_UBIGINT
 case SQL_C_BOOKMARK:
 return sizeof(BOOKMARK); */
 case SQL_C_TYPE_DATE:
@@ -99,7 +99,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 case SQL_C_CHAR:
 case SQL_C_WCHAR:
 case SQL_C_BINARY:
-// UnixODBC gives this the same value as SQL_C_BINARY
+// iODBC gives this the same value as SQL_C_BINARY
 //case SQL_C_VARBOOKMARK:
 // Unknown datatype -> cannot predict length
 default:
diff --git a/external/iODBC/README b/external/iODBC/README
new file mode 100644
index ..df189dcd88e7
--- /dev/null
+++ b/external/iODBC/README
@@ -0,0 +1 @@
+iODBC is an open-source ODBC driver manager and SDK that facilitates the 
development of database-independent applications on Linux, FreeBSD, Unix and 
macOS platforms.  [http://www.iodbc.org/]
diff --git a/external/iODBC/inc/odbc/iodbcunix.h 
b/external/iODBC/inc/odbc/iodbcunix.h
new file mode 100644
index ..22e1518ba44a
--- /dev/null
+++ b/external/iODBC/inc/odbc/iodbcunix.h
@@ -0,0 +1,160 @@
+/*
+ *  iodbcunix.h
+ *
+ *  $Id$
+ *
+ *  ODBC defines for Unix
+ *