radhermit 14/12/14 20:08:56
Added: inkscape-0.91_pre3-automagic.patch
inkscape-0.91_pre3-sk-man.patch
inkscape-0.91_pre3-desktop.patch
inkscape-0.91_pre3-cppflags.patch
Log:
Version bump. Add cdr, dbus, imagemagick, openmp, static-libs, visio, and wpg
use flags.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.1 media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch?rev=1.1&content-type=text/plain
Index: inkscape-0.91_pre3-automagic.patch
===================================================================
Add configure options for aspell, gtkspell, and imagemagick.
--- inkscape-0.91pre3/configure.ac
+++ inkscape-0.91pre3/configure.ac
@@ -675,9 +675,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 +719,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 +734,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 +813,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 +943,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.
1.1 media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch?rev=1.1&content-type=text/plain
Index: inkscape-0.91_pre3-sk-man.patch
===================================================================
Install sk man page to the right directory.
https://bugs.gentoo.org/show_bug.cgi?id=481276
--- inkscape-0.91pre3/Makefile.am
+++ inkscape-0.91pre3/Makefile.am
@@ -561,7 +561,7 @@
manja_DATA = inkscape.ja.1
manjadir = $(mandir)/ja/man1
-mansk_DATA = inkscape.ja.1
+mansk_DATA = inkscape.sk.1
manskdir = $(mandir)/sk/man1
manzhtw_DATA = inkscape.zh_TW.1
1.1 media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch?rev=1.1&content-type=text/plain
Index: inkscape-0.91_pre3-desktop.patch
===================================================================
--- 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
1.1 media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch?rev=1.1&content-type=text/plain
Index: inkscape-0.91_pre3-cppflags.patch
===================================================================
Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings.
--- inkscape-0.91pre3/configure.ac
+++ inkscape-0.91pre3/configure.ac
@@ -72,9 +72,6 @@
####
# Generic cpp flags...
- # What is just plain "-W" ?
- # Fortify source requires -O2 or higher, which is handled with newer autoconf
- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS"
# Enable format and format security warnings
CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
# Enable all default warnings
