Merging debian version 4:24.2.2-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 180 insertions, 95 deletions

diff --git a/debian/rules b/debian/rules
index ab21c4a38e..5d3ad1a327 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
 # NOT in proper libreoffice-3-6 branch
 # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
 GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-24-2-1
+GIT_BRANCH=libreoffice-24-2-2
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -105,7 +105,6 @@ BUILD_DEPS=\
     bison,\
     bzip2,\
     flex, \
-    fontforge-nox | fontforge, \
     gperf,\
     libfreetype-dev,\
     libfontconfig-dev,\
@@ -199,6 +198,7 @@ ENABLE_ZXING=y
 SYSTEM_STUFF += zxing
 BUILD_CAIROCANVAS=y
 SYSTEM_STUFF += cairo
+ENABLE_GPGMEPP=y
 ifeq "$(ENABLE_GUI)" "y"
 BUILD_PLASMA=y
 # let's assume we won't ship two plasmas parallel..
@@ -459,6 +459,33 @@ SYSTEM_STUFF += libtiff
 SYSTEM_STUFF += frozen
 SYSTEM_STUFF += argon2
 
+# override stuff for build-indep to save build dependencies
+ifeq ($(MAKECMDGOALS),build-indep)
+ENABLE_EVOAB=n
+BUILD_GTK3=n
+ENABLE_INTROSPECTION=n
+ENABLE_GIO=n
+BUILD_GTK4=n
+ENABLE_QT5=n
+ENABLE_QT6=n
+# libgpgmepp-dev depends on Qt, too, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863149
+ENABLE_GPGMEPP=n
+ENABLE_KF5=n
+ENABLE_KF6=n
+BUILD_PLASMA=n
+ENABLE_MARIADB=n
+ENABLE_FIREBIRD=n
+ENABLE_SDBC_POSTGRESQL=n
+ENABLE_SKIA=n
+ENABLE_COINMP=n
+ENABLE_LPSOLVE=n
+USE_GSTREAMER=n
+ENABLE_LDAP=n
+ENABLE_PDFIUM=n
+USE_DBUS=n
+ENABLE_AVAHI=n
+endif
+
 # Default flags to pass to configure
 CONFIGURE_FLAGS+= \
 		--with-vendor='$(OOO_VENDOR)' \
@@ -470,11 +497,34 @@ CONFIGURE_FLAGS+= \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--disable-online-update \
 		--disable-fetch-external \
-		--without-fonts --enable-build-opensymbol \
+		--without-fonts \
 		--without-myspell-dicts \
 		--with-branding=$(CURDIR)/debian/branding \
 		--without-coredumpctl
 
+# don't rebuild the font anywhere, we just really need it in indep builds.
+# please put https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
+# into $(SOURCE_TREE)/tarballs if you don't rebuild the font.
+BUILD_DEPS_INDEP += , fontforge-nox | fontforge <!pkg.libreoffice.noopensymbolbuild>
+ifeq ($(filter pkg.libreoffice.noopensymbolbuild,$(DEB_BUILD_PROFILES)),)
+ENABLE_OPENSYMBOL_BUILD=y
+endif
+
+# we get a fonts-opensymbol build-dep -b builds (_ARCH also affects -b), too anyway but it's still lesser
+# dependencies than fontforge-nox | fontforge...
+# But this can get a problem for bootstrapping if we ever needed a newer fonts-opensymbol for
+# tests to pass...
+# Allow building it nevertheless if wanted
+BUILD_DEPS_ARCH += , fonts-opensymbol <!pkg.libreoffice.opensymbolbuild>
+ifneq ($(MAKECMDGOALS),build-arch)
+ifneq ($(filter pkg.libreoffice.opensymbolbuild,$(DEB_BUILD_PROFILES)),)
+ENABLE_OPENSYMBOL_BUILD=y
+endif
+ifeq "$(ENABLE_OPENSYMBOL_BUILD)" "y"
+CONFIGURE_FLAGS_INDEP += --enable-build-opensymbol 
+endif
+endif
+
 ifeq "$(ENABLE_GUI)" "y"
 BUILD_DEPS += ,\
     libcups2-dev,\
