Rebased ref, commits from common ancestor:
commit 213bcd36037774ab21d6784db086cb05106d5153
Author: Thorsten Behrens <[email protected]>
AuthorDate: Fri Dec 9 18:15:21 2022 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Fri Dec 9 21:22:36 2022 +0100
Try KF5 vcl plugin first, for unity/gnome desktop sessions too
Change-Id: Id8d52d0ce2423df7465400c790c84b334715eb10
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 7c2a91cec471..325456b9c835 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -183,6 +183,9 @@ SalInstance* autodetect_plugin()
static const char* const pStandardFallbackList[] =
{
+#if ENABLE_KF5
+ "kf5",
+#endif
"gtk3", "gen", nullptr
};
commit 3221a7c20db96a04f09b49c9f86d815fe0013a06
Author: Thorsten Behrens <[email protected]>
AuthorDate: Fri Dec 9 18:12:27 2022 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Fri Dec 9 21:22:35 2022 +0100
Add base system libstdc++ to package
Since g++-7 ships & requires libstdc++.6.0.28.so, exceptionally add
this as runtime dependency. Historically, we did that for Linux during
OOo times.
Change-Id: Ic113d724c21da49132d92b3fdca084d9e392200f
diff --git a/Repository.mk b/Repository.mk
index b796367ea735..ab4704f8946a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -880,6 +880,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_glade \
extras_labels \
$(if $(filter WNT,$(OS)),extras_newfiles) \
+ extras_libstdcpp \
extras_palettes \
extras_personas \
extras_persona_dark \
diff --git a/extras/CustomTarget_libstdcpp.mk b/extras/CustomTarget_libstdcpp.mk
new file mode 100644
index 000000000000..188394c1306b
--- /dev/null
+++ b/extras/CustomTarget_libstdcpp.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
+#
+# 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 http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,extras/libstdcpp))
+
+$(call gb_CustomTarget_get_workdir,extras/libstdcpp)/libstdc++.so.6.0.28: \
+ /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.28 \
+ $(SRCDIR)/extras/CustomTarget_libstdcpp.mk \
+ | $(call gb_CustomTarget_get_workdir,extras/libstdcpp)/.dir
+
+$(call gb_CustomTarget_get_workdir,extras/libstdcpp)/libstdc++.so.6.0.28:
+ cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.28 $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index cf7177c21180..9246a95e737e 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autotextuser \
CustomTarget_glade \
CustomTarget_gallsystem \
+ CustomTarget_libstdcpp \
CustomTarget_tplofficorr \
CustomTarget_tploffimisc \
CustomTarget_tplpersonal \
@@ -27,6 +28,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
+ Package_libstdcpp \
Package_resource_fonts \
Package_gallbullets \
Package_gallmytheme \
diff --git a/extras/Package_libstdcpp.mk b/extras/Package_libstdcpp.mk
new file mode 100644
index 000000000000..5159d7329818
--- /dev/null
+++ b/extras/Package_libstdcpp.mk
@@ -0,0 +1,16 @@
+# -*- 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 http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,extras_libstdcpp,$(call
gb_CustomTarget_get_workdir,extras/libstdcpp)))
+
+$(eval $(call
gb_ExternalPackage_add_file,extras_libstdcpp,$(LIBO_LIB_FOLDER)/libstdc++.so.6,libstdc++.so.6.0.28))
+
+$(eval $(call gb_Package_use_custom_target,extras_libstdcpp,extras/libstdcpp))
+
+# vim: set noet sw=4 ts=4:
