4 files changed, 206 insertions, 0 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 49b0fbf9a856..7c91ffcdc616 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 66dff038ac58..24a80494fcf3 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,7 +3,10 @@ AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 AUX scribus-1.5.8-cmake.patch 1023 BLAKE2B 684765783eda135aa9f1d687aafe6e591f94e5d6bd8fb714a815c3bd5474dd30e075a82eb53fb0492466e201a49e2c72c83627c206d2c6dbc33f5d6f22e708fc SHA512 747d5159b9b9c3d74c0c209e9ce6e00bd929d9d6891c7913ed03904b73e5fa25d811cdc365730d8df06c1ee156ae2dbf671ebda6ecfdf48171bbbafb3d15a356
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
+AUX scribus-1.5.8-python-3.12.patch 1668 BLAKE2B 56561c71f3892bae15d2e60ddda1dddf5e3d29002e94171769919baab87704646c4c1ecbf09e4a5993dd21bbec71b4811ca8d0a0701ce7c843d6ac3e224c3bf4 SHA512 dbf1e9d75ac4b7c00b568b1cbfa7b31236c7de7a97fc3cf39a21afef6d164b3842ce76f874a9f40f5f41939546e7852e9d16735f89b2662dfa618c412fb052cd
 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
 EBUILD scribus-1.5.8-r5.ebuild 4299 BLAKE2B 981f8e02836e922df9c15953d4ea1ae9167d08f48c0f1a41d502e9ab160308177b3149a465855add49eb06a2c6a8274e0dd3d6aaa8977f26cdc8f52a558969c5 SHA512 c7c118f984d00ae5d7e09809e05a8f64a8dae7a3cde1b37454cc6ebdddb43fc1dfbb6030f919918db5bd552866510eefd01d50846d6cc082ada823c4f32bafc7
+EBUILD scribus-1.5.8-r6.ebuild 4446 BLAKE2B b66ff8c08b13234193fb9357a42d8d42240f9718f157da4ee7d49919e17f95efcf3988903c2e98327b10513b74957a42e2ef1291945536b145a8d44edd3f91a3 SHA512 b87c19f9e3f66d985c42154983d30afc030d2f4f223e7eb456407e5efd124b690f121730eba737d6f712ecda5f4ce10b87eabc0cd3c359ffc4244844415b98b6
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
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
new file mode 100644
index 000000000000..ba30cb3eb467
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
@@ -0,0 +1,32 @@
+Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix
+https://bugzilla.redhat.com/show_bug.cgi?id=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		2022-01-23 17:16:04.000000000 +0100
++++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12	2023-06-17 23:59:35.497937156 +0200
+@@ -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
new file mode 100644
index 000000000000..d5391b38535f
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -0,0 +1,171 @@
+# 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
+}