Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 657802 - app-office/scribus-1.5.4 version bump request
Summary: app-office/scribus-1.5.4 version bump request
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Justin Lecher (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-06-11 08:48 UTC by bugtrack
Modified: 2018-06-20 16:31 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 bugtrack 2018-06-11 08:48:36 UTC
Scribus 1.5.4 has been released, see

https://www.scribus.net/scribus-1-4-7-and-1-5-4-released/

and

https://wiki.scribus.net/canvas/1.5.4_Release
Comment 1 bugtrack 2018-06-11 10:33:12 UTC
The following allowed me to compile scribus 1.5.4 with poppler 0.65.0:

# create new ebuild by copying the old one
cp scribus-1.5.3-r1.ebuild scribus-1.5.4.ebuild
# copy the patches we still need
cp files/scribus-1.5.3-docdir.patch files/scribus-1.5.4-docdir.patch
cp files/scribus-1.5.3-fpic.patch files/scribus-1.5.4-fpic.patch

# get the >=poppler-0.64.0 patches
cd files
wget "https://github.com/scribusproject/scribus/commit/7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch"
wget "https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch"

# correct the second patch(!)
sed -e 's/UnicodeParsedString(const /UnicodeParsedString(/g' \
 < files/76561c1a55cd07c268f8f2b2fea888532933700b.patch \
 > files/76561c1a55cd07c268f8f2b2fea888532933700b_correct.patch

Edit scribus-1.5.4.ebuild to adjust PATCHES variable:
PATCHES=(
    "${FILESDIR}"/${P}-docdir.patch
    "${FILESDIR}"/${P}-fpic.patch
    "${FILESDIR}"/7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch
    "${FILESDIR}"/76561c1a55cd07c268f8f2b2fea888532933700b_correct.patch
)

# create/update Manifest
ebuild scribus-1.5.4.ebuild digest

# done!
emerge scribus
Comment 2 Larry the Git Cow gentoo-dev 2018-06-20 16:31:03 UTC
The bug has been closed via the following commit(s):

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

commit 402f130003a7d3ca58863ba2b8a9430f569f0d5e
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2018-06-20 14:41:17 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2018-06-20 16:30:49 +0000

    app-office/scribus: 1.5.4 version bump, fix build with poppler-0.64.0
    
    Closes: https://bugs.gentoo.org/656036
    Closes: https://bugs.gentoo.org/657802
    Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/scribus/Manifest             |   2 +
 app-office/scribus/scribus-1.5.4.ebuild | 243 ++++++++++++++++++++++++++++++++
 app-office/scribus/scribus-9999.ebuild  |  26 ++--
 3 files changed, 253 insertions(+), 18 deletions(-)