diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 9e895ffcc646f..8661c8e5585b9 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.6.4.tar.xz 74761856 BLAKE2B 2fcccc479404b65b0333711a9bd44b5805e25385b23f82544fab749837ace0d0a2dd833c6221c083b8140440f844dc3ae58a41e62af99a455768ab43d3641698 SHA512 32ad85def7fa7ae39aaabb363a77f0e1cbc209d3c13caad059e5386a889ba36ba92fe3454e5867a8914bb392fce8c1a3429d78665bfb29e7e7cf7cc5f66c7d92 DIST scribus-1.7.1_pre20250929.tar.xz 73318868 BLAKE2B b6d6672ab0e9658f72f12b0601341239eb8e69b8123d6ee5bdf1fa934d4adb66e890d19f025809544e359029742dec60eb1fd88bba1e1ab69d6df321f96e39fc SHA512 deed0583d68a588442a3e9f00fbfa731007da502841403255e0398968bfc95eb6783cdb08c63add16013d79f51e94e7a927443cb45b10bd36a5ce4f540dbb7f9 diff --git a/app-office/scribus/files/scribus-1.6.1-findhyphen.patch b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch deleted file mode 100644 index cc6e5db58a246..0000000000000 --- a/app-office/scribus/files/scribus-1.6.1-findhyphen.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- 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/files/scribus-1.6.4-poppler-25.06.0.patch b/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch deleted file mode 100644 index 7078faeec4989..0000000000000 --- a/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp -@@ -606,7 +606,12 @@ - FormWidget *fm = m_formWidgets->getWidget(i); - if (!fm) - continue; -- AnnotWidget *ano = fm->getWidgetAnnotation(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) -+ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); -+ AnnotWidget* ano = anoSharedPtr.get(); -+#else -+ AnnotWidget* ano = fm->getWidgetAnnotation(); -+#endif - if (!ano) - continue; - if (ano != (AnnotWidget*) annota) diff --git a/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch b/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch deleted file mode 100644 index 4f8c1be3fcec0..0000000000000 --- a/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26939) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26940) -@@ -3091,10 +3091,15 @@ - break; - case fontTrueType: - case fontTrueTypeOT: --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) - if (!fileName.empty()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else -+ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); -+ else - ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); - #else - if (!fileName.empty()) -@@ -3226,10 +3231,15 @@ - #endif - else - { --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) - if (!fileName.empty()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else -+ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); -+ else - ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); - #else - if (!fileName.empty()) diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 77e1cdcae5e09..040db62a44dc4 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -7,7 +7,6 @@ Enable support for Boost based enhancement - Enable support for spell checking with app-text/hunspell Don't install headers (only required for e.g. plug-in developers) 3D rendering via dev-games/openscenegraph Install the scripts diff --git a/app-office/scribus/scribus-1.6.4-r1.ebuild b/app-office/scribus/scribus-1.6.4-r1.ebuild deleted file mode 100644 index 5a56aab5d72c9..0000000000000 --- a/app-office/scribus/scribus-1.6.4-r1.ebuild +++ /dev/null @@ -1,159 +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.06.0.patch # 1.6 branch, in 1.6.5 - "${FILESDIR}"/${PN}-1.7.0-poppler-25.07.0.patch # from trunk -) - -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/icon_32x32@2x.png 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 -} diff --git a/app-office/scribus/scribus-1.6.9999.ebuild b/app-office/scribus/scribus-1.6.9999.ebuild deleted file mode 100644 index d4671eca1255b..0000000000000 --- a/app-office/scribus/scribus-1.6.9999.ebuild +++ /dev/null @@ -1,157 +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 -) - -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/icon_32x32@2x.png 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 -}