commit: f720773f7aa3c2da8bf8b28b5080e84857c7525f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 8 20:11:10 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 8 20:13:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f720773f
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 <asturm <AT> gentoo.org> ...phen.patch => scribus-1.5.5-findhyphen-1.patch} | 19 --- .../scribus/files/scribus-1.5.5-findhyphen-2.patch | 19 +++ .../scribus/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(-) 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 13c168c51f5..98682d60f70 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 -+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) --- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 +++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 @@ -1069,7 +1069,9 @@ diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch new file mode 100644 index 00000000000..a8993ca6387 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch @@ -0,0 +1,19 @@ +--- 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 ++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.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch new file mode 100644 index 00000000000..3123ce4477c --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists_Dependencies.cmake 2019-07-31 00:34:43.000000000 +0200 ++++ b/CMakeLists_Dependencies.cmake 2019-10-02 00:17:34.968355656 +0200 +@@ -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/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild index 3cfe057c2ad..65a2d33765b 100644 --- a/app-office/scribus/scribus-1.5.5.ebuild +++ b/app-office/scribus/scribus-1.5.5.ebuild @@ -72,7 +72,7 @@ PATCHES=( # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${P}-docdir.patch - "${FILESDIR}"/${P}-findhyphen.patch + "${FILESDIR}"/${P}-findhyphen-{1,2}.patch ) src_prepare() { diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 27fa3c1b8ce..ac7b913c7f8 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -5,8 +5,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE="tk?" -CMAKE_MAKEFILE_GENERATOR=ninja - inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg DESCRIPTION="Desktop publishing (DTP) and layout program" @@ -18,37 +16,18 @@ ESVN_PROJECT=Scribus-1.5 LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" - -#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a -# Keep this sorted, otherwise eliminating of duplicates below won't work -IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*) ;; - # Consider all other xx_XX as duplicates of the generic xx tag - *_*) lang=${1%%_*} ;; - esac - echo ${lang} -} - -prev_l= -for l in ${IUSE_L10N}; do - l=$(map_lang ${l}) - [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" - prev_l=${l} -done -unset l prev_l +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 -COMMON_DEPEND="${PYTHON_DEPS} +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND="${PYTHON_DEPS} app-text/libmspub app-text/libqxp app-text/poppler:= @@ -78,28 +57,30 @@ COMMON_DEPEND="${PYTHON_DEPS} sys-libs/zlib[minizip] virtual/jpeg:0= >=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_32...@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 -}