<!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>[153004] users/devans/GNOME-3/stable/dports/gnome/dconf-editor</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/153004">153004</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-09-22 00:49:13 -0700 (Thu, 22 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: dconf-editor, merge unstable to stable and update to stable version 3.22.0, use upstream patch to fix appdata installation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfeditorPortfile">users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfeditorfilesfixappdatainstallationpatch">users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfeditor">users/devans/GNOME-3/stable/dports/gnome/dconf-editor/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomedconfeditor"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/dconf-editor</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/dconf-editor:141711-147190
</span><span class="cx">/users/rmstonecipher/gnome/dconf-editor:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/dconf-editor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/dconf-editor:141711-147190,148132-153003
</span><span class="cx">/users/rmstonecipher/gnome/dconf-editor:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomedconfeditorPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile (153003 => 153004)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile 2016-09-22 07:28:11 UTC (rev 153003)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile 2016-09-22 07:49:13 UTC (rev 153004)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name dconf-editor
</span><del>-version 3.20.3
</del><ins>+version 3.22.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e0c09d2427fde084a126ab1e83ebb09ff6526d30 \
- sha256 a8721499a277550b28d8dd94dafbea6efeb95fa153020da10603d0d4d628c579
</del><ins>+checksums rmd160 b0c185196076490522d0456a949088af7f3db334 \
+ sha256 4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-themes-standard
</span><span class="cx">
</span><ins>+patchfiles fix-appdata-installation.patch
+
</ins><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedconfeditorfilesfixappdatainstallationpatch"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch (0 => 153004)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch 2016-09-22 07:49:13 UTC (rev 153004)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From a51f887042419d721fcb996751b74e528dbabaf5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Thu, 22 Sep 2016 06:28:25 +0200
+Subject: Fix appdata installation
+
+Add back @APPSTREAM_XML_RULES@ that got accidentally lost in commit
+8ae85f0.
+---
+ editor/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/editor/Makefile.am b/editor/Makefile.am
+index 3ef2952..a3d13c1 100644
+--- editor/Makefile.am
++++ editor/Makefile.am
+@@ -68,6 +68,7 @@ ca.desrt.dconf-editor.service: Makefile
+ echo 'Exec=${bindir}/dconf-editor --gapplication-service') > $@.tmp && \
+ mv $@.tmp $@
+
++@APPSTREAM_XML_RULES@
+ appstream_in_files = ca.desrt.dconf-editor.appdata.xml.in
+ appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+--
+cgit v0.12
+
</ins></span></pre>
</div>
</div>
</body>
</html>