gentoo auto-resync : 04:03:2024 - 05:43:09

7 files changed, 46 insertions, 109 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index dd0a934ef888..ffa08618fbd2 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest
index 9e7f47617534..7e4329e8d704 100644
--- a/app-office/joplin-desktop/Manifest
+++ b/app-office/joplin-desktop/Manifest
@@ -1,9 +1,7 @@
-DIST Joplin-2.13.12.AppImage 210948143 BLAKE2B ea2e1f73009b6255cb780e9c19878090ec90c0203a1cf33dc6e0f23feb8e1fe18ce8acaeb48904f6f71a0ec1aa8d6beaeb79be2db5196477ee8c7379fabc8d0d SHA512 6a68967045b31b010d03ac17a855404f77fbe0d403dce2f5740673c135b99536b940880fe2f103199295476ed1ec5e83465b8b0a26ef409cef362c8ef23e2219
-DIST Joplin-2.13.13.AppImage 210904202 BLAKE2B cb2496524cfa0510da5046f74f87a59cf830a0a80c643b813d282085bb6620a9455185a4365c2cef53a6009cc160a231e61ad0c07c4520794ffd188d960789c3 SHA512 d2184d84c6d9f3bf10ddb2da1c4f7437ceb8f6fb237989b109e0051bafbd990b42710a277786ffd09826b825e7fc815f3853e9b2388fbf55544f49803d0b9d86
 DIST Joplin-2.13.15.AppImage 210896525 BLAKE2B 3474dc12fa083ff4d56e0c64343def5171dd7b739c845c2a3ade562de7ae63d3d79a434611d00b0763f43e2a97281f989128c1fdf5ca5acb64f3e8bdd9cbc7f8 SHA512 d5fc3eee37f506aabb131b14e61ce459602d9c80da61b63ef07a849987cce5ff59af913000ac27baad8e3af637ca6cb28ad4ecaea523b24b4aac1a8b0df76493
 DIST Joplin-2.14.11.AppImage 247754522 BLAKE2B c39b87ca790b41d30c505b1001b75b442790c314cfd1340e2a6c1df7fa9d83505a9664d9fa57f30f7d2dd4dd23e2e04abad3bced978023203e2d9de773aac1a6 SHA512 1f2ed8d9ca6c83d86e09eb039b7d200c926e6ccd02e3db0f1e276640204bf5d6cc2df511b302fcf8b28edcff8f3534b0d52d051439f4275ce1b8f6a55fa5ad78
-EBUILD joplin-desktop-2.13.12.ebuild 2370 BLAKE2B c31b3c291b6f68af1e6fc7857d696c0fb887fbb0a569351bd988e3aed51fc53649df0adb6ec74df71632dcbad718f36be945097507ed4003f2102d7f619e8a3f SHA512 6091bf7ca2898bf48bc15a9e4f004ff39c5b4546c3f39c390aa6a026603c1ac51d53568f71bc4df13252ebee23f7d8ef99da51013edaaeeec0bf03ba692d0eec
-EBUILD joplin-desktop-2.13.13.ebuild 2370 BLAKE2B c31b3c291b6f68af1e6fc7857d696c0fb887fbb0a569351bd988e3aed51fc53649df0adb6ec74df71632dcbad718f36be945097507ed4003f2102d7f619e8a3f SHA512 6091bf7ca2898bf48bc15a9e4f004ff39c5b4546c3f39c390aa6a026603c1ac51d53568f71bc4df13252ebee23f7d8ef99da51013edaaeeec0bf03ba692d0eec
+DIST Joplin-2.14.17.AppImage 248140038 BLAKE2B 62fb124745ced06fce45cea01efb8eae39556cb58bec768935e826e070f6eaba0050daf8c42bb6308e74539735a9e955c188a0c00c5b6209a4550733776c6d38 SHA512 ff6db5b353092d87c35c9c39038f93b0b8f7da8f021fa3057dcdf15cbbffd72b81c5a180ec439802b58060b3862d46ed902ab66a315f574713b9d871b4788502
 EBUILD joplin-desktop-2.13.15.ebuild 2370 BLAKE2B c31b3c291b6f68af1e6fc7857d696c0fb887fbb0a569351bd988e3aed51fc53649df0adb6ec74df71632dcbad718f36be945097507ed4003f2102d7f619e8a3f SHA512 6091bf7ca2898bf48bc15a9e4f004ff39c5b4546c3f39c390aa6a026603c1ac51d53568f71bc4df13252ebee23f7d8ef99da51013edaaeeec0bf03ba692d0eec
 EBUILD joplin-desktop-2.14.11.ebuild 2371 BLAKE2B 75f8638b02d789e48e0ab968aa862886478dfb8da8025ce1bb5ed014e6b0076c2dd1228c048ed0ee784310549a688096060446c7063e61a3057ef5d1a1ea7833 SHA512 f745f089a455cc3cf92a2ab4a1c443727002666ec951d0d47341899e852ec3c90334a1645a21d866ec105f9a953f2a8bab99c8f4b591ce577a6ecb55d11d782a
