[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 1d3dda3d680b411bf38a965c6490bc45e58ff3d2 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Jun 3 17:35:34 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jun 3 17:35:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3dda3d app-office/scribus: fixed one boost issue in 1.6.1-r1 Bug: https://bugs.gentoo.org/932492 Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.6.1-boost-1.85.patch | 39 ++ app-office/scribus/scribus-1.6.1-r1.ebuild | 1 + 2 files changed, 40 insertions(+) diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch new file mode 100644 index ..9d5dc0868843 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch @@ -0,0 +1,39 @@ +From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sat, 1 Jun 2024 22:04:13 + +Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170 11d20701-8431-0410-a711-e3c959e3b870 +--- a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h +@@ -121,10 +121,14 @@ class Point { + + Point &operator*=(Matrix const &m); + +-inline int operator == (const Point &in_pnt) { ++inline bool operator==(const Point &in_pnt) const { + return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); + } + ++inline bool operator!=(const Point &in_pnt) const { ++return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); ++} ++ + friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); + }; + +@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { + return ret; + } + +-//IMPL: boost::EqualityComparableConcept +-inline bool operator==(Point const &a, Point const &b) { +-return (a[X] == b[X]) && (a[Y] == b[Y]); +-} +-inline bool operator!=(Point const &a, Point const &b) { +-return (a[X] != b[X]) || (a[Y] != b[Y]); +-} +- + /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ + inline bool operator<=(Point const &a, Point const &b) { + return ( ( a[Y] < b[Y] ) || diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index bf38de284c12..e112af815030 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -78,6 +78,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch "${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch + "${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: d89e178ab6335aafa7fbcc8c1afd6b9c23a61b83 Author: Miroslav Šulc gentoo org> AuthorDate: Wed May 22 07:37:49 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed May 22 07:37:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89e178a app-office/scribus: fixed compilation with poppler 24.05.0 Closes: https://bugs.gentoo.org/931916 Signed-off-by: Miroslav Šulc gentoo.org> .../files/scribus-1.6.1-poppler-24.03.patch| 6 -- .../files/scribus-1.6.1-poppler-24.05.patch| 24 ++ app-office/scribus/scribus-1.6.1-r1.ebuild | 1 + 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch index 076e48e14fd9..0a8d317b6109 100644 --- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch @@ -9,12 +9,6 @@ Fixes build errors caused by: Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 Signed-off-by: Andreas Sturmlechner - scribus/plugins/import/pdf/slaoutput.cpp | 16 - 1 file changed, 16 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 4e31e4b6c..3e4a768ec 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch new file mode 100644 index ..9d2ae918768c --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch @@ -0,0 +1,24 @@ +From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 2 May 2024 22:26:03 + +Subject: [PATCH] Enforce C++20 when building with poppler >= 24.05.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 +--- a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake +@@ -28,7 +28,14 @@ if (poppler_FOUND) + message(STATUS "Found poppler") + message(STATUS "Found poppler libs: ${poppler_LIBRARY}") + message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") +- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) ++ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) ++ message(STATUS "Poppler Version:" ${poppler_VERSION}) ++ if (CMAKE_CXX_STANDARD LESS 20) ++ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") ++ message(STATUS "Enabling C++20 compiler features") ++ set(CMAKE_CXX_STANDARD 20) ++ endif() ++ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) + message(STATUS "Poppler Version:" ${poppler_VERSION}) + if (CMAKE_CXX_STANDARD LESS 17) + message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index 6943d0b9a6bc..1614345f8f40 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -77,6 +77,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch + "${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 705bcbcd49dc364cb43f22ff0e4dcf753f2da1d7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 14 17:02:29 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 14 17:23:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705bcbcd app-office/scribus: Drop obsolete patch Upstream commit 4ce56cc8d362211958b3d539d2000de9fc4331a7 commented out the directory. Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.7.0-remove-hello-world-test.patch | 10 -- app-office/scribus/scribus-.ebuild | 1 - 2 files changed, 11 deletions(-) diff --git a/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch b/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch deleted file mode 100644 index cf9018fe1924.. --- a/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch +++ /dev/null @@ -1,10 +0,0 @@ a/scribus/CMakeLists.txt -+++ b/scribus/CMakeLists.txt -@@ -40,7 +40,6 @@ include(styles/CMakeLists.txt) - include(text/CMakeLists.txt) - - add_subdirectory(dtd) --add_subdirectory(ui/qml) - if(WITH_TESTS) - add_subdirectory(tests) - endif() diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index e6a659a11344..d7e694a35803 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -78,7 +78,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${PN}-1.7.0-findhyphen.patch - "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch "${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch )
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 5f19629e0a9fc0e2ae03382664e72eea71526311 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 4 22:15:58 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 4 22:18:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f19629e app-office/scribus: Fix build with >=app-text/poppler-24.03 Fix is pending upstream: https://github.com/scribusproject/scribus/pull/177 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/scribus-1.6.1-poppler-24.03.patch| 70 ++ app-office/scribus/scribus-1.6.1-r1.ebuild | 1 + 2 files changed, 71 insertions(+) diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch new file mode 100644 index ..076e48e14fd9 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch @@ -0,0 +1,70 @@ +From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 4 Mar 2024 17:35:11 +0100 +Subject: [PATCH] Fix build with >=poppler-24.03.0 + +Fixes build errors caused by: + +"Use an enum for Function getType" +Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 + +Signed-off-by: Andreas Sturmlechner +--- + scribus/plugins/import/pdf/slaoutput.cpp | 16 + 1 file changed, 16 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..3e4a768ec 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ if (func->getType() == Function::Type::Stitching) ++#else + if (func->getType() == 3) ++#endif + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; + const double *bounds = stitchingFunc->getBounds(); +@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); + } + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); +@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ if (func->getType() == Function::Type::Stitching) ++#else + if (func->getType() == 3) ++#endif + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; + const double *bounds = stitchingFunc->getBounds(); +@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); + } + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); +-- +2.44.0 + diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index 3b9230eb12a6..21e17e6ae260 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -77,6 +77,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch + "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 73525eaa3d3b87962d64d606a883fc84569b6f8e Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jan 14 10:22:34 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jan 14 10:24:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73525eaa app-office/scribus: in 1.6.1 squashed findhyphen patches and backported some patches from live Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.6.1-findhyphen.patch | 69 ++ ...cribus-1.6.1.ebuild => scribus-1.6.1-r1.ebuild} | 21 ++- 2 files changed, 73 insertions(+), 17 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.1-findhyphen.patch b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch new file mode 100644 index ..cc6e5db58a24 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch @@ -0,0 +1,69 @@ +--- a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake +@@ -1,6 +1,16 @@ + ## + ## Find Dependencies ## + ++#<>HYPHEN for Hyphenation support ++ + #< + + #include "scribusapi.h" +-#include "third_party/hyphen/hyphen.h" ++#include + + class ScribusDoc; + class ScribusMainWindow; diff --git a/app-office/scribus/scribus-1.6.1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild similarity index 88% rename from app-office/scribus/scribus-1.6.1.ebuild rename to app-office/scribus/scribus-1.6.1-r1.ebuild index 23dca9517e2f..6a80b0653e02 100644 --- a/app-office/scribus/scribus-1.6.1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -72,31 +72,18 @@ BDEPEND=" " PATCHES=( - # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch - "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch + "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch + "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch + "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch ) src_prepare() { cmake_src_prepare + # for safety remove files that we patched out rm -r scribus/third_party/hyphen || die - - 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 - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 8aa06bee94ae1f0b31f9f91d31fb40a553602c02 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jan 14 09:38:03 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jan 14 09:38:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa06bee app-office/scribus: removed obsolete patch from live Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.7.0-fix-install-prefix-path.patch | 11 --- app-office/scribus/scribus-.ebuild| 1 - 2 files changed, 12 deletions(-) diff --git a/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch b/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch deleted file mode 100644 index 33cad2b9c7fc.. --- a/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch +++ /dev/null @@ -1,11 +0,0 @@ a/resources/templates/CMakeLists.txt -+++ b/resources/templates/CMakeLists.txt -@@ -5,7 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus - - # Gentoo has an option for no templates. Let's make the ebuild simpler and open up the option to others, but leave as a default for us. Make the directory in any case as our source will look for it. - if (WANT_NOTEMPLATES) -- install(CODE "file(MAKE_DIRECTORY ${ENV}${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})") -+ install(CODE "file(MAKE_DIRECTORY ${ENV}./${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})") - else (WANT_NOTEMPLATES) - - install(FILES diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index c1af6fc67077..4e7611020d9c 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -79,7 +79,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${PN}-1.7.0-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch - "${FILESDIR}"/${PN}-1.7.0-fix-install-prefix-path.patch "${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch )
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: e6ac94fc102dc2e801cad6e3661f6c4981529c3c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Jan 13 14:46:08 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Jan 13 18:50:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ac94fc app-office/scribus: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Michał Górny gentoo.org> .../scribus/files/scribus-1.6.0-fix-desktop.patch| 20 1 file changed, 20 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch deleted file mode 100644 index ad4d88818295.. --- a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ a/scribus.desktop.in -+++ b/scribus.desktop.in -@@ -1,11 +1,11 @@ - [Desktop Entry] - Type=Application --Name=Scribus --Name[ar]=سكريبس --Name[fa]=اسکریباس --Name[lo]=ສະຄຣີບັດສ໌ --Name[ru]=Scribus --Name[ta]=ஸ்கிரிபஸ் -+Name=Scribus@TAG_VERSION@ -+Name[ar]=سكريبس@TAG_VERSION@ -+Name[fa]=اسکریباس@TAG_VERSION@ -+Name[lo]=ສະຄຣີບັດສ໌@TAG_VERSION@ -+Name[ru]=Scribus@TAG_VERSION@ -+Name[ta]=ஸ்கிரிபஸ்@TAG_VERSION@ - Comment=Page Layout and Publication - Comment[ar]=سكريبس - Comment[fa]=اسکریباس
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 568af5f6f6f200ae9539ceec7cdddaad3015723d Author: Miroslav Šulc gentoo org> AuthorDate: Mon Jan 1 09:30:31 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jan 1 09:30:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568af5f6 app-office/scribus: bump to 1.6.0 + introduced slotting + scrubbed patches Signed-off-by: Miroslav Šulc gentoo.org> app-office/scribus/Manifest| 1 + app-office/scribus/files/scribus-1.5.3-fpic.patch | 2 - .../scribus/files/scribus-1.5.6-docdir.patch | 2 - .../scribus/files/scribus-1.5.6-findhyphen.patch | 4 +- app-office/scribus/files/scribus-1.5.8-cmake.patch | 4 +- .../scribus/files/scribus-1.5.8-findhyphen-1.patch | 4 - .../scribus/files/scribus-1.5.8-python-3.12.patch | 6 +- .../scribus/files/scribus-1.6.0-fix-desktop.patch | 20 +++ app-office/scribus/scribus-1.6.0.ebuild| 165 + 9 files changed, 193 insertions(+), 15 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 5bb7b3812a2a..a5618a8e6015 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,3 +1,4 @@ DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20 SHA512 ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d DIST scribus-1.5.8-podofo-0.10.tar.xz 19116 BLAKE2B 3aa6ecc6726fece8c3b1645096493615eafc67daf45bb5e5ff56a01e75a08418aaad9cfd67e1de3114b4e1e8dd7478c2be3da63ea29560948ddd5295f586e00e SHA512 7d03cedbdae5147c6f2b662ae8c9bd009d5eb9efcb3087bd841e785b4a4a1942a2811f29d433590022d9dc68f716b8b20c30b818d5c91197cbe79fe3260d0db7 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d +DIST scribus-1.6.0.tar.xz 73267436 BLAKE2B a855820c7c4b63339fb8a1e15764425b95655e20fe26857ebbc730d816d229441a639ca46f5be803e8599131495e698f1ff7d61b3b08dd42a303653dcdbdfc9d SHA512 bb64b628dda07acdd29b7bbcb765b4f22abbfa175df68f1f046041f840800549be04ada6cf3f24ea4bf0c61b38a1ad503c482d4d47b1f2a3a6885f7c963adef8 diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch index ba0721955ef8..bb4378e5effa 100644 --- a/app-office/scribus/files/scribus-1.5.3-fpic.patch +++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch @@ -1,8 +1,6 @@ scribus/third_party/prc/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt -index 5f7c2c6..1da7177 100644 --- a/scribus/third_party/prc/CMakeLists.txt +++ b/scribus/third_party/prc/CMakeLists.txt @@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch index 957991c2acc4..06d878af55fd 100644 --- a/app-office/scribus/files/scribus-1.5.6-docdir.patch +++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake -index db6133f..faf85ce 100644 --- a/CMakeLists_Directories.cmake +++ b/CMakeLists_Directories.cmake @@ -36,14 +36,16 @@ else() diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch index 3123ce4477c9..d8e2400ea1f4 100644 --- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch +++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch @@ -1,5 +1,5 @@ a/CMakeLists_Dependencies.cmake2019-07-31 00:34:43.0 +0200 -+++ b/CMakeLists_Dependencies.cmake2019-10-02 00:17:34.968355656 +0200 +--- a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake @@ -954,6 +954,16 @@ endif() #>>HUNSPELL for Speelling support diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch b/app-office/scribus/files/scribus-1.5.8-cmake.patch index a461ee20c281..6ddd76912dbe 100644 --- a/app-office/scribus/files/scribus-1.5.8-cmake.patch +++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch @@ -1,5 +1,5 @@ a/CMakeLists.txt 2022-01-23 17:14:43.0 +0100 -+++ b/CMakeLists.txt 2023-02-05 15:59:57.828047452 +0100 +--- a/CMakeLists.txt b/CMakeLists.txt @@ -362,25 +362,6 @@ if(APPLE) ### Include our Apple configure commands diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch index 39a11b0ee4a9..e199c488c020 100644 --- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch +++ b/ap
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: cc0e1590aeba91a990174b7da4553c0524dd1e0f Author: Miroslav Šulc gentoo org> AuthorDate: Fri Mar 17 06:52:26 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Mar 17 06:52:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0e1590 app-office/scribus: dropped obsolete 1.5.8-r4 Bug: https://bugs.gentoo.org/893488 Signed-off-by: Miroslav Šulc gentoo.org> .../files/scribus-1.5.8-poppler-22.03.0.patch | 52 .../files/scribus-1.5.8-poppler-22.04.0.patch | 291 - .../files/scribus-1.5.8-poppler-22.09.0.patch | 20 -- .../files/scribus-1.5.8-poppler-22.2.0-1.patch | 129 - .../files/scribus-1.5.8-poppler-22.2.0-2.patch | 28 -- app-office/scribus/scribus-1.5.8-r4.ebuild | 170 6 files changed, 690 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch deleted file mode 100644 index f7a0c03fdd96.. --- a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Wed, 2 Mar 2022 22:22:53 + -Subject: [PATCH] #16764: Build break with poppler 22.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870 - scribus/plugins/import/pdf/importpdf.cpp | 13 + - 1 file changed, 13 insertions(+) - -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index 154e58a3f0..392dcd9e64 100644 a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/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(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 ocgGroups; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) -+ auto pdfDoc = std::make_unique(std::make_unique(fname)); -+#else - auto pdfDoc = std::unique_ptr(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 userPW(std::in_place, text.toLocal8Bit().data()); -+ pdfDoc.reset(new PDFDoc(std::make_unique(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/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch deleted file mode 100644 index 290484e7e872.. --- a/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch +++ /dev/null @@ -1,291 +0,0 @@ -https://bugs.gentoo.org/843287 -https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch - -From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Fri, 1 Apr 2022 23:52:32 + -Subject: [PATCH] Fix build with poppler 22.04.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870 - scribus/plugins/import/pdf/slaoutput.cpp | 123 ++- - 1 file changed, 78 insertions(+), 45 deletions(-) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index e20a81f99e..5626fe3477 100644 a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/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 G
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: eb70711765546964429e8734e71a17d26ce6cd56 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 5 15:33:43 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 6 10:35:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb707117 app-office/scribus: Add python3_11, fix memleak, fix dashed lines Use upstream poppler-22.09 support patch, amended by Debian for dashed lines fix. Drop CMAKE_BUILD_TYPE="Release" Hopefully stop cmake overwriting user optimisations Bug: https://bugs.gentoo.org/691684 Closes: https://bugs.gentoo.org/886251 Closes: https://bugs.gentoo.org/893158 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/scribus/Manifest| 1 + app-office/scribus/files/scribus-1.5.8-cmake.patch | 28 app-office/scribus/scribus-1.5.8-r5.ebuild | 168 + 3 files changed, 197 insertions(+) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index b68a6cf5f28c..77fcc903a9bf 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1 +1,2 @@ +DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20 SHA512 ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch b/app-office/scribus/files/scribus-1.5.8-cmake.patch new file mode 100644 index ..a461ee20c281 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt 2022-01-23 17:14:43.0 +0100 b/CMakeLists.txt 2023-02-05 15:59:57.828047452 +0100 +@@ -362,25 +362,6 @@ + if(APPLE) + ### Include our Apple configure commands + include(CMakeLists_Apple.cmake) +-else() +- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*") +- # Windows build with Visual Studio +- # Surely there's a better way to identify the compiler? +- set(CMAKE_CXX_FLAGS_DEBUG) +- set(CMAKE_C_FLAGS_DEBUG) +- else() +- # vanilla gcc +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing") +- endif() +- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*") +- set(CMAKE_CXX_FLAGS_RELEASE) +- set(CMAKE_C_FLAGS_RELEASE) +- else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -Wall") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall") +- # add_definitions(-DNDEBUG) +- endif() + endif() + if(WIN32) + add_definitions(-DWIN32_LEAN_AND_MEAN diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild new file mode 100644 index ..6f8c9ec7de09 --- /dev/null +++ b/app-office/scribus/scribus-1.5.8-r5.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET=${P}-patchset-1 +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="tk?" +inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg + +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/${PATCHSET}.tar.xz"; +S="${WORKDIR}/${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + tk? ( scripts )" + +# osg +# couple of third_party libs bundled +DEPEND="${PYTHON_DEPS} + app-text/libmspub + app-text/libqxp + app-text/poppler:= + dev-libs/hyphen + dev-libs/icu:0= + dev-libs/librevenge + dev-libs/libxml2 + dev-qt/qtcore:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:0=[icu] + media-libs/lcms:2 + media-libs/libcdr + media-libs/libfreehand + media-libs/libjpeg-turbo:= + media-libs/libpagemaker + media-libs/libpng:0= + med
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a353ebd90d6cf08b5f2923315e1104d4a9bc3629 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Mar 27 06:04:55 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Mar 27 06:05:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a353ebd9 app-office/scribus: removed obsolete 1.5.7 Bug: https://bugs.gentoo.org/show_bug.cgi?id=835425 Signed-off-by: Miroslav Šulc gentoo.org> app-office/scribus/Manifest| 1 - .../scribus/files/scribus-1.5.5-findhyphen-1.patch | 51 - .../scribus/files/scribus-1.5.7-osg-cpp17.patch| 219 - .../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 68 --- app-office/scribus/scribus-1.5.7.ebuild| 162 --- 5 files changed, 501 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 0844d8a46097..b68a6cf5f28c 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch deleted file mode 100644 index 98682d60f700.. --- a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch +++ /dev/null @@ -1,51 +0,0 @@ a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 -+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 -@@ -1069,7 +1069,9 @@ - ${SCRIBUS_GMAGICK_SRC} - ) - --if(NOT HAVE_HYPHEN) -+if(HAVE_HYPHEN) -+ include_directories(${HYPHEN_INCLUDE_DIR}) -+else() - include_directories(third_party/hyphen) - set(SCRIBUS_SOURCES - ${SCRIBUS_SOURCES} -@@ -1180,13 +1182,6 @@ - - endif() - --if(HAVE_HYPHEN) -- target_link_libraries(${EXE_NAME} -- ${HYPHEN_LIBRARY} -- ) --endif() -- -- - if(GESTURE_FRAME_PREVIEW) -message(STATUS "Enable gesture frame preview [experimental]") -set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) -@@ -1234,6 +1229,12 @@ - ) - endif () - -+if(HAVE_HYPHEN) -+ target_link_libraries(${EXE_NAME} -+ ${HYPHEN_LIBRARY} -+ ) -+endif() -+ - if(WIN32) - set_target_properties(${EXE_NAME} - PROPERTIES a/scribus/hyphenator.h 2019-07-31 00:35:05.0 +0200 -+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200 -@@ -13,7 +13,7 @@ - #include - - #include "scribusapi.h" --#include "third_party/hyphen/hyphen.h" -+#include - - class ScribusDoc; - class ScribusMainWindow; diff --git a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch deleted file mode 100644 index 21f0c00554d2.. --- a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch +++ /dev/null @@ -1,219 +0,0 @@ -https://bugs.gentoo.org/831161 -Backport of https://github.com/scribusproject/scribus/commit/80405ce - -From: Jean Ghali -Date: Mon, 10 Jan 2022 20:38:51 + -Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential - conflict with std::byte in c++17 mode a/scribus/third_party/prc/oPRCFile.cc -+++ b/scribus/third_party/prc/oPRCFile.cc -@@ -76,3 +76,3 @@ - // Map [0,1] to [0,255] --inline uint8_t byte(double r) -+inline uint8_t to_byte(double r) - { -@@ -451,5 +451,5 @@ - { --tess->rgba_vertices.push_back(byte(lit->color.red)); --tess->rgba_vertices.push_back(byte(lit->color.green)); --tess->rgba_vertices.push_back(byte(lit->color.blue)); -+tess->rgba_vertices.push_back(to_byte(lit->color.red)); -+tess->rgba_vertices.push_back(to_byte(lit->color.green)); -+tess->rgba_vertices.push_back(to_byte(lit->color.blue)); - } -@@ -595,19 +595,19 @@ - { --tessFace->rgba_vertices.push_back(byte(C[1].R)); --tessFace->rgba_vertices.push_back(byte(C[1].G)); --tessFace->rgba_vertices.push_back(byte(C[1].B)); -+tessFace->rgba_vertices.push_back(to_byte(C[1].R)); -+tessFace->rgba_vertices.push_back(to_byte(C[1].G)); -+tessFace->rgba_vertices.push_back(to_byte(C[1].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[1].A)); -+ tessFace->rgba_vertices.push_b
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a7e4e34c72ef8b2df011b995ba3c85fac10a5394 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Feb 10 19:37:43 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Feb 10 19:37:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e4e34c app-office/scribus: added patches for poppler 2.22.0 Bug: https://bugs.gentoo.org/833086 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> .../files/scribus-1.5.8-poppler-22.2.0-1.patch | 129 + .../files/scribus-1.5.8-poppler-22.2.0-2.patch | 28 + app-office/scribus/scribus-1.5.8.ebuild| 2 + 3 files changed, 159 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch new file mode 100644 index ..4e0f607c6a07 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch @@ -0,0 +1,129 @@ +From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 2 Feb 2022 23:12:52 + +Subject: [PATCH] #16734: Build break with poppler 22.2.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 47 +++- + 1 file changed, 37 insertions(+), 10 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 5894bf2ad6..3650c96f52 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp b/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 ++#include ++#endif ++ + #include + #include + #include +@@ -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 fontLoc; ++ const GooString * fileName = nullptr; ++ std::unique_ptr 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 + } +
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: 7b8c6af798cc7d82e65be5e6699558016dd3 Author: Sam James gentoo org> AuthorDate: Sun Oct 10 00:54:34 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 10 00:54:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8c6af7 app-office/scribus: fix with Harfbuzz 3 (again) Bug: https://bugs.gentoo.org/813711 Closes: https://bugs.gentoo.org/817281 Signed-off-by: Sam James gentoo.org> .../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 41 +- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch index 11e251866f0..f1645e516fa 100644 --- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch +++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch @@ -1,7 +1,46 @@ +https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch https://bugs.scribus.net/view.php?id=16635 +https://bugs.gentoo.org/817281 https://bugs.gentoo.org/813711 +From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sat, 21 Aug 2021 20:05:43 + +Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to + prepeare for removal of legacy API in 3.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/fonts/sfnt.cpp | 10 +- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp +index 50777f66e3..fca8b39158 100644 +--- a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp +@@ -1256,11 +1256,19 @@ namespace sfnt { + + for (int i = 0; i < cids.count(); ++i) + hb_set_add(glyphSet, cids.at(i)); +- ++ ++#if HB_VERSION_ATLEAST(2, 9, 0) ++ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); ++ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; ++ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; ++ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; ++ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); ++#else + hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); + hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); + #if HB_VERSION_ATLEAST(2, 6, 5) + hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); ++#endif + #endif + + QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); + From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 From: Jean Ghali Date: Sun, 19 Sep 2021 11:59:50 + @@ -26,4 +65,4 @@ git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959 +#endif QScopedPointer hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); - if (hbSubsetBlob.isNull()) + if (hbSubsetBlob.isNull()) \ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: bd3a0a60eb96a95e025ba101430b3ee12c46dc97 Author: Sam James gentoo org> AuthorDate: Sat Oct 9 19:37:43 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 9 19:38:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3a0a60 app-office/scribus: fix build with Harfbuzz 3 Closes: https://bugs.gentoo.org/813711 Signed-off-by: Sam James gentoo.org> .../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 29 ++ app-office/scribus/scribus-1.5.7.ebuild| 2 ++ 2 files changed, 31 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch new file mode 100644 index 000..11e251866f0 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch @@ -0,0 +1,29 @@ +https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch +https://bugs.scribus.net/view.php?id=16635 +https://bugs.gentoo.org/813711 + +From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 19 Sep 2021 11:59:50 + +Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by + hb_subset_or_fail + +git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870 +--- a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp +@@ -1271,9 +1271,15 @@ namespace sfnt { + #endif + #endif + ++#if HB_VERSION_ATLEAST(2, 9, 0) ++ QScopedPointer hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); ++ if (hbSubsetFace.isNull()) ++ return QByteArray(); ++#else + QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); + if (hbSubsetFace.isNull()) + return QByteArray(); ++#endif + + QScopedPointer hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); + if (hbSubsetBlob.isNull()) diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild index 67c6ac3aa05..806085da0d1 100644 --- a/app-office/scribus/scribus-1.5.7.ebuild +++ b/app-office/scribus/scribus-1.5.7.ebuild @@ -76,6 +76,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.6-docdir.patch "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch + # upstream + "${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch ) CMAKE_BUILD_TYPE="Release"
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 419db5bfcc58960fb15f8a108014995d8a207d67 Author: Miroslav Šulc gentoo org> AuthorDate: Sun May 30 10:45:14 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 30 10:45:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419db5bf app-office/scribus: removed obsolete 1.5.6.1 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> app-office/scribus/Manifest| 1 - .../files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 --- .../files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27 .../files/scribus-1.5.6.1-poppler-21.04.0.patch| 27 app-office/scribus/scribus-1.5.6.1.ebuild | 161 - 5 files changed, 269 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 0d731f62af6..1ef4d5a62e0 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch deleted file mode 100644 index 18c1edcaaa9..000 --- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Mon, 1 Mar 2021 21:52:54 + -Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler - 21.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870 - scribus/plugins/import/pdf/slaoutput.cpp | 12 +++- - scribus/plugins/import/pdf/slaoutput.h | 4 - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 7cbc73e8d4..d1b37a0c21 100644 a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh - return gTrue; - } - --GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#else -+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -+#endif - { - //qDebug() << "SlaOutputDev::tilingPatternFill"; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+ const double *bbox = tPat->getBBox(); -+ const double *pmat = tPat->getMatrix(); -+ Dict *resDict = tPat->getResDict(); -+#endif -+ - PDFRectangle box; - Gfx *gfx; - QString id; -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 5149f19e31..66c34203ae 100644 a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev - void stroke(GfxState *state) override; - void fill(GfxState *state) override; - void eoFill(GfxState *state) override; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) -+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; -+#else - GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; -+#endif - GBool func
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 6dbd3c2927d356ed242b437be3b807fc1ea94ed5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 7 01:04:09 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 7 01:04:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbd3c29 app-office/scribus: Fix build with app-text/poppler-21.03.0 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 ++ .../files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27 +++ app-office/scribus/scribus-1.5.6.1.ebuild | 3 +- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch new file mode 100644 index 000..18c1edcaaa9 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch @@ -0,0 +1,53 @@ +From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 1 Mar 2021 21:52:54 + +Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler + 21.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 12 +++- + scribus/plugins/import/pdf/slaoutput.h | 4 + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 7cbc73e8d4..d1b37a0c21 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh + return gTrue; + } + +-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#else ++GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++#endif + { + //qDebug() << "SlaOutputDev::tilingPatternFill"; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ const double *bbox = tPat->getBBox(); ++ const double *pmat = tPat->getMatrix(); ++ Dict *resDict = tPat->getResDict(); ++#endif ++ + PDFRectangle box; + Gfx *gfx; + QString id; +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 5149f19e31..66c34203ae 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#else + GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; ++#endif + GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; } + GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); } diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch new file mode 100644 index 000..bff1c08b39a --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch @@ -0,0 +1,27 @@ +From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 1 Mar 2021 22:00:02 + +Subject: [PATCH] Attempt to fix build of pdf import plugin wit
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: feb8be0ac2f9df871ee473e68222e59d80581275 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 00:55:29 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 08:31:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb8be0a app-office/scribus: Drop 1.5.5-r1 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/scribus/Manifest| 1 - .../scribus/files/scribus-1.5.5-docdir.patch | 29 -- .../scribus/files/scribus-1.5.5-findhyphen-2.patch | 19 - .../scribus/files/scribus-1.5.5-poppler-0.82.patch | 89 .../scribus/files/scribus-1.5.5-poppler-0.83.patch | 153 --- .../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 -- .../scribus/files/scribus-1.5.5-poppler-0.86.patch | 459 - .../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 - app-office/scribus/scribus-1.5.5-r1.ebuild | 167 9 files changed, 973 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 823daf4f2db..968c3cbf84b 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch b/app-office/scribus/files/scribus-1.5.5-docdir.patch deleted file mode 100644 index 897a8a75ae9..000 --- a/app-office/scribus/files/scribus-1.5.5-docdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5b3e77..4c5fd3f 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -313,14 +313,16 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") --elseif(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") --else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ elseif(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() - endif() - - if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch deleted file mode 100644 index a8993ca6387..000 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch +++ /dev/null @@ -1,19 +0,0 @@ a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200 -+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<>HYPHEN for Hyphenation support -+ - #< -Date: Mon, 28 Oct 2019 22:11:56 + -Subject: [PATCH] Work around poppler 0.82 signature changes - -git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870 - -Use same mechanism as with previous poppler versions to support change of constness in function signatures - -git-svn-id: svn://scribus.net/trunk/Scribus@23289 11d20701-8431-0410-a711-e3c959e3b870 - scribus/plugins/import/pdf/importpdfconfig.h | 6 ++ - scribus/plugins/import/pdf/slaoutput.cpp | 6 +++--- - scribus/plugins/import/pdf/slaoutput.h | 6 +++--- - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index 2a13b0d10..9913ee382 100644 a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_REF - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0) -+#define POPPLER_CONST_082 const -+#else -+#define POPPLER_CONST_082 -+#endif -+ - #endif -diff --git a/scri
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a97286f1925b40327ab2e35aa468ed3c0902285b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 30 09:20:39 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 30 09:31:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286f1 app-office/scribus: Fix build with Qt 5.15 Reported-by: Kobboi lermytte.be> Thanks-to: Dennis Schridde gmx.net> Closes: https://bugs.gentoo.org/726046 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 ++ app-office/scribus/scribus-1.5.5-r1.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch new file mode 100644 index 000..4ece0feb8e4 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch @@ -0,0 +1,22 @@ +From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 29 Mar 2020 10:55:06 + +Subject: [PATCH] #16076: Fix build with Qt 5.15 + +git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/ui/scresizecursor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp +index f2c78e5ae7..85271ed861 100644 +--- a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild index 48d5cb285e7..9ba57749729 100644 --- a/app-office/scribus/scribus-1.5.5-r1.ebuild +++ b/app-office/scribus/scribus-1.5.5-r1.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}"/${P}-poppler-0.83.patch "${FILESDIR}"/${P}-poppler-0.84.patch "${FILESDIR}"/${P}-poppler-0.86.patch + "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046 # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${P}-docdir.patch
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 9478d521df295284f5892c9f2790d31351c0eca0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 6 23:36:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 7 07:49:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9478d521 app-office/scribus: Fix build with app-text/poppler-0.86.0 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.5.5-poppler-0.86.patch | 459 + app-office/scribus/scribus-1.5.5-r1.ebuild | 1 + 2 files changed, 460 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch new file mode 100644 index 000..e91bb3afdb6 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch @@ -0,0 +1,459 @@ +From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 2 Mar 2020 14:45:59 + +Subject: [PATCH] PDF import plugin: support poppler 0.86.x + +git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 51 +++- + scribus/plugins/import/pdf/importpdf.h | 19 +-- + scribus/plugins/import/pdf/slaoutput.cpp | 154 +-- + scribus/plugins/import/pdf/slaoutput.h | 13 +- + 4 files changed, 215 insertions(+), 22 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index 427cd66ef2..4679674a4d 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn) + names = catDict.dictLookup("OpenAction"); + if (names.isDict()) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) ++ std::unique_ptr linkAction; ++ linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); ++#else + LinkAction *linkAction = nullptr; + linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); ++#endif + if (linkAction) + { +- LinkJavaScript *jsa = (LinkJavaScript*)linkAction; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) ++ LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get(); ++#else ++ LinkJavaScript *jsa = (LinkJavaScript*) linkAction; ++#endif + if (jsa->isOk()) + { + QString script = UnicodeParsedString(jsa->getScript()); +@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1) + } + return result; + } ++ ++QString PdfPlug::UnicodeParsedString(const std::string& s1) ++{ ++ if (s1.length() == 0) ++ return QString(); ++ GBool isUnicode; ++ int i; ++ Unicode u; ++ QString result; ++ if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff)) ++ { ++ isUnicode = gTrue; ++ i = 2; ++ result.reserve((s1.length() - 2) / 2); ++ } ++ else ++ { ++ isUnicode = gFalse; ++ i = 0; ++ result.reserve(s1.length()); ++ } ++ while (i < s1.length()) ++ { ++ if (isUnicode) ++ { ++ u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff); ++ i += 2; ++ } ++ else ++ { ++ u = s1.at(i) & 0xff; ++ ++i; ++ } ++ // #15616: imagemagick may write unicode strings incorrectly in PDF ++ if (u == 0) ++ continue; ++ result += QChar( u ); ++ } ++ return result; ++} +diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: 534c58cdbefddb55d4fd9689b1a59c9b8768765b Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jan 1 21:12:22 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Jan 1 23:08:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c58cd app-office/scribus: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14205 Signed-off-by: Aaron Bauman gentoo.org> .../scribus/files/scribus-1.5.3-docdir.patch | 42 -- 1 file changed, 42 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch deleted file mode 100644 index d866922fa18..000 --- a/app-office/scribus/files/scribus-1.5.3-docdir.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMakeLists.txt | 28 +++- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29d66f3..1c08cdd 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,19 +244,21 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --else() -- if(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -- else() -- if(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -- else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -- endif() -- endif() --endif() -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ else() -+ if(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ else() -+ if(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() -+ endif() -+ endif() -+endif() - if(NOT IS_ABSOLUTE ${DOCDIR}) - add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") - else()
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: ffabc71c416a88c0b4a588b6a480c4206245d4d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 29 11:51:36 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 29 11:54:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffabc71c app-office/scribus: Fix build with app-text/poppler-0.83.0 Closes: https://bugs.gentoo.org/704162 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.5.5-poppler-0.83.patch | 153 + app-office/scribus/scribus-1.5.5.ebuild| 1 + 2 files changed, 154 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch new file mode 100644 index 000..0d52486da92 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch @@ -0,0 +1,153 @@ +Source/Upstream: Yes fixed in svn +Reason: Fix build with poppler 0.83.0 + +From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 4 Dec 2019 05:51:19 + +Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@23395 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 22 + scribus/plugins/import/pdf/importpdfconfig.h | 6 ++ + scribus/plugins/import/pdf/slaoutput.cpp | 4 ++-- + scribus/plugins/import/pdf/slaoutput.h | 2 +- + 4 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index 2ab38ac758..427cd66ef2 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) + QImage PdfPlug::readThumbnail(const QString& fName) + { + QString pdfFile = QDir::toNativeSeparators(fName); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++ globalParams.reset(new GlobalParams()); ++#else + globalParams = new GlobalParams(); ++#endif + if (globalParams) + { + #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) +@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName) + if (pdfDoc->getErrorCode() == errEncrypted) + { + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return QImage(); + } + if (pdfDoc->isOk()) +@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName) + image.setText("YSize", QString("%1").arg(h)); + delete dev; + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return image; + } + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + } + } + return QImage(); +@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn) + qApp->processEvents(); + } + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++ globalParams.reset(new GlobalParams()); ++#else + globalParams = new GlobalParams(); ++#endif + GooString *userPW = nullptr; + if (globalParams) + { +@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn) + if (progressDialog) + progressDialog->close(); + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return false; + } + if (progressDialog) +@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn) + progressDialog->close(); + delete optImp; + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return false; + } + pageString = optImp->getPagesString(); +@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& f
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: f720773f7aa3c2da8bf8b28b5080e84857c7525f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 8 20:11:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 8 20:13:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f720773f app-office/scribus: Sync with most recent 1.5.5 changes Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> ...phen.patch => scribus-1.5.5-findhyphen-1.patch} | 19 --- .../scribus/files/scribus-1.5.5-findhyphen-2.patch | 19 +++ .../scribus/files/scribus-1.5.6-findhyphen.patch | 19 +++ app-office/scribus/scribus-1.5.5.ebuild| 2 +- app-office/scribus/scribus-.ebuild | 144 ++--- 5 files changed, 77 insertions(+), 126 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch similarity index 66% rename from app-office/scribus/files/scribus-1.5.5-findhyphen.patch rename to app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch index 13c168c51f5..98682d60f70 100644 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch +++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch @@ -1,22 +1,3 @@ a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200 -+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<>HYPHEN for Hyphenation support -+ - #<>HUNSPELL for Speelling support + ++#<>HYPHEN for Hyphenation support ++ + #<>HUNSPELL for Speelling support + ++#<>HYPHEN for Hyphenation support ++ + #<=x11-libs/cairo-1.10.0[X,svg] - boost? ( >=dev-libs/boost-1.62:= ) + boost? ( >=dev-libs/boost-1.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} app-text/ghostscript-gpl " -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" PATCHES=( - "${FILESDIR}"/${PN}-1.5.6-docdir.patch + # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch + "${FILESDIR}"/${PN}-1.5.6-docdir.patch + "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch + "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch ) src_prepare() { - rm -r codegen/cheetah || die + cmake-utils_src_prepare + + rm -r codegen/cheetah scribus/third_party/hyphen || die + cat > cmake/modules/FindZLIB.cmake <<- EOF || die find_package(PkgConfig) pkg_check_modules(ZLIB minizip zlib) @@ -107,7 +88,6 @@ src_prepare() { 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" \ @@ -121,54 +101,27 @@ src_prepare() { sed \ -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test - - 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)" + -DPYTHON_INCLUDE_PATH=$(python_get_includedir) + -DPYTHON_LIBRARY=$(python_get_library_path) -DWANT_DISTROBUILD=ON -
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 1c9a7b1068756fc7ae6b52febaaf850a481b8ad3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 1 20:13:17 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 1 23:43:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9a7b10 app-office/scribus: 1.5.5 version bump, EAPI-7 bump Drop L10N hacks Fix build against system dev-libs/hyphen, drop bundled Install bigger icon Set USE +templates by default Closes: https://bugs.gentoo.org/692280 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/scribus/Manifest| 1 + .../scribus/files/scribus-1.5.5-findhyphen.patch | 70 + app-office/scribus/scribus-1.5.5.ebuild| 156 + 3 files changed, 227 insertions(+) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 3734ddc121f..bc1bb961c1a 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1 +1,2 @@ +DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324 diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch new file mode 100644 index 000..13c168c51f5 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch @@ -0,0 +1,70 @@ +--- a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200 b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 +@@ -954,6 +954,16 @@ + endif() + #>>HUNSPELL for Speelling support + ++#<>HYPHEN for Hyphenation support ++ + #< + + #include "scribusapi.h" +-#include "third_party/hyphen/hyphen.h" ++#include + + class ScribusDoc; + class ScribusMainWindow; diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild new file mode 100644 index 000..576abf23fb5 --- /dev/null +++ b/app-office/scribus/scribus-1.5.5.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="tk?" +inherit cmake-utils desktop flag-o-matic python-single-r1 xdg + +DESCRIPTION="Desktop publishing (DTP) and layout program" +HOMEPAGE="https://www.scribus.net/"; +SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.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" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + tk? ( scripts )" + +# osg +# couple of third_party libs bundled +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND="${PYTHON_DEPS} + app-text/libmspub + app-text/libqxp + 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[-gles2] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport: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/libzmf + 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.67:= ) + hunspell? ( app-text/hunspell:= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + osg? ( dev-games/openscenegraph:= ) + pdf? ( app-text/podofo:0= ) + scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) +" +RDEPEND="${DEPEND} + app-text/ghostscript-gpl +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.3-fpic.patch + "${FILESDIR}"/${P}-docdir.patch + "${FILESDIR}"/${P}-findhyphen.patch +) + +src_prepare() { + cmake-utils_src_prepare + + rm -r codegen/cheetah scribus/third_party/hyphen || 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}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: ac6f121dce90c63353c16afc77a73cb9ed10146e Author: Miroslav Šulc gentoo org> AuthorDate: Fri Aug 16 08:51:45 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Aug 16 08:52:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6f121d app-office/scribus-: updated docdir patch keeping files/scribus-1.5.5-docdir.patch for scribus-1.5.5 bump Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.5.6-docdir.patch | 29 ++ app-office/scribus/scribus-.ebuild | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch new file mode 100644 index 000..957991c2acc --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake +index db6133f..faf85ce 100644 +--- a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake +@@ -36,14 +36,16 @@ else() + endif() + + #SHARE - use the default on Apple as TAG_VERSION is empty +-if(WIN32 OR OS2) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") +-elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +-elseif(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +-else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++if(NOT DOCDIR) ++ if(WIN32 OR OS2) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") ++ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++ elseif(NOT WANT_VERSIONING) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ else() ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ endif() + endif() + + if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index 98c9fa5d082..06ff411dee8 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}"/${PN}-1.5.5-docdir.patch + "${FILESDIR}"/${PN}-1.5.6-docdir.patch "${FILESDIR}"/${PN}-1.5.3-fpic.patch )
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: b8163a1828bcf65ede1b6e55f99d926147575f2f Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jun 23 16:43:20 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jun 23 16:44:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8163a18 app-office/scribus-: updated docdir patch Package-Manager: Portage-2.3.67, Repoman-2.3.15 Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.5.5-docdir.patch | 29 ++ app-office/scribus/scribus-.ebuild | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch b/app-office/scribus/files/scribus-1.5.5-docdir.patch new file mode 100644 index 000..897a8a75ae9 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-docdir.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5b3e77..4c5fd3f 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -313,14 +313,16 @@ else() + endif() + + #SHARE - use the default on Apple as TAG_VERSION is empty +-if(WIN32 OR OS2) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") +-elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +-elseif(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +-else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++if(NOT DOCDIR) ++ if(WIN32 OR OS2) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") ++ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++ elseif(NOT WANT_VERSIONING) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ else() ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ endif() + endif() + + if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index 89fb20f8034..98c9fa5d082 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-docdir.patch + "${FILESDIR}"/${PN}-1.5.5-docdir.patch "${FILESDIR}"/${PN}-1.5.3-fpic.patch )
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: 9d9bf65384f04e9f25d598c65428784a9bbeed2e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 16 18:25:26 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 16 18:39:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9bf653 app-office/scribus: Improve poppler-0.73 patch Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 +++--- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch index af98da7050c..f63f4c6d1ee 100644 --- a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch +++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch @@ -1,24 +1,24 @@ -From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 14 Jan 2019 23:58:59 +0100 -Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73 +From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 16 Jan 2019 00:30:35 + +Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure +git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870 --- - scribus/plugins/import/pdf/slaoutput.h | 1 - - 1 file changed, 1 deletion(-) + scribus/plugins/import/pdf/slaoutput.h | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index c46448b..83e010c 100644 +index c46448b80a..4dac7c3983 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -28,7 +28,6 @@ for which a new license (GPL+exception) is in place. +@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. #include "selection.h" #include "vgradient.h" --#include ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) + #include ++#endif #include #include #include --- -2.20.1 -
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a10f0ceb43cd137a0783e5d702ed351a2281b318 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 20 16:29:55 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 20 16:30:49 2018 + 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 3e7702da61a069887317505d86bc473a4d2d59be4bca894bbde41844029707dda7307f1d07033fde501da03097aed21dcf12991bb978df1156cb6654077a 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..000 --- 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 -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..000 --- 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 -Date: Fri, 8 Sep 2017 16:52:10 + -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 - #include - #include -+#include - #include - #include - -@@ -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) * 1) \ -+ + ((minor) * 100) \ -+ + ((micro) * 1)) -+#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSIO
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: eb6e4b54f11a87fe5ab5a5bbbc64f6720d9d09e2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 10 15:06:33 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 10 15:54:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6e4b54 app-office/scribus: QA: Remove duplicate patches Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-office/scribus/files/scribus--docdir.patch | 42 -- app-office/scribus/files/scribus--fpic.patch | 16 - app-office/scribus/scribus-.ebuild | 4 +-- 3 files changed, 2 insertions(+), 60 deletions(-) diff --git a/app-office/scribus/files/scribus--docdir.patch b/app-office/scribus/files/scribus--docdir.patch deleted file mode 100644 index d866922fa18..000 --- a/app-office/scribus/files/scribus--docdir.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMakeLists.txt | 28 +++- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29d66f3..1c08cdd 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,19 +244,21 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --else() -- if(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -- else() -- if(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -- else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -- endif() -- endif() --endif() -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ else() -+ if(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ else() -+ if(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() -+ endif() -+ endif() -+endif() - if(NOT IS_ABSOLUTE ${DOCDIR}) - add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") - else() diff --git a/app-office/scribus/files/scribus--fpic.patch b/app-office/scribus/files/scribus--fpic.patch deleted file mode 100644 index ba0721955ef..000 --- a/app-office/scribus/files/scribus--fpic.patch +++ /dev/null @@ -1,16 +0,0 @@ - scribus/third_party/prc/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt -index 5f7c2c6..1da7177 100644 a/scribus/third_party/prc/CMakeLists.txt -+++ b/scribus/third_party/prc/CMakeLists.txt -@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} - ${FREETYPE_INCLUDE_DIRS} - ) - -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") -+ - set(SCRIBUS_PRC_LIB_SOURCES - oPRCFile.cc - PRCbitStream.cc diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index e0fb1c4035f..742448b2738 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -94,8 +94,8 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-docdir.patch - "${FILESDIR}"/${P}-fpic.patch + "${FILESDIR}"/${PN}-1.5.3-docdir.patch + "${FILESDIR}"/${PN}-1.5.3-fpic.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 44fdb3b5863b58db7b6960d1a869ffdac2355374 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 12 18:26:19 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 13 22:50:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fdb3b5 app-office/scribus: Drop 1.4.6 Bug: https://bugs.gentoo.org/631800 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-office/scribus/Manifest| 1 - .../scribus/files/scribus-1.4.0-minizip.patch | 60 app-office/scribus/scribus-1.4.6.ebuild| 171 - 3 files changed, 232 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 27700cdb4b8..deea45c88c3 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980 diff --git a/app-office/scribus/files/scribus-1.4.0-minizip.patch b/app-office/scribus/files/scribus-1.4.0-minizip.patch deleted file mode 100644 index c0a4b7cb38e..000 --- a/app-office/scribus/files/scribus-1.4.0-minizip.patch +++ /dev/null @@ -1,60 +0,0 @@ - Scribus.pro|4 - scribus/CMakeLists.txt |2 -- - 2 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/Scribus.pro b/Scribus.pro -index 17b5417..0cc23c9 100644 a/Scribus.pro -+++ b/Scribus.pro -@@ -276,7 +276,6 @@ HEADERS += scribus/about.h \ -scribus/insertaframe.h \ -scribus/insertTable.h \ -scribus/inspage.h \ -- scribus/ioapi.h \ -scribus/javadocs.h \ -scribus/KarbonCurveFit.h \ -scribus/langmgr.h \ -@@ -496,7 +495,6 @@ HEADERS += scribus/about.h \ -scribus/undostate.h \ -scribus/unicodesearch.h \ -scribus/units.h \ -- scribus/unzip.h \ -scribus/updatemanager.h \ -scribus/upgradechecker.h \ -scribus/urllauncher.h \ -@@ -933,7 +931,6 @@ SOURCES += scribus/about.cpp \ -scribus/insertaframe.cpp \ -scribus/insertTable.cpp \ -scribus/inspage.cpp \ -- scribus/ioapi.c \ -scribus/javadocs.cpp \ -scribus/KarbonCurveFit.cpp \ -scribus/langmgr.cpp \ -@@ -1143,7 +1140,6 @@ SOURCES += scribus/about.cpp \ -scribus/undostate.cpp \ -scribus/unicodesearch.cpp \ -scribus/units.cpp \ -- scribus/unzip.c \ -scribus/updatemanager.cpp \ -scribus/upgradechecker.cpp \ -scribus/urllauncher.cpp \ -diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt -index dcd7e10..3aca69b 100644 a/scribus/CMakeLists.txt -+++ b/scribus/CMakeLists.txt -@@ -405,7 +405,6 @@ SET(SCRIBUS_SOURCES - insertTable.cpp - insertaframe.cpp - inspage.cpp -- ioapi.c - javadocs.cpp - KarbonCurveFit.cpp - langmgr.cpp -@@ -613,7 +612,6 @@ SET(SCRIBUS_SOURCES - undostate.cpp - unicodesearch.cpp - units.cpp -- unzip.c - updatemanager.cpp - upgradechecker.cpp - urllauncher.cpp diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild deleted file mode 100644 index 09084384679..000 --- a/app-office/scribus/scribus-1.4.6.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk?" - -inherit cmake-utils fdo-mime python-single-r1 - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="http://www.scribus.net/"; -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86" -IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk" - -# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a} -# Keep this sorted, otherwise eliminating of duplicates below won't work -IUSE_L10N=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 011a496c85cf6f36b24082a3ac55f6b63162f2e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 9 13:32:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 13:46:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011a496c app-office/scribus: Fix build w/ x86 on 17.0 profile Closes: https://bugs.gentoo.org/642242 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-office/scribus/files/scribus-1.5.3-x86-fpic.patch | 16 app-office/scribus/scribus-1.5.3-r1.ebuild| 1 + app-office/scribus/scribus-.ebuild| 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..03d4dc4daa3 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt 2017-05-28 11:10:27.0 +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 0c8f8171b5e..e1ed169825a 100644 --- a/app-office/scribus/scribus-1.5.3-r1.ebuild +++ b/app-office/scribus/scribus-1.5.3-r1.ebuild @@ -96,6 +96,7 @@ PATCHES=( "${FILESDIR}"/${P}-fpic.patch "${FILESDIR}"/${P}-cmake-openssl.patch "${FILESDIR}"/${P}-poppler-0.58.patch + "${FILESDIR}"/${P}-x86-fpic.patch ) src_prepare() { diff --git a/app-office/scribus/scribus-.ebuild b/app-office/scribus/scribus-.ebuild index b65e60a412b..f9c847c7aa6 100644 --- a/app-office/scribus/scribus-.ebuild +++ b/app-office/scribus/scribus-.ebuild @@ -6,7 +6,6 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" CMAKE_MAKEFILE_GENERATOR=ninja -CMAKE_MIN_VERSION=3.2.0 inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils @@ -97,6 +96,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${P}-docdir.patch "${FILESDIR}"/${P}-fpic.patch + "${FILESDIR}"/${PN}-1.5.3-x86-fpic.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: baa2b7d340e6636519d069ee235a429bd546d289 Author: Justin Lecher gentoo org> AuthorDate: Wed Dec 20 21:30:13 2017 + Commit: Justin Lecher gentoo org> CommitDate: Wed Dec 20 21:34:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa2b7d3 app-office/scribus: Patch openssl determination in cmake Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../scribus/files/scribus-1.5.3-cmake-openssl.patch | 15 +++ app-office/scribus/scribus-1.5.3.ebuild | 1 + 2 files changed, 16 insertions(+) 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 new file mode 100644 index 000..c2cb5e9dd58 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch @@ -0,0 +1,15 @@ +Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake +Author: Mattia Rizzolo +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/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild index 9f7a0a8ca01..d28665aead7 100644 --- a/app-office/scribus/scribus-1.5.3.ebuild +++ b/app-office/scribus/scribus-1.5.3.ebuild @@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${P}-docdir.patch "${FILESDIR}"/${P}-fpic.patch + "${FILESDIR}"/${P}-cmake-openssl.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: c900914ed16732bb5404483793e98984dedfa755 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Dec 2 08:04:18 2017 + Commit: Patrice Clement gentoo org> CommitDate: Tue Dec 12 20:14:52 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c900914e app-office/scribus: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/6390 .../scribus/files/scribus-1.5.0-QObject.patch | 15 -- .../scribus/files/scribus-1.5.0-docdir.patch | 42 - app-office/scribus/files/scribus-1.5.0-fpic.patch | 178 - .../scribus/files/scribus-1.5.2-cmake-qt57.patch | 31 .../scribus/files/scribus-1.5.2-cxx-build.patch| 24 --- app-office/scribus/files/scribus-1.5.2-fpic.patch | 16 -- .../scribus/files/scribus-1.5.2-gcc6-warn.patch| 87 -- .../scribus/files/scribus-1.5.2-qt57-build.patch | 21 --- 8 files changed, 414 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch deleted file mode 100644 index 1ad2d1a575c..000 --- a/app-office/scribus/files/scribus-1.5.0-QObject.patch +++ /dev/null @@ -1,15 +0,0 @@ - scribus/sclayer.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp -index 502112b..4da7bd5 100644 a/scribus/sclayer.cpp -+++ b/scribus/sclayer.cpp -@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. - - #include//necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates - #include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates -+#include - #include - - ScLayer::ScLayer(void) diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch deleted file mode 100644 index 2ff316a91b5..000 --- a/app-office/scribus/files/scribus-1.5.0-docdir.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMakeLists.txt | 28 +++- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29d66f3..1c08cdd 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,19 +244,21 @@ ELSE() - ENDIF() - - #SHARE - use the default on Apple as TAG_VERSION is empty --IF(WIN32 OR OS2) -- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --ELSE (WIN32 OR OS2) -- IF(TAG_VERSION OR BUILD_OSX_BUNDLE) -- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) -- IF(NOT WANT_VERSIONING) -- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -- ELSE(NOT WANT_VERSIONING) -- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -- ENDIF(NOT WANT_VERSIONING) -- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) --ENDIF (WIN32 OR OS2) -+IF(NOT DOCDIR) -+ IF(WIN32 OR OS2) -+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ ELSE (WIN32 OR OS2) -+ IF(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ IF(NOT WANT_VERSIONING) -+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ ELSE(NOT WANT_VERSIONING) -+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ ENDIF(NOT WANT_VERSIONING) -+ ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) -+ ENDIF (WIN32 OR OS2) -+ENDIF(NOT DOCDIR) - IF(NOT IS_ABSOLUTE ${DOCDIR}) - ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") - ELSE() diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch deleted file mode 100644 index 9f6a6c4e0ab..000 --- a/app-office/scribus/files/scribus-1.5.0-fpic.patch +++ /dev/null @@ -1,178 +0,0 @@ - CMakeLists.txt | 15 +++ - scribus/colormgmt/CMakeLists.txt| 2 ++ - scribus/desaxe/CMakeLists.txt | 1 + - scribus/fonts/CMakeLists.txt| 1 + - scribus/styles/CMakeLists.txt | 2 ++ - scribus/text/CMakeLists.txt | 1 + - scribus/third_party/lib2geom/CMakeLists.txt | 8 +--- - scribus/third_party/pgf/CMakeLists.txt | 2 ++ - scribus/third_party/prc/CMakeLists.txt | 2 ++ - scribus/third_party/wpg/CMakeLists.txt | 7 --- - scribus/third_party/zip/CMakeLists.txt | 2 ++ - 11 files changed, 33 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29d66f3..a92da7e 100644 a/
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 31e9ab607088bf9f7ec7308f2e601d6b933372e0 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Oct 27 01:31:50 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sun Nov 6 08:24:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e9ab60 app-office/scribus: Fix build w/ Qt-5.7.0 and C++11 Use upstream's WANT_CPP11 Drop duplicate boost DEPEND. Add missing || die's Add subslot operators on boost and libpng Require >=boost-1.62 for C++11 per dracwyrm+Soap's advice Package-Manager: portage-2.3.0 Signed-off-by: Justin Lecher gentoo.org> .../scribus/files/scribus-1.5.2-cmake-qt57.patch | 31 +++ .../scribus/files/scribus-1.5.2-cxx-build.patch| 24 +++ .../scribus/files/scribus-1.5.2-gcc6-warn.patch| 87 .../scribus/files/scribus-1.5.2-qt57-build.patch | 21 ++ app-office/scribus/scribus-1.5.2-r2.ebuild | 218 + 5 files changed, 381 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch b/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch new file mode 100644 index ..214fab4 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch @@ -0,0 +1,31 @@ +commit 413c8c8a0ded5aa4b0f8d85dbc335082e809f3b2 +Author: Craig Bradney +Date: Thu Jun 16 20:01:34 2016 + + +Add better support for C++11/Qt 5.7.0. CMAKE minimum bumped to 3.2 + +git-svn-id: svn://scribus.net/trunk/Scribus@21377 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bc1ec57..9e92a38 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -3,8 +3,9 @@ + + #Set our CMake minimum version + #Require 2.8.9 for Qt5 ++#Require 3.1.0 for Qt 5.7 C++ 11 easy support + #Require 3.2.0 for add_custom_target with byproducts +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR) + + #Pretty colors + SET(CMAKE_COLOR_MAKEFILE ON) +@@ -382,6 +383,7 @@ ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") + #C++11 Support + IF(WANT_CPP11) + MESSAGE(STATUS "Enabling C++11 compiler features") ++ set(CMAKE_CXX_STANDARD 11) + ADD_DEFINITIONS("-std=c++11") + ENDIF(WANT_CPP11) + diff --git a/app-office/scribus/files/scribus-1.5.2-cxx-build.patch b/app-office/scribus/files/scribus-1.5.2-cxx-build.patch new file mode 100644 index ..da8d50d --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.2-cxx-build.patch @@ -0,0 +1,24 @@ +commit 1a9bdbc7ab793b15e93f1ab29ce06dd69c061f58 +Author: Jean Ghali +Date: Sat Jun 18 12:49:45 2016 + + +fix build issue when not compiling with c++11 : std::isinf is c++11 only + +git-svn-id: svn://scribus.net/trunk/Scribus@21382 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc +index 673e1b6..0c1bad5 100644 +--- a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc +@@ -7296,7 +7296,11 @@ namespace FPoptimizer_CodeTree + //if(imm >= 0.0) + { + double new_base_immed = std::pow(base_immed, imm); ++#if __cplusplus < 201103L ++ if(isinf(new_base_immed) || new_base_immed == 0.0) ++#else + if(std::isinf(new_base_immed) || new_base_immed == 0.0) ++#endif + { + // It produced an infinity. Do not change. + break; diff --git a/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch b/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch new file mode 100644 index ..224ebe4 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch @@ -0,0 +1,87 @@ +commit bb3066704e987210c324ec7f3bfb2c8153d9710e +Author: Jean Ghali +Date: Sat Aug 20 12:18:31 2016 + + +fix a few gcc 6 warnings related to auto_ptr deprecation in c++11 by replacing it with QScopedPointer + +git-svn-id: svn://scribus.net/trunk/Scribus@21430 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h +index 044d45a..a067b79 100644 +--- a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h +@@ -13,6 +13,7 @@ for which a new license (GPL+exception) is in place. + #include + #include + #include ++#include + #include + + #include "scguardedptr.h" +@@ -30,19 +31,19 @@ public: + virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const; + virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; + protected: +- static std::auto_ptr pmap; ++ static QScopedPointer pmap; + // The drawPixmap fun
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 6ffd5dae18526e489fc873b1b7a2ab0b380f3340 Author: Justin Lecher gentoo org> AuthorDate: Sun Oct 23 20:24:41 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sun Oct 23 20:25:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffd5dae app-office/scribus: Add adapted fPIC patch back Bump to EAPI=6 Shorten helper functions take back maintainership Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=593510 Package-Manager: portage-2.3.2 Signed-off-by: Justin Lecher gentoo.org> app-office/scribus/files/scribus-1.5.2-fpic.patch | 16 app-office/scribus/metadata.xml| 5 +- ...cribus-1.5.2.ebuild => scribus-1.5.2-r1.ebuild} | 91 -- 3 files changed, 72 insertions(+), 40 deletions(-) diff --git a/app-office/scribus/files/scribus-1.5.2-fpic.patch b/app-office/scribus/files/scribus-1.5.2-fpic.patch new file mode 100644 index ..5828364 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.2-fpic.patch @@ -0,0 +1,16 @@ + scribus/third_party/prc/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt +index 5f7c2c6..1da7177 100644 +--- a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt +@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_PRC_LIB_SOURCES + oPRCFile.cc + PRCbitStream.cc diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 745ba20..885d510 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd";> - + +j...@gentoo.org +Primary maintainer + Enable support for Boost based enhancement Add support for media-gfx/graphicsmagick diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2-r1.ebuild similarity index 72% rename from app-office/scribus/scribus-1.5.2.ebuild rename to app-office/scribus/scribus-1.5.2-r1.ebuild index ea8ec9e..939d847 100644 --- a/app-office/scribus/scribus-1.5.2.ebuild +++ b/app-office/scribus/scribus-1.5.2-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~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 -IUSE_LINGUAS=" 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_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW" +IUSE_LINGUAS=" 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 fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW" IUSE+=" ${IUSE_LINGUAS// / linguas_}" REQUIRED_USE=" @@ -42,7 +42,6 @@ COMMON_DEPEND=" dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 - dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig @@ -73,6 +72,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch + "${FILESDIR}"/${P}-fpic.patch ) src_prepare() { @@ -103,20 +103,28 @@ src_prepare() { } src_configure() { - local lang langs + local _lang lang langs for lang in ${IUSE_LINGUAS}; do + _lang=$(translate_lang ${lang}) if use linguas_${lang} || [[ ${lang} == "en" ]]; 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}" + langs+=";${_lang}" else # Don't install localized documentation - sed -e "/${lang}/d" -i doc/CMakeLists.txt || die - safe_delete file ./resources/dicts/README_${lang}.txt - safe_delete file ./resources/dicts
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 1617ba74c828ee4e4b1dd531037c3b5982c25a81 Author: Michael Weber gentoo org> AuthorDate: Tue Sep 27 18:50:25 2016 + Commit: Michael Weber gentoo org> CommitDate: Tue Sep 27 18:50:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1617ba74 app-office/scribus: drop old versions. Package-Manager: portage-2.2.28 app-office/scribus/Manifest| 2 - app-office/scribus/files/scribus-1.4.2-docs.patch | 29 --- .../scribus/files/scribus-1.4.4-ppc64-fpic.patch | 19 -- app-office/scribus/scribus-1.4.5.ebuild| 151 app-office/scribus/scribus-1.5.1.ebuild| 200 - 5 files changed, 401 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 7460f6b..1f887c4 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,5 +1,3 @@ -DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca -DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9 DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7 diff --git a/app-office/scribus/files/scribus-1.4.2-docs.patch b/app-office/scribus/files/scribus-1.4.2-docs.patch deleted file mode 100644 index 977bfe0.. --- a/app-office/scribus/files/scribus-1.4.2-docs.patch +++ /dev/null @@ -1,29 +0,0 @@ - CMakeLists.txt |4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f34048..4880594 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") - ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) - IF(NOT WANT_VERSIONING) --SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") -+SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/") - ELSE(NOT WANT_VERSIONING) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") - ENDIF(NOT WANT_VERSIONING) -@@ -801,12 +801,11 @@ INSTALL(FILES - BUILDING - ChangeLog - ChangeLogSVN -- COPYING - LINKS - NEWS - PACKAGING - README - TODO - TRANSLATION - DESTINATION ${DOCDIR} - ) diff --git a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch deleted file mode 100644 index 295cec3.. --- a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch +++ /dev/null @@ -1,19 +0,0 @@ - scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt -index 18898a7..ba872b9 100755 a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt -+++ b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt -@@ -18,9 +18,9 @@ SET(2GEOM_VERSION 0.1.0) - # 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) -+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MI
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 3e6927120ea7bd661efa99f1c676b1f93311c411 Author: Justin Lecher gentoo org> AuthorDate: Mon Oct 19 11:35:32 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Oct 19 12:06:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e692712 app-office/scribus: Patch merged upstream Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563386 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> app-office/scribus/files/scribus--fpic.patch | 192 --- app-office/scribus/scribus-.ebuild | 5 +- 2 files changed, 1 insertion(+), 196 deletions(-) diff --git a/app-office/scribus/files/scribus--fpic.patch b/app-office/scribus/files/scribus--fpic.patch deleted file mode 100644 index dbc640b..000 --- a/app-office/scribus/files/scribus--fpic.patch +++ /dev/null @@ -1,192 +0,0 @@ - Scribus/CMakeLists.txt | 15 +++ - Scribus/scribus/colormgmt/CMakeLists.txt| 2 ++ - Scribus/scribus/desaxe/CMakeLists.txt | 1 + - Scribus/scribus/fonts/CMakeLists.txt| 1 + - Scribus/scribus/styles/CMakeLists.txt | 2 ++ - Scribus/scribus/text/CMakeLists.txt | 1 + - Scribus/scribus/third_party/lib2geom/CMakeLists.txt | 8 +--- - Scribus/scribus/third_party/pgf/CMakeLists.txt | 2 ++ - Scribus/scribus/third_party/prc/CMakeLists.txt | 2 ++ - Scribus/scribus/third_party/rtf-qt/CMakeLists.txt | 2 ++ - Scribus/scribus/third_party/wpg/CMakeLists.txt | 7 --- - Scribus/scribus/third_party/zip/CMakeLists.txt | 2 ++ - 12 files changed, 35 insertions(+), 10 deletions(-) - -diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt -index 8ab9525..f2ebf64 100644 a/Scribus/CMakeLists.txt -+++ b/Scribus/CMakeLists.txt -@@ -131,6 +131,21 @@ IF (_machine_sparc64) - SET(ARCH64BIT 1) - ENDIF (_machine_sparc64) - -+STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}") -+IF (_machine_hppa) -+ MESSAGE(STATUS "Found target Hppa") -+ SET(ARCH_HPPA 1) -+ENDIF (_machine_hppa) -+ -+ -+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. 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) -+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC") -+ENDIF (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) -+ - ## Do our Apple OSX version setup - IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1)) - STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}") -diff --git a/Scribus/scribus/colormgmt/CMakeLists.txt b/Scribus/scribus/colormgmt/CMakeLists.txt -index 7298a28..87c4f5e 100644 a/Scribus/scribus/colormgmt/CMakeLists.txt -+++ b/Scribus/scribus/colormgmt/CMakeLists.txt -@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/scribus - ) - -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") -+ - INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} ) - SET(SCRIBUS_LCMS_IMPL_SOURCES - sclcms2colormgmtengineimpl.cpp -diff --git a/Scribus/scribus/desaxe/CMakeLists.txt b/Scribus/scribus/desaxe/CMakeLists.txt -index 0098028..85e76b6 100644 a/Scribus/scribus/desaxe/CMakeLists.txt -+++ b/Scribus/scribus/desaxe/CMakeLists.txt -@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus - ${FREETYPE_INCLUDE_DIRS} - ) - -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") - - SET(SCRIBUS_DESAXE_LIB_SOURCES - saxXML.cpp -diff --git a/Scribus/scribus/fonts/CMakeLists.txt b/Scribus/scribus/fonts/CMakeLists.txt -index a8f0e8d..beade2e 100644 a/Scribus/scribus/fonts/CMakeLists.txt -+++ b/Scribus/scribus/fonts/CMakeLists.txt -@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus - ${FREETYPE_INCLUDE_DIRS} - ) - -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") - - SET(SCRIBUS_FONTS_LIB_SOURCES - scface.cpp -diff --git a/Scribus/scribus/styles/CMakeLists.txt b/Scribus/scribus/styles/CMakeLists.txt -index 6e0cf0a..2839689 100644 a/Scribus/scribus/styles/CMakeLists.txt -+++ b/Scribus/scribus/styles/CMakeLists.txt -@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES( - ${FREETYPE_INCLUDE_DIRS} - ) - -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") -+ - SET(SCRIBUS_STYLES_MOC_CLASSES - ) - -diff --git a/Scribus/scribus/text/CMakeLists.txt b/Scribus/scribus/text/CMakeLists.txt -index 1cd112f..4f658e3 100644 a/Scribus/scribus/text/CMakeLists.txt -+++ b/Scribus/scribus/text/CMakeLists.txt -@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES( - ${FREETYPE_INCLUDE_DIRS} - ) - -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") - - SET(SCRIBUS_TEXT_MOC_CLASSES - storytext.h -diff --
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 4a0809523c24b7d4baa4a9a7a1d565cf7c65b2af Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 16 13:04:36 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Oct 16 13:04:43 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a080952 app-office/scribus: Extend fPIC patch Scribus-Bug: http://bugs.scribus.net/view.php?id=13427 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563228 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> app-office/scribus/files/scribus--fpic.patch | 192 +++ app-office/scribus/scribus-.ebuild | 2 +- 2 files changed, 193 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus--fpic.patch b/app-office/scribus/files/scribus--fpic.patch new file mode 100644 index 000..dbc640b --- /dev/null +++ b/app-office/scribus/files/scribus--fpic.patch @@ -0,0 +1,192 @@ + Scribus/CMakeLists.txt | 15 +++ + Scribus/scribus/colormgmt/CMakeLists.txt| 2 ++ + Scribus/scribus/desaxe/CMakeLists.txt | 1 + + Scribus/scribus/fonts/CMakeLists.txt| 1 + + Scribus/scribus/styles/CMakeLists.txt | 2 ++ + Scribus/scribus/text/CMakeLists.txt | 1 + + Scribus/scribus/third_party/lib2geom/CMakeLists.txt | 8 +--- + Scribus/scribus/third_party/pgf/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/prc/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/rtf-qt/CMakeLists.txt | 2 ++ + Scribus/scribus/third_party/wpg/CMakeLists.txt | 7 --- + Scribus/scribus/third_party/zip/CMakeLists.txt | 2 ++ + 12 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt +index 8ab9525..f2ebf64 100644 +--- a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt +@@ -131,6 +131,21 @@ IF (_machine_sparc64) + SET(ARCH64BIT 1) + ENDIF (_machine_sparc64) + ++STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}") ++IF (_machine_hppa) ++ MESSAGE(STATUS "Found target Hppa") ++ SET(ARCH_HPPA 1) ++ENDIF (_machine_hppa) ++ ++ ++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. 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) ++ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC") ++ENDIF (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) ++ + ## Do our Apple OSX version setup + IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1)) + STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}") +diff --git a/Scribus/scribus/colormgmt/CMakeLists.txt b/Scribus/scribus/colormgmt/CMakeLists.txt +index 7298a28..87c4f5e 100644 +--- a/Scribus/scribus/colormgmt/CMakeLists.txt b/Scribus/scribus/colormgmt/CMakeLists.txt +@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/scribus + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} ) + SET(SCRIBUS_LCMS_IMPL_SOURCES + sclcms2colormgmtengineimpl.cpp +diff --git a/Scribus/scribus/desaxe/CMakeLists.txt b/Scribus/scribus/desaxe/CMakeLists.txt +index 0098028..85e76b6 100644 +--- a/Scribus/scribus/desaxe/CMakeLists.txt b/Scribus/scribus/desaxe/CMakeLists.txt +@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBUS_DESAXE_LIB_SOURCES + saxXML.cpp +diff --git a/Scribus/scribus/fonts/CMakeLists.txt b/Scribus/scribus/fonts/CMakeLists.txt +index a8f0e8d..beade2e 100644 +--- a/Scribus/scribus/fonts/CMakeLists.txt b/Scribus/scribus/fonts/CMakeLists.txt +@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBUS_FONTS_LIB_SOURCES + scface.cpp +diff --git a/Scribus/scribus/styles/CMakeLists.txt b/Scribus/scribus/styles/CMakeLists.txt +index 6e0cf0a..2839689 100644 +--- a/Scribus/scribus/styles/CMakeLists.txt b/Scribus/scribus/styles/CMakeLists.txt +@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES( + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_STYLES_MOC_CLASSES + ) + +diff --git a/Scribus/scribus/text/CMakeLists.txt b/Scribus/scribus/text/CMakeLists.txt +index 1cd112f..4f658e3 100644 +--- a/Scribus/scribus/text/CMakeLists.txt b/Scribus/scribus/text/CMakeLists.txt +@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES( + ${FREETYPE_INCLUDE_DIRS} + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") + + SET(SCRIBU