Blob Blame History Raw
diff -pruN libeasyfc-0.12.1.orig/libeasyfc/ezfc-config.c libeasyfc-0.12.1/libeasyfc/ezfc-config.c
--- libeasyfc-0.12.1.orig/libeasyfc/ezfc-config.c	2013-03-13 19:31:11.000000000 +0900
+++ libeasyfc-0.12.1/libeasyfc/ezfc-config.c	2013-05-29 19:25:29.000000000 +0900
@@ -379,6 +379,7 @@ _ezfc_config_real_to_font_xml(xmlNodePtr
 		masks >>= 1;
 		n++;
 	}
+#ifdef FC_FONT_FEATURES
 	if (feat) {
 		GList *l;
 
@@ -400,6 +401,7 @@ _ezfc_config_real_to_font_xml(xmlNodePtr
 		}
 		g_list_free(feat);
 	}
+#endif
 	xmlAddChild(root, match);
 	*no_elements = FALSE;
 
@@ -824,6 +826,7 @@ _ezfc_config_from_xml(ezfc_config_t  *co
 				if (xmlStrcmp(attr, (const xmlChar *)"append") == 0) {
 					xmlFree(attr);
 					attr = xmlGetProp(node, (const xmlChar *)"name");
+#ifdef FC_FONT_FEATURES
 					if (xmlStrcmp(attr, (const xmlChar *)FC_FONT_FEATURES) == 0) {
 						l = _ezfc_config_parse_string_node(node->children);
 						for (ll = l; ll != NULL; ll = g_list_next(ll)) {
@@ -831,9 +834,12 @@ _ezfc_config_from_xml(ezfc_config_t  *co
 						}
 						g_list_free(l);
 					} else {
+#endif
 						g_warning("Unexpected value in the name attribute: %s",
 							  attr);
+#ifdef FC_FONT_FEATURES
 					}
+#endif
 					xmlFree(attr);
 				} else if (xmlStrcmp(attr, (const xmlChar *)"assign") != 0) {
 					g_warning("Unexpected mode for <match target=\"font\"><edit>: %s",
diff -pruN libeasyfc-0.12.1.orig/libeasyfc/ezfc-font.c libeasyfc-0.12.1/libeasyfc/ezfc-font.c
--- libeasyfc-0.12.1.orig/libeasyfc/ezfc-font.c	2013-03-13 19:21:28.000000000 +0900
+++ libeasyfc-0.12.1/libeasyfc/ezfc-font.c	2013-05-29 18:26:47.000000000 +0900
@@ -1228,6 +1228,7 @@ gboolean
 ezfc_font_add_feature(ezfc_font_t *font,
 		      const gchar *feature)
 {
+#ifdef FC_FONT_FEATURES
 	ezfc_font_private_t *priv = (ezfc_font_private_t *)font;
 	GList *l;
 
@@ -1245,6 +1246,9 @@ ezfc_font_add_feature(ezfc_font_t *font,
 	g_list_free(l);
 
 	return FcPatternAddString(priv->pattern, FC_FONT_FEATURES, (const FcChar8 *)feature);
+#else
+	return FALSE;
+#endif
 }
 
 /**
@@ -1267,6 +1271,7 @@ ezfc_font_remove_feature(ezfc_font_t *fo
 	g_return_val_if_fail (font != NULL, FALSE);
 	g_return_val_if_fail (feature != NULL && feature[0] != 0, FALSE);
 
+#ifdef FC_FONT_FEATURES
 	if (priv->pattern) {
 		int i;
 		FcChar8 *s;
@@ -1281,6 +1286,7 @@ ezfc_font_remove_feature(ezfc_font_t *fo
 			}
 		}
 	}
+#endif
 
 	return FALSE;
 }
@@ -1304,6 +1310,7 @@ ezfc_font_get_features(ezfc_font_t *font
 
 	g_return_val_if_fail (font != NULL, NULL);
 
+#ifdef FC_FONT_FEATURES
 	if (priv->pattern) {
 		int i;
 		FcChar8 *s;
@@ -1316,6 +1323,7 @@ ezfc_font_get_features(ezfc_font_t *font
 			retval = g_list_append(retval, s);
 		}
 	}
+#endif
 
 	return retval;
 }
@@ -1341,6 +1349,7 @@ ezfc_font_get_available_features(ezfc_fo
 
 	g_return_val_if_fail (font != NULL, NULL);
 
+#ifdef FC_FONT_FEATURES
 	if (priv->pattern) {
 		FcPattern *match = NULL;
 		FcResult result;
@@ -1372,6 +1381,7 @@ ezfc_font_get_available_features(ezfc_fo
 		FcPatternDestroy(match);
 		FT_Done_FreeType(ftlib);
 	}
+#endif
 
 	return retval;
 }
diff -pruN libeasyfc-0.12.1.orig/requires libeasyfc-0.12.1/requires
--- libeasyfc-0.12.1.orig/requires	2013-03-29 17:34:55.000000000 +0900
+++ libeasyfc-0.12.1/requires	2013-05-29 18:24:25.000000000 +0900
@@ -1,4 +1,4 @@
-FONTCONFIG_REQUIRED=2.10.92
+FONTCONFIG_REQUIRED=2.9.91
 FREETYPE_REQUIRED=2.4.4
 GLIB_REQUIRED=2.14.0
 GOBJECT_REQUIRED=2.0