commit: a10f0ceb43cd137a0783e5d702ed351a2281b318 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jun 20 16:29:55 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jun 20 16:30:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10f0ceb
app-office/scribus: Move 1.5.3 specific patches into tarball Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-office/scribus/Manifest | 1 + .../files/scribus-1.5.3-cmake-openssl.patch | 15 - .../scribus/files/scribus-1.5.3-poppler-0.58.patch | 534 --------------------- .../scribus/files/scribus-1.5.3-qt-5.11.patch | 59 --- .../scribus/files/scribus-1.5.3-x86-fpic.patch | 16 - app-office/scribus/scribus-1.5.3-r1.ebuild | 11 +- 6 files changed, 7 insertions(+), 629 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 5fa3548de6d..cbfcaf580cf 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,3 +1,4 @@ +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 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 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 c2cb5e9dd58..00000000000 --- 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 <[email protected]> -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 61f5552f959..00000000000 --- 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 <[email protected]> -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 d46a9cfcf60..00000000000 --- 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 <[email protected]> -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 03d4dc4daa3..00000000000 --- 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 12d67402592..b962ce4b717 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() {
