[128149] trunk/dports/gnome/totem

[devans at macports.org]

Revision: 128149
          https://trac.macports.org/changeset/128149
Author:   devans at macports.org
Date:     2014-11-14 10:05:28 -0800 (Fri, 14 Nov 2014)
Log Message:
-----------
totem: replace dependency on appdata-tools with appstream-glib, apply upstream patch to build with appstream-xml.m4, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/totem/Portfile

Added Paths:
-----------
    trunk/dports/gnome/totem/files/patch-use-appstream-glib.diff

Property Changed:
----------------
    trunk/dports/gnome/totem/


Property changes on: trunk/dports/gnome/totem
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/totem:108269-127544
/users/devans/GNOME-3/unstable/dports/gnome/totem:117866-118154,124219-125772
   + /users/devans/GNOME-3/stable/dports/gnome/totem:108269-128145
/users/devans/GNOME-3/unstable/dports/gnome/totem:117866-118154,124219-125772

Modified: trunk/dports/gnome/totem/Portfile
===================================================================
--- trunk/dports/gnome/totem/Portfile	2014-11-14 18:02:46 UTC (rev 128148)
+++ trunk/dports/gnome/totem/Portfile	2014-11-14 18:05:28 UTC (rev 128149)
@@ -5,7 +5,7 @@
 
 name                totem
 version             3.14.0
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 # also has an exception allowing use of non-GPL-compatible plugins
@@ -34,7 +34,7 @@
                     port:itstool \
                     port:gnome-common \
                     port:yelp-tools \
-                    port:appdata-tools
+                    port:appstream-glib
 
 depends_lib         port:desktop-file-utils \
                     port:gnome-desktop \
@@ -63,7 +63,8 @@
 depends_run         port:gnome-settings-daemon \
                     port:yelp
 
-patchfiles          patch-vala-cflags.diff
+patchfiles          patch-use-appstream-glib.diff \
+                    patch-vala-cflags.diff
 
 # update m4/intltool.m4 and autoreconf
 

Copied: trunk/dports/gnome/totem/files/patch-use-appstream-glib.diff (from rev 128145, users/devans/GNOME-3/stable/dports/gnome/totem/files/patch-use-appstream-glib.diff)
===================================================================
--- trunk/dports/gnome/totem/files/patch-use-appstream-glib.diff	                        (rev 0)
+++ trunk/dports/gnome/totem/files/patch-use-appstream-glib.diff	2014-11-14 18:05:28 UTC (rev 128149)
@@ -0,0 +1,55 @@
+From cfd1b748e47cf66b7d7921fe9eeae743b9ab8f84 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip.withnall at collabora.co.uk>
+Date: Thu, 30 Oct 2014 17:54:46 +0000
+Subject: build: Port from appdata-tools to appstream-glib
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739406
+
+diff --git a/Makefile.am b/Makefile.am
+index 4cad8f6..5cc5e53 100644
+--- Makefile.am
++++ Makefile.am
+@@ -35,7 +35,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
+ 	--with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' \
+ 	--enable-introspection \
+-	--enable-appdata-validate
++	--enable-appstream-util
+ 
+ # Build ChangeLog from GIT history
+ ChangeLog:
+diff --git a/configure.ac b/configure.ac
+index 0889741..50a3bd7 100644
+--- configure.ac
++++ configure.ac
+@@ -495,7 +495,7 @@ GNOME_CXX_WARNINGS
+ GNOME_MAINTAINER_MODE_DEFINES
+ GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ 
+-APPDATA_XML
++APPSTREAM_XML
+ 
+ # This macro expands DIR and assigns it to RET.
+ # If DIR is NONE, then it's replaced by DEFAULT.
+diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
+index 50d848f..89ade54 100644
+--- data/appdata/Makefile.am
++++ data/appdata/Makefile.am
+@@ -1,9 +1,9 @@
+ # AppData
+- at APPDATA_XML_RULES@
++ at APPSTREAM_XML_RULES@
+ @INTLTOOL_XML_RULE@
+ 
+-appdata_in_files = org.gnome.Totem.appdata.xml.in
+-appdata_XML = $(appdata_in_files:.xml.in=.xml)
++appstream_in_files = org.gnome.Totem.appdata.xml.in
++appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ 
+-EXTRA_DIST = $(appdata_in_files)
+-CLEANFILES = $(appdata_XML)
++EXTRA_DIST = $(appstream_in_files)
++CLEANFILES = $(appstream_XML)
+-- 
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141114/4ba1d959/attachment.html>