gentoo auto-resync : 04:02:2024 - 23:42:56

6 files changed, 119 insertions, 2 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 361aa9924160..b8e2de3221ca 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index efc6905cda5a..25f7cceb7a27 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,6 +1,8 @@
+AUX paperwork-backend-2.2.1-cairo_workaround.patch 2028 BLAKE2B 4b7074165c3761427f667e81f843b4a680878406f5a79ebb8733b5bb9ff5ea45c5fe836531a742d303981c52eb3b122aec5dea07522226c48b969d8f0fde2327 SHA512 d5790b96c3745c769cc3296d24399c21f2a6a864beb188105fb27c407b3739661943aa9ef706ca95d97f08ecb6d6cb0e9b1ec1a8c00093434a96913f8eeb5849
 DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
 DIST paperwork-backend-2.1.2.tar.gz 1346499 BLAKE2B daf8c6dee97b0bdf814bcf7e9c83a80ab878250994a770f5fa6be4c0b4e23f0def51e22c0a8652a19e9294f3fab0b522b25c2a91c306ad760d568faf76a78610 SHA512 0156baa658a9fe26680bf6d146af3f03b98da307ee1cfaf4803f8b70a2ffdb0010fe23c4d4f9b5a572919c4be94a1aad4fd070220849248cdb18c5b1c4bc478b
 DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b
 EBUILD paperwork-backend-2.1.2.ebuild 1317 BLAKE2B 1cd4f19bdd2c9ebd2808ec4a98e9dcc367be5061ff439019894e722f13d39bd5eeed39a21bcfc34fee76d931fc59227cc53693b5a02a083eb55e4d562fc1621a SHA512 517e128b5eb38752eb173a308ec4f898d1a40de714c9349c8f0553bf416dd411b87fc6071fae196437a91ee6099db9cd0ef786d7efc3fe7289025f007df23c6b
+EBUILD paperwork-backend-2.2.1-r1.ebuild 1673 BLAKE2B 8e7aea02b94811ed3b7d70e3981ce0aff16e2ccf68fb73498ebb69309a04fb33d287eed040832397bc4bc0d3e689f1ac459cefb336a354d06f9273e7f5912cd5 SHA512 b37dca8cb31037454391c58dec1cbde20e34a821f0e16e8b3e85a30b48f8017720bb08b59081fd920830ca67032b4556062ce027c09289e91026f7b485f3d0e2
 EBUILD paperwork-backend-2.2.1.ebuild 1639 BLAKE2B 69995b3643e868ead1d8a266d9d3d9d1f427f015b91a6ef3e27d48398fae400f3896bf73c672d47c15c2cba577df82e5d155be78c874017fd7f178e26e654141 SHA512 fd6745e7d56695ef600219a5ca2bb0fafa5563a8da643eee86bdecb2f8f61951d750d313e15329fa285c9f6ce04fca366954fad87f4f6b30d3024cd10e1c031e
 MISC metadata.xml 410 BLAKE2B c6ed41347886699086f69694dbaa5134e9ebfb02cbc157909e02971cce01cc562e82f31c15bb5ae1ee261d79d6e5a9ece81c1cf7fa48a9839ddf467c06fab392 SHA512 01bf86e9c8fd1b9e1d514edca46992609eb8789fe95ea914914ef4fc43c7b3f0fcaffaa712bb5c72e3936679b44749837b0ba73c2b62c1b0bc52f318fcc8e31f
diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch
new file mode 100644
index 000000000000..01eb2a6154b0
--- /dev/null
+++ b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch
@@ -0,0 +1,52 @@
+From c9430b844fbcedc9119e3d464f5f0c85feb7b197 Mon Sep 17 00:00:00 2001
+From: Jerome Flesch <jflesch@openpaper.work>
+Date: Sun, 4 Feb 2024 20:33:27 +0100
+Subject: [PATCH] Backend/docexport PDF: Workaround Cairo bug that causes
+ occasional crashes when exporting to generated PDF.
+
+Closes #942
+---
+ .../src/paperwork_backend/docexport/pdf.py          | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/paperwork-backend/src/paperwork_backend/docexport/pdf.py b/paperwork-backend/src/paperwork_backend/docexport/pdf.py
+index 160e60710..befded73c 100644
+--- a/paperwork-backend/src/paperwork_backend/docexport/pdf.py
++++ b/paperwork-backend/src/paperwork_backend/docexport/pdf.py
+@@ -115,6 +115,8 @@ class PdfCreator(object):
+         )
+         self.pdf_context = cairo.Context(self.pdf_surface)
+ 
++        self.gc_protection = []  # WORKAROUND(Jflesch): Cairo crash
++
+     def set_page_size(self, img_size):
+         # portrait or landscape
+         if (img_size[0] < img_size[1]):
+@@ -187,6 +189,16 @@ class PdfCreator(object):
+             "pillow_to_surface", img,
+             intermediate="jpeg", quality=int(self.quality * 100)
+         )
++        # WORKAROUND(Jflesch):
++        # If Cairo supports JPEG embedding, we use
++        # cairo.ImageSurface.set_mime_data() instead of the usual Cairo
++        # surface functions to draw the image. It seems this function does
++        # not increment the ref counter of the surface object
++        # --> the Python GC tends to collect it while Cairo is still going
++        # to use it to generate the PDF.
++        # --> we have to keep a reference on it ourselves, until the page has
++        # been generated.
++        self.gc_protection.append(img_surface)
+ 
+         self.pdf_context.save()
+         try:
+@@ -199,6 +211,7 @@ class PdfCreator(object):
+ 
+     def next_page(self):
+         self.pdf_context.show_page()
++        self.gc_protection = []  # WORKAROUND(Jflesch): Cairo crash
+ 
+     def finish(self):
+         self.pdf_surface.flush()
+-- 
+GitLab
+
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..bb7a9c75061b
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+# Update from release hash at:
+# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
+REL_HASH="0bea4054"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
+	https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/openpaperwork-core[${PYTHON_USEDEP}]
+	app-text/openpaperwork-gtk[${PYTHON_USEDEP}]
+	app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	sys-apps/which
+	sys-devel/gettext
+	test? (
+		dev-python/libpillowfight[${PYTHON_USEDEP}]
+		media-libs/libinsane
+	)
+"
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	default
+	cd "${WORKDIR}"/paperwork-${PV} || die
+	eapply "${FILESDIR}"/${P}-cairo_workaround.patch
+}
+
+python_compile() {
+	emake l10n_compile
+
+	distutils-r1_python_compile
+}
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index 07aed494df8d..9bdaa20b1e99 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,6 +1,6 @@
 AUX ronn-ng-0.9.1-psych-4-tests.patch 1640 BLAKE2B 52ec0e314d9253c06874ce95ab5be8bb9fa9e5ff8b04b6df385a7e14c3edb919b0f2b9a7e2048552cf235c91d77877485e4fb3239eb222c99f53c412a46983d8 SHA512 803f7f4368599e8b55ed78d8444d585bc9f7568af4f9ab3d4b53c12d31fdc412776c259bff91a9b905b3482c68ce29ed2827682d2d7541669b9e5a4bdf1ebe3b
 DIST ronn-ng-0.10.1.tar.gz 78696 BLAKE2B 1e56b90c5919e0a1af317da78161b34124268521fbc379fbba09ff9cb344073665460abc53fd961e4773ee444f33fba7e72ae3f6af84f8a170cfb1e89e557922 SHA512 3f6ee5355c7a19d5cb04c1b677028dd13ad2ff620acdb2e83d9b6f154a7b1e7b5a77ea0bcfbcef4bbb46a60b1c0fbc52fda079ff860c83a71f89b8fed0b83665
 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
-EBUILD ronn-ng-0.10.1.ebuild 1272 BLAKE2B 961f534ad92fa7d2a315c77bb40135cb7ed2670ad7f286992f4c091be13bc63401fdec0026f2ba0e93471ef134199611d119e471f5720f553be18bd49dbf14e0 SHA512 58056603a10c1900b2c0117e2c83bb0e03f523a5ef40fe7f7c1085dd106604255ae2b988c6df5c6412b8cb559b4590384fa12ef195fa0c2d1b0aeaa42d14a100
+EBUILD ronn-ng-0.10.1.ebuild 1277 BLAKE2B dc3871905a448256b35616ab7df240dd3d61ecea1a684fb5519b06cdbed1596c1a284528cc3ae3163d7ad87f5392291418419662e2f1d280bbdbb8dff47f8679 SHA512 654120549309886f94d2b2743fce0c3934a13a887c3090b0bfc04c7ef9037bd9620759ecc6c5987a95a39e48e199cedae36c65fb005282b45eab38e70903af1b
 EBUILD ronn-ng-0.9.1-r3.ebuild 1324 BLAKE2B 07a801ced9834a24c67b30cc897bb674823e79bd26fe246f78aa5b13e92d6d01f2fc8c66bba0ca36b1e1302a389475f4c3296d5f8d20778544f983a5a290d163 SHA512 ab57b427ec2a02eb5595d4ca4d124e52f3b5e884ef7f00dc13f7d9544d38f67cda2fe7a4bab3645dc67ba0130c493021bd02f42e7b943b9d386cb3fdd96f2b9a
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
index 346191ce83af..d3ad3e6c9d47 100644
--- a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/apjanke/ronn-ng/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 
 RDEPEND+="!app-text/ronn"