commit: b43baa97e96998cc9eb5de95331381bb6cb1835a Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Dec 29 10:17:30 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Dec 29 10:17:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b43baa97
app-office/scribus: dropped obsolete 1.7.1_pre20250929 Bug: https://bugs.gentoo.org/967337 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> app-office/scribus/Manifest | 1 - ...scribus-1.7.1_pre20250929-poppler-25.10.0.patch | 111 --------------- .../scribus/scribus-1.7.1_pre20250929.ebuild | 158 --------------------- 3 files changed, 270 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 462c7be11461..45471b649cf8 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,3 +1,2 @@ DIST scribus-1.7.1.tar.xz 97905316 BLAKE2B b6c17982edb91e024f84433b06d31a9adab26be11d4899205be696db4e35bce64b60b528d19015ebe23bde1d9564802f7234861456245b13230c5c8271635835 SHA512 67e18af3c64a7f0fca9364bff53b54f68006b93e4b29c9f1b37ae7d9920a4659568ba7460519a64b4e60882d56ed2663e4cfb7b50fcfba7984bc9eac2bb6e96b -DIST scribus-1.7.1_pre20250929.tar.xz 73318868 BLAKE2B b6d6672ab0e9658f72f12b0601341239eb8e69b8123d6ee5bdf1fa934d4adb66e890d19f025809544e359029742dec60eb1fd88bba1e1ab69d6df321f96e39fc SHA512 deed0583d68a588442a3e9f00fbfa731007da502841403255e0398968bfc95eb6783cdb08c63add16013d79f51e94e7a927443cb45b10bd36a5ce4f540dbb7f9 DIST scribus-1.7.1_pre20251119.tar.xz 73390516 BLAKE2B de361f4669fbbebbc0d4550af7788e67a099a8f055b14d985573353890687ae7a64d17080e5c665d3ea2e390f4cc80b99203c159dde82811f70e3ba0c2132877 SHA512 3f9f8a0529416f3552ebf5246b75edb90bc705d18d09e7260e80bf3300c6eb1a5dbcd4e8aa5332ad2582dd9f63c9771eaf0cba60063b546b8b7a6fad28e809ef diff --git a/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch b/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch deleted file mode 100644 index 8abe7b029ede..000000000000 --- a/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch +++ /dev/null @@ -1,111 +0,0 @@ -Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 27039) -+++ Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 27042) -@@ -874,6 +874,44 @@ - - QString PdfPlug::UnicodeParsedString(const GooString *s1) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 10, 0) -+ if (!s1 || s1->size() == 0) -+ return QString(); -+ bool isUnicode; -+ int i; -+ Unicode u; -+ QString result; -+ if ((s1->getChar(0) & 0xff) == 0xfe && (s1->size() > 1 && (s1->getChar(1) & 0xff) == 0xff)) -+ { -+ isUnicode = true; -+ i = 2; -+ result.reserve((s1->size() - 2) / 2); -+ } -+ else -+ { -+ isUnicode = false; -+ i = 0; -+ result.reserve(s1->size()); -+ } -+ while (i < s1->size()) -+ { -+ if (isUnicode) -+ { -+ u = ((s1->getChar(i) & 0xff) << 8) | (s1->getChar(i + 1) & 0xff); -+ i += 2; -+ } -+ else -+ { -+ u = s1->getChar(i) & 0xff; -+ ++i; -+ } -+ // #15616: imagemagick may write unicode strings incorrectly in PDF -+ if (u == 0) -+ continue; -+ result += QChar(u); -+ } -+ return result; -+#else - if (!s1 || s1->getLength() == 0) - return QString(); - bool isUnicode; -@@ -910,6 +948,7 @@ - result += QChar( u ); - } - return result; -+#endif - } - - QString PdfPlug::UnicodeParsedString(const std::string& s1) -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27039) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27042) -@@ -3883,6 +3883,41 @@ - - QString SlaOutputDev::UnicodeParsedString(const GooString *s1) const - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 10, 0) -+ if (!s1 || s1->size() == 0) -+ return QString(); -+ bool isUnicode; -+ int i; -+ Unicode u; -+ QString result; -+ if ((s1->getChar(0) & 0xff) == 0xfe && (s1->size() > 1 && (s1->getChar(1) & 0xff) == 0xff)) -+ { -+ isUnicode = true; -+ i = 2; -+ result.reserve((s1->size() - 2) / 2); -+ } -+ else -+ { -+ isUnicode = false; -+ i = 0; -+ result.reserve(s1->size()); -+ } -+ while (i < s1->size()) -+ { -+ if (isUnicode) -+ { -+ u = ((s1->getChar(i) & 0xff) << 8) | (s1->getChar(i + 1) & 0xff); -+ i += 2; -+ } -+ else -+ { -+ u = s1->getChar(i) & 0xff; -+ ++i; -+ } -+ result += QChar(u); -+ } -+ return result; -+#else - if (!s1 || s1->getLength() == 0) - return QString(); - bool isUnicode; -@@ -3916,6 +3951,7 @@ - result += QChar( u ); - } - return result; -+#endif - } - - QString SlaOutputDev::UnicodeParsedString(const std::string& s1) const diff --git a/app-office/scribus/scribus-1.7.1_pre20250929.ebuild b/app-office/scribus/scribus-1.7.1_pre20250929.ebuild deleted file mode 100644 index f2e16d58e609..000000000000 --- a/app-office/scribus/scribus-1.7.1_pre20250929.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_{11..14} ) -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"; - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"; - S="${WORKDIR}/${PN^}" - else - SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"; - S="${WORKDIR}/${P}" - fi - KEYWORDS="amd64 ppc ppc64 x86" -fi - -LICENSE="GPL-2" -SLOT="$(ver_cut 1-2)" -IUSE="+boost debug examples graphicsmagick +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/hunspell:= - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - dev-libs/icu:0= - dev-libs/librevenge - dev-libs/libxml2:= - dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,network,opengl,X,xml,widgets] - dev-qt/qtsvg:6 - 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 - virtual/minizip:= - x11-libs/cairo[X,svg(+)] - x11-libs/libxcb - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - 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/qttools:6[linguist] - virtual/pkgconfig -" - -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-dont-install-qtadvanceddocking.patch # bugs 961290, 960017 - "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch - "${FILESDIR}"/${P}-poppler-25.10.0.patch # from trunk -) - -src_prepare() { - cmake_src_prepare - - # 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_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_7_0/scribus-icon.svg 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 -}
