[patch] libreoffice-24.2.6.2.ebuild.patch

8nMYyrdk (text/plain), 1.43 KB, created by nvinson234 on 2024-09-23 09:03:38 UTC

$ diff -pU5 /var/db/repos/gentoo/app-office/libreoffice/libreoffice-24.2.6.2.ebuild libreoffice-24.2.6.2.ebuild
--- /var/db/repos/gentoo/app-office/libreoffice/libreoffice-24.2.6.2.ebuild	2024-09-22 01:43:53.433334542 -0400
+++ libreoffice-24.2.6.2.ebuild	2024-09-22 23:10:54.433163752 -0400
@@ -318,10 +318,13 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
 	"${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
 
+	# bug #940119
+	"${FILESDIR}/${PN}-24.2.6.2-UnpackedTarball_zxcvbn-c.mk-libcxx-19.patch"
+
 	# git master
 	# bug #917618, thx to Debian:
 	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
 	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
 	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch"
@@ -403,10 +406,15 @@ src_prepare() {
 	if use branding; then
 		# hack...
 		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
 	fi
 
+	# bug #940119
+	# >=libcxx-19 patch. Based on upstream commit d91ab7de467abea6c01c9dd8473f81ac1f29513c
+	cp "${FILESDIR}/$PN-$PV-0001-There-is-no-std-basic_string-int.patch" \
+		"$S/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch"
+
 	# Don't list pdfimport support in desktop when built with none, bug # 605464
 	if ! use pdfimport; then
 		sed -i \
 			-e ":MimeType: s:application/pdf;::" \
 			-e ":Keywords: s:pdf;::" \