summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-12-07 10:37:41 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-12-07 10:37:41 +0100
commit3a4906fa477b18df55a7671d825265e337c0ca6d (patch)
tree5ebaea5a68f8f7a75fecede1cffab75821d1eaa0 /app-office/scribus
parentdev-ml/llvm-ocaml: Remove outdated blocker (diff)
downloadgentoo-3a4906fa477b18df55a7671d825265e337c0ca6d.tar.gz
gentoo-3a4906fa477b18df55a7671d825265e337c0ca6d.tar.bz2
gentoo-3a4906fa477b18df55a7671d825265e337c0ca6d.zip
app-office/scribus: Drop 1.5.5_pre20190429
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest1
-rw-r--r--app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch59
-rw-r--r--app-office/scribus/scribus-1.5.5_pre20190429.ebuild230
3 files changed, 0 insertions, 290 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index bc1bb961c1a7..e8d12ffa74f8 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
deleted file mode 100644
index d62db93663ef..000000000000
--- a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 2 May 2019 00:08:12 +0200
-Subject: [PATCH] Fix build with poppler-0.76
-
-findPage(int num, int gen) -> findPage(const Ref ref)
-
-https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
----
- scribus/plugins/import/pdf/slaoutput.cpp | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index fe9794a65..b25082de6 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- {
- if (dstn->isPageRef())
- {
-- Ref dstr = dstn->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dstn->getPageRef());
- }
- else
- pagNum = dstn->getPageNum();
-@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- {
- if (dstn->isPageRef())
- {
-- Ref dstr = dstn->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dstn->getPageRef());
- }
- else
- pagNum = dstn->getPageNum();
---
-2.21.0
-
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
deleted file mode 100644
index 1926b62bb623..000000000000
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=a6cf8dce47922ebe3fca131316236e3aa7ca2d9b
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-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
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
- 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.9.42:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.62:= )
- 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}
- app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.3-docdir.patch
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
-)
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
- rm -r codegen/cheetah || die
- cat > cmake/modules/FindZLIB.cmake <<- EOF || die
- find_package(PkgConfig)
- pkg_check_modules(ZLIB minizip zlib)
- SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
- 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" \
- -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
-
- has_version ">=app-text/poppler-0.76.0" && PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
-
- 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)"
- -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)"
- )
- cmake-utils_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
- rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
- fi
-
- use scripts && \
- python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
- python_optimize "${ED%/}"/usr/share/scribus/scripts
-
- mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
- ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
- 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
- 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
-}