Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 893158 - app-office/scribus-1.5.8: Add python3_11 support, poppler patching coordination
Summary: app-office/scribus-1.5.8: Add python3_11 support, poppler patching coordination
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Miroslav Šulc
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2023-02-03 21:33 UTC by Andreas Sturmlechner
Modified: 2023-02-07 10:55 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Sturmlechner gentoo-dev 2023-02-03 21:33:42 UTC
Python 3.11:
Fedora seem to have rebuilt it with py3_11, we should be able to do the same.


poppler-22.09:
- I was wondering why our patch looks significantly different to Debian's:
https://salsa.debian.org/debian/scribus/-/blob/master/debian/patches/25139.patch
^ @sam, where is the patch from commit 5908d48769d80baedb730c61b2605a983d97bb0f coming from? bug or rebuild contain no reference.

Upstream patch:
https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fac65819ed7
^ context conflicting bugfix commit merged by Debian:
https://github.com/scribusproject/scribus/commit/a9236cd44254339e64d1e422dcbbfd31913c8c11


harfbuzz-3.0.0 API:
- Arch are applying a patch for that, should we too?
https://github.com/archlinux/svntogit-community/blob/packages/scribus/trunk/harfbuzz-3.0.0.patch
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-02-04 08:27:54 UTC
On Poppler, I'm pretty sure that's my own, then I didn't get to submitting it upstream as the Inkscape one took more work/iterations than I expected. Or I needed to wait for an account on their site and forgot.
Comment 2 Andreas Sturmlechner gentoo-dev 2023-02-05 15:28:36 UTC
It seems like we had some harfbuzz-3 patch that was meant for 1.5.8, but was never applied to this version.
Comment 3 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-02-05 15:31:48 UTC
(In reply to Andreas Sturmlechner from comment #2)
> It seems like we had some harfbuzz-3 patch that was meant for 1.5.8, but was
> never applied to this version.

It was added in bd3a0a60eb96a95e025ba101430b3ee12c46dc97 in gentoo, then 7b8c6af798cc7d82e658888be5e6699558016dd3 updated the patch. I don't know what happened after that or why it got dropped or what.

Maybe it got dropped pre-emptively because of the #upstream comment? Not sure.
Comment 4 Andreas Sturmlechner gentoo-dev 2023-02-05 15:33:05 UTC
It got dropped with 1.5.7, never having been applied to 1.5.8. It seems it was part of 1.5.8 upstream already.
Comment 5 Larry the Git Cow gentoo-dev 2023-02-06 10:36:02 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb70711765546964429e8734e71a17d26ce6cd56

commit eb70711765546964429e8734e71a17d26ce6cd56
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-02-05 15:33:43 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-02-06 10:35:21 +0000

    app-office/scribus: Add python3_11, fix memleak, fix dashed lines
    
    Use upstream poppler-22.09 support patch, amended by Debian
    for dashed lines fix.
    
    Drop CMAKE_BUILD_TYPE="Release"
    
    Hopefully stop cmake overwriting user optimisations
    
    Bug: https://bugs.gentoo.org/691684
    Closes: https://bugs.gentoo.org/886251
    Closes: https://bugs.gentoo.org/893158
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/scribus/Manifest                        |   1 +
 app-office/scribus/files/scribus-1.5.8-cmake.patch |  28 ++++
 app-office/scribus/scribus-1.5.8-r5.ebuild         | 168 +++++++++++++++++++++
 3 files changed, 197 insertions(+)