Drop checks for ancient dependency versions. These are satisfied elsewhere.

(bzr r12213)

15 files changed, 7 insertions, 65 deletions

diff --git a/configure.ac b/configure.ac
index 219748f28..d1df91807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,27 +598,10 @@ AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
 AC_SUBST(IMAGEMAGICK_LIBS)
 AC_SUBST(IMAGEMAGICK_CFLAGS)
 
-dnl ***********************************************************************************************************
-dnl Check for a Cairo version that implements user-fonts feature (with a stable API, that is cairo > 1.7.6),
-dnl so that we conditionally add SVGFonts support
-dnl ***********************************************************************************************************
-
-PKG_CHECK_MODULES(CAIRO_USER_FONTS, cairo > 1.7.6, cairouserfonts=yes, cairouserfonts=no)
-if test "x$cairouserfonts" = "xyes"; then
-       AC_DEFINE(ENABLE_SVG_FONTS, 1, [SVG Fonts should be used])
-fi
-
 dnl ******************************
 dnl   Unconditional dependencies
 dnl ******************************
 
-dnl sigc++-2.0 >= 2.0.12: using "visit_each" not available in 2.0.10
-if test $cc_vers_major -gt 3; then
-  min_sigc_version=2.0.12
-else
-  min_sigc_version=2.0.11
-fi
-
 dnl *********************************
 dnl   Allow experimental GTK+3 build
 dnl *********************************
@@ -635,7 +618,7 @@ if test "x$enable_gtk3" = "xyes"; then
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi
 
-	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  gtkmm-3.0 >= 3.2  gdkmm-3.0 >= 3.2 gtk+-3.0 >= 3.2 gdk-3.0 >= 3.2 gdl-3.0 > 3.3.4 glib-2.0 >= 2.28  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4 pango >= 1.24 pangoft2 >= 1.24, with_gtkmm_3_0=yes, with_gtkmm_3_0=no)
+	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  gtkmm-3.0 >= 3.2  gdkmm-3.0 >= 3.2 gtk+-3.0 >= 3.2 gdk-3.0 >= 3.2 gdl-3.0 > 3.3.4 glib-2.0 >= 2.28  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= 2.0.12 $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4 pango >= 1.24 pangoft2 >= 1.24, with_gtkmm_3_0=yes, with_gtkmm_3_0=no)
 
 	if test "x$with_gtkmm_3_0" = "xyes"; then
 		AC_MSG_RESULT([Using EXPERIMENTAL Gtkmm 3 build])
@@ -672,7 +655,7 @@ else
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi
 
-	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  glib-2.0 >= 2.28  gtk+-2.0 >= 2.24  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4  gdkmm-2.4  gtkmm-2.4 >= 2.24 pango >= 1.24 pangoft2 >= 1.24)
+	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  glib-2.0 >= 2.28  gtk+-2.0 >= 2.24  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= 2.0.12 $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4  gdkmm-2.4  gtkmm-2.4 >= 2.24 pango >= 1.24 pangoft2 >= 1.24)
 	
 	# Enable build strict options that should work on most systems unless
 	# the build has been configured explicitly not to do so
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index 0d1b56d54..84b4bd080 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -1,5 +1,4 @@
 #include "config.h"
