<!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>[138837] users/devans/GNOME-3/unstable/dports/gnome/gedit</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/138837">138837</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-07-20 23:11:09 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: gedit, merge recent commits from stable and update to version 3.17.2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditPortfile">users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditfilespatchconfigureacdiff">users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegedit">users/devans/GNOME-3/unstable/dports/gnome/gedit/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomegedit"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/unstable/dports/gnome/gedit</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/stable/dports/gnome/gedit:132144-136501
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920
</span><span class="cx"> + /trunk/dports/gnome/gedit:108265-127338
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gedit:132144-138834
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920
</span><a id="usersdevansGNOME3unstabledportsgnomegeditPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile (138836 => 138837)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2015-07-21 06:07:47 UTC (rev 138836)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2015-07-21 06:11:09 UTC (rev 138837)
</span><span class="lines">@@ -2,9 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name gedit
</span><del>-version 3.17.1
</del><ins>+version 3.17.2
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GNOME editor.
</span><span class="lines">@@ -17,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e07c37b4e9ff4a19d3e5cb809058e27d86b0df92 \
- sha256 6706a1aa2dfad0ee9ce29ec0809d75f96900dcd584c9557e876aad91c9193558
</del><ins>+checksums rmd160 b42775933085ef746f47d47c3fbb4c92da228523 \
+ sha256 d28eb5dbd530a760c5e8e531506ae3785eeea33f9eee60afb2d496439951d9b6
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -33,7 +34,6 @@
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gsettings-desktop-schemas \
</span><span class="cx"> port:gtk3 \
</span><del>- port:gvfs \
</del><span class="cx"> port:gtksourceview3 \
</span><span class="cx"> port:libpeas \
</span><span class="cx"> port:libsoup \
</span><span class="lines">@@ -42,8 +42,7 @@
</span><span class="cx"> port:iso-codes \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><del>-depends_run port:gnome-settings-daemon \
- port:yelp
</del><ins>+depends_run port:gnome-themes-standard
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff
</span><span class="cx">
</span><span class="lines">@@ -72,6 +71,20 @@
</span><span class="cx"> configure.args-replace --disable-python --enable-python
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant quartz {}
+
+if {[variant_isset quartz]} {
+ require_active_variants gtk3 quartz
+ configure.args-append --disable-gvfs-metadata
+ depends_lib-append port:gtk-osx-application-gtk3
+} else {
+ require_active_variants gtk3 x11
+ configure.args-append --enable-gvfs-metadata
+ depends_lib-append port:gvfs
+ depends_run-append port:gnome-settings-daemon \
+ port:yelp
+}
+
</ins><span class="cx"> default_variants +python34
</span><span class="cx">
</span><span class="cx"> notes "For extra functionality install gedit-plugins"
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegeditfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff (138836 => 138837)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff 2015-07-21 06:07:47 UTC (rev 138836)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff 2015-07-21 06:11:09 UTC (rev 138837)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2014-11-09 12:10:59.000000000 -0800
-+++ configure.ac 2014-11-16 15:06:49.000000000 -0800
-@@ -190,8 +190,9 @@
</del><ins>+--- configure.ac.orig 2015-07-20 08:37:46.000000000 -0700
++++ configure.ac 2015-07-20 21:40:49.000000000 -0700
+@@ -177,8 +177,9 @@
</ins><span class="cx">
</span><span class="cx"> IT_PROG_INTLTOOL([0.50.1])
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>