commit: d0647ae12a0292c2c2ce982415300acf4b95f124 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Fri Jun 14 09:28:45 2024 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Fri Jun 14 10:40:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0647ae1
app-text/paperwork-backend: add 2.2.3, drop 2.2.1-r1 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> app-text/paperwork-backend/Manifest | 4 +- .../paperwork-backend-2.2.1-cairo_workaround.patch | 52 ---------------------- ....1-r1.ebuild => paperwork-backend-2.2.3.ebuild} | 10 +---- 3 files changed, 4 insertions(+), 62 deletions(-) diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest index 3bb713c3cb5a..9f6c193ed7f0 100644 --- a/app-text/paperwork-backend/Manifest +++ b/app-text/paperwork-backend/Manifest @@ -1,4 +1,4 @@ -DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b -DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b +DIST paperwork-2.2.3.tar.bz2 2531208 BLAKE2B 6259a9b7a916ad71fc0f0747ce0c17e874dbff962c3d8b46c4c25c2a119de6d27f0ce7ce262dfbf7290fa436726fc538d9bead2664d7f158d51634eece768620 SHA512 68bad3ccc9ed2fdea2b1336945ca4f11de5b0a2249d5f043dc34d620ae5bf6627c0255d4776a5c19e9d266972403023f0b63eb3bf694d7a33051b53239c017bf DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 +DIST paperwork-data-2.2.3.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 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 deleted file mode 100644 index 01eb2a6154b0..000000000000 --- a/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c9430b844fbcedc9119e3d464f5f0c85feb7b197 Mon Sep 17 00:00:00 2001 -From: Jerome Flesch <jfle...@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.3.ebuild similarity index 91% rename from app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild rename to app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild index bedb4d1adafb..122954f5aaab 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild @@ -12,9 +12,10 @@ 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" +REL_HASH="3f51346f" 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" +S=${WORKDIR}/paperwork-${PV}/${PN} LICENSE="GPL-3" SLOT="0" @@ -44,18 +45,11 @@ BDEPEND=" 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
