diff options
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r-- | media-gfx/inkscape/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch | 34 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 178 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.4.ebuild | 3 |
4 files changed, 3 insertions, 218 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 633b8346547f..34db3a93bc5f 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -4,11 +4,7 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 -AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698 -DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa -DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 -EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9 -EBUILD inkscape-0.92.4.ebuild 3664 BLAKE2B 71b85c0baccac8ab4253f693d6378dd81c3f20b27da87374df8e8bad81cf9eff8f94ecce5571748cb2a29e2c156b3287b547bb46a24ebc40cb3f595b34ddcade SHA512 eea1b821ec3c5bb766465d6c97615c17692dd0a18d52a3f3fc7e3ab087230e39c1708ba17d4f84e5c447f8f78b02d54aaa04b5c0ef48773c1d9bf03cce2a545f +EBUILD inkscape-0.92.4.ebuild 3705 BLAKE2B 5a68cfa5f3e7c9aa88fdd838d09ce1cf50c5a36942b3bd11a31327727118b9bd4b765a9aecf8f4c2aad15f1359c2c6bcf7a11b9c1044f84424d166db7b262b72 SHA512 0085ceac1b06eddeb5b42b38290ec4d6c5dde0137ff21d8a764343520cb5ec61729b9425f6bc32be72cc3c5034edbd29a1e0d218379ec354636858dd3f9da0c5 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch deleted file mode 100644 index d00c23d8addc..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Fri, 18 May 2018 07:55:38 +0200 -Subject: [PATCH] Use pkg-config to find freetype - -As of freetype-2.9.1 the freetype-config file no longer gets installed -by default. ---- - configure.ac | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 12a081612b..1b75e23670 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [ - [#include <malloc.h>]) - ]) - --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --if test "x$FREETYPE_CONFIG" = "xno"; then -- AC_MSG_ERROR([Cannot find freetype-config]) --fi --FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` --FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` -+PKG_CHECK_MODULES(FREETYPE, freetype2,, -+ AC_MSG_ERROR([Cannot find freetype]) -+) - AC_SUBST(FREETYPE_CFLAGS) - AC_SUBST(FREETYPE_LIBS) - --- -2.17.0 - diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild deleted file mode 100644 index 7e552f52df9d..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild +++ /dev/null @@ -1,178 +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="xml" -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2 - https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches-1.tar.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - dev-python/lxml[${PYTHON_USEDEP}] - media-gfx/potrace - media-gfx/scour[${PYTHON_USEDEP}] - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( media-gfx/imagemagick:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libvisio - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] - media-gfx/uniconvertor - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.64.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.65.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.64-2.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.69.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.71.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.72.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild index f0122c56aa5f..08369700fb96 100644 --- a/media-gfx/inkscape/inkscape-0.92.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" IUSE+=" lcms nls spell static-libs visio wpg" @@ -148,6 +148,7 @@ src_configure() { } src_compile() { + emake -C src helper/sp-marshal.h #686304 emake AR="$(tc-getAR)" } |