diff options
Diffstat (limited to 'media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch')
| -rw-r--r-- | media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch | 154 |
1 files changed, 0 insertions, 154 deletions
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. |