diff options
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r-- | media-gfx/inkscape/Manifest | 10 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch | 63 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch | 154 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch | 20 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.91-r3.ebuild | 176 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 173 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.3.ebuild (renamed from media-gfx/inkscape/inkscape-0.91-r4.ebuild) | 14 |
7 files changed, 7 insertions, 603 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index e1e7441f330b..9c45bd56e44b 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,18 +1,12 @@ AUX inkscape-0.48.4-epython.patch 441 BLAKE2B 3c30f6a15002b8b046d01220a7528078d877fdb5632dae6f07d65ca257d5021e4ad29ffb1caa8584473f5634f8487189015b0667a696b40ec4eb848cfb282e1e SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 -AUX inkscape-0.91-fix-gtkmm-2.48.patch 2302 BLAKE2B b6409791bcdde3c85287afd7c3cd33fb561e76b41e99b2a7b508ebf5519b0ffb36246118cc61bac052abe280db2d7f8973a8f86b5b83dfc420ed61d1ed002f4f SHA512 fcb986d33d1481d9cc9343c833b3cbdd5cc1d25fe71692e078b0ca4b2d934cf776e668500ca65f0b6179e1499281763ba5bfbd0f31db93c0fdf40dee21125215 -AUX inkscape-0.91_pre3-automagic.patch 5281 BLAKE2B 315082e6f0fb0c58e7fa304d742da6a5061709085487c2c72d24c1f69ccdb402d352b23c073d1ed8c2b6d4479d97d544a7504e5cae76c886d6e584b89f323d3a SHA512 badd58f08d1e3b4e84e8b18de23e08a1ad44b24367e05092629e7793b4c5f54653b3c47ec9189f1297d071cb3ac9cb098ca65aa16f79e5c3e0bb3a97ee5cc9a2 AUX inkscape-0.91_pre3-cppflags.patch 493 BLAKE2B 6690a5d9eea503c4fccaaca8df67cd64e854a72b2941f51f8f82addca6120692a79e862d8a222b72cb97f0d14ef28f5a3dc19215119e0ab43ec4a472661010f4 SHA512 12253f89d51b2ad7610381aeba637d844c5ee2579eebc75aaad1791c87ef455a6a9a8dd1db5fc9e1adf51a928e8efe06946efc73e3743e209f970a457b397c35 -AUX inkscape-0.91_pre3-desktop.patch 693 BLAKE2B 048ec5bd6069ce1cb157e88a84d654ff0fa0b31a770cd0fe72a4e0ed9dc4a81ad251bd7e8b462fa510e826808e29acad0737f432b55d28a545d99aa8b6e592d9 SHA512 036ddbe38cb2bb229a864ed43445d1b9a2b3a1ade882edf8f24aa2df10c317f60c6be3849470729a1dabe81282864fcfa6e6283b0df5cf0fdbc2f31f0c3bdc46 AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c5392974d64cf8c9374266b89b8fc75197185bb8a48ce8b3a19cd7daf3ac24e26220fdf72b976bcf9f73816ecf61b07 SHA512 c35b97cceba4e9470bd04d3f01f1eb8469c817b848c604540e61830321281b642856b6e38446cb9762c1501c16606ace2776344df20fd80a6952e6cd2e6e9ff2 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 -DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650d980ef455106d40ae17555d4792a532df493dab23dad2d3c7cdcc68f59391228bae76ebd30f03cf66cbb4fd0ae65 SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab -DIST inkscape-0.92.1.tar.bz2 31222684 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 -EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0 -EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188 -EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e +DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500 +EBUILD inkscape-0.92.3.ebuild 3838 BLAKE2B 73b22aecff0f4859f0e304da287000b146e4d0aa8aac3ca37d42ae623cd29ec969bee9245ceafe014c7dab7051bfcbdf3465c6b7ff6924040ce457e797fcf66c SHA512 9f3dbb7c4d173d310feff9b74927cacc4b8ad3f7b21e57666adebb70928a7fd17854a83610eabe728a1727f55383a41a67fc168584a854ec5b36e022f3a5470a MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch b/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch deleted file mode 100644 index f9c06601e837..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000 -+++ b/src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000 -@@ -146,8 +146,6 @@ - void _setClipboardColor(guint32); - void _userWarn(SPDesktop *, char const *); - -- void _inkscape_wait_for_targets(std::list<Glib::ustring> &); -- - // private properites - SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it - Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node -@@ -1302,9 +1300,7 @@ - */ - Glib::ustring ClipboardManagerImpl::_getBestTarget() - { -- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets() -- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets(); -- _inkscape_wait_for_targets(targets); -+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets(); - - // clipboard target debugging snippet - /* -@@ -1456,39 +1452,6 @@ - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg); - } - -- --// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see --// --// https://bugs.launchpad.net/inkscape/+bug/296778 --// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html --// --// for details. Until this has been fixed upstream we will use our own implementation --// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc. --void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets) --{ -- //Get a newly-allocated array of atoms: -- GdkAtom* targets = NULL; -- gint n_targets = 0; -- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets ); -- if (!test || (targets == NULL)) { -- return; -- } -- -- //Add the targets to the C++ container: -- for (int i = 0; i < n_targets; i++) -- { -- //Convert the atom to a string: -- gchar* const atom_name = gdk_atom_name(targets[i]); -- -- Glib::ustring target; -- if (atom_name) { -- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*. -- } -- -- listTargets.push_back(target); -- } --} -- - /* ####################################### - ClipboardManager class - ####################################### */ - diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch deleted file mode 100644 index e29b7e9f787e..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch +++ /dev/null @@ -1,154 +0,0 @@ -Respect configure option for openmp and add configure options for aspell, -gtkspell, imagemagick, jpeg, and exif. - ---- inkscape-0.91pre3/configure.ac -+++ inkscape-0.91pre3/configure.ac -@@ -233,19 +233,28 @@ - dnl Check for OpenMP - dnl ****************************** - AC_OPENMP --if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -- openmp_ok=yes -- dnl We have it, now set up the flags -- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+openmp_ok="no" -+if test "x$enable_openmp" = "xyes"; then -+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -+ openmp_ok=yes -+ dnl We have it, now set up the flags -+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+ fi - fi - - dnl ****************************** - dnl Check for libexif - dnl ****************************** --PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) --if test "x$exif_ok" = "xyes"; then -- AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+AC_ARG_ENABLE(exif, -+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]), -+ enable_exif=$enableval,enable_exif=no) -+ -+if test "x$enable_exif" = "xyes"; then -+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) -+ if test "x$exif_ok" = "xyes"; then -+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+ fi - fi - AC_SUBST(EXIF_LIBS) - AC_SUBST(EXIF_CFLAGS) -@@ -253,10 +262,16 @@ - dnl ****************************** - dnl Check for libjpeg - dnl ****************************** --AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) --if test "x$jpeg_ok" = "xyes"; then -- LIBS="-ljpeg $LIBS" -- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+AC_ARG_ENABLE(jpeg, -+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]), -+ enable_jpeg=$enableval,enable_jpeg=no) -+ -+if test "x$enable_jpeg" = "xyes"; then -+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) -+ if test "x$jpeg_ok" = "xyes"; then -+ LIBS="-ljpeg $LIBS" -+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+ fi - fi - - dnl This check is to get a FIONREAD definition on Solaris 8 -@@ -675,9 +690,16 @@ - dnl Check for ImageMagick Magick++ - dnl ****************************** - --PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) --if test "x$magick_ok" = "xyes"; then -- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+AC_ARG_ENABLE(magick, -+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]), -+ enable_magick=$enableval,enable_magick=no) -+ -+magick_ok="no" -+if test "x$enable_magick" = "xyes"; then -+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) -+ if test "x$magick_ok" = "xyes"; then -+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+ fi - fi - AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") - -@@ -712,6 +734,10 @@ - AC_DEFINE(WITH_GLIBMM_2_32,1,[Build with Glibmm 2.32 or higher]) - fi - -+ -+AC_ARG_WITH([gtkspell], -+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) -+ - dnl ********************************* - dnl Allow experimental GTK+3 build - dnl ********************************* -@@ -723,11 +749,13 @@ - if test "x$enable_gtk3" = "xyes"; then - - ink_spell_pkg= -- if pkg-config --exists gtkspell-3.0; then -- ink_spell_pkg=gtkspell-3.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-3.0; then -+ ink_spell_pkg=gtkspell-3.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtkmm-3.0 >= 3.2 - gdkmm-3.0 >= 3.2 -@@ -800,11 +828,13 @@ - else - - ink_spell_pkg= -- if pkg-config --exists gtkspell-2.0; then -- ink_spell_pkg=gtkspell-2.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-2.0; then -+ ink_spell_pkg=gtkspell-2.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtk+-2.0 >= 2.24 - $ink_spell_pkg -@@ -928,12 +958,17 @@ - dnl ************************** - dnl Check for aspell - dnl ****************************** --AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) --if test "x$aspell_ok" = "xyes"; then -- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" --else -- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+AC_ARG_WITH([aspell], -+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) -+ -+if test "x$with_aspell" = "xyes"; then -+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) -+ if test "x$aspell_ok" = "xyes"; then -+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" -+ else -+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+ fi - fi - - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch deleted file mode 100644 index f02fa1a8aca5..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- inkscape-0.91pre3/inkscape.desktop.in -+++ inkscape-0.91pre3/inkscape.desktop.in -@@ -5,7 +5,7 @@ - _X-GNOME-FullName=Inkscape Vector Graphics Editor - _Comment=Create and edit Scalable Vector Graphics images - Type=Application --Categories=Graphics;VectorGraphics;GTK; -+Categories=Graphics;2DGraphics;VectorGraphics;GTK; - MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; - Exec=inkscape %F - TryExec=inkscape -@@ -14,7 +14,7 @@ - Icon=inkscape - X-Ayatana-Desktop-Shortcuts=Drawing - --[Drawing Shortcut Group] -+[X-Drawing Shortcut Group] - _Name=New Drawing - Exec=inkscape - TargetEnvironment=Unity diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild deleted file mode 100644 index e66661ffc32f..000000000000 --- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1 - -MY_P=${P/_/} - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -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}" - -WPG_DEPS=" - || ( - ( app-text/libwpg:0.3 dev-libs/librevenge ) - ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) - ) -" -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 - >=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-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? ( - media-libs/libcdr - ${WPG_DEPS} - ) - 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? ( - media-libs/libvisio - ${WPG_DEPS} - ) - wpg? ( ${WPG_DEPS} ) -" - -# 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/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.91_pre3-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.91_pre3-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.91-fix-gtkmm-2.48.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 - # enable c++11 as needed for sigc++-2.6, #566318 - # remove it when upstream solves the issue - # https://bugs.launchpad.net/inkscape/+bug/1488079 - append-cxxflags -std=c++11 - - econf \ - $(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) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - prune_libtool_files - python_optimize "${ED}"/usr/share/${PN}/extensions -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild deleted file mode 100644 index 3a632ccb1ac2..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1 - -MY_P=${P/_/} - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -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}" - -WPG_DEPS=" - || ( - ( app-text/libwpg:0.3 dev-libs/librevenge ) - ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) - ) -" -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.48 - >=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? ( - media-libs/libcdr - ${WPG_DEPS} - ) - 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? ( - media-libs/libvisio - ${WPG_DEPS} - ) - wpg? ( ${WPG_DEPS} ) -" - -# 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/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" -) - -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 - - econf \ - $(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) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - prune_libtool_files - python_optimize "${ED}"/usr/share/${PN}/extensions -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild index 26296f1bf535..69b0c27405f4 100644 --- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild @@ -11,11 +11,12 @@ MY_P=${P/_/} DESCRIPTION="A SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" +SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2 +https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +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" @@ -93,13 +94,12 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-0.91_pre3-automagic.patch" + "${FILESDIR}/${PN}-0.92.1-automagic.patch" "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.91_pre3-desktop.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.91-fix-gtkmm-2.48.patch" ) S=${WORKDIR}/${MY_P} @@ -127,10 +127,6 @@ src_prepare() { src_configure() { # aliasing unsafe wrt #310393 append-flags -fno-strict-aliasing - # enable c++11 as needed for sigc++-2.6, #566318 - # remove it when upstream solves the issue - # https://bugs.launchpad.net/inkscape/+bug/1488079 - append-cxxflags -std=c++11 econf \ $(use_enable static-libs static) \ |