gentoo auto-resync : 14:11:2024 - 03:02:32

7 files changed, 155 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 63f0e755edd5..42115ddc9be3 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 f78846df57cc..ab867dd66506 100644
--- a/app-office/joplin-desktop/Manifest
+++ b/app-office/joplin-desktop/Manifest
@@ -1,7 +1,9 @@
 DIST Joplin-3.1.20.AppImage 244577745 BLAKE2B b0d0ad00cd1967669a75428090d0fbd8f6dd0aeda68f3d21c03d72264c2cdb6c3a7429db886c76ee00ba608a806512accbd2a6bf5e0b57e36e10b854ba693d14 SHA512 f078d7df5c3733b54aa6d35a8f77b4c4edc06149deebae0bd97d398721afde69f841f7d039e4d069642aa8c461366c26561a978934c9be232464dfc4501332b2
 DIST Joplin-3.1.23.AppImage 244602125 BLAKE2B b344accd0fa80240c11074acab90c46b91d4e9c294087663d8cd0f4353649cf1631828cf2ba7d89b5156cfdc80bbee3e37d4dc988359ff3c4f2ea6cbc52f607e SHA512 ec917be832a7c0c33033a4ee1a7f85cefdaa6f07ab735af54689fd4ffc70477c6b4a8e31add3b1c85ccff6df7e613b338bf1d67c395dfd113948f594b2da34fe
+DIST Joplin-3.1.24.AppImage 244603841 BLAKE2B 2175019cbcca58473fb9b7f6157f001ca3c36ede16cc62191c165c3852496dfabb811fc3507ab2e0c5981959e9be50bc8836d0108cc9c80969f6ce0f511f130a SHA512 e286186c07f64ca70f13a95584fa49b7c8ac97bb025c288ca5b15b8334f9ea52ed758cc272c3e6c277544785b02f24423f8af9191973245faef1974791a7366c
 DIST Joplin-3.1.3.AppImage 241399868 BLAKE2B a8a6960788dd0e703387fa3e88722513d6a394d4b347b6a69e0cf0079c2e4ce276e21fac60fe9a7a8f573259cdce5dc19dd871c06b6faffeedf5f6ded874a930 SHA512 b49bfed97bcc2210ef6c74d5a431d0620fe43332418486cc854e2f525c9e93d62682a732a03e977ed42ca55eabcde5e897406c3ecf4cc6d86fa6e333a71b9345
 EBUILD joplin-desktop-3.1.20-r1.ebuild 2414 BLAKE2B 418e767399a5845038f9672725cee82c721f905d128b7c158589d846eceebe2fee4c230e17c3684b163b84abc74f654372e279f1a4af602c5840c495b20aa262 SHA512 1f6a558b4b88a9c2ab652112f23ea4eadc8c4c0e16a7d6c829b40261e179f8010a7c28b3fb7dd9e6df8cb2d7d616508a228576ff3d10673e47d63e8c0a94cdbf
 EBUILD joplin-desktop-3.1.23.ebuild 2414 BLAKE2B 418e767399a5845038f9672725cee82c721f905d128b7c158589d846eceebe2fee4c230e17c3684b163b84abc74f654372e279f1a4af602c5840c495b20aa262 SHA512 1f6a558b4b88a9c2ab652112f23ea4eadc8c4c0e16a7d6c829b40261e179f8010a7c28b3fb7dd9e6df8cb2d7d616508a228576ff3d10673e47d63e8c0a94cdbf
+EBUILD joplin-desktop-3.1.24.ebuild 2414 BLAKE2B 418e767399a5845038f9672725cee82c721f905d128b7c158589d846eceebe2fee4c230e17c3684b163b84abc74f654372e279f1a4af602c5840c495b20aa262 SHA512 1f6a558b4b88a9c2ab652112f23ea4eadc8c4c0e16a7d6c829b40261e179f8010a7c28b3fb7dd9e6df8cb2d7d616508a228576ff3d10673e47d63e8c0a94cdbf
 EBUILD joplin-desktop-3.1.3-r1.ebuild 2413 BLAKE2B 8e72795387703f527e0a824750c7b0728f46ec34775fa15210caf14b94f2f5e4073f8685cfe4cb1c6af13c290b4ebb9d907e012f5d4b9eb190f315b2ad2ebd72 SHA512 00121d12e8054e931493cb39e0507d9585f8cd1086157c0392aff04ba0c65654afb3a7913ae6714cf2beb1c62bf72bc4f42476898e6b618bfd13e8de7c7fa53e
 MISC metadata.xml 755 BLAKE2B 2f95bccd9fb7bf21b253a524950c4775273c2d1911ebf4b90a392f8c2c7f38e986af0fbd217287595ba39a684609d8df6f275e146388aa0331169e51ba6fc823 SHA512 b62f1dfc822413386115305900866f6cf16fc2071425d2f0f515f537a29bf282d65c31b7f59ccf9187280456eb759a5fcce7340fb983ff0f50413c649c8fc1d0
diff --git a/app-office/joplin-desktop/joplin-desktop-3.1.24.ebuild b/app-office/joplin-desktop/joplin-desktop-3.1.24.ebuild
new file mode 100644
index 000000000000..64c2fd46b4e0
--- /dev/null
+++ b/app-office/joplin-desktop/joplin-desktop-3.1.24.ebuild
@@ -0,0 +1,106 @@
+# 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/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/scribus/Manifest b/app-office/scribus/Manifest
index 92df0219c66e..4c4ffe2a7810 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,12 +2,13 @@ AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1
 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
 AUX scribus-1.6.2-poppler-24.10.0.patch 5944 BLAKE2B 90c8cce46f3993e2102d2a14d65f932dbde979dd1fa55c40bee6dad5f1f94cdf2de5f6976b6ac3f4e24b34b3b1012152abe597b959a1f3f9030a28d8f4a7bf66 SHA512 5443a35b586ed2f6552bb07ff6bfc1a6fc4177f3bbdc94e3bb09b5977d799b6357cd62ca8f773a6757469eefce6cc3cf38880e4baa47f9f8a858f5dedf4aac51