-#ifdef ENABLE_SVG_FONTS
 /*
  * SVGFonts rendering implementation
  *
@@ -356,8 +355,6 @@ void SvgFont::refresh(){
     this->userfont = NULL;
 }
 
-#endif //#ifdef ENABLE_SVG_FONTS
-
 /*
   Local Variables:
   mode:c++
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 868b606a4..694619089 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -252,9 +252,7 @@ static char const menus_skeleton[] =
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Text") "\">\n"
 "       <verb verb-id=\"DialogText\" />\n"
-#ifdef ENABLE_SVG_FONTS
 "       <verb verb-id=\"DialogSVGFonts\" />\n"
-#endif // ENABLE_SVG_FONTS
 "       <verb verb-id=\"DialogGlyphs\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionTextToPath\" />\n"
diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp
index 4288a5d64..0a649b17f 100644
--- a/src/sp-font-face.cpp
+++ b/src/sp-font-face.cpp
@@ -2,8 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 /*
  * SVG <font-face> element implementation
  *
@@ -849,7 +847,6 @@ static Inkscape::XML::Node *sp_fontface_write(SPObject *object, Inkscape::XML::D
 
     return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables:
   mode:c++
diff --git a/src/sp-font-face.h b/src/sp-font-face.h
index 57702b683..968644556 100644
--- a/src/sp-font-face.h
+++ b/src/sp-font-face.h
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #ifndef __SP_FONTFACE_H__
 #define __SP_FONTFACE_H__
 
@@ -122,4 +121,3 @@ GType sp_fontface_get_type (void);
 G_END_DECLS
 
 #endif //#ifndef __SP_FONTFACE_H__
-#endif //#ifdef ENABLE_SVG_FONTS
diff --git a/src/sp-font.cpp b/src/sp-font.cpp
index 6ebbd5218..a03890fc7 100644
--- a/src/sp-font.cpp
+++ b/src/sp-font.cpp
@@ -2,8 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 /*
  * SVG <font> element implementation
  *
@@ -250,7 +248,6 @@ static Inkscape::XML::Node *sp_font_write(SPObject *object, Inkscape::XML::Docum
 
     return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables:
   mode:c++
diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp
index 652d965bb..10884fb81 100644
--- a/src/sp-glyph-kerning.cpp
+++ b/src/sp-glyph-kerning.cpp
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #define __SP_ANCHOR_C__
 
 /*
@@ -267,7 +266,6 @@ static Inkscape::XML::Node *sp_glyph_kerning_write(SPObject *object, Inkscape::X
 
     return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables:
   mode:c++
diff --git a/src/sp-glyph-kerning.h b/src/sp-glyph-kerning.h
index ce9b4bb15..b7f733cad 100644
--- a/src/sp-glyph-kerning.h
+++ b/src/sp-glyph-kerning.h
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #ifndef __SP_GLYPH_KERNING_H__
 #define __SP_GLYPH_KERNING_H__
 
@@ -60,4 +59,3 @@ GType sp_glyph_kerning_h_get_type (void);
 GType sp_glyph_kerning_v_get_type (void);
 
 #endif //#ifndef __SP_GLYPH_KERNING_H__
-#endif //#ifdef ENABLE_SVG_FONTS
diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp
index e14ef8667..0417ea8c1 100644
--- a/src/sp-glyph.cpp
+++ b/src/sp-glyph.cpp
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #define __SP_GLYPH_C__
 
 /*
@@ -284,7 +283,6 @@ static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Docu
 
     return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables:
   mode:c++
diff --git a/src/sp-glyph.h b/src/sp-glyph.h
index 316204c23..7556b0e25 100644
--- a/src/sp-glyph.h
+++ b/src/sp-glyph.h
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #ifndef __SP_GLYPH_H__
 #define __SP_GLYPH_H__
 
@@ -58,4 +57,3 @@ struct SPGlyphClass {
 GType sp_glyph_get_type (void);
 
 #endif //#ifndef __SP_GLYPH_H__
-#endif //#ifdef ENABLE_SVG_FONTS
diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp
index bdf993e5b..911c9be92 100644
--- a/src/sp-missing-glyph.cpp
+++ b/src/sp-missing-glyph.cpp
@@ -2,8 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 /*
  * SVG <missing-glyph> element implementation
  *
@@ -164,7 +162,6 @@ static Inkscape::XML::Node *sp_missing_glyph_write(SPObject *object, Inkscape::X
 
     return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables:
   mode:c++
diff --git a/src/sp-missing-glyph.h b/src/sp-missing-glyph.h
index 0b3f74360..7930df513 100644
--- a/src/sp-missing-glyph.h
+++ b/src/sp-missing-glyph.h
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
 #ifndef __SP_MISSING_GLYPH_H__
 #define __SP_MISSING_GLYPH_H__
 
@@ -40,4 +39,3 @@ struct SPMissingGlyphClass {
 GType sp_missing_glyph_get_type (void);
 
 #endif //#ifndef __SP_MISSING_GLYPH_H__
-#endif //#ifdef ENABLE_SVG_FONTS
diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp
index cd332cd34..eba38ec67 100644
--- a/src/sp-object-repr.cpp
+++ b/src/sp-object-repr.cpp
@@ -48,13 +48,11 @@
 #include "sp-script.h"
 #include "config.h"
 
-#ifdef ENABLE_SVG_FONTS
-    #include "sp-font.h"
-    #include "sp-font-face.h"
-    #include "sp-glyph.h"
-    #include "sp-missing-glyph.h"
-    #include "sp-glyph-kerning.h"
-#endif
+#include "sp-font.h"
+#include "sp-font-face.h"
+#include "sp-glyph.h"
+#include "sp-missing-glyph.h"
+#include "sp-glyph-kerning.h"
 
 #include "sp-style-elem.h"
 #include "sp-switch.h"
@@ -151,14 +149,12 @@ populate_dtables()
         { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE },
         { "svg:flowRoot", SP_TYPE_FLOWTEXT },
         { "svg:flowSpan", SP_TYPE_FLOWTSPAN },
-#ifdef ENABLE_SVG_FONTS
         { "svg:font", SP_TYPE_FONT },
         { "svg:font-face", SP_TYPE_FONTFACE },
         { "svg:glyph", SP_TYPE_GLYPH },
         { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH },
         { "svg:hkern", SP_TYPE_HKERN },
         { "svg:vkern", SP_TYPE_VKERN },
-#endif
         { "svg:g", SP_TYPE_GROUP },
         { "svg:feBlend", SP_TYPE_FEBLEND },
         { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX },
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index faba47769..993f48d8f 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -53,10 +53,7 @@
 #include "ui/dialog/export.h"
 #include "ui/dialog/xml-tree.h"
 #include "ui/dialog/clonetiler.h"
-
-#ifdef ENABLE_SVG_FONTS
 #include "ui/dialog/svg-fonts-dialog.h"
-#endif // ENABLE_SVG_FONTS
 
 namespace Inkscape {
 namespace UI {
@@ -118,9 +115,7 @@ DialogManager::DialogManager() {
         registerFactory("ObjectProperties",    &create<ObjectProperties,     FloatingBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         FloatingBehavior>);
-#ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
-#endif
         registerFactory("Swatches",            &create<SwatchesPanel,        FloatingBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        FloatingBehavior>);
         registerFactory("TileDialog",          &create<TileDialog,           FloatingBehavior>);
@@ -154,9 +149,7 @@ DialogManager::DialogManager() {
         registerFactory("ObjectProperties",    &create<ObjectProperties,     DockBehavior>);
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         DockBehavior>);
-#ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
-#endif
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
         registerFactory("TileDialog",          &create<TileDialog,           DockBehavior>);
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 0da39dd73..bce63093d 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -15,8 +15,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 #include "svg-fonts-dialog.h"
 #include "document-private.h"
 #include "document-undo.h"
@@ -945,8 +943,6 @@ SvgFontsDialog::~SvgFontsDialog(){}
 } // namespace UI
 } // namespace Inkscape
 
-#endif //#ifdef ENABLE_SVG_FONTS
-
 /*
   Local Variables:
   mode:c++