@@ -641,7 +691,7 @@ OOO_BASE_ARCHS := $(OOO_ARCHS)
 $(eval $(call gen_no_archs,OOO_BASE_ARCHS))
 OOO_REPORTBUILDER_ARCHS := $(OOO_JAVA_ARCHS)
 $(eval $(call gen_no_archs,OOO_REPORTBUILDER_ARCHS))
-OOO_FIREBIRD_ARCHS := $(OOO_BASE_ARCHS)
+OOO_FIREBIRD_ARCHS := $(filter-out m68k,$(OOO_BASE_ARCHS))
 $(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
 OOO_NOGUI_ARCHS := $(filter amd64 i386 arm64 armhf s390x ppc64 ppc64el,$(OOO_ARCHS))
 $(eval $(call gen_no_archs,OOO_NOGUI_ARCHS))
@@ -756,9 +806,9 @@ ifneq "$(shell echo $(USE_CLANG)$(ALLOW_CLANG) | grep y)" ""
     else
       ifeq "$(ALLOW_CLANG)" "y"
         ifeq "$(CLANG_VERSION)" "default"
-	  BUILD_DEPS += , llvm$(OOO_NO_CLANG_ARCHS)
+	  BUILD_DEPS_ARCH += , llvm$(OOO_NO_CLANG_ARCHS)
         else
-	  BUILD_DEPS += , llvm-$(CLANG_VERSION)-linker-tools$(OOO_NO_CLANG_ARCHS)
+	  BUILD_DEPS_ARCH += , llvm-$(CLANG_VERSION)-linker-tools$(OOO_NO_CLANG_ARCHS)
         endif
       endif
     endif
@@ -857,11 +907,11 @@ endif
       ifeq "$(CLANG_VERSION)" "default"
 	export LO_CLANG_CC=clang
 	export LO_CLANG_CXX=clang++
-	BUILD_DEPS += , clang$(OOO_NO_CLANG_ARCHS)
+	BUILD_DEPS_ARCH += , clang$(OOO_NO_CLANG_ARCHS)
       else
 	export LO_CLANG_CC=clang-$(CLANG_VERSION)
 	export LO_CLANG_CXX=clang++-$(CLANG_VERSION)
-	BUILD_DEPS += , clang-$(CLANG_VERSION) [$(OOO_LE_ARCHS)]
+	BUILD_DEPS_ARCH += , clang-$(CLANG_VERSION) [$(OOO_LE_ARCHS)]
       endif
     endif
   endif
@@ -912,10 +962,10 @@ ifeq "$(ENABLE_PDFIMPORT)" "y"
 	SYSTEM_STUFF += abseil
 	SYSTEM_STUFF += openjpeg
     ifneq (,$(filter openjpeg, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libopenjp2-7-dev [$(OOO_PDFIUM_ARCHS)]
+	BUILD_DEPS_ARCH += , libopenjp2-7-dev [$(OOO_PDFIUM_ARCHS)]
     endif
     ifneq (,$(filter abseil, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libabsl-dev [$(OOO_PDFIUM_ARCHS)]
+	BUILD_DEPS_ARCH += , libabsl-dev [$(OOO_PDFIUM_ARCHS)]
     endif
   endif
 endif
@@ -1000,7 +1050,7 @@ ifneq ($(ENABLE_COINMP),y)
 	CONFIGURE_FLAGS += --disable-coinmp
 else
   ifneq (,$(filter coinmp, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
+	BUILD_DEPS_ARCH += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
   endif
 endif
 
@@ -1066,13 +1116,13 @@ ifeq "$(ENABLE_PYTHON)" "y"
 PYMAJOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[0])")
 PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
 PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1]+1)")
-PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PYTHON_SITE:=$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
 endif
 
 	BUILD_DEPS += , $(PYTHON)
 ifeq "$(ENABLE_PYTHON)" "y"
 	BUILD_DEPS += , $(PYTHON)-dev <!nopython>
-	BUILD_DEPS += , $(PYTHON)-distutils <!nopython>
+	BUILD_DEPS += , $(PYTHON)-setuptools <!nopython>
 	BUILD_DEPS += , dh-python <!nopython>
   ifeq "$(RUN_MAKE_CHECK)" "y"
     ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -1224,7 +1274,7 @@ ifeq "$(ENABLE_JAVA)" "y"
 	JAVA_HOME=/usr/lib/jvm/default-java
 	DEFAULT_JDK := $(call java_dependency, default-jdk)
 	# build-depend on 1.9 (upstream needs it anyway for module-info support)
-	BUILD_DEPS += , $(shell echo $(DEFAULT_JDK) | sed -e 's/default-jdk/default-jdk (>= 2:1.17)/' | sed -e 's/\]/$(foreach i,$(JAVA_BRIDGE_BROKEN_ARCHS), !$(i))\]/') <!nojava>
+	BUILD_DEPS += , $(shell echo $(DEFAULT_JDK) | sed -e 's/default-jdk/default-jdk (>= 2:1.9)/' | sed -e 's/\]/$(foreach i,$(JAVA_BRIDGE_BROKEN_ARCHS), !$(i))\]/') <!nojava>
   endif
   ifeq "$(JDK)" "openjdk"
 	BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk <!nojava>
@@ -1267,7 +1317,7 @@ export JAVA_HOME
 	CONFIGURE_FLAGS_INDEP += --enable-ext-nlpsolver
   endif
 	OOO_OFFICEBEAN_DEP = libofficebean-java
-	BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION) <!nojava>
+	BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)$(OOO_NO_JAVA_ARCHS) <!nojava>
 else
 	CONFIGURE_FLAGS += --without-java
 	DEBHELPER_OPTIONS += -Nlibofficebean-java -Nlibreoffice-java-common -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js -Nlibreoffice-subsequentcheckbase -Nlibunoloader-java -Nliblibreoffice-java -Nlibreoffice-sdbc-hsqldb -Nure-java
@@ -1447,7 +1497,7 @@ ifneq (,$(filter lcms2, $(SYSTEM_STUFF)))
 endif
 
 ifneq (,$(filter openldap, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libldap-dev
+	BUILD_DEPS_ARCH += , libldap-dev
 endif
 
 ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
@@ -1469,39 +1519,39 @@ endif
 
 ifeq "$(ENABLE_KF5)" "y"
 	CONFIGURE_FLAGS += --enable-kf5
-	BUILD_DEPS += , libkf5coreaddons-dev, libkf5i18n-dev, libkf5config-dev, libkf5windowsystem-dev, libkf5kio-dev
+	BUILD_DEPS_ARCH += , libkf5coreaddons-dev, libkf5i18n-dev, libkf5config-dev, libkf5windowsystem-dev, libkf5kio-dev
 endif
 ifeq "$(ENABLE_KF6)" "y"
 	CONFIGURE_FLAGS += --enable-kf6
-	BUILD_DEPS += , libkf6coreaddons-dev, libkf6i18n-dev, libkf6config-dev, libkf6windowsystem-dev, libkf6kio-dev
+	BUILD_DEPS_ARCH += , libkf6coreaddons-dev, libkf6i18n-dev, libkf6config-dev, libkf6windowsystem-dev, libkf6kio-dev
 endif
 	PLASMA_ICONSET_DEP=libreoffice-style-breeze
 ifeq "$(ENABLE_QT5)" "y"
 	CONFIGURE_FLAGS += --enable-qt5
-	BUILD_DEPS += , qtbase5-dev $(QT5_MINVER), qt5-qmake $(QT5_MINVER), qtbase5-dev-tools $(QT5_MINVER)
-	BUILD_DEPS += , libqt5x11extras5-dev $(QT5_MINVER)
-	BUILD_DEPS += , libglib2.0-dev
-	BUILD_DEPS += , libxcb1-dev
+	BUILD_DEPS_ARCH += , qtbase5-dev $(QT5_MINVER), qt5-qmake $(QT5_MINVER), qtbase5-dev-tools $(QT5_MINVER)
+	BUILD_DEPS_ARCH += , libqt5x11extras5-dev $(QT5_MINVER)
+	BUILD_DEPS_ARCH += , libglib2.0-dev
+	BUILD_DEPS_ARCH += , libxcb1-dev
 endif
 ifeq "$(ENABLE_QT6)" "y"
 	CONFIGURE_FLAGS += --enable-qt6
-	BUILD_DEPS += , qt6-base-dev $(QT6_MINVER), qmake6 $(QT6_MINVER), qt6-base-dev-tools $(QT6_MINVER)
-	BUILD_DEPS += , libxcb1-dev
+	BUILD_DEPS_ARCH += , qt6-base-dev $(QT6_MINVER), qmake6 $(QT6_MINVER), qt6-base-dev-tools $(QT6_MINVER)
+	BUILD_DEPS_ARCH += , libxcb1-dev
 endif
 
 ifeq "$(ENABLE_MARIADB)" "y"
   ifeq "$(MYSQL_FLAVOUR)" "default"
-	BUILD_DEPS += , default-libmysqlclient-dev
+	BUILD_DEPS_ARCH += , default-libmysqlclient-dev
   else
     ifeq "$(MYSQL_FLAVOUR)" "mysql"
         ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
-        BUILD_DEPS += , libmysqlclient-dev
+        BUILD_DEPS_ARCH += , libmysqlclient-dev
         endif
       MARIADBCONFIG=/usr/bin/mysql_config
     endif
     ifeq "$(MYSQL_FLAVOUR)" "mariadb"
       ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libmariadb-dev
+	BUILD_DEPS_ARCH += , libmariadb-dev
       endif
     MARIADBCONFIG=/usr/bin/mariadb_config
     endif
@@ -1514,13 +1564,13 @@ endif
 ifeq "$(ENABLE_FIREBIRD)" "y"
 	BASE_FIREBIRD_RECOMMENDS = libreoffice-sdbc-firebird [$(OOO_FIREBIRD_ARCHS)]
   ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libatomic-ops-dev$(OOO_NO_FIREBIRD_ARCHS)
+	BUILD_DEPS_ARCH += , libatomic-ops-dev$(OOO_NO_FIREBIRD_ARCHS)
   endif
   ifneq (,$(filter libtommath, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libtommath-dev$(OOO_NO_FIREBIRD_ARCHS)
+	BUILD_DEPS_ARCH += , libtommath-dev$(OOO_NO_FIREBIRD_ARCHS)
   endif
   ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , firebird-dev$(OOO_NO_FIREBIRD_ARCHS)
+	BUILD_DEPS_ARCH += , firebird-dev$(OOO_NO_FIREBIRD_ARCHS)
 	# we need libEngine12.so
   ifeq "$(RUN_MAKE_CHECK)" "y"
 	BUILD_DEPS_ARCH += , firebird3.0-server-core $(OOO_NO_FIREBIRD_ARCHS) <!nocheck>
@@ -1533,7 +1583,7 @@ else
 endif
 
 ifeq "$(BUILD_GTK3)" "y"
-	BUILD_DEPS += , libgtk-3-dev, libglib2.0-dev
+	BUILD_DEPS_ARCH += , libgtk-3-dev, libglib2.0-dev
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
@@ -1542,7 +1592,7 @@ ifeq "$(BUILD_GTK3)" "y"
   endif
 	GNOME_GTK_RECOMMENDS += libreoffice-gtk3
   ifeq "$(ENABLE_INTROSPECTION)" "y"
-	BUILD_DEPS += , gobject-introspection <!nogir>, libgirepository1.0-dev <!nogir>
+	BUILD_DEPS_ARCH += , gobject-introspection <!nogir>, libgirepository1.0-dev <!nogir>
 	CONFIGURE_FLAGS += --enable-introspection
   else
 	DEBHELPER_OPTIONS+= -Ngir1.2-lokdocview-0.1
@@ -1556,10 +1606,12 @@ ifeq "$(BUILD_GTK3)" "y"
 	# explicitely disable it if not wanted as t is auto-enabled if the above is there
 	CONFIGURE_FLAGS += --disable-atspi-tests
   endif
+else
+	CONFIGURE_FLAGS += --disable-gtk3
 endif
 
 ifeq "$(BUILD_GTK4)" "y"
-	BUILD_DEPS += , libgtk-4-dev, libglib2.0-dev, libcairo2-dev, libatk1.0-dev
+	BUILD_DEPS_ARCH += , libgtk-4-dev, libglib2.0-dev, libcairo2-dev, libatk1.0-dev
 	CONFIGURE_FLAGS += --enable-gtk4
 endif
 
@@ -1568,13 +1620,14 @@ ifeq "$(ENABLE_EVO2)" "n"
 	#DEBHELPER_OPTIONS += -Nlibreoffice-evolution
 else
 	CONFIGURE_FLAGS += --enable-evolution2
-	BUILD_DEPS += , libebook1.2-dev
+	BUILD_DEPS_ARCH += , libebook1.2-dev
 	LIBEBOOK_DEP = $(shell debian/scripts/get_libebook_dep.sh)
 endif
 
 ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
   ifneq (,$(filter postgresql, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libpq-dev
+	BUILD_DEPS += , libkrb5-dev
+	BUILD_DEPS_ARCH += , libpq-dev
   else
 	BUILD_DEPS += , libkrb5-dev
   endif
@@ -1632,7 +1685,7 @@ endif
 ifeq ($(ENABLE_LPSOLVE),y)
   ifneq (,$(filter lpsolve, $(SYSTEM_STUFF)))
     ifeq "$(USE_SHARED_LPSOLVE)" "y"
-	BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION), lp-solve $(LPSOLVE_MIN_VERSION)
+	BUILD_DEPS_ARCH += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION), lp-solve $(LPSOLVE_MIN_VERSION)
 	LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
     else
 	BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
@@ -1644,8 +1697,7 @@ else
 endif
 
 ifeq "$(USE_DBUS)" "y"
-	BUILD_DEPS += , libdbus-1-dev
-	CONFIGURE_FLAGS += --enable-dbus
+	BUILD_DEPS_ARCH += , libdbus-1-dev
   ifeq "$(ENABLE_BLUETOOTH)" "y"
 	BUILD_DEPS += , libglib2.0-dev
     ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
@@ -1657,17 +1709,19 @@ ifeq "$(USE_DBUS)" "y"
   ifeq "$(ENABLE_PACKAGEKIT)" "y"
 	CONFIGURE_FLAGS += --enable-packagekit
   endif
+else
+	CONFIGURE_FLAGS += --disable-dbus
 endif
 
 ifeq "$(ENABLE_AVAHI)" "y"
-	BUILD_DEPS += , libavahi-client-dev
+	BUILD_DEPS_ARCH += , libavahi-client-dev
 	CONFIGURE_FLAGS += --enable-avahi
 endif
 
 ifeq "$(USE_GSTREAMER)" "y"
-	BUILD_DEPS += , libgstreamer1.0-dev
+	BUILD_DEPS_ARCH += , libgstreamer1.0-dev
 	CONFIGURE_FLAGS += --enable-gstreamer-1-0
-	BUILD_DEPS += , libgstreamer-plugins-base1.0-dev
+	BUILD_DEPS_ARCH += , libgstreamer-plugins-base1.0-dev
 	GSTREAMER_PLUGINS_SUGGESTS += , gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-ugly, gstreamer1.0-plugins-bad, gstreamer1.0-libav
 else
 	CONFIGURE_FLAGS += --disable-gstreamer-1-0
@@ -1723,18 +1777,22 @@ ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev
 endif
 
+ifeq "$(ENABLE_GPGMEPP)" "y"
 ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))
-	BUILD_DEPS+= , libgpgmepp-dev, libgpgme-dev, libgpg-error-dev
+	BUILD_DEPS_ARCH+= , libgpgmepp-dev, libgpgme-dev, libgpg-error-dev
 endif
 ifeq "$(RUN_MAKE_CHECK)" "y"
 	BUILD_DEPS_ARCH += , gpg$(OOO_NO_CHECK_ARCHS) <!nocheck>
 	BUILD_DEPS_ARCH += , gpgconf$(OOO_NO_CHECK_ARCHS) <!nocheck>
 	BUILD_DEPS_ARCH += , gpg-agent$(OOO_NO_CHECK_ARCHS) <!nocheck>
 endif
+else
+	CONFIGURE_FLAGS += --disable-gpgmepp
+endif
 
 ifeq "$(ENABLE_GIO)" "y"
   ifneq "$(BUILD_GTK3)" "y"
-	BUILD_DEPS += , libglib2.0-dev
+	BUILD_DEPS_ARCH += , libglib2.0-dev
   endif
 else
 	CONFIGURE_FLAGS += --disable-gio
@@ -1942,8 +2000,6 @@ endif
 
 	rm -f download.list
 
-	rm -f extras/source/truetype/symbol/opens___.ttf
-
 	# obsolete lock file not cleaned up....
 	rm -f dbaccess/qa/extras/testdocuments/fdo84315.odb.lck
 
@@ -1953,6 +2009,13 @@ endif
 		rm -f prism.js && \
 		rm -f prism.css
 
+	# remove only if we linked it over. otherwise we remove the one
+	# intentionally added there if so
+	cd $(SOURCE_TREE)/tarballs && \
+		if [ -L f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ]; then \
+			rm f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf; \
+		fi
+
 	# Files created in debian directory
 	$(MAKE) -f debian/rules clean-debdir
 
@@ -2141,10 +2204,6 @@ endif
 ifeq "$(MYSQL_FLAVOUR)" "mysql"
 	perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control.new
 endif
-ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	# be sure to use our rebuilt font
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,fonts-opensymbol <!nocheck>,/" debian/control.new
-endif
 
 ifneq "$(ALLOW_CLANG)" "y"
 	perl -pi -e "s/(Build-Conflicts: .*)/\1,clang,/" debian/control.new
@@ -2269,6 +2328,14 @@ endif
 		ln -sf /usr/share/nodejs/prismjs/prism.js && \
 		ln -sf /usr/share/nodejs/prismjs/themes/prism-coy.css prism.css
 
+ifeq ($(filter pkg.libreoffice.opensymbolbuild,$(DEB_BUILD_PROFILES)),)
+	# link to already-rebuilt opens___.ttf (fonts-opensymbol) form the arch indep build.
+	# Thankfully the sha256sum is only checked in Makefile.fetch (which we don't do)
+	cd $(SOURCE_TREE)/tarballs && \
+		ln -sf /usr/share/fonts/truetype/libreoffice/opens___.ttf \
+			f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
+endif
+
 	touch $@
 
 .PHONY: config_host.mk
@@ -2280,9 +2347,7 @@ config_host.mk:
 	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS)
 
-build:
-	$(CURDIR)/debian/rules build-arch
-	$(CURDIR)/debian/rules build-indep
+build: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch $(STAMP_DIR)/build-indep
 	touch $(STAMP_DIR)/$@
 
 build-arch: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch
@@ -2573,37 +2638,47 @@ endif
 	# FIXME
 	cd $(CURDIR)/debian/tmp/pkg && rm -rf \*
 
-ifeq "$(ENABLE_QT5)" "y"
 	# we need to do it here. If -kf5 isn't built
 	# there's no -kf5.install generated, so dh_missing complains later
-	mkdir -p debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program
-	mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so\
-		debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program
+ifeq "$(ENABLE_QT5)" "y"
+	if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so ]; then \
+		mkdir -p debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program; \
+		mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so\
+			debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program; \
+	fi
 endif
 ifeq "$(ENABLE_QT6)" "y"
-	mkdir -p debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program
-	mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so\
-		debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program
+	if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so ]; then \
+		mkdir -p debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program; \
+		mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so\
+			debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program; \
+	fi
 endif
 ifeq "$(shell echo $(ENABLE_KF5)$(ENABLE_KF6) | grep -q y && echo true)" "true"
 ifeq "$(BUILD_PLASMA)" "y"
-	mkdir -p debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program
-	mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so \
-		debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program
+	if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so ]; then \
+		mkdir -p debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program; \
+		mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so \
+			debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program; \
+	fi
 	# remove other ones maybe built by --enable-kfX