+EBUILD joplin-desktop-2.14.17.ebuild 2371 BLAKE2B 75f8638b02d789e48e0ab968aa862886478dfb8da8025ce1bb5ed014e6b0076c2dd1228c048ed0ee784310549a688096060446c7063e61a3057ef5d1a1ea7833 SHA512 f745f089a455cc3cf92a2ab4a1c443727002666ec951d0d47341899e852ec3c90334a1645a21d866ec105f9a953f2a8bab99c8f4b591ce577a6ecb55d11d782a
 MISC metadata.xml 755 BLAKE2B 2f95bccd9fb7bf21b253a524950c4775273c2d1911ebf4b90a392f8c2c7f38e986af0fbd217287595ba39a684609d8df6f275e146388aa0331169e51ba6fc823 SHA512 b62f1dfc822413386115305900866f6cf16fc2071425d2f0f515f537a29bf282d65c31b7f59ccf9187280456eb759a5fcce7340fb983ff0f50413c649c8fc1d0
diff --git a/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild b/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild
deleted file mode 100644
index 8178f87f501f..000000000000
--- a/app-office/joplin-desktop/joplin-desktop-2.13.13.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTICE: This is a Electron app (oh my) and the upstream only provides AppImages.
-
-EAPI=8
-
-APPIMAGE="Joplin-${PV}.AppImage"
-
-inherit desktop xdg
-
-DESCRIPTION="Secure note taking and to-do app with synchronization capabilities"
-HOMEPAGE="https://joplinapp.org/
-	https://github.com/laurent22/joplin/"
-SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE}"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libcanberra[gtk3]
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libnotify
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cp "${DISTDIR}/${APPIMAGE}" "${S}" || die
-
-	cd "${S}" || die         # "appimage-extract" unpacks to current directory.
-	chmod +x "${S}/${APPIMAGE}" || die
-	"${S}/${APPIMAGE}" --appimage-extract || die
-}
-
-src_prepare() {
-	# Fix permissions.
-	find "${S}" -type d -exec chmod a+rx {} + || die
-	find "${S}" -type f -exec chmod a+r {} + || die
-
-	default
-}
-
-src_install() {
-	cd "${S}/squashfs-root" || die
-
-	insinto /usr/share
-	doins -r ./usr/share/icons
-
-	local apphome="/opt/${PN}"
-	local toremove=(
-		.DirIcon
-		@joplinapp-desktop.desktop
-		@joplinapp-desktop.png
-		AppRun
-		LICENSE.electron.txt
-		LICENSES.chromium.html
-		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm
-		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm64
-		resources/app.asar.unpacked/node_modules/node-notifier
-		usr
-	)
-	rm -f -r "${toremove[@]}" || die
-
-	mkdir -p "${ED}/${apphome}" || die
-	cp -r . "${ED}/${apphome}" || die
-
-	dosym -r "${apphome}/@joplinapp-desktop" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" Joplin @joplinapp-desktop "Office;" \
-		"StartupWMClass=Joplin\nMimeType=x-scheme-handler/joplin;"
-}
diff --git a/app-office/joplin-desktop/joplin-desktop-2.13.12.ebuild b/app-office/joplin-desktop/joplin-desktop-2.14.17.ebuild
index 8178f87f501f..a9c365263d83 100644
--- a/app-office/joplin-desktop/joplin-desktop-2.13.12.ebuild
+++ b/app-office/joplin-desktop/joplin-desktop-2.14.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 RESTRICT="bindist"
 
 RDEPEND="
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 62c9dd2e2dcb..15f69042f156 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343
 AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
 AUX libreoffice-7.5.8.2-icu-74-compatibility.patch 5299 BLAKE2B b1c12af133c48ef3e586c41f2fa1cd4b7b6c4d7e93d783ada5c3670a30eb7e2bf3039df242d2f186270810b479621b38f4e91cde6428ee6453170eaffe326a56 SHA512 d64618c007d35ea873d25c7e40058fdc50de29ce1fe2c573aa8b9d628094d681af8ef31e4cd992b0baa996b097dec9c0a28e4d5881ac17b7916ec3bf330f4128
 AUX libreoffice-7.5.9.2-libxml2-2.12.patch 12445 BLAKE2B 3675c092e6a6d5f357a623fd0381faf53d20f66a555895450f0b437b0ca709a9bb2453a351abcf2e5caaad17dcaa8a9bebf2ede559ad6311c5f382088f44e460 SHA512 ffe0c6a3c696bf7549dcd4b6907d35b271361a53aa730502569b5073ecef15747f40886a554da0b369f549ab2fccb897dba7c1c04332f9271ba98d9ac11dc6ea