-AUX scribus-1.6.2-poppler-24.11.0.patch 10980 BLAKE2B fce503d3a018dac6747f7462febe82a2201935e371ec890191692964ecc667800d60c775f9f69941abf3449f0ab23dc3c5084c2ab20e26834b00f44321a7913f SHA512 cff7998296b83123d7ef31844244553774998b5c94bbbfb592ac3495ac0f4fb6588296e6322b68383c06e31c5f6c22386ce309dbf9f3b930c9cae1965386b9ca
+AUX scribus-1.6.2-poppler-24.11.0-1.patch 10980 BLAKE2B fce503d3a018dac6747f7462febe82a2201935e371ec890191692964ecc667800d60c775f9f69941abf3449f0ab23dc3c5084c2ab20e26834b00f44321a7913f SHA512 cff7998296b83123d7ef31844244553774998b5c94bbbfb592ac3495ac0f4fb6588296e6322b68383c06e31c5f6c22386ce309dbf9f3b930c9cae1965386b9ca
+AUX scribus-1.6.2-poppler-24.11.0-2.patch 1573 BLAKE2B c1f00b8fe437f921aec7e96a7f530445ac39d000c600ca3203c98a98bf2081b19dc4e28b77f3f2dad36d934532f2977931ab4f9a3732889179533a1083cabcea SHA512 716fd00c292051734603bff501d6148411f8efeea87ed3f837cf0b257ead2964261c67ebd00c8837c502f58f809213a2becdcc1c40654fa7262908ae9fd9ad52
 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e
 AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f
 AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
-EBUILD scribus-1.6.2.ebuild 4158 BLAKE2B 04ab98dd2165578a38a5e1c6cba1d965dcc5c9e1aaa90d3458f4734a077da06085ad2e951f7cb3f79a75748cd72008e98f6c65eb58a2637b579f6ff2898291d8 SHA512 def82103c8890d80cf8db84884c7e764f1fa5f44493eaaf02ea56c7bcb1fccb821ffc6ca20e2446d4cc79815e87d13aadd392ed769c307eab4a3131c3b8dd9ce
+EBUILD scribus-1.6.2.ebuild 4201 BLAKE2B 1e28eb40199277d68579f85d47468acb34b0b5575f11e628ff5edb6a45fca4056f1d8ee9f7f3933cb81e389903498db0d450628443643cc3358116f8e47aa0e6 SHA512 bd3be20c40fd83e5d22154b8c4ceb95cbb212403941f5bbe28eae80191d346e2d512db3fbdf87cac5e932fe0e2a194c8f61b2896ce573e6ef67b385b588386b9
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 EBUILD scribus-9999.ebuild 3989 BLAKE2B 20bbc3996092f2e2afd085b749fb9d043ce01b4571447edca5498970f2879aa3a3284f282276fc60d0642ea55f0b8609445d8f6e387abe420ebabf768856ae40 SHA512 882a57ab93f56ee6afc81dda58d79b41e9d2035b4a24cc8c70edfc7aeed6b7beba6bb392cd0d751747d58cc66b5ce7dc625b627e172b6335ecbf060383d7b326
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch
index c6ad46df633a..c6ad46df633a 100644
--- a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch
+++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch
diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch
new file mode 100644
index 000000000000..1402ebd8d26e
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch
@@ -0,0 +1,42 @@
+From 874e1c13995223b1433026bc26e13911a74f3880 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 13 Nov 2024 23:19:51 +0100
+Subject: [PATCH] Drop unused headers to fix build w/ poppler-24.11
+
+Fix still pending upstream:
+https://bugs.scribus.net/view.php?id=17308
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ scribus/plugins/import/pdf/pdftextrecognition.h | 1 -
+ scribus/plugins/import/pdf/slaoutput.h          | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/pdftextrecognition.h b/scribus/plugins/import/pdf/pdftextrecognition.h
+index a04b45358..6edac9906 100644
+--- a/scribus/plugins/import/pdf/pdftextrecognition.h
++++ b/scribus/plugins/import/pdf/pdftextrecognition.h
+@@ -16,7 +16,6 @@ for which a new license (GPL+exception) is in place.
+ #include "slaoutput.h"

+ 

+ #include <poppler/GfxState.h>

+-#include <poppler/CharCodeToUnicode.h>

+ 

+ /* PDF TextBox Framework */

+ /*

+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index 69bebbf5f..ae7630d29 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -45,8 +45,6 @@ for which a new license (GPL+exception) is in place.
+ #include <poppler/Form.h>

+ #include <poppler/Page.h>

+ #include <poppler/Catalog.h>

+-#include <poppler/CharCodeToUnicode.h>

+-#include <poppler/FontEncodingTables.h>

+ #include <poppler/splash/SplashFontFileID.h>

+ #include <poppler/splash/SplashFontFile.h>

+ #include <poppler/splash/SplashFontEngine.h>

+-- 
+2.47.0
+
diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 753044e56f3c..71b32025e6fc 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -83,7 +83,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
-	"${FILESDIR}"/${P}-poppler-24.{10,11}.0.patch # bug 941932
+	"${FILESDIR}"/${P}-poppler-24.10.0.patch # bug 941932
+	"${FILESDIR}"/${P}-poppler-24.11.0-{1,2}.patch
 )
 
 src_prepare() {