[shotwell/shotwell-0.26] build: use APPSTREAM_XML instead of APPDATA_XML



commit 553c35470798f959ac2cc2e44cddcccb88d23fdd
Author: Brian Masney <masneyb onstation org>
Date:   Wed Jul 12 19:29:12 2017 -0400

    build: use APPSTREAM_XML instead of APPDATA_XML
    
    According to commit 8c0c9ec747bc in the appstream-glib project
    (https://github.com/hughsie/appstream-glib), APPDATA_XML has been
    deprecated and APPSTREAM_XML should be used insted. Fedora 26
    no longer ships with appdata-xml.m4 in the libappstream-glib-devel
    package. This patch converts the build system to use APPSTREAM_XML.
    
    Signed-off-by: Brian Masney <masneyb onstation org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784883

 configure.ac     |    4 ++--
 misc/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d4c907..9f9ad93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,8 +256,8 @@ YELP_HELP_INIT
 dnl ***********************************************************************
 dnl AppData support
 dnl ***********************************************************************
-AX_REQUIRE_DEFINED([APPDATA_XML])
-APPDATA_XML
+AX_REQUIRE_DEFINED([APPSTREAM_XML])
+APPSTREAM_XML
 
 dnl ***********************************************************************
 dnl GResource compiler
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 6376879..711b06f 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -19,7 +19,7 @@ $(appdata_XML) : $(appdata_in_files)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 @GSETTINGS_RULES@
-@APPDATA_XML_RULES@
+@APPSTREAM_XML_RULES@
 
 CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]