diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
tree | 620cbf137661399a3fb1eff92914204f9a970713 /media-gfx/inkscape | |
parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) |
gentoo resync : 25.09.2021
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r-- | media-gfx/inkscape/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-1.1.ebuild | 164 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-9999.ebuild | 24 |
3 files changed, 183 insertions, 10 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index c8e680bd1e2a..bff735126361 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,5 +1,8 @@ AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d +DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668 +DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80 EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd -EBUILD inkscape-9999.ebuild 4048 BLAKE2B 312994fd1988b8f14f681d8b8f68ad89d7a8787b8aa2a89cf746fb6dd06c8861d11609ea5c7d90991d2f1d9a9a548dd4db75ad11a69157eeed6d0cf7b3ee697f SHA512 95f72b8aa4d20a6c4b58741b36bea22f8b7cccd40380fa536849580f17c9463fe1e0bfe4e64ea8289716b3c226d5dc665e888e9caca6200f35278785224a01d5 +EBUILD inkscape-1.1.ebuild 4300 BLAKE2B 77b5e57c53d9801e3f999e469909e0088552c365d60fed0cf8db0c95cddb9d3912d2da1998f6a139e7284fbd08585bf4ec5c7729b6ed968c13f0f38fa152fb52 SHA512 dfbbae2a1149457ef4a460f4067f197fe77148d32833f8a85074aeb4f33437c38b0f645e5f4f1aa62a07c6e259ab942027a0e64204f0788b4e4dd6b0385dc302 +EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0 diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild new file mode 100644 index 000000000000..e62f8efdec2c --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.1.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_REQ_USE="xml" + +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/" +SRC_URI=" + https://media.inkscape.org/dl/resources/file/${P}.tar.xz + https://dev.gentoo.org/~dilfridge/distfiles/inkscape-1.1-musl.txz +" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg +openmp postscript readline spell static-libs svg2 visio wpg" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.54.1:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + net-libs/libsoup:2.4 + sci-libs/gsl:= + x11-libs/libX11 + >=x11-libs/pango-1.37.2 + x11-libs/gtk+:3 + $(python_gen_cond_dep ' + dev-python/lxml[${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + dbus? ( dev-libs/dbus-glib ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0 ) + readline? ( sys-libs/readline:= ) + spell? ( app-text/gspell ) + 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} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.65 +" + +RESTRICT="test" + +S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + # Backport from master + eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch + + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DBUILD_TESTING=OFF + -DWITH_LIBCDR=$(usex cdr) + -DWITH_DBUS=$(usex dbus) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + local extdir="${ED}"/usr/share/${PN}/extensions + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi + + # Empty directory causes sandbox issues, see bug #761915 + rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." +} diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 6912d66bb360..05de5cb6c18a 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -15,8 +15,8 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms -openmp postscript spell static-libs svg2 visio wpg" +IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg +openmp postscript readline spell static-libs svg2 test visio wpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -43,6 +43,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 + media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= @@ -66,11 +67,8 @@ COMMON_DEPEND="${PYTHON_DEPS} ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:3 - ) + readline? ( sys-libs/readline:= ) + spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge @@ -94,9 +92,10 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.65 + test? ( dev-cpp/gtest ) " -RESTRICT="test" +RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" @@ -121,12 +120,15 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DBUILD_TESTING=$(usex test) -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus) -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) -DWITH_JEMALLOC=$(usex jemalloc) - -DENABLE_LCMS=$(usex lcms) + -DENABLE_LCMS=ON -DWITH_OPENMP=$(usex openmp) -DBUILD_SHARED_LIBS=$(usex !static-libs) -DWITH_SVG2=$(usex svg2) @@ -156,3 +158,7 @@ src_install() { # Empty directory causes sandbox issues, see bug #761915 rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } + +src_test() { + cmake_build -j1 check +} |