<!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>[116630] 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/116630">116630</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-31 12:46:54 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable/dports: gedit, sync with stable, update patch files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditPortfile">users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditfilespatchconfigurediff">users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditfilespatchgeditgeditappcdiff">users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegeditfilesautogensh">users/devans/GNOME-3/unstable/dports/gnome/gedit/files/autogen.sh</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"> + /trunk/dports/gnome/gedit:108265-116598
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gedit:114069-116629
</span><a id="usersdevansGNOME3unstabledportsgnomegeditPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile (116629 => 116630)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2014-01-31 19:55:02 UTC (rev 116629)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile 2014-01-31 20:46:54 UTC (rev 116630)
</span><span class="lines">@@ -23,7 +23,13 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:itstool
</del><ins>+ port:itstool \
+ port:yelp-tools \
+ port:automake \
+ port:autoconf \
+ port:libtool \
+ port:gnome-common \
+ port:gtk-doc
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-icon-theme \
</span><span class="lines">@@ -49,6 +55,14 @@
</span><span class="cx"> patchfiles patch-configure.diff \
</span><span class="cx"> patch-gedit-gedit-app.c.diff
</span><span class="cx">
</span><ins>+# use autogen.sh from upstream git to update intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd ./autogen.sh
+
</ins><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="cx">
</span><span class="lines">@@ -57,10 +71,6 @@
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><del>-# libpeas is not universal
-
-universal_variant no
-
</del><span class="cx"> # minimum python version is 3.2.3
</span><span class="cx">
</span><span class="cx"> variant python32 description {Use python 3.2} {
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegeditfilesautogenshfromrev116629usersdevansGNOME3stabledportsgnomegeditfilesautogensh"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/autogen.sh (from rev 116629, users/devans/GNOME-3/stable/dports/gnome/gedit/files/autogen.sh) (0 => 116630)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/autogen.sh 2014-01-31 20:46:54 UTC (rev 116630)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+OLDDIR=`pwd`
+cd $srcdir
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please intall it ***"
+ exit 1
+fi
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+ echo "*** No intltoolize found, please install the intltool package ***"
+ exit 1
+fi
+
+GNOMEDOC=`which yelp-build`
+if test -z $GNOMEDOC; then
+ echo "*** The tools to build the documentation are not found,"
+ echo " please intall the yelp-tools package ***"
+ exit 1
+fi
+
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+ echo "*** No GTK-Doc found, please install it ***"
+ exit 1
+fi
+
+git submodule update --init --recursive
+
+gtkdocize || exit $?
+autopoint --force || exit $?
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+
+cd $OLDDIR
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegeditfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff (116629 => 116630)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff 2014-01-31 19:55:02 UTC (rev 116629)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.diff 2014-01-31 20:46:54 UTC (rev 116630)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2013-12-20 08:15:32.000000000 -0800
-+++ configure 2013-12-20 15:02:06.000000000 -0800
-@@ -16556,9 +16556,9 @@
</del><ins>+--- configure.orig 2014-01-21 14:52:42.000000000 -0800
++++ configure 2014-01-29 14:54:13.000000000 -0800
+@@ -16457,9 +16457,9 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegeditfilespatchgeditgeditappcdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff (116629 => 116630)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-01-31 19:55:02 UTC (rev 116629)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-01-31 20:46:54 UTC (rev 116630)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>---- gedit/gedit-app.c.orig 2013-09-29 07:56:34.000000000 -0700
-+++ gedit/gedit-app.c 2013-11-03 01:37:41.000000000 -0800
-@@ -95,7 +95,7 @@
</del><ins>+--- gedit/gedit-app.c.orig 2014-01-11 05:54:03.000000000 -0800
++++ gedit/gedit-app.c 2014-01-31 12:12:54.000000000 -0800
+@@ -96,7 +96,7 @@
</ins><span class="cx"> static gboolean new_window = FALSE;
</span><span class="cx"> static gboolean new_document = FALSE;
</span><span class="cx"> static gchar *geometry = NULL;
</span><span class="cx"> -static gboolean wait = FALSE;
</span><span class="cx"> +static gboolean gwait = FALSE;
</span><ins>+ static gboolean gapplication_service = FALSE;
</ins><span class="cx"> static gboolean standalone = FALSE;
</span><span class="cx"> static gchar **remaining_args = NULL;
</span><del>- static const GeditEncoding *encoding = NULL;
-@@ -161,7 +161,7 @@
</del><ins>+@@ -171,7 +171,7 @@
</ins><span class="cx"> /* Wait for closing documents */
</span><span class="cx"> {
</span><span class="cx"> "wait", 'w', 0, G_OPTION_ARG_NONE,
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> N_("Open files and block process until files are closed"),
</span><span class="cx"> NULL
</span><span class="cx"> },
</span><del>-@@ -753,7 +753,7 @@
</del><ins>+@@ -811,7 +811,7 @@
</ins><span class="cx"> new_window = FALSE;
</span><span class="cx"> new_document = FALSE;
</span><span class="cx"> geometry = NULL;
</span><span class="lines">@@ -27,3 +27,12 @@
</span><span class="cx"> standalone = FALSE;
</span><span class="cx"> remaining_args = NULL;
</span><span class="cx"> encoding = NULL;
</span><ins>+@@ -874,7 +874,7 @@
+ }
+ else
+ {
+- if (wait)
++ if (gwait)
+ {
+ command_line = cl;
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>