commit: 568af5f6f6f200ae9539ceec7cdddaad3015723d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 09:30:31 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 09:30:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568af5f6
app-office/scribus: bump to 1.6.0 + introduced slotting + scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
app-office/scribus/Manifest | 1 +
app-office/scribus/files/scribus-1.5.3-fpic.patch | 2 -
.../scribus/files/scribus-1.5.6-docdir.patch | 2 -
.../scribus/files/scribus-1.5.6-findhyphen.patch | 4 +-
app-office/scribus/files/scribus-1.5.8-cmake.patch | 4 +-
.../scribus/files/scribus-1.5.8-findhyphen-1.patch | 4 -
.../scribus/files/scribus-1.5.8-python-3.12.patch | 6 +-
.../scribus/files/scribus-1.6.0-fix-desktop.patch | 20 +++
app-office/scribus/scribus-1.6.0.ebuild | 165 +++++++++++++++++++++
9 files changed, 193 insertions(+), 15 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 5bb7b3812a2a..a5618a8e6015 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
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.0.tar.xz 73267436 BLAKE2B
a855820c7c4b63339fb8a1e15764425b95655e20fe26857ebbc730d816d229441a639ca46f5be803e8599131495e698f1ff7d61b3b08dd42a303653dcdbdfc9d
SHA512
bb64b628dda07acdd29b7bbcb765b4f22abbfa175df68f1f046041f840800549be04ada6cf3f24ea4bf0c61b38a1ad503c482d4d47b1f2a3a6885f7c963adef8
diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch
b/app-office/scribus/files/scribus-1.5.3-fpic.patch
index ba0721955ef8..bb4378e5effa 100644
--- a/app-office/scribus/files/scribus-1.5.3-fpic.patch
+++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch
@@ -1,8 +1,6 @@
scribus/third_party/prc/CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/scribus/third_party/prc/CMakeLists.txt
b/scribus/third_party/prc/CMakeLists.txt
-index 5f7c2c6..1da7177 100644
--- a/scribus/third_party/prc/CMakeLists.txt
+++ b/scribus/third_party/prc/CMakeLists.txt
@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch
b/app-office/scribus/files/scribus-1.5.6-docdir.patch
index 957991c2acc4..06d878af55fd 100644
--- a/app-office/scribus/files/scribus-1.5.6-docdir.patch
+++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake
-index db6133f..faf85ce 100644
--- a/CMakeLists_Directories.cmake
+++ b/CMakeLists_Directories.cmake
@@ -36,14 +36,16 @@ else()
diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
index 3123ce4477c9..d8e2400ea1f4 100644
--- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
+++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists_Dependencies.cmake 2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists_Dependencies.cmake 2019-10-02 00:17:34.968355656 +0200
+--- a/CMakeLists_Dependencies.cmake
++++ b/CMakeLists_Dependencies.cmake
@@ -954,6 +954,16 @@
endif()
#>>HUNSPELL for Speelling support
diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch
b/app-office/scribus/files/scribus-1.5.8-cmake.patch
index a461ee20c281..6ddd76912dbe 100644
--- a/app-office/scribus/files/scribus-1.5.8-cmake.patch
+++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists.txt 2022-01-23 17:14:43.000000000 +0100
-+++ b/CMakeLists.txt 2023-02-05 15:59:57.828047452 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -362,25 +362,6 @@
if(APPLE)
### Include our Apple configure commands
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
index 39a11b0ee4a9..e199c488c020 100644
--- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
+++ b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
@@ -1,5 +1,3 @@
-diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
-index aec69d3..9451404 100644
--- a/scribus/CMakeLists.txt
+++ b/scribus/CMakeLists.txt
@@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES
@@ -39,8 +37,6 @@ index aec69d3..9451404 100644
if(WIN32)
set_target_properties(${EXE_NAME}
PROPERTIES
-diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h
-index 7fa4abd..2863c70 100644
--- a/scribus/hyphenator.h
+++ b/scribus/hyphenator.h
@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
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
index ba30cb3eb467..0e13892c7e26 100644
--- 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
@@ -1,9 +1,9 @@
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'
+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
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
+--- 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))
diff --git a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
new file mode 100644
index 000000000000..ad4d88818295
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
@@ -0,0 +1,20 @@
+--- a/scribus.desktop.in
++++ b/scribus.desktop.in
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Type=Application
+-Name=Scribus
+-Name[ar]=سكريبس
+-Name[fa]=اسکریباس
+-Name[lo]=ສະຄຣີບັດສ໌
+-Name[ru]=Scribus
+-Name[ta]=ஸ்கிரிபஸ்
++Name=Scribus@TAG_VERSION@
++Name[ar]=سكريبس@TAG_VERSION@
++Name[fa]=اسکریباس@TAG_VERSION@
++Name[lo]=ສະຄຣີບັດສ໌@TAG_VERSION@
++Name[ru]=Scribus@TAG_VERSION@
++Name[ta]=ஸ்கிரிபஸ்@TAG_VERSION@
+ Comment=Page Layout and Publication
+ Comment[ar]=سكريبس
+ Comment[fa]=اسکریباس
diff --git a/app-office/scribus/scribus-1.6.0.ebuild
b/app-office/scribus/scribus-1.6.0.ebuild
new file mode 100644
index 000000000000..5b5fb9de4298
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+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
+ "${FILESDIR}"/${PN}-1.6.0-fix-desktop.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -r 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=(
+ -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
+}
