diff -up stardict-3.0.1/configure.in.testing stardict-3.0.1/configure.in
--- stardict-3.0.1/configure.in.testing	2007-11-01 03:37:15.000000000 -0400
+++ stardict-3.0.1/configure.in	2008-07-10 13:30:19.000000000 -0400
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([gucharmap],
 	[enable_gucharmap=yes])
 
 if test "x$enable_gucharmap" = "xyes" ; then
-	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
+	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 2.22.1], have_gucharmap=yes, have_gucharmap=no)
 	if test "x$have_gucharmap" = "xyes"; then
 		GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}"
 		GUCHARMAP_LIBS="${GUCHARMAP_LIBS}"
@@ -393,11 +393,11 @@ STARDICT_CFLAGS="$SIGCPP_CFLAGS $STARDIC
 STARDICT_LIBS="$SIGCPP_LIBS $STARDICT_LIBS"
 else
 echo "Use local libsigc++20";
-SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
-SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
-SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION()
-SIGC_CXX_HAS_NAMESPACE_STD()
-SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+#SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
+#SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
+#SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION()
+#SIGC_CXX_HAS_NAMESPACE_STD()
+#SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
 
 if test "X$config_error" = "Xyes" ; then
   AC_ERROR(
diff -up stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
--- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing	2008-07-11 06:34:02.000000000 -0400
+++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp	2008-07-11 06:34:29.000000000 -0400
@@ -238,7 +238,7 @@ static void lookup(const char *text, cha
 	/* canonical decomposition */
 	gunichar *decomposition;
 	gsize result_len;
-	decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len);
+	decomposition = g_unicode_canonical_decomposition (uc, &result_len);
 	if (result_len != 1) {
 		definition += _("Canonical decomposition:");
 		definition += " ";