[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     badb43a76d2ba1cc0e1fdd33b076c4d0161fdf1c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 10:27:51 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 10:29:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badb43a7

app-office/scribus: dropped obsolete 1.5.8-r6

Bug: https://bugs.gentoo.org/925325
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest                        |   3 -
 .../scribus/files/scribus-1.5.6-docdir.patch       |  27 ----
 .../scribus/files/scribus-1.5.6-findhyphen.patch   |  19 ---
 .../scribus/files/scribus-1.5.8-findhyphen-1.patch |  50 ------
 .../scribus/files/scribus-1.5.8-python-3.12.patch  |  32 ----
 app-office/scribus/scribus-1.5.8-r6.ebuild         | 171 ---------------------
 6 files changed, 302 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 8980478a95bb..0ffc05a70363 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1 @@
-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.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e

diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch
deleted file mode 100644
index 06d878af55fd..000000000000
--- a/app-office/scribus/files/scribus-1.5.6-docdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
deleted file mode 100644
index d8e2400ea1f4..000000000000
--- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists_Dependencies.cmake
-+++ b/CMakeLists_Dependencies.cmake
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
- 
-+#<<HYPHEN for Hyphenation support
-+find_package(HYPHEN)
-+if(HYPHEN_FOUND)
-+	message("System Hyphen Found OK")
-+	set(HAVE_HYPHEN ON)
-+else()
-+	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
-+endif()
-+#>>HYPHEN for Hyphenation support
-+
- #<<PoDoFo for AI PDF import
- option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
- if (WITH_PODOFO)

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
deleted file mode 100644
index e199c488c020..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/scribus/CMakeLists.txt
-+++ b/scribus/CMakeLists.txt
-@@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES
- 	${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}
-@@ -678,12 +680,6 @@ if(HAVE_PODOFO)
- 
- endif()
- 
--if(HAVE_HYPHEN)
--	target_link_libraries(${EXE_NAME} PRIVATE
--	${HYPHEN_LIBRARY}
--	)
--endif()
--
- 
- if(GESTURE_FRAME_PREVIEW)
- 	 message(STATUS "Enable gesture frame preview [experimental]")
-@@ -743,6 +739,12 @@ if(WANT_PCH)
- 	target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h)
- endif()
- 
-+if(HAVE_HYPHEN)
-+	target_link_libraries(${EXE_NAME} PRIVATE
-+	${HYPHEN_LIBRARY}
-+	)
-+endif()
-+
- if(WIN32)
- 	set_target_properties(${EXE_NAME}
- 		PROPERTIES
---- a/scribus/hyphenator.h
-+++ b/scribus/hyphenator.h
-@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
- #include <QSet>
- 
- #include "scribusapi.h"
--#include "third_party/hyphen/hyphen.h"
-+#include <hyphen.h>
- 
- class ScribusDoc;
- class ScribusMainWindow;

diff --git a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
deleted file mode 100644
index 0e13892c7e26..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix
-https://bugzilla.redhat.com/2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE'
-was not declared in this scope.
-
---- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
-+++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12
-@@ -409,10 +409,8 @@
- 			success = obj->setProperty(propertyName, QString::fromUtf8(PyBytes_AsString(objValue)));
- 		else if (PyUnicode_Check(objValue))
- 		{
--			// Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted
--			const unsigned short * ucs2Data = (const unsigned short *) PyUnicode_AS_UNICODE(objValue);
--			// and make a new QString from it (the string is copied)
--			success = obj->setProperty(propertyName, QString::fromUtf16(ucs2Data));
-+			QString qStrValue = PyUnicode_asQString(objValue);
-+			success = obj->setProperty(propertyName, qStrValue);
- 		}
- 		else
- 			matched = false;
-@@ -429,10 +427,8 @@
- 		}
- 		else if (PyUnicode_Check(objValue))
- 		{
--			// Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted
--			const unsigned short * utf16Data = (const unsigned short *)PyUnicode_AS_UNICODE(objValue);
--			// and make a new QString from it (the string is copied)
--			success = obj->setProperty(propertyName, QString::fromUtf16(utf16Data).toLatin1());
-+			QString qStrValue = PyUnicode_asQString(objValue);
-+			success = obj->setProperty(propertyName, qStrValue.toLatin1());
- 		}
- 		else
- 			matched = false;

diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild
deleted file mode 100644
index 9dd9b956b095..000000000000
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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..12} )
-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
-https://dev.gentoo.org/~asturm/distfiles/${P}-podofo-0.10.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=
-	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=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-
-	# git master; # bug 834537, 843287, 893158
-	"${WORKDIR}"/${PATCHSET}
-	"${WORKDIR}"/${P}-podofo-0.10 # 914493
-	"${FILESDIR}"/${P}-python-3.12.patch
-)
-
-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
-		-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/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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "MS Word .doc file import filter support" app-text/antiword
-}