gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 06:37:10 -08:00
Code Issues Projects Releases Wiki Activity

media-gfx/inkscape: Version bump

Browse Source 
Package-Manager: Portage-2.3.5, Repoman-2.3.2
This commit is contained in:
Andreas K. Hüttel
2017-05-12 21:40:46 +02:00
parent 026776c948
commit 3096fcc8a7
4 changed files with 338 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media-gfx/inkscape/Manifest
+1
View File
@@ -1 +1,2 @@
DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126
DIST inkscape-0.92.1.tar.bz2 31222684 SHA256 257405bf802de125f17d123638093a37db02ebe334d243cf9b0d8903f7c89005 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0 WHIRLPOOL f8134aed9ddb174fda88e13c201cf9099604e9591228ec306feeabaeee859f657961370ba4d1420f51e5e520f3543d7d129577144d9221e52f638a9f0bf81493
media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
+154
View File
@@ -0,0 +1,154 @@
diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac
--- inkscape-0.92.1.orig/configure.ac 2017-02-14 00:46:57.000000000 +0100
+++ inkscape-0.92.1/configure.ac 2017-05-12 21:20:45.880842301 +0200
@@ -201,11 +201,14 @@
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 ********************
@@ -222,9 +225,15 @@
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)
@@ -232,10 +241,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
@@ -614,9 +629,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_CHECK_HEADER([boost/unordered_set.hpp], [AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >= 1.36)])], [])
+
+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,
gtk+-3.0 >= 3.8
gdk-3.0 >= 3.8
@@ -804,11 +832,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)
@@ -931,12 +961,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.
media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch
+12
View File
@@ -0,0 +1,12 @@
diff -ruN inkscape-0.92.1.orig/inkscape.desktop.in inkscape-0.92.1/inkscape.desktop.in
--- inkscape-0.92.1.orig/inkscape.desktop.in 2017-02-14 00:46:57.000000000 +0100
+++ inkscape-0.92.1/inkscape.desktop.in 2017-05-12 21:25:01.628853033 +0200
@@ -6,7 +6,7 @@
_Comment=Create and edit Scalable Vector Graphics images
_Keywords=image;editor;vector;drawing;
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;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd;
Exec=inkscape %F
TryExec=inkscape
media-gfx/inkscape/inkscape-0.92.1.ebuild
+171
View File
@@ -0,0 +1,171 @@
# Copyright 1999-2017 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="http://www.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-6.4
>=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
)
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
}