diff options
Diffstat (limited to 'app-office/scribus')
-rw-r--r-- | app-office/scribus/Manifest | 7 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch | 27 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.5.6.1.ebuild | 161 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.5.7.ebuild | 2 |
6 files changed, 2 insertions, 275 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 89f05018ba9f..352f80203898 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -2,12 +2,7 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9 -AUX scribus-1.5.6.1-poppler-21.03.0-1.patch 3383 BLAKE2B e72297007c3c27b5089340f6704ab685bf3b21eed7e0324dff3ba66c57eaa707847873417fa1b136b1b981bca44819ebada61d954309035af194cd523390942e SHA512 15c0e6f207ae700ab6cb899ee517bad323347f856c6fbbca6cbd4b1393ecb8ce884acb8ebe47575b398f299ee49f2e63b61be6a705e584683eeb9760be8e7368 -AUX scribus-1.5.6.1-poppler-21.03.0-2.patch 1137 BLAKE2B 59594ede7b957602a66a7d42afa137031553422f7dd6bb4a7711a5a7655e126ed2cb435e0425fe28a6efe24544df77c6ed66eacdc6419021c58c7c2011002928 SHA512 f51009e841761c014bad115e1c3b7b3496bd8a2d2cc85b69b819130629996992ec9c80a97c59d18d5f7c3ba88f978b457e893f29bed60e2763ed42963a27870e -AUX scribus-1.5.6.1-poppler-21.04.0.patch 1079 BLAKE2B a8f4a785ad33ca7ad1760abcd18e2925dc2253a906cade963e830a0f39ca19678f2edaf3111aa8985ba8bb30cc3da4eef4cdb95bf23a28bb2082379d894d7faa SHA512 afd2379cd9666c4f77241198fcea565f1b568cce928e629482c16f817465ac832b1143a359fea53ad38f25064710501a6bb316f35172074910f2c5747cce87a6 -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 -EBUILD scribus-1.5.6.1.ebuild 4134 BLAKE2B 56606a24ce138d0b3774aebb6a0b9fea34665cb0c93af152b45995c3eb2aa0319c0cf71ae69e97b0ef47ccb0fa1aee89b1a578257b06732f6507da1e5443e7ec SHA512 a9f87b09c805b2c6438a0c7115f0e752976c6f1227f08a4c4674fb53f0a06afd172d4648c39d20e9b539790b4cf0825292760454c1e16582e9415509f4d421e6 -EBUILD scribus-1.5.7.ebuild 3993 BLAKE2B 7e9c5270091c3af45d7d47512653b5aaa1284dbc57d492c5ae144340ba4a52511e4de75f88cda0bf64c6fe8c5ed44edf0b2386b0f175e5293ddc8207ad4cfbdd SHA512 6813630a3a949ab75c95e821817a7ea85d433a948cbcaee5ca707345fc58b55b94fe5f4817a97f7eb7fa82eedef97485ee697a854e1b995748b9170e380fab5b +EBUILD scribus-1.5.7.ebuild 3989 BLAKE2B 4e038adf5f2fe3797e5d06db2a5ebcbc5fab1abc4290c8c500fec11759e4bb90cb7dce35f84a14085cef1caf5fa49b35a2a7f85f6365c899822f9c17c44d6488 SHA512 80890b92964d5f32eece3621c6c7f45308833753bbb2f8218f9f0e8ad3cfc1e0eabfdd28204b8ab5cc1a40c52ceda68568ed30db6aa43c1698bd0e5aee545a5a EBUILD scribus-9999.ebuild 3952 BLAKE2B 324e637c48bfa8d2d4c1b4f065e21263300df57ea11189f294b0121a1d1925678fcff30b36f5f75d23a2be455ee43a3f8845a326cef99c77cd5527bf54829146 SHA512 38c4ec22cbc9df9c3664bae7ff0e6131003b29da21e13956d04b7a3493e7ae0e7d3f05c025b303d9d51ce6f5a00fb5ad31be0808212413974e131937036933ec MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58 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 18c1edcaaa99..000000000000 --- 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 <jghali@libertysurf.fr> -Date: Mon, 1 Mar 2021 21:52:54 +0000 -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 deleted file mode 100644 index bff1c08b39ad..000000000000 --- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Mon, 1 Mar 2021 22:00:02 +0000 -Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler - 21.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index d1b37a0c21..de0a4145ef 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c - // Unset the clip path as it is unrelated to the pattern's coordinate space.
- QPainterPath savedClip = m_currentClipPath;
- m_currentClipPath = QPainterPath();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ gfx->display(tPat->getContentStream());
-+#else
- gfx->display(str);
-+#endif
- m_currentClipPath = savedClip;
- inPattern--;
- gElements = m_groupStack.pop();
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch deleted file mode 100644 index bb821ea5c9a5..000000000000 --- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sun, 4 Apr 2021 21:37:04 +0000 -Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler - 21.04.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/slaoutput.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 66c34203ae..cb191b1023 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev - Catalog *catalog {nullptr};
- SplashFontEngine *m_fontEngine {nullptr};
- SplashFont *m_font {nullptr};
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
-+ std::unique_ptr<FormPageWidgets> m_formWidgets;
-+#else
- FormPageWidgets *m_formWidgets {nullptr};
-+#endif
- QHash<QString, QList<int> > m_radioMap;
- QHash<int, PageItem*> m_radioButtons;
- int m_actPage;
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild deleted file mode 100644 index 5e803e2024d1..000000000000 --- a/app-office/scribus/scribus-1.5.6.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="tk?" -COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a -inherit cmake desktop flag-o-matic python-single-r1 xdg - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -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 -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: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/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[X,svg] - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - hunspell? ( app-text/hunspell:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( - $(python_gen_cond_dep ' - dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - app-text/ghostscript-gpl -" - -PATCHES=( - "${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch - "${FILESDIR}"/${P}-poppler-21.04.0.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 -) - -CMAKE_BUILD_TYPE="Release" - -S="${WORKDIR}"/${PN}-${COMMIT} - -src_prepare() { - cmake_src_prepare - - rm -r codegen/cheetah 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() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DWANT_DISTROBUILD=ON - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ - -DPython3_EXECUTABLE="${PYTHON}" - -DWITH_BOOST=$(usex boost) - -DWANT_DEBUG=$(usex debug) - -DWANT_NOEXAMPLES=$(usex !examples) - -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) - -DWANT_HEADERINSTALL=$(usex !minimal) - -DWANT_NOOSG=$(usex !osg) - -DWITH_PODOFO=$(usex pdf) - -DWANT_NOTEMPLATES=$(usex !templates) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts - else - rm "${ED}"/usr/share/scribus/scripts/*.py || die - fi - - mv "${ED}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en || die - - # These files are parsed to populate the help/about window. - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - - local size - for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild index 0793c811fb99..eebeed0651f5 100644 --- a/app-office/scribus/scribus-1.5.7.ebuild +++ b/app-office/scribus/scribus-1.5.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} |