From f720773f7aa3c2da8bf8b28b5080e84857c7525f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 8 Nov 2019 21:11:10 +0100 Subject: [PATCH] app-office/scribus: Sync 9999 with most recent 1.5.5 changes Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- ...patch => scribus-1.5.5-findhyphen-1.patch} | 19 --- .../files/scribus-1.5.5-findhyphen-2.patch | 19 +++ .../files/scribus-1.5.6-findhyphen.patch | 19 +++ app-office/scribus/scribus-1.5.5.ebuild | 2 +- app-office/scribus/scribus-9999.ebuild | 144 +++++------------- 5 files changed, 77 insertions(+), 126 deletions(-) rename app-office/scribus/files/{scribus-1.5.5-findhyphen.patch => scribus-1.5.5-findhyphen-1.patch} (66%) create mode 100644 app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch create mode 100644 app-office/scribus/files/scribus-1.5.6-findhyphen.patch diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch similarity index 66% rename from app-office/scribus/files/scribus-1.5.5-findhyphen.patch rename to app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch index 13c168c51f50..98682d60f700 100644 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch +++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch @@ -1,22 +1,3 @@ ---- a/CMakeLists.txt 2019-07-31 00:34:43.000000000 +0200 -+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<>HYPHEN for Hyphenation support -+ - #<>HUNSPELL for Speelling support + ++#<>HYPHEN for Hyphenation support ++ + #<>HUNSPELL for Speelling support + ++#<>HYPHEN for Hyphenation support ++ + #<=x11-libs/cairo-1.10.0[X,svg] - boost? ( >=dev-libs/boost-1.62:= ) + boost? ( >=dev-libs/boost-1.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} app-text/ghostscript-gpl " -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" PATCHES=( - "${FILESDIR}"/${PN}-1.5.6-docdir.patch + # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch + "${FILESDIR}"/${PN}-1.5.6-docdir.patch + "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch + "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch ) src_prepare() { - rm -r codegen/cheetah || die + cmake-utils_src_prepare + + rm -r codegen/cheetah scribus/third_party/hyphen || die + cat > cmake/modules/FindZLIB.cmake <<- EOF || die find_package(PkgConfig) pkg_check_modules(ZLIB minizip zlib) @@ -107,7 +88,6 @@ src_prepare() { SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) EOF - sed \ -e "/^\s*unzip\.[ch]/d" \ -e "/^\s*ioapi\.[ch]/d" \ @@ -121,54 +101,27 @@ src_prepare() { sed \ -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test - - cmake-utils_src_prepare } src_configure() { # bug #550818 append-cppflags -DHAVE_MEMRCHR - local _lang lang langs - for _lang in ${IUSE_L10N}; do - lang=$(map_lang ${_lang}) - if use l10n_${lang}; then - # From the CMakeLists.txt - # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" - langs+=";${_lang}" - else - # Don't install localized documentation - sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_${_lang}.txt \ - ./resources/dicts/README_hyph_${_lang}.txt \ - ./resources/dicts/hyph_${_lang}.dic \ - ./resources/loremipsum/${_lang}.xml - fi - sed -e "/en_EN/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_en_EN.txt \ - ./resources/dicts/README_hyph_en_EN.txt \ - ./resources/dicts/hyph_en_EN.dic \ - ./resources/loremipsum/en_EN.xml - done - local mycmakeargs=( -DHAVE_PYTHON=ON - -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_PATH=$(python_get_includedir) + -DPYTHON_LIBRARY=$(python_get_library_path) -DWANT_DISTROBUILD=ON - -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/" - -DWANT_GUI_LANG="${langs#;};en" - -DWITH_PODOFO="$(usex pdf)" - -DWITH_BOOST="$(usex boost)" - -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)" - -DWANT_NOOSG="$(usex !osg)" - -DWANT_DEBUG="$(usex debug)" - -DWANT_HEADERINSTALL="$(usex !minimal)" - -DWANT_HUNSPELL="$(usex hunspell)" - -DWANT_NOEXAMPLES="$(usex !examples)" - -DWANT_NOTEMPLATES="$(usex !templates)" + -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ + -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-utils_src_configure } @@ -176,53 +129,32 @@ src_configure() { src_install() { cmake-utils_src_install - local lang _lang - # en_EN can be deleted always - for _lang in ${IUSE_L10N}; do - lang=$(map_lang ${_lang}) - if ! use l10n_${lang}; then - safe_delete "${ED}"/usr/share/man/${_lang} - fi - done - - if ! use scripts; then - rm "${ED}"/usr/share/scribus/scripts/*.py || die - elif ! use tk; then + if ! use tk; then rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die fi - - use scripts && \ - python_fix_shebang "${ED}"/usr/share/scribus/scripts && \ + 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; do + 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 } - -safe_delete () { - local x - for x in ${@}; do - if [[ -d "${x}" ]]; then - ebegin "Deleting ${x} recursively" - rm -r "${x}" || die - eend $? - elif [[ -f "${x}" ]]; then - ebegin "Deleting ${x}" - rm "${x}" || die - eend $? - fi - done -} -- 2.26.2