-	rm -f debian/tmp/pkg/libreoffice-kf5/$(OODIR)/libkf*be1lo.so 
+	rm -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/libkf*be1lo.so 
 else
-	rm -f debian/tmp/pkg/libreoffice-kf5/$(OODIR)/libkf*be1lo.so
+	rm -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/libkf*be1lo.so
 endif
 ifeq "$(ENABLE_KF5)" "y"
-	mkdir -p debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program
-	mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so \
-		debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program
+	if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so ]; then \
+		mkdir -p debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program; \
+		mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so \
+			debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program; \
+	fi
 endif
 ifeq "$(ENABLE_KF6)" "y"
-	mkdir -p debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program
-	mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so \
-		debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program
+	if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so ]; then \
+		mkdir -p debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program; \
+		mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so \
+			debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program; \
+	fi
 endif
 endif
 
@@ -2748,14 +2823,6 @@ ifeq "$(BUILD_PLASMA)" "y"
 	echo "../usr/share/metainfo/org.libreoffice.kde.metainfo.xml /usr/share/metainfo/" >> $(PKGDIR)-plasma.install
 endif
 
-ifeq "$(PACKAGE_LOKIT)" "y"
-	echo "../../../include/LibreOfficeKit usr/include" > debian/libreofficekit-dev.install
-endif
-ifeq "$(ENABLE_INTROSPECTION)" "y"
-	echo "../../../workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir /usr/share/gir-1.0/" >> debian/libreofficekit-dev.install
-	echo "../../../workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib /usr/lib/$(DEB_HOST_MULTIARCH)/girepository-1.0" >> debian/gir1.2-lokdocview-0.1.install
-endif
-
 ifneq "$(ENABLE_GUI)" "y"
 	rm -rf debian/tmp/pkg/libreofficekit-data
 endif
