Rebased ref, commits from common ancestor:
commit 64d6b385959f73fddbc5f362dd87a2cae75c0eda
Author: Thorsten Behrens <[email protected]>
AuthorDate: Wed Jan 4 17:09:03 2023 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Wed Jan 4 17:09:03 2023 +0100
Release version 7.3.7.3 for both Windows and Linux
Change-Id: I7dcbe34d4585c2eedf7d1878c757d83ed454a8d0
diff --git a/configure.ac b/configure.ac
index d448e8d011a6..ff27cdf17e81 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([LibreOffice],[7.3.7.2.xenial],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.3],[],[],[http://documentfoundation.org/])
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
commit b398970f3f057e181366e7974abd8a6126d435b4
Author: Thorsten Behrens <[email protected]>
AuthorDate: Wed Jan 4 17:02:12 2023 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Wed Jan 4 17:06:38 2023 +0100
Make 'add base system libstdc++' Linux-only
Change-Id: I623c0790472386b48b8b55cb94c1c2eeec55f7a8
diff --git a/Repository.mk b/Repository.mk
index ab4704f8946a..de7212685858 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -880,7 +880,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_glade \
extras_labels \
$(if $(filter WNT,$(OS)),extras_newfiles) \
- extras_libstdcpp \
+ $(if $(filter LINUX,$(OS)),extras_libstdcpp) \
extras_palettes \
extras_personas \
extras_persona_dark \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 9246a95e737e..ab56ce452b2e 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autotextuser \
CustomTarget_glade \
CustomTarget_gallsystem \
- CustomTarget_libstdcpp \
+ $(if $(filter LINUX,$(OS)),CustomTarget_libstdcpp) \
CustomTarget_tplofficorr \
CustomTarget_tploffimisc \
CustomTarget_tplpersonal \
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
- Package_libstdcpp \
+ $(if $(filter LINUX,$(OS)),Package_libstdcpp) \
Package_resource_fonts \
Package_gallbullets \
Package_gallmytheme \
