[libeasyfc/f18] missing more ifdef
Akira TAGOH
tagoh at fedoraproject.org
Wed May 29 10:25:59 UTC 2013
commit 815701ebf9eb886cb5cb60184a3a72248674fcb8
Author: Akira TAGOH <tagoh at redhat.com>
Date: Wed May 29 19:25:52 2013 +0900
missing more ifdef
libeasyfc-disable-feature-tags.patch | 40 ++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/libeasyfc-disable-feature-tags.patch b/libeasyfc-disable-feature-tags.patch
index dab6590..0e7dece 100644
--- a/libeasyfc-disable-feature-tags.patch
+++ b/libeasyfc-disable-feature-tags.patch
@@ -1,3 +1,43 @@
+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
More information about the scm-commits
mailing list