@@ -2933,9 +3000,9 @@ else
 endif
 
 ifeq "$(PACKAGE_BASE)" "y"
-	mkdir -p debian/python3-access2base/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+	mkdir -p debian/python3-access2base/$(PYTHON_SITE)
 	mv $(PKGDIR)-common/$(OODIR)/program/access2base.py \
-		debian/python3-access2base/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+		debian/python3-access2base/$(PYTHON_SITE)
 else
 	rm -rf $(PKGDIR)-common/$(OODIR)/share/basic/Access2Base
 	t=`mktemp -q`; grep -v Access2Base $(PKGDIR)-common/$(OODIR)/share/basic/dialog.xlc > \
@@ -2946,9 +3013,9 @@ else
 endif
 
 	# ScriptForge
-	mkdir -p debian/python3-scriptforge/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+	mkdir -p debian/python3-scriptforge/$(PYTHON_SITE)
 	mv $(PKGDIR)-common/$(OODIR)/program/scriptforge.py \
-		debian/python3-scriptforge/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+		debian/python3-scriptforge/$(PYTHON_SITE)
 
 ifeq "$(PACKAGE_SDK)" "y"
 	# move gengal stuff into -dev-gui
@@ -3282,6 +3349,18 @@ ifeq "$(ENABLE_GUI)" "y"
   endif
 endif
 
