Robin Candau pushed to branch main at Arch Linux / Packaging / Packages /
scribus
Commits:
f5302f2a by Robin Candau at 2024-12-17T20:20:27+01:00
upgpkg: 1.6.2-7: Poppler 24.12 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- fix_build_with_poppler_24.11.0.patch → fix_build_with_poppler_24.12.0.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = scribus
pkgdesc = Desktop publishing software
pkgver = 1.6.2
- pkgrel = 6
+ pkgrel = 7
url = https://www.scribus.net/
arch = x86_64
license = GPL-2.0-or-later
@@ -43,12 +43,12 @@ pkgbase = scribus
options = !lto
source = https://downloads.sourceforge.net/scribus/scribus-1.6.2.tar.xz
source =
https://downloads.sourceforge.net/scribus/scribus-1.6.2.tar.xz.asc
- source = fix_build_with_poppler_24.11.0.patch
+ source = fix_build_with_poppler_24.12.0.patch
validpgpkeys = 5086B8D68E70FDDF4C40045AEF7B95E7F60166DA
validpgpkeys = 757F5E9B13DD648887AD50092D47C099E782504E
validpgpkeys = 6558BE84D27273A438A151198BEA48118AEBEE64
sha256sums =
7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383
sha256sums = SKIP
- sha256sums =
d3c44aaead0f3fc553a1da9147ceed72c353fd257efb96626b460bc95bfddf53
+ sha256sums =
69b060bb880a9681fe6223fbc9f94f848a7eb71199efcf36dc8974c94fadeb2d
pkgname = scribus
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
pkgname=scribus
pkgver=1.6.2
-pkgrel=6
+pkgrel=7
pkgdesc="Desktop publishing software"
arch=(x86_64)
url="https://www.scribus.net/";
@@ -49,10 +49,10 @@ optdepends=('gdal: enable gdal plugin'
options=(!lto)
_archive="$pkgname-$pkgver"
source=("https://downloads.sourceforge.net/${pkgname}/$_archive.tar.xz"{,.asc}
- fix_build_with_poppler_24.11.0.patch)
+ fix_build_with_poppler_24.12.0.patch)
sha256sums=('7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383'
'SKIP'
- 'd3c44aaead0f3fc553a1da9147ceed72c353fd257efb96626b460bc95bfddf53')
+ '69b060bb880a9681fe6223fbc9f94f848a7eb71199efcf36dc8974c94fadeb2d')
validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA # Peter Linnell
<[email protected]>
757F5E9B13DD648887AD50092D47C099E782504E # The Scribus Team
(www.scribus.net) <[email protected]>
6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney
<[email protected]>
@@ -61,10 +61,11 @@ prepare() {
cd "$_archive"
sed -e 's|WANT_CPP17|WANT_CPP20|g' -e 's|CMAKE_CXX_STANDARD
17|CMAKE_CXX_STANDARD 20|g' -i CMakeLists.txt
- # Temporary patch to fix build with poppler 24.11.0
+ # Temporary patch to fix build with poppler 24.12.0
# See
https://github.com/scribusproject/scribus/commit/c9490423c8d4819ecb35af7b7f2cad581b5219da
# And
https://github.com/scribusproject/scribus/commit/16b660d4d2a7f4cb4cb7775f72ec026197278838
- patch -Np1 < "$srcdir/fix_build_with_poppler_24.11.0.patch"
+ # And
https://github.com/scribusproject/scribus/commit/44745297bd70a25b1d88ed922bdcb2d90a2fb435
+ patch -Np1 < "$srcdir/fix_build_with_poppler_24.12.0.patch"
}
build() {
=====================================
fix_build_with_poppler_24.11.0.patch → fix_build_with_poppler_24.12.0.patch
=====================================
@@ -1847,3 +1847,37 @@ index 35de565..9eca5a8 100644
QHash<QString, QList<int> > m_radioMap;
QHash<int, PageItem*> m_radioButtons;
int m_actPage { 1 };
+diff --git a/scribus/plugins/import/pdf/pdftextrecognition.h
b/scribus/plugins/import/pdf/pdftextrecognition.h
+index a04b453..631a2d1 100644
+--- a/scribus/plugins/import/pdf/pdftextrecognition.h
++++ b/scribus/plugins/import/pdf/pdftextrecognition.h
+@@ -16,7 +16,6 @@ for which a new license (GPL+exception) is in place.
+ #include "slaoutput.h"
+
+ #include <poppler/GfxState.h>
+-#include <poppler/CharCodeToUnicode.h>
+
+ /* PDF TextBox Framework */
+ /*
+@@ -143,7 +142,7 @@ class PdfTextOutputDev : public SlaOutputDev
+ {
+ public:
+ PdfTextOutputDev(ScribusDoc* doc, QList<PageItem*>* Elements,
QStringList* importedColors, int flags);
+- virtual ~PdfTextOutputDev();
++ ~PdfTextOutputDev() override;
+
+ void updateFont(GfxState* state) override;
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+index 35de565..66582c7 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -45,8 +45,6 @@ for which a new license (GPL+exception) is in place.
+ #include <poppler/Form.h>
+ #include <poppler/Page.h>
+ #include <poppler/Catalog.h>
+-#include <poppler/CharCodeToUnicode.h>
+-#include <poppler/FontEncodingTables.h>
+ #include <poppler/splash/SplashFontFileID.h>
+ #include <poppler/splash/SplashFontFile.h>
+ #include <poppler/splash/SplashFontEngine.h>
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/scribus/-/commit/f5302f2a9e08348e3375ce0040e9aa0082b9c045
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/scribus/-/commit/f5302f2a9e08348e3375ce0040e9aa0082b9c045
You're receiving this email because of your account on gitlab.archlinux.org.