+AUX libreoffice-7.6.5.2-gcc14.patch 1134 BLAKE2B a58f62b255455a827625eeecb43816aae1e66b98c9d93b926f2b000be72787e68a5f7c2e3a9a5301b7c82978275dfe53ec9474fc0bdd6d10801cf473009a0573 SHA512 2f4d00cec8ddf2362b787420f5f6e71f060fd4800291b907918255615cfa0996d7cc199898e69665ec0d6041776025043c796402a02be1192b087632cad9bea3
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
@@ -42,7 +43,7 @@ DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4
 EBUILD libreoffice-24.2.1.2.ebuild 20424 BLAKE2B 6a8c80b10a0a5ffe466f7f4f9cf96f5a1812960f684ec0fa27b4c6100b54662a08dd99f75a4ee0c7f26fa216ceacf29d9e561d1ee80b818fba905c396b4d6cc4 SHA512 0009c741c8af2691e3648cfa75a067caaf8f27b915039b5c80f501aa19bd3190f0d85f2a0235ff9108c7716afe5a903d92923a5760787e617261a9079bb856b5
 EBUILD libreoffice-24.2.9999.ebuild 20222 BLAKE2B fee79a008428c0c47cfbd9f7d331b516250d376793e8cef6e03aa5ac0e6bcee23f912a22d22f6a56ca7aa89a2f1b06fa174644a63ed87fea31053f07cbcfe1ad SHA512 456ab217c5745ee35191e7314d4f231bbef1e456596b0834b10307afa98ba4bac132c85a491a555695aeefe433c406435dd238039e140ae9a082c789184dd713
 EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0
-EBUILD libreoffice-7.6.5.2.ebuild 19605 BLAKE2B 44eaf13e864a48694db459b7473a18c93f6d9eaf213e2585ee2bf3736298491e5e5f87282d9a11d73fa45244d718ca5fbb251668477725436e7bbbe4377d3dec SHA512 46de6587355114e19f7104ef683d53da2d104529a0a5edb5713b985f844425c337bf59f9e743918c7be8fc9f493c55be785fc8fc22bdedccbc91efa088c75e34
+EBUILD libreoffice-7.6.5.2.ebuild 19659 BLAKE2B 81a6b4e532ee828a93e7a586f7ca7765cc3a05500c563e9ead4f739de44f5c3ada7d9025862df5cf2d7d177e59ee091bd7554141df3c5f5a86616e367ddd901c SHA512 ce8574db7ad42413e68775dfe7cbf2ea3d5b3e8a5d27de9a84b9e1c4381a3bcd0c395f64ade36a44b5e6c463670f6c9959073b5634f543fb97c2a7c60c164974
 EBUILD libreoffice-7.6.9999.ebuild 19605 BLAKE2B 44eaf13e864a48694db459b7473a18c93f6d9eaf213e2585ee2bf3736298491e5e5f87282d9a11d73fa45244d718ca5fbb251668477725436e7bbbe4377d3dec SHA512 46de6587355114e19f7104ef683d53da2d104529a0a5edb5713b985f844425c337bf59f9e743918c7be8fc9f493c55be785fc8fc22bdedccbc91efa088c75e34
 EBUILD libreoffice-9999.ebuild 20222 BLAKE2B fee79a008428c0c47cfbd9f7d331b516250d376793e8cef6e03aa5ac0e6bcee23f912a22d22f6a56ca7aa89a2f1b06fa174644a63ed87fea31053f07cbcfe1ad SHA512 456ab217c5745ee35191e7314d4f231bbef1e456596b0834b10307afa98ba4bac132c85a491a555695aeefe433c406435dd238039e140ae9a082c789184dd713
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
new file mode 100644
index 000000000000..a98012320375
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
@@ -0,0 +1,38 @@
+https://github.com/LibreOffice/core/commit/db98a3f1b1a703ea8e1284b8815eea2274abb2db
+
+From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
+From: Martin Jambor <mjambor@suse.cz>
+Date: Wed, 7 Jun 2023 18:11:45 +0200
+Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++
+ (tdf#155715)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without explicitely including <cstdlib>, compiling some files
+including store/source/storbase.hxx (such as store/source/storpage.cxx
+which includes it through store/source/storpage.hxx) will result in
+errors:
+
+  error: ‘malloc’ is not a member of ‘std’
+
+and
+
+  error: ‘free’ is not a member of ‘std’
+
+This patch simply adds the necessary include.
+
+Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+--- a/store/source/storbase.hxx
++++ b/store/source/storbase.hxx
+@@ -32,6 +32,7 @@
+ 
+ #include <store/types.h>
+ 
++#include <cstdlib>
+ #include <memory>
+ #include <utility>
+ 
diff --git a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
index 938dfe9ad75d..f13092052517 100644
--- a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
+	# upstream
+	"${FILESDIR}/${PN}-7.6.5.2-gcc14.patch"
+
 	# maybe upstreamable
 	"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
 )