summaryrefslogtreecommitdiff
path: root/app-office/scribus
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest12
-rw-r--r--app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch15
-rw-r--r--app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch534
-rw-r--r--app-office/scribus/files/scribus-1.5.3-qt-5.11.patch59
-rw-r--r--app-office/scribus/files/scribus-1.5.3-x86-fpic.patch16
-rw-r--r--app-office/scribus/scribus-1.5.3-r1.ebuild11
-rw-r--r--app-office/scribus/scribus-1.5.4.ebuild243
-rw-r--r--app-office/scribus/scribus-9999.ebuild26
8 files changed, 263 insertions, 653 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0280291133df..f549b7c60645 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,10 +1,10 @@
-AUX scribus-1.5.3-cmake-openssl.patch 737 BLAKE2B 276d3ad6804506ef4d4c041ce1e0bbf943fe4325e933c9d56401690d1bbd38317898dd5ab00311ee3dd92a873255f615a6b8c415d3c7a6878ce0469ac2a24853 SHA512 63ef4eaa68aad8811150e4208842e602640a7e2e034d2923b79318ca1bcb433829daf7fb6b33fcd22d3e2e9f4103c5f7c6d76883970307ea280c0bfd6df80d61
AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c8c2dd8f15f40da5a20f9d09a652191c77dc103640357dc5928fbfeae90031762e288221c13115da97a7d307b676f697510d SHA512 e9ad65c1c20ca6efd204829bec141336d250c073ebed08f74f07c416213bf46204826abc410510f7a72df21a00a43f7e1793847107612981dedbe96a5927956d
-AUX scribus-1.5.3-qt-5.11.patch 2165 BLAKE2B 57d76b3eda506465442a4fffcf268f1db559a341273350825d5d7e67610f5873501e16c3c1c7a27312250d4fcde920131ca2671fb349833756aa4ba372277c29 SHA512 5cbb775ab034ecf3a26a3181fdf9985418af555cfec42fc67fe314a0cf8b3ddcc01fdbded81591c7a309dc7a47611ea0126bf2d86c39fb4825d6766f0a1fff46
-AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
+DIST scribus-1.5.3.patches.tar.xz 5332 BLAKE2B 3e7702da61a0698873175011115d86bc473a4d2d59be4bca894bbde41844029707dda7307f1d07033fde501da03097aed21dcf12991bb978df1156cb6654077a SHA512 aeb8142eca826a3f9cbd25e8e2276a352f24fe65241a2fe737fd26597419ad9a7180b337f77fb6ba6ac83f378b235d38b1eb6fd85d10985d3a1dbd21bbe4773f
DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
-EBUILD scribus-1.5.3-r1.ebuild 7057 BLAKE2B 3fb1fa669b1742ff4426032e0c0caddcd3c7f2f3653acfe41c9cac88d46bddd85051d688d25a52f82f5f77cba0637ea64e90be89c0424d8355d9b439650f08af SHA512 0040419091f78c69532d82d86a45f0d43fd66d1a72d495382e2c30f1358404f7faa5a9e8df14344f7cfba297afd2cd78e48ee7c3f3cc846d3ac345c28ae828c5
-EBUILD scribus-9999.ebuild 6919 BLAKE2B 001f1dd93db566b3403db7066cb3f1e9067449f39af08335d54cbf5880a265f1b51f33fd5036b42851d1420cd375c0a08e97b15a29e6d49f3556ea65ecef7cc3 SHA512 92bbd75dd620a61f03373b969e38d939a32ddddc9f4db39213c0b52c8edc5897d594fb1e5a9b62060abbe79ff70f5845b150efbc7738b2f2ea93b6ab73cda008
+DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
+DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
+EBUILD scribus-1.5.3-r1.ebuild 7114 BLAKE2B 6007bc6d4f797fef14bbf2eafa9f31fb6669d1d9218c5c572537d3f561368765e86fbb7b5a2629de84c25e9c2d5369d16cf02f10a7e0d719d473cf5bdc3f0b19 SHA512 3f9f2698b8ffbc68534252602bcb05452ed0101a12b62387f31d2ea9d4da0de4311359411935c6993e53414ebad38d3128ba242b446437de3e146255f1bd6933
+EBUILD scribus-1.5.4.ebuild 7083 BLAKE2B 93bac4daa6990439ade16caff6eea03798d0d13d0da641d012961a3e9a8b89d60d67264eadbd2ae118841022976892c641c280686fbca2401db1cba7e2f0e177 SHA512 5b8bc7e5706915255b376ac57d3e7c509cc4926707bb6693a88e307862f8a536d4a4d9b58face769423dc0d087dc2b51fd95c4d0b1ae9ca5047525f9183719b7
+EBUILD scribus-9999.ebuild 6770 BLAKE2B b6c97500b940fc8535bf729e0dd53f1f83e119a567d6ebd84354855d9701a185ce0e0393a67729aa14e682fe3ffc4cd72786e3b7becfd8ba0b2160910683c127 SHA512 06aa425130bdf6540d0c2f07bff00b8a639c74790faaecd3c3af3e7714220821be0312e162248b6d748abea48e965ee29deedd230cb18eb9d84e38b1b670f105
MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
deleted file mode 100644
index c2cb5e9dd58e..000000000000
--- a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake
-Author: Mattia Rizzolo <mattia@debian.org>
-Last-Update: 2017-06-05
-
---- a/cmake/modules/FindLIBPODOFO.cmake
-+++ b/cmake/modules/FindLIBPODOFO.cmake
-@@ -45,7 +45,7 @@
- #message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
- set(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string")
- if(LIBPODOFO_VERSION VERSION_GREATER "0.9.4")
-- find_package(OPENSSL)
-+ find_package(OpenSSL)
- if (OPENSSL_FOUND)
- message("OpenSSL found OK for installed version of PoDoFo (>= 0.9.5) - Enabling support for PDF embedded in AI")
- set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found")
diff --git a/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch b/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
deleted file mode 100644
index 61f5552f959e..000000000000
--- a/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-From 61186c7ef083046b7e0c908952e8a773e2787d82 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Fri, 8 Sep 2017 16:52:10 +0000
-Subject: [PATCH] #14979: poppler-0.58 breaks build
-
-git-svn-id: svn://scribus.net/trunk/Scribus@22154 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp | 95 +++++++++++++++--
- scribus/plugins/import/pdf/slaoutput.cpp | 174 ++++++++++++++++++++++++++++++-
- 2 files changed, 258 insertions(+), 11 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 4c462beadd..1c0bd8a888 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -22,6 +22,7 @@ for which a new license (GPL+exception) is in place.
- #include <poppler/PageTransition.h>
- #include <poppler/ViewerPreferences.h>
- #include <poppler/poppler-config.h>
-+#include <poppler/cpp/poppler-version.h>
- #include <poppler/SplashOutputDev.h>
- #include <poppler/splash/SplashBitmap.h>
-
-@@ -59,6 +60,12 @@ for which a new license (GPL+exception) is in place.
- #include "ui/multiprogressdialog.h"
- #include "ui/propertiespalette.h"
-
-+#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \
-+ ((major) * 10000) \
-+ + ((minor) * 100) \
-+ + ((micro) * 1))
-+#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO)
-+
- PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
- {
- tmpSele = new Selection(this, false);
-@@ -507,12 +514,20 @@ bool PdfPlug::convert(const QString& fn)
- {
- for (int i = 0; i < order->getLength (); ++i)
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object orderItem = order->get(i);
-+#else
- Object orderItem;
- order->get(i, &orderItem);
-+#endif
- if (orderItem.isDict())
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object ref = order->getNF(i);
-+#else
- Object ref;
- order->getNF(i, &ref);
-+#endif
- if (ref.isRef())
- {
- OptionalContentGroup *oc = ocg->findOcgByRef(ref.getRef());
-@@ -523,7 +538,9 @@ bool PdfPlug::convert(const QString& fn)
- ocgNames.append(ocgName);
- }
- }
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 58, 0)
- ref.free();
-+#endif
- }
- else
- {
-@@ -597,39 +614,71 @@ bool PdfPlug::convert(const QString& fn)
- dev->layersSetByOCG = true;
- }
- #endif
-+
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object info = pdfDoc->getDocInfo();
-+ if (info.isDict())
-+ {
-+ Object obj;
-+ Dict *infoDict = info.getDict();
-+ obj = infoDict->lookup((char*) "Title");
-+ if (obj.isString())
-+ {
-+ m_Doc->documentInfo().setTitle(UnicodeParsedString(obj.getString()));
-+ }
-+ obj = infoDict->lookup((char*) "Author");
-+ if (obj.isString())
-+ {
-+ m_Doc->documentInfo().setAuthor(UnicodeParsedString(obj.getString()));
-+ }
-+ obj = infoDict->lookup((char*) "Subject");
-+ if (obj.isString())
-+ {
-+ m_Doc->documentInfo().setSubject(UnicodeParsedString(obj.getString()));
-+ }
-+ obj = infoDict->lookup((char*) "Keywords");
-+ if (obj.isString())
-+ {
-+ // s1 = obj.getString();
-+ m_Doc->documentInfo().setKeywords(UnicodeParsedString(obj.getString()));
-+ }
-+ }
-+ info = Object();
-+#else
- Object info;
- pdfDoc->getDocInfo(&info);
- if (info.isDict())
- {
- Object obj;
-- // GooString *s1;
-+ // GooString *s1;
- Dict *infoDict = info.getDict();
-- if (infoDict->lookup((char*)"Title", &obj )->isString())
-+ if (infoDict->lookup((char*)"Title", &obj)->isString())
- {
-- // s1 = obj.getString();
-+ // s1 = obj.getString();
- m_Doc->documentInfo().setTitle(UnicodeParsedString(obj.getString()));
- obj.free();
- }
-- if (infoDict->lookup((char*)"Author", &obj )->isString())
-+ if (infoDict->lookup((char*)"Author", &obj)->isString())
- {
-- // s1 = obj.getString();
-+ // s1 = obj.getString();
- m_Doc->documentInfo().setAuthor(UnicodeParsedString(obj.getString()));
- obj.free();
- }
-- if (infoDict->lookup((char*)"Subject", &obj )->isString())
-+ if (infoDict->lookup((char*)"Subject", &obj)->isString())
- {
-- // s1 = obj.getString();
-+ // s1 = obj.getString();
- m_Doc->documentInfo().setSubject(UnicodeParsedString(obj.getString()));
- obj.free();
- }
-- if (infoDict->lookup((char*)"Keywords", &obj )->isString())
-+ if (infoDict->lookup((char*)"Keywords", &obj)->isString())
- {
-- // s1 = obj.getString();
-+ // s1 = obj.getString();
- m_Doc->documentInfo().setKeywords(UnicodeParsedString(obj.getString()));
- obj.free();
- }
- }
- info.free();
-+#endif
- if (cropped)
- {
- QRectF crBox = getCBox(contentRect, pageNs[0]);
-@@ -746,8 +795,13 @@ bool PdfPlug::convert(const QString& fn)
- pdfDoc->displayPage(dev, pp, hDPI, vDPI, rotate, useMediaBox, crop, printing, NULL, NULL, dev->annotations_callback, dev);
- }
- PDFPresentationData ef;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object trans = pdfDoc->getPage(pp)->getTrans();
-+ Object *transi = &trans;
-+#else
- Object trans;
- Object *transi = pdfDoc->getPage(pp)->getTrans(&trans);
-+#endif
- if (transi->isDict())
- {
- m_Doc->pdfOptions().PresentMode = true;
-@@ -793,32 +847,51 @@ bool PdfPlug::convert(const QString& fn)
- delete pgTrans;
- }
- m_Doc->currentPage()->PresentVals = ef;
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 58, 0)
- trans.free();
- transi->free();
-+#endif
- }
- int numjs = pdfDoc->getCatalog()->numJS();
- if (numjs > 0)
- {
- NameTree *jsNameTreeP = new NameTree();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object catDict = pdfDoc->getXRef()->getCatalog();
-+#else
- Object catDict;
- pdfDoc->getXRef()->getCatalog(&catDict);
-+#endif
- if (catDict.isDict())
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object names = catDict.dictLookup("Names");
-+#else
- Object names;
- catDict.dictLookup("Names", &names);
-+#endif
- if (names.isDict())
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object obj = names.dictLookup("JavaScript");
-+ jsNameTreeP->init(pdfDoc->getXRef(), &obj);
-+#else
- Object obj;
- names.dictLookup("JavaScript", &obj);
- jsNameTreeP->init(pdfDoc->getXRef(), &obj);
- obj.free();
-+#endif
- }
- for (int a = 0; a < numjs; a++)
- {
- m_Doc->JavaScripts.insert(UnicodeParsedString(jsNameTreeP->getName(a)), UnicodeParsedString(pdfDoc->getCatalog()->getJS(a)));
- }
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ names = catDict.dictLookup("OpenAction");
-+#else
- names.free();
- catDict.dictLookup("OpenAction", &names);
-+#endif
- if (names.isDict())
- {
- LinkAction *linkAction = NULL;
-@@ -839,9 +912,13 @@ bool PdfPlug::convert(const QString& fn)
- }
- }
- }
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 58, 0)
- names.free();
-+#endif
- }
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 58, 0)
- catDict.free();
-+#endif
- delete jsNameTreeP;
- }
- m_Doc->pdfOptions().Version = (PDFOptions::PDFVersion)qMin(15, qMax(13, pdfDoc->getPDFMajorVersion() * 10 + pdfDoc->getPDFMinorVersion()));
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 32cfed1012..ffa417a3b6 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -6,6 +6,7 @@ for which a new license (GPL+exception) is in place.
- */
-
- #include "slaoutput.h"
-+#include <poppler/cpp/poppler-version.h>
- #include <poppler/GlobalParams.h>
- #include <poppler/poppler-config.h>
- #include <poppler/FileSpec.h>
-@@ -19,11 +20,49 @@ for which a new license (GPL+exception) is in place.
- #include "util_math.h"
- #include <tiffio.h>
-
-+#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \
-+ ((major) * 10000) \
-+ + ((minor) * 100) \
-+ + ((micro) * 1))
-+#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO)
-+
- LinkSubmitForm::LinkSubmitForm(Object *actionObj)
- {
- Object obj1, obj2, obj3;
- fileName = NULL;
- m_flags = 0;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ if (actionObj->isDict())
-+ {
-+ obj1 = actionObj->dictLookup("F");
-+ if (!obj1.isNull())
-+ {
-+ if (obj1.isDict())
-+ {
-+ obj3 = obj1.dictLookup("FS");
-+ if (!obj3.isNull())
-+ {
-+ if (obj3.isName())
-+ {
-+ char *name = obj3.getName();
-+ if (!strcmp(name, "URL"))
-+ {
-+ obj2 = obj1.dictLookup("F");
-+ if (!obj2.isNull())
-+ fileName = obj2.getString()->copy();
-+ }
-+ }
-+ }
-+ }
-+ }
-+ obj1 = actionObj->dictLookup("Flags");
-+ if (!obj1.isNull())
-+ {
-+ if (obj1.isNum())
-+ m_flags = obj1.getInt();
-+ }
-+ }
-+#else
- if (actionObj->isDict())
- {
- if (!actionObj->dictLookup("F", &obj1)->isNull())
-@@ -54,6 +93,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
- }
- obj1.free();
- }
-+#endif
- }
-
- LinkSubmitForm::~LinkSubmitForm()
-@@ -66,11 +106,25 @@ LinkImportData::LinkImportData(Object *actionObj)
- {
- Object obj1, obj3;
- fileName = NULL;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ if (actionObj->isDict())
-+ {
-+ obj1 = actionObj->dictLookup("F");
-+ if (!obj1.isNull())
-+ {
-+ obj3 = getFileSpecNameForPlatform(&obj1);
-+ if (!obj3.isNull())
-+ {
-+ fileName = obj3.getString()->copy();
-+ }
-+ }
-+ }
-+#else
- if (actionObj->isDict())
- {
- if (!actionObj->dictLookup("F", &obj1)->isNull())
- {
-- if (getFileSpecNameForPlatform (&obj1, &obj3))
-+ if (getFileSpecNameForPlatform(&obj1, &obj3))
- {
- fileName = obj3.getString()->copy();
- obj3.free();
-@@ -78,6 +132,7 @@ LinkImportData::LinkImportData(Object *actionObj)
- }
- obj1.free();
- }
-+#endif
- }
-
- LinkImportData::~LinkImportData()
-@@ -256,6 +311,27 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano)
- Object obj;
- Ref refa = ano->getRef();
- Object additionalActions;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ obj = xref->fetch(refa.num, refa.gen);
-+ if (obj.isDict())
-+ {
-+ Dict* adic = obj.getDict();
-+ additionalActions = adic->lookupNF("A");
-+ Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef());
-+ if (additionalActionsObject.isDict())
-+ {
-+ Object actionObject = additionalActionsObject.dictLookup("S");
-+ if (actionObject.isName("ImportData"))
-+ {
-+ linkAction = new LinkImportData(&additionalActionsObject);
-+ }
-+ else if (actionObject.isName("SubmitForm"))
-+ {
-+ linkAction = new LinkSubmitForm(&additionalActionsObject);
-+ }
-+ }
-+ }
-+#else
- Object *act = xref->fetch(refa.num, refa.gen, &obj);
- if (act)
- {
-@@ -283,6 +359,7 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano)
- }
- }
- obj.free();
-+#endif
- return linkAction;
- }
-
-@@ -293,6 +370,22 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *a
- Object obj;
- Ref refa = ano->getRef();
- Object additionalActions;
-+
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ obj = xref->fetch(refa.num, refa.gen);
-+ if (obj.isDict())
-+ {
-+ Dict* adic = obj.getDict();
-+ additionalActions = adic->lookupNF("AA");
-+ Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef());
-+ if (additionalActionsObject.isDict())
-+ {
-+ Object actionObject = additionalActionsObject.dictLookup(key);
-+ if (actionObject.isDict())
-+ linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
-+ }
-+ }
-+#else
- Object *act = xref->fetch(refa.num, refa.gen, &obj);
- if (act)
- {
-@@ -313,6 +406,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *a
- }
- }
- obj.free();
-+#endif
- return linkAction;
- }
-
-@@ -838,6 +932,33 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
- {
- Object obj1;
- Ref refa = annota->getRef();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ obj1 = xref->fetch(refa.num, refa.gen);
-+ if (obj1.isDict())
-+ {
-+ Dict* dict = obj1.getDict();
-+ Object obj2 = dict->lookup("Kids");
-+ //childs
-+ if (obj2.isArray())
-+ {
-+ // Load children
-+ QList<int> radList;
-+ for (int i = 0; i < obj2.arrayGetLength(); i++)
-+ {
-+ Object childRef = obj2.arrayGetNF(i);
-+ if (!childRef.isRef())
-+ continue;
-+ Object childObj = obj2.arrayGet(i);
-+ if (!childObj.isDict())
-+ continue;
-+ const Ref ref = childRef.getRef();
-+ radList.append(ref.num);
-+ }
-+ QString tmTxt = UnicodeParsedString(annota->getName());
-+ m_radioMap.insert(tmTxt, radList);
-+ }
-+ }
-+#else
- Object *act = xref->fetch(refa.num, refa.gen, &obj1);
- if (act && act->isDict())
- {
-@@ -873,6 +994,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
- obj2.free();
- }
- obj1.free();
-+#endif
- }
- return retVal;
- }
-@@ -3007,6 +3129,23 @@ void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef)
- }
- else
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ dictObj = dictRef->fetch(xref);
-+ if (!dictObj.isDict())
-+ return;
-+ dict = dictObj.getDict();
-+ dictType = dict->lookup("Type");
-+ if (dictType.isName("OCG"))
-+ {
-+ oc = contentConfig->findOcgByRef(dictRef->getRef());
-+ if (oc)
-+ {
-+ // qDebug() << "Begin OCG Content with Name " << UnicodeParsedString(oc->getName());
-+ m_doc->setActiveLayer(UnicodeParsedString(oc->getName()));
-+ mSte.ocgName = UnicodeParsedString(oc->getName());
-+ }
-+ }
-+#else
- dictRef->fetch(xref, &dictObj);
- if (!dictObj.isDict())
- {
-@@ -3027,6 +3166,7 @@ void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef)
- }
- dictType.free();
- dictObj.free();
-+#endif
- }
- }
- m_mcStack.push(mSte);
-@@ -3046,14 +3186,20 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict *properties)
- {
- if (layersSetByOCG)
- return;
-- Object obj;
- QString lName = QString("Layer_%1").arg(layerNum + 1);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ Object obj = properties->lookup((char*) "Title");
-+ if (obj.isString())
-+ lName = QString(obj.getString()->getCString());
-+#else
-+ Object obj;
- if (properties->lookup((char*)"Title", &obj))
- {
- if (obj.isString())
- lName = QString(obj.getString()->getCString());
- obj.free();
- }
-+#endif
- for (ScLayers::iterator it = m_doc->Layers.begin(); it != m_doc->Layers.end(); ++it)
- {
- if (it->Name == lName)
-@@ -3066,6 +3212,29 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict *properties)
- if (!firstLayer)
- currentLayer = m_doc->addLayer(lName, true);
- firstLayer = false;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
-+ obj = properties->lookup((char*) "Visible");
-+ if (obj.isBool())
-+ m_doc->setLayerVisible(currentLayer, obj.getBool());
-+ obj = properties->lookup((char*) "Editable");
-+ if (obj.isBool())
-+ m_doc->setLayerLocked(currentLayer, !obj.getBool());
-+ obj = properties->lookup((char*) "Printed");
-+ if (obj.isBool())
-+ m_doc->setLayerPrintable(currentLayer, obj.getBool());
-+ obj = properties->lookup((char*)"Color");
-+ if (obj.isArray())
-+ {
-+ Object obj1;
-+ obj1 = obj.arrayGet(0);
-+ int r = obj1.getNum() / 256;
-+ obj1 = obj.arrayGet(1);
-+ int g = obj1.getNum() / 256;
-+ obj1 = obj.arrayGet(2);
-+ int b = obj1.getNum() / 256;
-+ m_doc->setLayerMarker(currentLayer, QColor(r, g, b));
-+ }
-+#else
- if (properties->lookup((char*)"Visible", &obj))
- {
- if (obj.isBool())
-@@ -3102,6 +3271,7 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict *properties)
- }
- obj.free();
- }
-+#endif
- }
- }
- }
diff --git a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
deleted file mode 100644
index d46a9cfcf60a..000000000000
--- a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ed5bb7e205e10a2855b2f55d6de9d5702f81633f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 19 Mar 2018 23:52:49 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
----
- .../plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp | 3 ++-
- scribus/plugins/tools/lenseffects/lensdialog.cpp | 1 +
- scribus/sclistboxpixmap.h | 2 ++
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
-index 3f0d916b7..645aec8d1 100644
---- a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
-+++ b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
-@@ -26,8 +26,9 @@ for which a new license (GPL+exception) is in place.
-
- #include "meshdistortiondialog.h"
-
--#include <QPainterPath>
- #include <QGraphicsItem>
-+#include <QPainterPath>
-+#include <QStyleOptionGraphicsItem>
-
- #include "commonstrings.h"
- #include "fpointarray.h"
-diff --git a/scribus/plugins/tools/lenseffects/lensdialog.cpp b/scribus/plugins/tools/lenseffects/lensdialog.cpp
-index cfabc4091..bed8305dc 100644
---- a/scribus/plugins/tools/lenseffects/lensdialog.cpp
-+++ b/scribus/plugins/tools/lenseffects/lensdialog.cpp
-@@ -27,6 +27,7 @@ for which a new license (GPL+exception) is in place.
- #include "lensdialog.h"
- #include <cmath>
- #include <QRadialGradient>
-+#include <QStyleOptionGraphicsItem>
- #include "iconmanager.h"
- #include "selection.h"
- #include "sccolorengine.h"
-diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
-index a067b7912..ebdae272c 100644
---- a/scribus/sclistboxpixmap.h
-+++ b/scribus/sclistboxpixmap.h
-@@ -9,11 +9,13 @@ for which a new license (GPL+exception) is in place.
-
- #include <memory>
-
-+#include <QAbstractItemDelegate>
- #include <QApplication>
- #include <QDebug>
- #include <QPainter>
- #include <QPixmap>
- #include <QScopedPointer>
-+#include <QStyleOptionMenuItem>
- #include <QVariant>
-
- #include "scguardedptr.h"
---
-2.16.2
-
diff --git a/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
deleted file mode 100644
index 03d4dc4daa3c..000000000000
--- a/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMakeLists.txt 2017-05-28 11:10:27.000000000 +0200
-+++ b/CMakeLists.txt 2018-01-09 14:26:14.494922353 +0100
-@@ -155,11 +155,11 @@
- set(ARCH_HPPA 1)
- endif()
-
--# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
-+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, hppa and x86. See:
- # http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
-
--if (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
-+if (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
- set(CMAKE_CXX_FLAGS_FPIC "-fPIC")
- endif()
-
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 12d674025929..b962ce4b7175 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -11,7 +11,8 @@ inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}.patches.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -94,10 +95,10 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
"${FILESDIR}"/${P}-fpic.patch
- "${FILESDIR}"/${P}-cmake-openssl.patch
- "${FILESDIR}"/${P}-poppler-0.58.patch
- "${FILESDIR}"/${P}-x86-fpic.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
+ "${WORKDIR}"/${P}-cmake-openssl.patch
+ "${WORKDIR}"/${P}-poppler-0.58.patch
+ "${WORKDIR}"/${P}-x86-fpic.patch
+ "${WORKDIR}"/${P}-qt-5.11.patch
)
src_prepare() {
diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
new file mode 100644
index 000000000000..4a0a3138ca51
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake-utils desktop eutils flag-o-matic gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
+
+#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
+done
+unset l prev_l
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/poppler:=
+ dev-libs/hyphen
+ >=dev-libs/icu-58.2:0=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libfreehand
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+ media-libs/libvisio
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10.0[X,svg]
+ boost? ( >=dev-libs/boost-1.62:= )
+ hunspell? ( app-text/hunspell )
+ graphicsmagick? ( media-gfx/graphicsmagick )
+ osg? ( dev-games/openscenegraph )
+ pdf? ( app-text/podofo:0= )
+ scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.3-docdir.patch
+ "${FILESDIR}"/${PN}-1.5.3-fpic.patch
+ "${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036
+)
+
+src_prepare() {
+ rm -r codegen/cheetah || die
+ cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+ find_package(PkgConfig)
+ pkg_check_modules(ZLIB minizip zlib)
+ SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+ SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+ MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+ EOF
+
+ sed \
+ -e "/^\s*unzip\.[ch]/d" \
+ -e "/^\s*ioapi\.[ch]/d" \
+ -i scribus/CMakeLists.txt Scribus.pro || die
+ rm scribus/ioapi.[ch] || die
+
+ sed \
+ -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+ -i resources/templates/CMakeLists.txt || die
+
+ # required for ${P}-poppler-0.64.0.patch
+ edos2unix \
+ scribus/plugins/import/pdf/slaoutput.{cpp,h} \
+ scribus/plugins/import/pdf/importpdf.{cpp,h}
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ # bug #550818
+ append-cppflags -DHAVE_MEMRCHR
+
+ local _lang lang langs
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if use l10n_${lang}; then
+ # From the CMakeLists.txt
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
+ langs+=";${_lang}"
+ else
+ # Don't install localized documentation
+ sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
+ safe_delete \
+ ./resources/dicts/README_${_lang}.txt \
+ ./resources/dicts/README_hyph_${_lang}.txt \
+ ./resources/dicts/hyph_${_lang}.dic \
+ ./resources/loremipsum/${_lang}.xml
+ fi
+ sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+ safe_delete \
+ ./resources/dicts/README_en_EN.txt \
+ ./resources/dicts/README_hyph_en_EN.txt \
+ ./resources/dicts/hyph_en_EN.dic \
+ ./resources/loremipsum/en_EN.xml
+ done
+
+ local mycmakeargs=(
+ -DHAVE_PYTHON=ON
+ -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DWANT_DISTROBUILD=ON
+ -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+ -DWANT_GUI_LANG="${langs#;};en"
+ -DWANT_CPP11=ON
+ -DWITH_PODOFO="$(usex pdf)"
+ -DWITH_BOOST="$(usex boost)"
+ -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+ -DWANT_NOOSG="$(usex !osg)"
+ -DWANT_DEBUG="$(usex debug)"
+ -DWANT_HEADERINSTALL="$(usex !minimal)"
+ -DWANT_HUNSPELL="$(usex hunspell)"
+ -DWANT_NOEXAMPLES="$(usex !examples)"
+ -DWANT_NOTEMPLATES="$(usex !templates)"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local lang _lang
+ # en_EN can be deleted always
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if ! use l10n_${lang}; then
+ safe_delete "${ED%/}"/usr/share/man/${_lang}
+ fi
+ done
+
+ if ! use scripts; then
+ rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+ elif ! use tk; then
+ rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+ fi
+
+ use scripts && \
+ python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
+ python_optimize "${ED%/}"/usr/share/scribus/scripts
+
+ mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
+ ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+ cat >> "${T}"/COPYING <<- EOF || die
+ ${PN} is licensed under the "${LICENSE}".
+ Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+ EOF
+ dodoc "${T}"/COPYING
+ docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+ local size
+ for size in 16 32 128 256; do
+ newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+ done
+ newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+ doicon resources/iconsets/*/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+safe_delete () {
+ local x
+ for x in ${@}; do
+ if [[ -d "${x}" ]]; then
+ ebegin "Deleting ${x} recursively"
+ rm -r "${x}" || die
+ eend $?
+ elif [[ -f "${x}" ]]; then
+ ebegin "Deleting ${x}"
+ rm "${x}" || die
+ eend $?
+ fi
+ done
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 742448b27386..b2939a8c47f2 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/"
@@ -49,8 +49,7 @@ REQUIRED_USE="
# osg
# couple of third_party libs bundled
-COMMON_DEPEND="
- ${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
app-text/libmspub
app-text/poppler:=
dev-libs/hyphen
@@ -88,10 +87,12 @@ COMMON_DEPEND="
tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
"
RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl"
+ app-text/ghostscript-gpl
+"
DEPEND="${COMMON_DEPEND}
dev-qt/linguist-tools:5
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
@@ -118,8 +119,6 @@ src_prepare() {
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
- edos2unix scribus/ui/propertiespalette_utils.cpp
-
cmake-utils_src_prepare
}
@@ -158,24 +157,19 @@ src_configure() {
-DWANT_DISTROBUILD=ON
-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-DWANT_GUI_LANG="${langs#;};en"
- -DWANT_CPP11=ON
-DWITH_PODOFO="$(usex pdf)"
-DWITH_BOOST="$(usex boost)"
-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-DWANT_NOOSG="$(usex !osg)"
-DWANT_DEBUG="$(usex debug)"
- -DWANT_NOHEADERINSTALL="$(usex minimal)"
+ -DWANT_HEADERINSTALL="$(usex !minimal)"
-DWANT_HUNSPELL="$(usex hunspell)"
-DWANT_NOEXAMPLES="$(usex !examples)"
-DWANT_NOTEMPLATES="$(usex !templates)"
- )
+ )
cmake-utils_src_configure
}
-src_compile() {
- cmake-utils_src_compile
-}
-
src_install() {
cmake-utils_src_install
@@ -215,10 +209,6 @@ src_install() {
domenu scribus.desktop
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 09:59:12 +0000