git: 9f6409c376ac - main - print/scribus-devel: update 1.5.8 → 1.6.2 (copy of print/scribus)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 08 Jul 2024 15:27:32 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f6409c376ac6eab1aee3e4420f11ad2e4516c9c
commit 9f6409c376ac6eab1aee3e4420f11ad2e4516c9c
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-07-08 15:27:03 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-08 15:27:03 +0000
print/scribus-devel: update 1.5.8 → 1.6.2 (copy of print/scribus)
* 1.5.8 is outdated development version, older than the stable version;
* the port is almost broken (silent grab, incorrect dependency list);
* the next development branch 1.7 has no releases yet;
* keep the port for upcoming releases from the 1.7 branch.
Approved by: pkubaj (maintainer, via IRC)
MFH: 2024Q3
---
print/scribus-devel/Makefile | 62 +-
print/scribus-devel/distinfo | 6 +-
.../files/patch-cmake_modules_FindLIBPODOFO.cmake | 48 -
.../files/patch-kaos-poppler-22.02.0_1 | 119 -
.../files/patch-kaos-poppler-22.02.0_2 | 18 -
.../scribus-devel/files/patch-kaos-poppler-22.03.0 | 42 -
.../scribus-devel/files/patch-kaos-poppler-22.04.0 | 278 --
.../patch-scribus_plugins_import_pdf_slaoutput.cpp | 23 -
print/scribus-devel/pkg-plist | 3589 ++++++++++----------
9 files changed, 1833 insertions(+), 2352 deletions(-)
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 2217154baf80..ed9c1f550f19 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -1,6 +1,5 @@
PORTNAME= scribus
-PORTVERSION= 1.5.8
-PORTREVISION= 26
+DISTVERSION= 1.6.2
CATEGORIES= print editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
http://www.scribus.net/downloads/${PORTVERSION}/
@@ -14,12 +13,8 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
- libboost_thread.so:devel/boost-libs \
- libhunspell-1.7.so:textproc/hunspell \
- libcairo.so:graphics/cairo \
librevenge-0.0.so:textproc/librevenge \
libcups.so:print/cups \
- libwpg-0.3.so:graphics/libwpg03 \
libcdr-0.1.so:graphics/libcdr01 \
libfreehand-0.1.so:graphics/libfreehand \
libpagemaker-0.0.so:print/libpagemaker \
@@ -30,45 +25,48 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
libpoppler.so:graphics/poppler \
libharfbuzz-icu.so:print/harfbuzz-icu \
libfontconfig.so:x11-fonts/fontconfig \
- libpodofo09.so:graphics/podofo09 \
libharfbuzz.so:print/harfbuzz \
libpng.so:graphics/png \
libicuuc.so:devel/icu \
libqxp-0.0.so:textproc/libqxp \
libzmf-0.0.so:graphics/libzmf
-USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \
- jpeg pkgconfig python qt:5 shared-mime-info tar:xz
-USE_QT= buildtools:build core declarative gui linguisttools:build \
- network opengl printsupport qmake:build widgets xml
-DOS2UNIX_REGEX= .*\.(cpp|h|txt)
-USE_GNOME= libxml2
+USES= cmake compiler:c++17-lang desktop-file-utils gnome jpeg \
+ pkgconfig python qt:5 shared-mime-info tar:xz
+USE_QT= buildtools:build core gui linguisttools:build network opengl \
+ printsupport qmake:build widgets xml
+USE_GNOME= cairo libxml2
-CMAKE_ARGS+= -DWANT_HUNSPELL=YES \
- -DWANT_CPP17=YES \
- -DCMAKE_COLOR_MAKEFILE:BOOL=ON
+CMAKE_ARGS= -DWANT_CPP17=YES
CONFLICTS_INSTALL= scribus
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= BOOST DOCS GRAPHICSMAGICK HUNSPELL OSG PDF
+OPTIONS_DEFAULT=BOOST GRAPHICSMAGICK HUNSPELL OSG PDF
-.include <bsd.port.pre.mk>
+BOOST_DESC= Enable support for Boost-based enhancement
+GRAPHICSMAGICK_DESC= Use GraphicsMagick for image import support
+HUNSPELL_DESC= Enable spellchecking via hunspell
+OSG_DESC= Enable 3D rendering via osg
+PDF_DESC= Enable PDF export via podofo
-# Patch sources to force using include files installed by graphics/podofo09
-post-patch:
- @${REINPLACE_CMD} -e '/^[\t ]*#include/s|podofo/podofo.h|podofo09/podofo.h|' \
- ${WRKSRC}/scribus/plugins/import/ps/importps.cpp \
- ${WRKSRC}/scribus/plugins/import/ai/importai.cpp \
- ${WRKSRC}/scribus/imagedataloaders/scimgdataloader_pdf.cpp \
- ${WRKSRC}/scribus/pdflib_core.h \
- ${WRKSRC}/scribus/pdf_analyzer.h
-.if ${COMPILER_TYPE} == clang
- @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
- ${WRKSRC}/scribus/desaxe/digester.cpp
-.endif
+BOOST_BUILD_DEPENDS= boost-libs>0:devel/boost-libs
+BOOST_CMAKE_BOOL= WITH_BOOST
+
+GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick
+GRAPHICSMAGICK_CMAKE_BOOL= WANT_GRAPHICSMAGICK
+
+HUNSPELL_LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell
+HUNSPELL_CMAKE_BOOL= WANT_HUNSPELL
+
+OSG_LIB_DEPENDS= libosg.so:graphics/osg
+OSG_CMAKE_BOOL_OFF= WANT_NOOSG
+
+PDF_LIB_DEPENDS= libpodofo.so:graphics/podofo
+PDF_CMAKE_BOOL= WITH_PODOFO
post-install:
- ${LN} -sf ../share/icons/1_5_1/scribus.png \
+ ${LN} -sf ../scribus/icons/1_5_1/scribus.png \
${STAGEDIR}${PREFIX}/share/pixmaps/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo
index 90416483e307..398199eb17c3 100644
--- a/print/scribus-devel/distinfo
+++ b/print/scribus-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643023155
-SHA256 (scribus-1.5.8.tar.xz) = 47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
-SIZE (scribus-1.5.8.tar.xz) = 74543476
+TIMESTAMP = 1718530983
+SHA256 (scribus-1.6.2.tar.xz) = 7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383
+SIZE (scribus-1.6.2.tar.xz) = 73129400
diff --git a/print/scribus-devel/files/patch-cmake_modules_FindLIBPODOFO.cmake b/print/scribus-devel/files/patch-cmake_modules_FindLIBPODOFO.cmake
deleted file mode 100644
index 5858c363fc48..000000000000
--- a/print/scribus-devel/files/patch-cmake_modules_FindLIBPODOFO.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
---- cmake/modules/FindLIBPODOFO.cmake.orig 2022-01-23 16:16:42 UTC
-+++ cmake/modules/FindLIBPODOFO.cmake
-@@ -13,7 +13,7 @@ find_path(LIBPODOFO_INCLUDE_DIR
- endif(WIN32)
-
- find_path(LIBPODOFO_INCLUDE_DIR
-- NAMES podofo/podofo.h
-+ NAMES podofo09/podofo.h
- PATHS
- "${LIBPODOFO_DIR}/include"
- "${LIBPODOFO_DIR}/src"
-@@ -23,7 +23,7 @@ find_library(LIBPODOFO_LIBRARY
- set(LIBPODOFO_FIND_QUIETLY ON)
-
- find_library(LIBPODOFO_LIBRARY
-- NAMES libpodofo podofo
-+ NAMES libpodofo09 podofo09
- PATHS
- "${LIBPODOFO_DIR}/lib"
- "${LIBPODOFO_DIR}/src"
-@@ -32,7 +32,7 @@ if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
-
- if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
- if(NOT LIBPODOFO_CONFIG_H)
-- set(LIBPODOFO_CONFIG_H "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" CACHE FILEPATH "Alternative place of podofo_config.h")
-+ set(LIBPODOFO_CONFIG_H "${LIBPODOFO_INCLUDE_DIR}/podofo09/base/podofo_config.h" CACHE FILEPATH "Alternative place of podofo_config.h")
- endif()
-
- file(STRINGS "${LIBPODOFO_CONFIG_H}" PODOFO_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
-@@ -69,14 +69,14 @@ if(NOT LIBPODOFO_FIND_QUIETLY)
-
- if(NOT LIBPODOFO_FIND_QUIETLY)
- if(LIBPODOFO_INCLUDE_DIR)
-- message("podofo/podofo.h: ${LIBPODOFO_INCLUDE_DIR}")
-+ message("podofo09/podofo.h: ${LIBPODOFO_INCLUDE_DIR}")
- else(LIBPODOFO_INCLUDE_DIR)
-- message("podofo/podofo.h: not found")
-+ message("podofo09/podofo.h: not found")
- endif(LIBPODOFO_INCLUDE_DIR)
- if(LIBPODOFO_LIBRARY)
-- message("podofo lib: ${LIBPODOFO_LIBRARY}")
-+ message("podofo09 lib: ${LIBPODOFO_LIBRARY}")
- else(LIBPODOFO_LIBRARY)
-- message("podofo lib: not found")
-+ message("podofo09 lib: not found")
- endif(LIBPODOFO_LIBRARY)
- message("PoDoFo cflags: ${useshared}")
- endif(NOT LIBPODOFO_FIND_QUIETLY)
diff --git a/print/scribus-devel/files/patch-kaos-poppler-22.02.0_1 b/print/scribus-devel/files/patch-kaos-poppler-22.02.0_1
deleted file mode 100644
index 14c2e381582e..000000000000
--- a/print/scribus-devel/files/patch-kaos-poppler-22.02.0_1
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 5894bf2ad6..3650c96f52 100644
---- scribus/plugins/import/pdf/slaoutput.cpp
-+++ scribus/plugins/import/pdf/slaoutput.cpp
-@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
-
- #include "slaoutput.h"
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+#include <memory>
-+#include <optional>
-+#endif
-+
- #include <poppler/GlobalParams.h>
- #include <poppler/poppler-config.h>
- #include <poppler/FileSpec.h>
-@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
- void SlaOutputDev::updateFont(GfxState *state)
- {
- GfxFont *gfxFont;
-- GfxFontLoc *fontLoc;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+ std::optional<GfxFontLoc> fontLoc;
-+ const GooString * fileName = nullptr;
-+ std::unique_ptr<FoFiTrueType> ff;
-+#else
-+ GfxFontLoc * fontLoc = nullptr;
-+ GooString * fileName = nullptr;
-+ FoFiTrueType * ff = nullptr;
-+#endif
- GfxFontType fontType;
- SlaOutFontFileID *id;
- SplashFontFile *fontFile;
- SplashFontSrc *fontsrc = nullptr;
-- FoFiTrueType *ff;
- Object refObj, strObj;
-- GooString *fileName;
-- char *tmpBuf;
-+ char *tmpBuf = nullptr;
- int tmpBufLen = 0;
-- int *codeToGID;
-- const double *textMat;
-+ int *codeToGID = nullptr;
-+ const double *textMat = nullptr;
- double m11, m12, m21, m22, fontSize;
- SplashCoord mat[4];
- int n = 0;
-@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
- SplashCoord matrix[6];
-
- m_font = nullptr;
-- fileName = nullptr;
-- tmpBuf = nullptr;
-- fontLoc = nullptr;
-
- gfxFont = state->getFont();
- if (!gfxFont)
-@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
- }
- else
- { // gfxFontLocExternal
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+ fileName = fontLoc->pathAsGooString();
-+#else
- fileName = fontLoc->path;
-+#endif
- fontType = fontLoc->fontType;
- }
-
-@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
- ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
- if (ff)
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
-+ ff.reset();
-+#else
- codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
-- n = 256;
- delete ff;
-+#endif
-+ n = 256;
- }
- else
- {
-@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
- ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
- if (! ff)
- goto err2;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
-+ ff.reset();
-+#else
- codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
- delete ff;
-+#endif
- }
- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
- id,
-@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
- mat[3] = -m22;
- m_font = m_fontEngine->getFont(fontFile, mat, matrix);
-
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
- delete fontLoc;
-+#endif
- if (fontsrc && !fontsrc->isFile)
- fontsrc->unref();
- return;
-
- err2:
- delete id;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
- delete fontLoc;
-+#endif
-+
- err1:
- if (fontsrc && !fontsrc->isFile)
- fontsrc->unref();
diff --git a/print/scribus-devel/files/patch-kaos-poppler-22.02.0_2 b/print/scribus-devel/files/patch-kaos-poppler-22.02.0_2
deleted file mode 100644
index eb06789716d2..000000000000
--- a/print/scribus-devel/files/patch-kaos-poppler-22.02.0_2
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 3650c96f52..a6f4e00fa9 100644
---- scribus/plugins/import/pdf/slaoutput.cpp
-+++ scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
- delete id;
- else
- {
-- if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
-+ fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
-+ if (!fontLoc)
- {
-- error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
-
diff --git a/print/scribus-devel/files/patch-kaos-poppler-22.03.0 b/print/scribus-devel/files/patch-kaos-poppler-22.03.0
deleted file mode 100644
index 810a20726565..000000000000
--- a/print/scribus-devel/files/patch-kaos-poppler-22.03.0
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 154e58a3f0..392dcd9e64 100644
---- scribus/plugins/import/pdf/importpdf.cpp
-+++ scribus/plugins/import/pdf/importpdf.cpp
-@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- #endif
- globalParams->setErrQuiet(gTrue);
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
-+ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
-+#else
- PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
-+#endif
- if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
- return QImage();
-
-@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
- globalParams->setErrQuiet(gTrue);
- // globalParams->setPrintCommands(gTrue);
- QList<OptionalContentGroup*> ocgGroups;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
-+ auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));
-+#else
- auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
-+#endif
- if (pdfDoc)
- {
- if (pdfDoc->getErrorCode() == errEncrypted)
-@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
- #else
- auto fname = new GooString(QFile::encodeName(fn).data());
- #endif
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
-+ std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());
-+ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));
-+#else
- auto userPW = new GooString(text.toLocal8Bit().data());
- pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
-+#endif
- qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
- }
- if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))
diff --git a/print/scribus-devel/files/patch-kaos-poppler-22.04.0 b/print/scribus-devel/files/patch-kaos-poppler-22.04.0
deleted file mode 100644
index 19d0e761367c..000000000000
--- a/print/scribus-devel/files/patch-kaos-poppler-22.04.0
+++ /dev/null
@@ -1,278 +0,0 @@
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index e20a81f99e..5626fe3477 100644
---- scribus/plugins/import/pdf/slaoutput.cpp
-+++ scribus/plugins/import/pdf/slaoutput.cpp
-@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
- int shade = 100;
- currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
- fontSize = state->getFontSize();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ if (state->getFont() && state->getFont()->getName())
-+ fontName = new GooString(state->getFont()->getName().value());
-+#else
- if (state->getFont())
- fontName = state->getFont()->getName()->copy();
-+#endif
- itemText = s->copy();
- }
-
-@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
- GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
- {
- SlaOutputDev *dev = (SlaOutputDev*)user_data;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ const PDFRectangle& annotRect = annota->getRect();;
-+ const PDFRectangle* box = &annotRect;
-+#else
- PDFRectangle *box = annota->getRect();
-+#endif
- double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;
- double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
- double width = box->x2 - box->x1;
-@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
- if (apa || !achar)
- {
- AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ const PDFRectangle& annotaRect = annota->getRect();
-+ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
-+#else
- Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
-+#endif
- ano->draw(gfx, false);
- if (!bgFound)
- m_currColorFill = annotOutDev->currColorFill;
-@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
-
- void SlaOutputDev::updateFont(GfxState *state)
- {
-- GfxFont *gfxFont;
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ std::optional<GfxFontLoc> fontLoc;
-+ std::string fileName;
-+ std::unique_ptr<FoFiTrueType> ff;
-+ std::optional<std::vector<unsigned char>> tmpBuf;
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
- std::optional<GfxFontLoc> fontLoc;
- const GooString * fileName = nullptr;
- std::unique_ptr<FoFiTrueType> ff;
-+ char* tmpBuf = nullptr;
- #else
- GfxFontLoc * fontLoc = nullptr;
- GooString * fileName = nullptr;
- FoFiTrueType * ff = nullptr;
-+ char* tmpBuf = nullptr;
- #endif
- GfxFontType fontType;
- SlaOutFontFileID *id;
- SplashFontFile *fontFile;
- SplashFontSrc *fontsrc = nullptr;
- Object refObj, strObj;
-- char *tmpBuf = nullptr;
- int tmpBufLen = 0;
- int *codeToGID = nullptr;
- const double *textMat = nullptr;
-@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
-
- m_font = nullptr;
-
-- gfxFont = state->getFont();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ GfxFont* gfxFont = state->getFont().get();
-+#else
-+ GfxFont* gfxFont = state->getFont();
-+#endif
- if (!gfxFont)
- goto err1;
-
-@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
- if (fontLoc->locType == gfxFontLocEmbedded)
- {
- // if there is an embedded font, read it to memory
-- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());
- if (! tmpBuf)
- goto err2;
-+#else
-+ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
-+ if (!tmpBuf)
-+ goto err2;
-+#endif
-
- // external font
- }
- else
- { // gfxFontLocExternal
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ fileName = fontLoc->path;
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
- fileName = fontLoc->pathAsGooString();
- #else
- fileName = fontLoc->path;
-@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
- }
-
- fontsrc = new SplashFontSrc;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ if (!fileName.empty())
-+ fontsrc->setFile(fileName);
-+ else
-+ fontsrc->setBuf(std::move(tmpBuf.value()));
-+#else
- if (fileName)
- fontsrc->setFile(fileName, gFalse);
- else
- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
-+#endif
-
- // load the font file
- switch (fontType) {
- case fontType1:
-- if (!(fontFile = m_fontEngine->loadType1Font(
-- id,
-- fontsrc,
-- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
-+ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
- case fontType1C:
-- if (!(fontFile = m_fontEngine->loadType1CFont(
-- id,
-- fontsrc,
-- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
-+ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
- case fontType1COT:
-- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
-- id,
-- fontsrc,
-- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
-+ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
- case fontTrueType:
- case fontTrueTypeOT:
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ if (!fileName.empty())
-+ ff = FoFiTrueType::load(fileName.c_str());
-+ else
-+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
-+#else
- if (fileName)
- ff = FoFiTrueType::load(fileName->getCString());
- else
- ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
-+#endif
- if (ff)
- {
- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
- codeToGID = nullptr;
- n = 0;
- }
-- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
-- id,
-- fontsrc,
-- codeToGID, n)))
-+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
- case fontCIDType0:
- case fontCIDType0C:
-- if (!(fontFile = m_fontEngine->loadCIDFont(
-- id,
-- fontsrc)))
-+ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
-@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
- codeToGID = nullptr;
- n = 0;
- }
-- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
-- id,
-- fontsrc,
-- codeToGID, n)))
-+ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
- {
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
- }
- else
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ if (!fileName.empty())
-+ ff = FoFiTrueType::load(fileName.c_str());
-+ else
-+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
-+#else
- if (fileName)
- ff = FoFiTrueType::load(fileName->getCString());
- else
- ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
-+#endif
- if (! ff)
- goto err2;
- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
- delete ff;
- #endif
- }
-- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
-- id,
-- fontsrc,
-- codeToGID, n, faceIndex)))
-+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
- {
-- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
- goto err2;
- }
- break;
-@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
- GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
- {
- // qDebug() << "beginType3Char";
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
- GfxFont *gfxFont;
-+ if (!(gfxFont = state->getFont().get()))
-+ return gTrue;
-+#else
-+ GfxFont* gfxFont;
- if (!(gfxFont = state->getFont()))
- return gTrue;
-+#endif
- if (gfxFont->getType() != fontType3)
- return gTrue;
- F3Entry f3e;
diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp
deleted file mode 100644
index 0921eddd3997..000000000000
--- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-Obtained from:
- https://github.com/archlinux/svntogit-community/blob/packages/scribus/trunk/scribus-1.5.8-poppler-22.09.0.patch
-
---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2022-09-06 14:31:26 UTC
-+++ scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3681,9 +3681,16 @@ void SlaOutputDev::getPenState(GfxState *state)
- break;
- }
- double lw = state->getLineWidth();
-- double *dashPattern;
- int dashLength;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
-+ const double *dashPattern;
-+ const std::vector<double> &dash = state->getLineDash(&DashOffset);
-+ dashPattern = dash.data();
-+ dashLength = dash.size();
-+#else
-+ double *dashPattern;
- state->getLineDash(&dashPattern, &dashLength, &DashOffset);
-+#endif
- QVector<double> pattern(dashLength);
- for (int i = 0; i < dashLength; ++i)
- {
diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist
index 1af3518e1bc8..2935f87cc539 100644
--- a/print/scribus-devel/pkg-plist
+++ b/print/scribus-devel/pkg-plist
@@ -67,1800 +67,13 @@ lib/scribus/plugins/libuniconvertorplugin.so
lib/scribus/plugins/libwmfimplugin.so
lib/scribus/plugins/libxpsexplugin.so
lib/scribus/scribus.css
-share/man/de/man1/scribus.1.gz
-share/man/man1/scribus.1.gz
-share/man/pl/man1/scribus.1.gz
share/applications/scribus.desktop
-share/icons/hicolor/1024x1024/apps/scribus.png
-share/icons/hicolor/128x128/apps/scribus.png
-share/icons/hicolor/16x16/apps/scribus.png
-share/icons/hicolor/256x256/apps/scribus.png
-share/icons/hicolor/32x32/apps/scribus.png
-share/icons/hicolor/512x512/apps/scribus.png
-share/metainfo/scribus.appdata.xml
-share/mime/packages/scribus.xml
-share/pixmaps/scribus.png
-%%DATADIR%%/dicts/hyph/README_ca_ES.txt
-%%DATADIR%%/dicts/hyph/README_cs_CZ.txt
-%%DATADIR%%/dicts/hyph/README_cy_GB.txt
-%%DATADIR%%/dicts/hyph/README_de_1901.txt
-%%DATADIR%%/dicts/hyph/README_de_DE.txt
-%%DATADIR%%/dicts/hyph/README_en_EN.txt
-%%DATADIR%%/dicts/hyph/README_es_ES.txt
-%%DATADIR%%/dicts/hyph/README_fi_FI.txt
-%%DATADIR%%/dicts/hyph/README_hu_HU.txt
-%%DATADIR%%/dicts/hyph/README_hyph_da_DK.txt
-%%DATADIR%%/dicts/hyph/README_hyph_de_CH.txt
-%%DATADIR%%/dicts/hyph/README_hyph_de_DE.txt
-%%DATADIR%%/dicts/hyph/README_hyph_en_GB.txt
-%%DATADIR%%/dicts/hyph/README_hyph_en_US.txt
-%%DATADIR%%/dicts/hyph/README_hyph_fr.txt
-%%DATADIR%%/dicts/hyph/README_hyph_ia.txt
-%%DATADIR%%/dicts/hyph/README_hyph_ml_IN.txt
-%%DATADIR%%/dicts/hyph/README_hyph_nb_NO.txt
-%%DATADIR%%/dicts/hyph/README_hyph_nn_NO.txt
-%%DATADIR%%/dicts/hyph/README_hyph_pl_PL.txt
-%%DATADIR%%/dicts/hyph/README_hyph_ro_RO.txt
-%%DATADIR%%/dicts/hyph/README_id_ID.txt
-%%DATADIR%%/dicts/hyph/README_is_IS.txt
-%%DATADIR%%/dicts/hyph/README_ku.txt
-%%DATADIR%%/dicts/hyph/README_lt_LT.txt
-%%DATADIR%%/dicts/hyph/README_pt_BR.txt
-%%DATADIR%%/dicts/hyph/README_pt_PT.txt
-%%DATADIR%%/dicts/hyph/README_ru_RU_0.txt
-%%DATADIR%%/dicts/hyph/README_sk_SK.txt
-%%DATADIR%%/dicts/hyph/README_sl_SI.txt
-%%DATADIR%%/dicts/hyph/README_sv_SE.txt
-%%DATADIR%%/dicts/hyph/README_uk_UA.txt
-%%DATADIR%%/dicts/hyph/hyph_af.dic
-%%DATADIR%%/dicts/hyph/hyph_bg.dic
-%%DATADIR%%/dicts/hyph/hyph_ca.dic
-%%DATADIR%%/dicts/hyph/hyph_cs.dic
-%%DATADIR%%/dicts/hyph/hyph_da.dic
-%%DATADIR%%/dicts/hyph/hyph_de.dic
-%%DATADIR%%/dicts/hyph/hyph_de_1901.dic
-%%DATADIR%%/dicts/hyph/hyph_de_CH.dic
-%%DATADIR%%/dicts/hyph/hyph_el.dic
-%%DATADIR%%/dicts/hyph/hyph_en_GB.dic
-%%DATADIR%%/dicts/hyph/hyph_en_US.dic
-%%DATADIR%%/dicts/hyph/hyph_eo.dic
-%%DATADIR%%/dicts/hyph/hyph_es.dic
-%%DATADIR%%/dicts/hyph/hyph_fi.dic
-%%DATADIR%%/dicts/hyph/hyph_fr.dic
-%%DATADIR%%/dicts/hyph/hyph_gl.dic
-%%DATADIR%%/dicts/hyph/hyph_hr.dic
-%%DATADIR%%/dicts/hyph/hyph_hu.dic
-%%DATADIR%%/dicts/hyph/hyph_ia.dic
-%%DATADIR%%/dicts/hyph/hyph_id.dic
-%%DATADIR%%/dicts/hyph/hyph_is.dic
-%%DATADIR%%/dicts/hyph/hyph_it.dic
-%%DATADIR%%/dicts/hyph/hyph_ku.dic
-%%DATADIR%%/dicts/hyph/hyph_lt.dic
-%%DATADIR%%/dicts/hyph/hyph_ml_IN.dic
-%%DATADIR%%/dicts/hyph/hyph_nb_NO.dic
-%%DATADIR%%/dicts/hyph/hyph_nl.dic
-%%DATADIR%%/dicts/hyph/hyph_nn_NO.dic
-%%DATADIR%%/dicts/hyph/hyph_pl.dic
-%%DATADIR%%/dicts/hyph/hyph_pt.dic
-%%DATADIR%%/dicts/hyph/hyph_pt_BR.dic
-%%DATADIR%%/dicts/hyph/hyph_ro.dic
-%%DATADIR%%/dicts/hyph/hyph_ru.dic
-%%DATADIR%%/dicts/hyph/hyph_sk.dic
-%%DATADIR%%/dicts/hyph/hyph_sl.dic
-%%DATADIR%%/dicts/hyph/hyph_sv.dic
-%%DATADIR%%/dicts/hyph/hyph_uk.dic
-%%DATADIR%%/dtd/scribuspdfoptions.dtd
-%%DATADIR%%/editorconfig/100_latex.tar
-%%DATADIR%%/editorconfig/100_latex.xml
-%%DATADIR%%/editorconfig/200_gnuplot.xml
-%%DATADIR%%/editorconfig/300_lilypond.xml
-%%DATADIR%%/editorconfig/400_dot.xml
-%%DATADIR%%/editorconfig/500_povray.xml
-%%DATADIR%%/editorconfig/600_xelatex.tar
-%%DATADIR%%/editorconfig/600_xelatex.xml
-%%DATADIR%%/editorconfig/dot.svg
-%%DATADIR%%/editorconfig/gnuplot.png
-%%DATADIR%%/editorconfig/lilypond.png
-%%DATADIR%%/editorconfig/povray_32.png
-%%DATADIR%%/icons/1_5_0.xml
-%%DATADIR%%/icons/1_5_0/16/accessories-text-editor.png
-%%DATADIR%%/icons/1_5_0/16/align-horizontal-center.png
-%%DATADIR%%/icons/1_5_0/16/align-horizontal-left-out.png
-%%DATADIR%%/icons/1_5_0/16/align-horizontal-left.png
-%%DATADIR%%/icons/1_5_0/16/align-horizontal-right-out.png
-%%DATADIR%%/icons/1_5_0/16/align-horizontal-right.png
-%%DATADIR%%/icons/1_5_0/16/align-vertical-bottom-out.png
-%%DATADIR%%/icons/1_5_0/16/align-vertical-bottom.png
-%%DATADIR%%/icons/1_5_0/16/align-vertical-center.png
-%%DATADIR%%/icons/1_5_0/16/align-vertical-top-out.png
-%%DATADIR%%/icons/1_5_0/16/align-vertical-top.png
-%%DATADIR%%/icons/1_5_0/16/annot3d.png
-%%DATADIR%%/icons/1_5_0/16/checkbox.png
-%%DATADIR%%/icons/1_5_0/16/close.png
-%%DATADIR%%/icons/1_5_0/16/color-fill.png
-%%DATADIR%%/icons/1_5_0/16/color-picker.png
-%%DATADIR%%/icons/1_5_0/16/color-stroke.png
-%%DATADIR%%/icons/1_5_0/16/combobox.png
-%%DATADIR%%/icons/1_5_0/16/configure.png
-%%DATADIR%%/icons/1_5_0/16/delete-table-columns.png
-%%DATADIR%%/icons/1_5_0/16/delete-table-rows.png
-%%DATADIR%%/icons/1_5_0/16/distribute-horizontal-center.png
-%%DATADIR%%/icons/1_5_0/16/distribute-horizontal-equal.png
-%%DATADIR%%/icons/1_5_0/16/distribute-horizontal-left.png
-%%DATADIR%%/icons/1_5_0/16/distribute-horizontal-right.png
-%%DATADIR%%/icons/1_5_0/16/distribute-vertical-bottom.png
-%%DATADIR%%/icons/1_5_0/16/distribute-vertical-center.png
-%%DATADIR%%/icons/1_5_0/16/distribute-vertical-equal.png
-%%DATADIR%%/icons/1_5_0/16/distribute-vertical-top.png
-%%DATADIR%%/icons/1_5_0/16/document-new.png
-%%DATADIR%%/icons/1_5_0/16/document-open.png
-%%DATADIR%%/icons/1_5_0/16/document-print-preview.png
-%%DATADIR%%/icons/1_5_0/16/document-print.png
-%%DATADIR%%/icons/1_5_0/16/document-properties.png
-%%DATADIR%%/icons/1_5_0/16/document-save-as.png
-%%DATADIR%%/icons/1_5_0/16/document-save.png
-%%DATADIR%%/icons/1_5_0/16/draw-arc.png
-%%DATADIR%%/icons/1_5_0/16/draw-arrow-back.png
-%%DATADIR%%/icons/1_5_0/16/draw-arrow-down.png
-%%DATADIR%%/icons/1_5_0/16/draw-arrow-forward.png
-%%DATADIR%%/icons/1_5_0/16/draw-arrow-up.png
-%%DATADIR%%/icons/1_5_0/16/draw-bezier-curves.png
-%%DATADIR%%/icons/1_5_0/16/draw-calligraphic.png
-%%DATADIR%%/icons/1_5_0/16/draw-cross.png
-%%DATADIR%%/icons/1_5_0/16/draw-donut.png
-%%DATADIR%%/icons/1_5_0/16/draw-ellipse.png
-%%DATADIR%%/icons/1_5_0/16/draw-freehand.png
-%%DATADIR%%/icons/1_5_0/16/draw-halfcircle1.png
-%%DATADIR%%/icons/1_5_0/16/draw-halfcircle2.png
-%%DATADIR%%/icons/1_5_0/16/draw-halfcircle3.png
-%%DATADIR%%/icons/1_5_0/16/draw-halfcircle4.png
-%%DATADIR%%/icons/1_5_0/16/draw-path.png
-%%DATADIR%%/icons/1_5_0/16/draw-polygon.png
-%%DATADIR%%/icons/1_5_0/16/draw-polyline.png
-%%DATADIR%%/icons/1_5_0/16/draw-rectangle.png
-%%DATADIR%%/icons/1_5_0/16/draw-spiral.png
-%%DATADIR%%/icons/1_5_0/16/draw-square-inverted-corners.png
-%%DATADIR%%/icons/1_5_0/16/draw-star.png
-%%DATADIR%%/icons/1_5_0/16/draw-text.png
-%%DATADIR%%/icons/1_5_0/16/draw-triangle.png
-%%DATADIR%%/icons/1_5_0/16/draw-triangle1.png
-%%DATADIR%%/icons/1_5_0/16/draw-triangle2.png
-%%DATADIR%%/icons/1_5_0/16/draw-triangle3.png
-%%DATADIR%%/icons/1_5_0/16/draw-triangle4.png
-%%DATADIR%%/icons/1_5_0/16/edit-clear.png
-%%DATADIR%%/icons/1_5_0/16/edit-copy.png
-%%DATADIR%%/icons/1_5_0/16/edit-cut.png
-%%DATADIR%%/icons/1_5_0/16/edit-delete-all.png
-%%DATADIR%%/icons/1_5_0/16/edit-delete.png
-%%DATADIR%%/icons/1_5_0/16/edit-find-replace.png
-%%DATADIR%%/icons/1_5_0/16/edit-guides.png
-%%DATADIR%%/icons/1_5_0/16/edit-paste.png
-%%DATADIR%%/icons/1_5_0/16/edit-redo.png
-%%DATADIR%%/icons/1_5_0/16/edit-select-all.png
-%%DATADIR%%/icons/1_5_0/16/edit-undo.png
-%%DATADIR%%/icons/1_5_0/16/editdoc.png
-%%DATADIR%%/icons/1_5_0/16/exit.png
-%%DATADIR%%/icons/1_5_0/16/flip-object-horizontal.png
-%%DATADIR%%/icons/1_5_0/16/flip-object-vertical.png
-%%DATADIR%%/icons/1_5_0/16/folder.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-center.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-fill-block-right.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-fill-block.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-fill.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-left.png
-%%DATADIR%%/icons/1_5_0/16/format-justify-right.png
-%%DATADIR%%/icons/1_5_0/16/go-bottom.png
-%%DATADIR%%/icons/1_5_0/16/go-down.png
-%%DATADIR%%/icons/1_5_0/16/go-first.png
-%%DATADIR%%/icons/1_5_0/16/go-home.png
-%%DATADIR%%/icons/1_5_0/16/go-last.png
-%%DATADIR%%/icons/1_5_0/16/go-next.png
-%%DATADIR%%/icons/1_5_0/16/go-previous.png
-%%DATADIR%%/icons/1_5_0/16/go-top.png
-%%DATADIR%%/icons/1_5_0/16/go-up.png
-%%DATADIR%%/icons/1_5_0/16/help-browser.png
-%%DATADIR%%/icons/1_5_0/16/image-x-generic.png
-%%DATADIR%%/icons/1_5_0/16/information.png
-%%DATADIR%%/icons/1_5_0/16/insert-barcode.png
-%%DATADIR%%/icons/1_5_0/16/insert-button.png
-%%DATADIR%%/icons/1_5_0/16/insert-image.png
-%%DATADIR%%/icons/1_5_0/16/insert-latex.png
-%%DATADIR%%/icons/1_5_0/16/insert-renderframe.png
-%%DATADIR%%/icons/1_5_0/16/insert-table-columns.png
-%%DATADIR%%/icons/1_5_0/16/insert-table-rows.png
-%%DATADIR%%/icons/1_5_0/16/insert-table.png
-%%DATADIR%%/icons/1_5_0/16/insert-text-frame.png
-%%DATADIR%%/icons/1_5_0/16/layer-flow-around.png
-%%DATADIR%%/icons/1_5_0/16/list-add.png
-%%DATADIR%%/icons/1_5_0/16/list-box.png
-%%DATADIR%%/icons/1_5_0/16/list-remove.png
-%%DATADIR%%/icons/1_5_0/16/lock-unlocked.png
-%%DATADIR%%/icons/1_5_0/16/lock.png
-%%DATADIR%%/icons/1_5_0/16/measure.png
-%%DATADIR%%/icons/1_5_0/16/merge-table-cells.png
-%%DATADIR%%/icons/1_5_0/16/page-3fold.png
-%%DATADIR%%/icons/1_5_0/16/page-4fold.png
-%%DATADIR%%/icons/1_5_0/16/page-doublesided.png
-%%DATADIR%%/icons/1_5_0/16/page-simple.png
-%%DATADIR%%/icons/1_5_0/16/pdf-annotations.png
-%%DATADIR%%/icons/1_5_0/16/pointer.png
-%%DATADIR%%/icons/1_5_0/16/preferences-desktop-font.png
-%%DATADIR%%/icons/1_5_0/16/preferences-desktop-keyboard-shortcuts.png
-%%DATADIR%%/icons/1_5_0/16/preflight-verifier.png
-%%DATADIR%%/icons/1_5_0/16/printer.png
-%%DATADIR%%/icons/1_5_0/16/radiobutton.png
-%%DATADIR%%/icons/1_5_0/16/scale.png
-%%DATADIR%%/icons/1_5_0/16/show-object.png
-%%DATADIR%%/icons/1_5_0/16/split-table-cells.png
-%%DATADIR%%/icons/1_5_0/16/story-editor.png
-%%DATADIR%%/icons/1_5_0/16/stroke-cap-butt.png
-%%DATADIR%%/icons/1_5_0/16/stroke-cap-round.png
-%%DATADIR%%/icons/1_5_0/16/stroke-cap-square.png
-%%DATADIR%%/icons/1_5_0/16/stroke-join-bevel.png
-%%DATADIR%%/icons/1_5_0/16/stroke-join-miter.png
-%%DATADIR%%/icons/1_5_0/16/stroke-join-round.png
-%%DATADIR%%/icons/1_5_0/16/system-file-manager.png
-%%DATADIR%%/icons/1_5_0/16/text-direction-ltr.png
-%%DATADIR%%/icons/1_5_0/16/text-direction-rtl.png
-%%DATADIR%%/icons/1_5_0/16/text-field.png
-%%DATADIR%%/icons/1_5_0/16/text-frame-link.png
-%%DATADIR%%/icons/1_5_0/16/text-frame-unlink.png
-%%DATADIR%%/icons/1_5_0/16/transform-rotate.png
-%%DATADIR%%/icons/1_5_0/16/video-display.png
-%%DATADIR%%/icons/1_5_0/16/zoom-in.png
-%%DATADIR%%/icons/1_5_0/16/zoom-original.png
-%%DATADIR%%/icons/1_5_0/16/zoom-out.png
-%%DATADIR%%/icons/1_5_0/16/zoom.png
-%%DATADIR%%/icons/1_5_0/22/accessories-text-editor.png
-%%DATADIR%%/icons/1_5_0/22/align-horizontal-center.png
-%%DATADIR%%/icons/1_5_0/22/align-horizontal-left-out.png
-%%DATADIR%%/icons/1_5_0/22/align-horizontal-left.png
-%%DATADIR%%/icons/1_5_0/22/align-horizontal-right-out.png
-%%DATADIR%%/icons/1_5_0/22/align-horizontal-right.png
-%%DATADIR%%/icons/1_5_0/22/align-vertical-bottom-out.png
-%%DATADIR%%/icons/1_5_0/22/align-vertical-bottom.png
-%%DATADIR%%/icons/1_5_0/22/align-vertical-center.png
-%%DATADIR%%/icons/1_5_0/22/align-vertical-top-out.png
-%%DATADIR%%/icons/1_5_0/22/align-vertical-top.png
-%%DATADIR%%/icons/1_5_0/22/annot3d.png
-%%DATADIR%%/icons/1_5_0/22/checkbox.png
-%%DATADIR%%/icons/1_5_0/22/close.png
-%%DATADIR%%/icons/1_5_0/22/color-picker.png
-%%DATADIR%%/icons/1_5_0/22/combobox.png
-%%DATADIR%%/icons/1_5_0/22/delete-table-columns.png
-%%DATADIR%%/icons/1_5_0/22/delete-table-rows.png
-%%DATADIR%%/icons/1_5_0/22/dialog-error.png
-%%DATADIR%%/icons/1_5_0/22/dialog-warning.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-center.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-equal.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-left.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-margin.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-page.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-right.png
-%%DATADIR%%/icons/1_5_0/22/distribute-horizontal-x.png
-%%DATADIR%%/icons/1_5_0/22/distribute-vertical-bottom.png
*** 3366 LINES SKIPPED ***