+ifeq "$(ENABLE_INTROSPECTION)" "y"
+	echo "workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib /usr/lib/$(DEB_HOST_MULTIARCH)/girepository-1.0" >> debian/gir1.2-lokdocview-0.1.install
+	dh_install -pgir1.2-lokdocview-0.1
+endif
+ifeq "$(PACKAGE_LOKIT)" "y"
+	echo "include/LibreOfficeKit usr/include" > debian/libreofficekit-dev.install
+ifeq "$(ENABLE_INTROSPECTION)" "y"
+	echo "workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir /usr/share/gir-1.0/" >> debian/libreofficekit-dev.install
+endif
+	dh_install -plibreofficekit-dev
+endif
+
 ifeq "$(PACKAGE_BASE)" "y"
 	mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
 	mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
@@ -3334,16 +3413,16 @@ endif
 
 ifeq "$(ENABLE_PYTHON)" "y"
 	# PyUNO packaging
-	install -d $(PYTHON_SITE)
+	install -d debian/python3-uno/$(PYTHON_SITE)
 	# prepend stuff so that it works when the module is not in LOs
 	# directories but in $(PYTHON_SITE). Can't be a patch (anymore)
 	# as otherwise the python-based unittests fail miserably.
-	echo "import sys, os" > $(PYTHON_SITE)/uno.py
-	echo "sys.path.append('/$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
-	echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
-	cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
+	echo "import sys, os" > debian/python3-uno/$(PYTHON_SITE)/uno.py
+	echo "sys.path.append('/$(OODIR)/program')" >> debian/python3-uno/$(PYTHON_SITE)/uno.py
+	echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >> debian/python3-uno/$(PYTHON_SITE)/uno.py
+	cat debian/python3-uno/$(OODIR)/program/uno.py >> debian/python3-uno/$(PYTHON_SITE)/uno.py
 	rm -f debian/python3-uno/$(OODIR)/program/uno.py
