Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / scribus
Commits: 2e991a47 by Robin Candau at 2026-03-11T23:42:27+01:00 upgpkg: 1.6.5-6: Poppler 26.03.0 Rebuild https://archlinux.org/todo/poppler-26030-rebuild/ - - - - - 4 changed files: - .SRCINFO - PKGBUILD - REUSE.toml - + fix_build_with_poppler_26.03.0.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = scribus pkgdesc = Desktop publishing software pkgver = 1.6.5 - pkgrel = 5 + pkgrel = 6 url = https://www.scribus.net/ arch = x86_64 license = GPL-2.0-or-later @@ -45,6 +45,7 @@ pkgbase = scribus source = https://downloads.sourceforge.net/scribus/scribus-1.6.5.tar.xz.asc source = fix_build_with_poppler_26.01.0.patch source = fix_build_with_poppler_26.02.0.patch + source = fix_build_with_poppler_26.03.0.patch validpgpkeys = 5086B8D68E70FDDF4C40045AEF7B95E7F60166DA validpgpkeys = 757F5E9B13DD648887AD50092D47C099E782504E validpgpkeys = 6558BE84D27273A438A151198BEA48118AEBEE64 @@ -52,5 +53,6 @@ pkgbase = scribus sha256sums = SKIP sha256sums = 6826daa9be333e722e91bd09d5e8c1f2c31317efb1875f2cf6c12a3c8c11f045 sha256sums = 136aba5019f6fcadad44c6615af10546ac32e4b9dd7d1459273ce10a9a553c28 + sha256sums = 369b181a4f818057b0cf733a3b83e1419923aa9484fa6962497bb3252f0a1049 pkgname = scribus ===================================== PKGBUILD ===================================== @@ -8,7 +8,7 @@ pkgname=scribus pkgver=1.6.5 -pkgrel=5 +pkgrel=6 pkgdesc="Desktop publishing software" arch=(x86_64) url="https://www.scribus.net/"; @@ -50,11 +50,13 @@ options=(!lto) _archive="$pkgname-$pkgver" source=("https://downloads.sourceforge.net/${pkgname}/$_archive.tar.xz"{,.asc} 'fix_build_with_poppler_26.01.0.patch' - 'fix_build_with_poppler_26.02.0.patch') + 'fix_build_with_poppler_26.02.0.patch' + 'fix_build_with_poppler_26.03.0.patch') sha256sums=('09bdb736a8ff8a437191458a36d847cc0adeca0fc059cf696474e0ba6f59ac6a' 'SKIP' '6826daa9be333e722e91bd09d5e8c1f2c31317efb1875f2cf6c12a3c8c11f045' - '136aba5019f6fcadad44c6615af10546ac32e4b9dd7d1459273ce10a9a553c28') + '136aba5019f6fcadad44c6615af10546ac32e4b9dd7d1459273ce10a9a553c28' + '369b181a4f818057b0cf733a3b83e1419923aa9484fa6962497bb3252f0a1049') validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA # Peter Linnell <[email protected]> 757F5E9B13DD648887AD50092D47C099E782504E # The Scribus Team (www.scribus.net) <[email protected]> 6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <[email protected]> @@ -70,6 +72,10 @@ prepare() { # Fix build with poppler 26.02.0 # https://github.com/scribusproject/scribus/commit/28bd3be104c06b9d4532affe150f7b74fe5b3e59 patch -Np1 -i "$srcdir/fix_build_with_poppler_26.02.0.patch" + + # Fix build with poppler 26.03.0 + # https://bugs.scribus.net/view.php?id=17777 + patch -Np1 -i "$srcdir/fix_build_with_poppler_26.03.0.patch" } pkgver() { ===================================== REUSE.toml ===================================== @@ -25,6 +25,7 @@ SPDX-License-Identifier = "0BSD" path = [ "fix_build_with_poppler_26.01.0.patch", "fix_build_with_poppler_26.02.0.patch", + "fix_build_with_poppler_26.03.0.patch", ] SPDX-FileCopyrightText = "scribus contributors" SPDX-License-Identifier = "GPL-2.0-or-later" ===================================== fix_build_with_poppler_26.03.0.patch ===================================== @@ -0,0 +1,15 @@ +diff -Nur scribus_orig/scribus/plugins/import/pdf/slaoutput.cpp scribus_new/scribus/plugins/import/pdf/slaoutput.cpp +--- scribus_orig/scribus/plugins/import/pdf/slaoutput.cpp 2026-01-10 03:35:36.000000000 +0700 ++++ scribus_new/scribus/plugins/import/pdf/slaoutput.cpp 2026-03-09 14:00:00.225640340 +0700 +@@ -884,7 +884,11 @@ + const Ref ref = childRef.getRef(); + radList.append(ref.num); + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 3, 0) ++ QString tmTxt = UnicodeParsedString(annota->getUniqueName()); ++#else + QString tmTxt = UnicodeParsedString(annota->getName()); ++#endif + m_radioMap.insert(tmTxt, radList); + } + } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/scribus/-/commit/2e991a47fcdadb9b1eca6dafe1f6060521e75c39 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/scribus/-/commit/2e991a47fcdadb9b1eca6dafe1f6060521e75c39 You're receiving this email because of your account on gitlab.archlinux.org.
