commit: 7f33d9ac7c2c340f09fa6aaf10aafdc4678e1d33
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 17:22:39 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 18:56:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f33d9ac
app-office/scribus: drop 1.6.3-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/scribus/Manifest | 1 -
.../files/scribus-1.6.3-poppler-25.02.0.patch | 180 ---------------------
app-office/scribus/scribus-1.6.3-r1.ebuild | 158 ------------------
3 files changed, 339 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 70f2197edda5..164d8b867087 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,2 @@
-DIST scribus-1.6.3.tar.xz 74909384 BLAKE2B
b208270fce3e013692e90ec354849f99440efc97bda0e15c0baea16a5fd039b7435498c4d2669bd5c3caaca9c7d1125f78ea6fde483bf81449a451f9f54bf26d
SHA512
b408ed862285d06d0f79a646ac2b43b0eb0b241c23dc276544e94a72e4fc3a0bf4efd500c5893c295886b11490115cdbe5f34ce7de51da30d31099831ba25d87
DIST scribus-1.6.4.tar.xz 74761856 BLAKE2B
2fcccc479404b65b0333711a9bd44b5805e25385b23f82544fab749837ace0d0a2dd833c6221c083b8140440f844dc3ae58a41e62af99a455768ab43d3641698
SHA512
32ad85def7fa7ae39aaabb363a77f0e1cbc209d3c13caad059e5386a889ba36ba92fe3454e5867a8914bb392fce8c1a3429d78665bfb29e7e7cf7cc5f66c7d92
DIST scribus-1.7.0.tar.xz 97163704 BLAKE2B
02c57ce21d0f48d2e6906d8056fa766ddbdae88d6ac4c758996ba59776243d308ffd34d6c1e5dc5b3f2e2042f6760f0188efa9ef3b16f2b38ff54dc4bc7e2bef
SHA512
c3a392d69e109165a9c28c2396e0e2e18df2d232099a6836f6a472fc3f899f50316e2b9227be40c3226dffc9f84e9db94dc2f353052fa06b35c776cd4f664448
diff --git a/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch
b/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch
deleted file mode 100644
index 8b69d257ccee..000000000000
--- a/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- Scribus/scribus/plugins/import/pdf/importpdf.cpp
-+++ Scribus/scribus/plugins/import/pdf/importpdf.cpp
-@@ -462,11 +462,11 @@
-
- if (dev->isOk())
- {
-- OCGs* ocg = pdfDoc->getOptContentConfig();
-+ POPPLER_CONST_25_02 OCGs* ocg =
pdfDoc->getOptContentConfig();
- if (ocg && ocg->hasOCGs())
- {
- QStringList ocgNames;
-- Array *order = ocg->getOrderArray();
-+ POPPLER_CONST_25_02 Array *order =
ocg->getOrderArray();
- if (order)
- {
- for (int i = 0; i <
order->getLength (); ++i)
---- Scribus/scribus/plugins/import/pdf/importpdfconfig.h
-+++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -27,4 +27,10 @@
- #define POPPLER_CONST_083
- #endif
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+#define POPPLER_CONST_25_02 const
-+#else
-+#define POPPLER_CONST_25_02
- #endif
-+
-+#endif
---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp
-+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -1685,7 +1685,7 @@
-
- auto& graphicState = m_graphicStack.top();
- graphicState.strokeColor = getColor(state->getStrokeColorSpace(),
state->getStrokeColor(), &graphicState.strokeShade);
--
-+
- QString output = convertPath(state->getPath());
- if ((m_Elements->count() != 0) && (output == m_coords))
// Path is the same as in last fill
- {
-@@ -2393,8 +2393,9 @@
- #endif
- m_graphicStack.top().clipPath = savedClip;
- m_inPattern--;
-+ m_doc->m_Selection->clear();
-+
- gElements = m_groupStack.pop();
-- m_doc->m_Selection->clear();
- if (gElements.Items.count() > 0)
- {
- for (int dre = 0; dre < gElements.Items.count(); ++dre)
-@@ -2932,7 +2933,7 @@
- {
- if (dictRef->isNull())
- return;
-- OCGs *contentConfig = m_catalog->getOptContentConfig();
-+ POPPLER_CONST_25_02 OCGs *contentConfig =
m_catalog->getOptContentConfig();
- OptionalContentGroup *oc;
- if (dictRef->isRef())
- {
-@@ -3084,7 +3085,11 @@
- #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0)
- int tmpBufLen = 0;
- #endif
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ std::vector<int> codeToGID;
-+#else
- int *codeToGID = nullptr;
-+#endif
- const double *textMat = nullptr;
- double m11, m12, m21, m22, fontSize;
- SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 };
-@@ -3244,10 +3249,20 @@
- }
- else
- {
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ codeToGID.clear();
-+#else
- codeToGID = nullptr;
-+#endif
- n = 0;
- }
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ if (!(fontFile =
m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID),
fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() :
"(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
- if (!(fontFile =
m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n,
fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() :
"(unnamed)");
-@@ -3278,6 +3293,18 @@
- #endif
- break;
- case fontCIDType0COT:
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)
-+ {
-+ codeToGID = ((GfxCIDFont*)
gfxFont)->getCIDToGID();
-+ n = codeToGID.size();
-+ }
-+ else
-+ {
-+ codeToGID.clear();
-+ n = 0;
-+ }
-+#else
- if (((GfxCIDFont *) gfxFont)->getCIDToGID())
- {
- n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen();
-@@ -3289,7 +3316,15 @@
- codeToGID = nullptr;
- n = 0;
- }
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#endif
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ if (!(fontFile =
m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID),
fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'",
-+ gfxFont->getName() ?
gfxFont->getName()->c_str() : "(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
- if (!(fontFile =
m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n,
fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'",
-@@ -3307,6 +3342,15 @@
- break;
- case fontCIDType2:
- case fontCIDType2OT:
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ codeToGID.clear();
-+ n = 0;
-+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)
-+ {
-+ codeToGID = ((GfxCIDFont*)
gfxFont)->getCIDToGID();
-+ n = codeToGID.size();
-+ }
-+#else
- codeToGID = nullptr;
- n = 0;
- if (((GfxCIDFont *) gfxFont)->getCIDToGID())
-@@ -3318,6 +3362,7 @@
- memcpy(codeToGID, ((GfxCIDFont
*)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID));
- }
- }
-+#endif
- else
- {
- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-@@ -3338,7 +3383,9 @@
- #endif
- if (! ff)
- goto err2;
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ codeToGID = ((GfxCIDFont*)
gfxFont)->getCodeToGIDMap(ff.get());
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
- codeToGID = ((GfxCIDFont*)
gfxFont)->getCodeToGIDMap(ff.get(), &n);
- ff.reset();
- #else
-@@ -3346,7 +3393,13 @@
- delete ff;
- #endif
- }
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+ if (!(fontFile =
m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID),
fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() :
"(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
- if (!(fontFile =
m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n,
fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a
font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() :
"(unnamed)");
diff --git a/app-office/scribus/scribus-1.6.3-r1.ebuild
b/app-office/scribus/scribus-1.6.3-r1.ebuild
deleted file mode 100644
index e114ff70ed41..000000000000
--- a/app-office/scribus/scribus-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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/";
-
-if [[ "${PV}" == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/scribusproject/scribus";
- EGIT_BRANCH="Version16x"
- inherit git-r3
-else
-
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz";
- S="${WORKDIR}/${P}"
- KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-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,X]
- 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=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:=
- net-print/cups
- sys-libs/zlib[minizip]
- 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_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
- "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
- "${FILESDIR}"/${P}-poppler-25.02.0.patch # Version16x branch
-)
-
-src_prepare() {
- cmake_src_prepare
- cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
-
- # for safety remove files that we patched out
- rm -r scribus/third_party/hyphen || die
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local mycmakeargs=(
- -DTAG_VERSION="-${SLOT}"
- -DHAVE_PYTHON=ON
- -DWANT_DISTROBUILD=ON
- -DWANT_CPP17=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-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
- fi
- if use scripts; then
- python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
- python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
- else
- rm "${ED}"/usr/share/scribus-${SLOT}/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-${SLOT}.png
- done
- newicon -s 64 resources/iconsets/artwork/[email protected]
scribus-${SLOT}.png
- newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
- newmenu scribus.desktop scribus-${SLOT}.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "MS Word .doc file import filter support" app-text/antiword
-}
