diff options
Diffstat (limited to 'libappstream-builder')
| -rw-r--r-- | libappstream-builder/asb-self-test.c | 8 | ||||
| -rw-r--r-- | libappstream-builder/plugins/Makefile.am | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libappstream-builder/asb-self-test.c b/libappstream-builder/asb-self-test.c index 18f8e15..2a68910 100644 --- a/libappstream-builder/asb-self-test.c +++ b/libappstream-builder/asb-self-test.c @@ -429,7 +429,11 @@ asb_test_context_test_func (AsbTestContextMode mode) ret = as_store_from_file (store, file, NULL, NULL, &error); g_assert_no_error (error); g_assert (ret); +#ifdef HAVE_FONTS g_assert_cmpint (as_store_get_size (store), ==, 4); +#else + g_assert_cmpint (as_store_get_size (store), ==, 3); +#endif app = as_store_get_app_by_pkgname (store, "app"); g_assert (app != NULL); app = as_store_get_app_by_id (store, "app.desktop"); @@ -439,6 +443,7 @@ asb_test_context_test_func (AsbTestContextMode mode) xml = as_store_to_xml (store, AS_NODE_TO_XML_FLAG_FORMAT_MULTILINE); expected_xml = "<components version=\"0.9\" builder_id=\"appstream-glib:4\" origin=\"asb-self-test\">\n" +#ifdef HAVE_FONTS "<component type=\"font\">\n" "<id>Liberation</id>\n" "<pkgname>font</pkgname>\n" @@ -474,6 +479,7 @@ asb_test_context_test_func (AsbTestContextMode mode) "<value key=\"X-CacheID\">font-1-1.fc21.noarch.rpm</value>\n" "</metadata>\n" "</component>\n" +#endif "<component type=\"addon\">\n" "<id>app-extra</id>\n" "<pkgname>app-extra</pkgname>\n" @@ -592,6 +598,7 @@ asb_test_context_test_func (AsbTestContextMode mode) xml_failed = as_store_to_xml (store_failed, AS_NODE_TO_XML_FLAG_FORMAT_MULTILINE); expected_xml = "<components version=\"0.9\" builder_id=\"appstream-glib:4\" origin=\"asb-self-test-failed\">\n" +#ifdef HAVE_FONTS "<component type=\"font\">\n" "<id>LiberationSerif</id>\n" "<pkgname>font-serif</pkgname>\n" @@ -629,6 +636,7 @@ asb_test_context_test_func (AsbTestContextMode mode) "<value key=\"X-CacheID\">font-serif-1-1.fc21.noarch.rpm</value>\n" "</metadata>\n" "</component>\n" +#endif "<component type=\"addon\">\n" "<id>app-core</id>\n" "<pkgname>app</pkgname>\n" diff --git a/libappstream-builder/plugins/Makefile.am b/libappstream-builder/plugins/Makefile.am index fddfc88..9a1e815 100644 --- a/libappstream-builder/plugins/Makefile.am +++ b/libappstream-builder/plugins/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ $(LIBARCHIVE_CFLAGS) \ $(SOUP_CFLAGS) \ $(RPM_CFLAGS) \ - $(SQLITE_CFLAGS) \ $(FREETYPE_CFLAGS) \ -I$(top_srcdir)/libappstream-glib \ -I$(top_builddir)/libappstream-glib \ @@ -21,7 +20,6 @@ plugin_LTLIBRARIES = \ libasb_plugin_desktop.la \ libasb_plugin_gir.la \ libasb_plugin_gresource.la \ - libasb_plugin_font.la \ libasb_plugin_gettext.la \ libasb_plugin_gstreamer.la \ libasb_plugin_hardcoded.la \ @@ -34,6 +32,11 @@ plugin_LTLIBRARIES += \ libasb_plugin_ostree.la endif +if HAVE_FONTS +plugin_LTLIBRARIES += \ + libasb_plugin_font.la +endif + libasb_plugin_dbus_la_SOURCES = asb-plugin-dbus.c libasb_plugin_dbus_la_LIBADD = $(GLIB_LIBS) libasb_plugin_dbus_la_LDFLAGS = -module -avoid-version @@ -94,10 +97,12 @@ libasb_plugin_nm_la_LIBADD = $(GLIB_LIBS) libasb_plugin_nm_la_LDFLAGS = -module -avoid-version libasb_plugin_nm_la_CFLAGS = $(GLIB_CFLAGS) $(WARNINGFLAGS_C) +if HAVE_FONTS libasb_plugin_font_la_SOURCES = asb-plugin-font.c libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS) libasb_plugin_font_la_LDFLAGS = -module -avoid-version libasb_plugin_font_la_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(WARNINGFLAGS_C) +endif if HAVE_OSTREE libasb_plugin_ostree_la_SOURCES = asb-plugin-ostree.c |