[128146] trunk/dports/devel/appstream-glib

[devans at macports.org]

Revision: 128146
          https://trac.macports.org/changeset/128146
Author:   devans at macports.org
Date:     2014-11-14 09:57:01 -0800 (Fri, 14 Nov 2014)
Log Message:
-----------
appstream-glib: update to version 0.3.2, obsoletes appdata-tools, apply upstream patch to prevent infinite loop when configuring apps that still use appdata-xml.m4.

Modified Paths:
--------------
    trunk/dports/devel/appstream-glib/Portfile

Added Paths:
-----------
    trunk/dports/devel/appstream-glib/files/patch-data-appdata-xml.m4.diff

Property Changed:
----------------
    trunk/dports/devel/appstream-glib/


Property changes on: trunk/dports/devel/appstream-glib
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/devel/appstream-glib:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/appstream-glib:96570-97031
/users/devans/GNOME-3/stable/dports/devel/appstream-glib:128116-128145

Modified: trunk/dports/devel/appstream-glib/Portfile
===================================================================
--- trunk/dports/devel/appstream-glib/Portfile	2014-11-14 14:49:26 UTC (rev 128145)
+++ trunk/dports/devel/appstream-glib/Portfile	2014-11-14 17:57:01 UTC (rev 128146)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        hughsie appstream-glib 0_3_1 appstream_glib_
+github.setup        hughsie appstream-glib 0_3_2 appstream_glib_
 version             [string map {_ .} ${version}]
 license             LGPL-2+
 categories          devel
@@ -17,8 +17,8 @@
 
 long_description    ${description}
 
-checksums           rmd160  ebbf89a807b9e73e022a5b8598472d89062b70c1 \
-                    sha256  061f6e9d1cdca7ba14c4ab1b5c1fcb9c53f362921c039c4f72dba5b5d0d0a359
+checksums           rmd160  4b9cdb1e646f4bb18329bffcd75bc3decb0e645d \
+                    sha256  9a560e515e0b34662d3c23520f1da23b2bd41db4f3c0915ac7b11251aec4f364
 
 depends_build       port:pkgconfig \
                     port:autoconf \
@@ -37,7 +37,8 @@
                     port:sqlite3 \
                     port:freetype
 
-patchfiles          patch-configure.ac.diff
+patchfiles          patch-configure.ac.diff \
+                    patch-data-appdata-xml.m4.diff
 
 configure.cmd       ./autogen.sh
 

Copied: trunk/dports/devel/appstream-glib/files/patch-data-appdata-xml.m4.diff (from rev 128145, users/devans/GNOME-3/stable/dports/devel/appstream-glib/files/patch-data-appdata-xml.m4.diff)
===================================================================
--- trunk/dports/devel/appstream-glib/files/patch-data-appdata-xml.m4.diff	                        (rev 0)
+++ trunk/dports/devel/appstream-glib/files/patch-data-appdata-xml.m4.diff	2014-11-14 17:57:01 UTC (rev 128146)
@@ -0,0 +1,41 @@
+--- data/appdata-xml.m4.orig	2014-11-14 06:15:33.000000000 -0800
++++ data/appdata-xml.m4	2014-11-14 06:16:09.000000000 -0800
+@@ -1,6 +1,6 @@
+ # appdata-xml.m4
+ #
+-# serial 4
++# serial 5
+ 
+ dnl APPDATA_XML
+ dnl Installs and validates AppData XML files.
+@@ -15,16 +15,13 @@
+ dnl
+ dnl Adding files to appdata_XML does not distribute them automatically.
+ 
+-AC_DEFUN([APPDATA_XML],
++AU_DEFUN([APPDATA_XML],
+ [
+   m4_pattern_allow([AM_V_GEN])
+   AC_ARG_ENABLE([appdata-validate],
+                 [AS_HELP_STRING([--disable-appdata-validate],
+                                 [Disable validating AppData XML files during check phase])])
+ 
+-  # big fat warning
+-  AC_MSG_WARN([APPDATA_XML is deprecated, use APPSTREAM_XML instead.])
+-
+   AS_IF([test "x$enable_appdata_validate" != "xno"],
+         [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
+          AS_IF([test "x$APPSTREAM_UTIL" = "x"],
+@@ -77,7 +74,11 @@
+ 	rm -f $(appdata_XML:.appdata.xml=.appdata.valid)
+ '
+   _APPDATA_XML_SUBST(APPDATA_XML_RULES)
+-])
++],
++[Use the new APPSTREAM_XML macro instead of APPDATA_XML in configure.ac, and
++ replace @APPDATA_XML_RULES@ with @APPSTREAM_XML_RULES@, appdata_XML with
++ appstream_XML and --enable-appdata-validate with --enable-appstream-validate
++ in Makefile.am])
+ 
+ dnl _APPDATA_XML_SUBST(VARIABLE)
+ dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141114/39a05d89/attachment-0001.html>