-	mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+	mv debian/python3-uno/$(OODIR)/program/unohelper.py debian/python3-uno/$(PYTHON_SITE)
 	touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
 	chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
 	( echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
@@ -3729,12 +3808,12 @@ endif
 		ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
 			$(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
 	done
-	mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
+	mkdir -p $(PKGDIR)-help-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
 	mv $(PKGDIR)-common/$(OODIR)/share/config/images_helpimg.zip \
-		$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
-	mkdir -p $(PKGDIR)-common/$(OODIR)/share/config; \
+		$(PKGDIR)-help-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
+	mkdir -p $(PKGDIR)-help-common/$(OODIR)/share/config; \
 	ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/images_helpimg.zip \
-		$(PKGDIR)-common/$(OODIR)/share/config/images_helpimg.zip; \
+		$(PKGDIR)-help-common/$(OODIR)/share/config/images_helpimg.zip; \
 
 ifeq "$(DEB_VENDOR)" "Debian"
 	# install Debian presentation template
@@ -3934,6 +4013,15 @@ ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
   endif
 endif
 
+	# not installed if skia is disabled. Arch-indep builds disable skia for build-dep and
+	# speed reasons and it is supposed to end up in an arch-indep package (libreoffice-common)
+	# So install this manually if skia is disabled
+ifneq "$(ENABLE_SKIA)" "y"
+	mkdir -p $(PKGDIR)-common/$(OODIR)/share/skia
+	install -m644 $(SOURCE_TREE)/vcl/skia/skia_denylist_vulkan.xml \
+		$(PKGDIR)-common/$(OODIR)/share/skia/skia_denylist_vulkan.xml
+endif
+
 	# fix fundamentalrc to not cause
 	# /usr/lib/libreoffice/program/../program/xpdfimport calls
 	# we know the path and the apparmor profiles disallow this...
@@ -4179,9 +4267,6 @@ ifeq "$(ENABLE_JAVA)" "y"
 	perl -pi -e 's/^(java:Depends.*$$)/\1, ure/' \
 		debian/libofficebean-java.substvars
 endif
-# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
-# causes ldd crashes sometimes when used with fakeroot:
-#          -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
 	dh_gencontrol -a $(DEBHELPER_OPTIONS) \
 		-- \
 		-V'base-version=$(BASE_VERSION)' \