<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128149] trunk/dports/gnome/totem</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128149">128149</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-11-14 10:05:28 -0800 (Fri, 14 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>totem: replace dependency on appdata-tools with appstream-glib, apply upstream patch to build with appstream-xml.m4, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnometotemPortfile">trunk/dports/gnome/totem/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnometotemfilespatchuseappstreamglibdiff">trunk/dports/gnome/totem/files/patch-use-appstream-glib.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnometotem">trunk/dports/gnome/totem/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnometotem"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/totem</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/totem:117866-118154,124219-125772
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/totem:108269-128145
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/totem:117866-118154,124219-125772
</span><a id="trunkdportsgnometotemPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/totem/Portfile (128148 => 128149)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name totem
</span><span class="cx"> version 3.14.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome
</span><span class="cx"> # also has an exception allowing use of non-GPL-compatible plugins
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> port:itstool \
</span><span class="cx"> port:gnome-common \
</span><span class="cx"> port:yelp-tools \
</span><del>- port:appdata-tools
</del><ins>+ port:appstream-glib
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-desktop \
</span><span class="lines">@@ -63,7 +63,8 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-vala-cflags.diff
</del><ins>+patchfiles patch-use-appstream-glib.diff \
+ patch-vala-cflags.diff
</ins><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnometotemfilespatchuseappstreamglibdifffromrev128145usersdevansGNOME3stabledportsgnometotemfilespatchuseappstreamglibdiff"></a>
<div class="copfile"><h4>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) (0 => 128149)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+From cfd1b748e47cf66b7d7921fe9eeae743b9ab8f84 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip.withnall@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
+-@APPDATA_XML_RULES@
++@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
+
</ins></span></pre>
</div>
</div>
</body>
</html>