<!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>[118357] trunk/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/118357">118357</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-31 15:21:24 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gedit: update m4/intltool.m4 and autoreconf to fix intltool configuration, build fix, update patch file, build deps.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegeditPortfile">trunk/dports/gnome/gedit/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegeditfilespatchconfigureacdiff">trunk/dports/gnome/gedit/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegeditfilespatchconfigurediff">trunk/dports/gnome/gedit/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegeditPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gedit/Portfile (118356 => 118357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gedit/Portfile 2014-03-31 22:14:36 UTC (rev 118356)
+++ trunk/dports/gnome/gedit/Portfile 2014-03-31 22:21:24 UTC (rev 118357)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> depends_build port:gtk-doc \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:gnome-doc-utils \
</span><ins>+ port:gnome-common \
</ins><span class="cx"> port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="lines">@@ -38,14 +39,26 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-configure.ac.diff
</ins><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-scrollkeeper \
</span><span class="cx"> --disable-schemas-install \
</span><span class="cx"> --disable-gvfs-metadata \
</span><span class="cx"> --disable-updater
</span><span class="cx">
</span><ins>+configure.cflags-append \
+ -Wno-error=pointer-arith -Wno-error=format-nonliteral
+
</ins><span class="cx"> variant python26 conflicts python27 description {Use python 2.6} {
</span><span class="cx"> configure.python ${prefix}/bin/python2.6
</span><span class="cx"> depends_lib-append port:py26-pygtksourceview
</span></span></pre></div>
<a id="trunkdportsgnomegeditfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gedit/files/patch-configure.ac.diff (0 => 118357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gedit/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gedit/files/patch-configure.ac.diff 2014-03-31 22:21:24 UTC (rev 118357)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+--- configure.ac.orig 2014-03-30 08:45:14.000000000 -0700
++++ configure.ac 2014-03-30 08:52:58.000000000 -0700
+@@ -155,8 +155,9 @@
+
+ IT_PROG_INTLTOOL([0.40.0])
+ AC_SUBST([GETTEXT_PACKAGE], [gedit])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GLIB_GNU_GETTEXT
++dnl Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
++dnl AM_GNU_GETTEXT_VERSION([0.17])
++dnl AM_GLIB_GNU_GETTEXT
+ AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
+
+ dnl ================================================================
+@@ -271,6 +272,7 @@
+ libxml-2.0 >= 2.5.0
+ glib-2.0 >= 2.22.0
+ gthread-2.0 >= 2.13.0
++ gmodule-2.0
+ gio-2.0 >= 2.23.1
+ gtk+-2.0 >= 2.16.0
+ gtksourceview-2.0 >= 2.9.7
+@@ -280,7 +282,7 @@
+ if test "$os_osx" = "no" &&
+ test "$os_win32" = "no"; then
+ PKG_CHECK_MODULES(X11, [
+- x11
++ x11 ice
+ ])
+ else
+ X11_CFLAGS=
</ins></span></pre></div>
<a id="trunkdportsgnomegeditfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gedit/files/patch-configure.diff (118356 => 118357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gedit/files/patch-configure.diff 2014-03-31 22:14:36 UTC (rev 118356)
+++ trunk/dports/gnome/gedit/files/patch-configure.diff 2014-03-31 22:21:24 UTC (rev 118357)
</span><span class="lines">@@ -1,145 +0,0 @@
</span><del>---- configure.orig 2013-02-11 09:46:05.000000000 -0800
-+++ configure 2013-02-11 09:47:49.000000000 -0800
-@@ -13874,6 +13874,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13883,6 +13884,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13895,6 +13897,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13914,6 +13917,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13923,6 +13927,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13935,6 +13940,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13963,6 +13969,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13973,6 +13980,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13986,6 +13994,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -14038,15 +14047,18 @@ if test -n "$X11_CFLAGS"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
-+ ice
- \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- x11
-+ ice
- ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "
- x11
-+ ice
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -14060,15 +14072,18 @@ if test -n "$X11_LIBS"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
-+ ice
- \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- x11
-+ ice
- ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "
- x11
-+ ice
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -14091,10 +14106,12 @@ fi
- if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
- x11
-+ ice
- " 2>&1`
- else
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "
- x11
-+ ice
- " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -14102,6 +14119,7 @@ fi
-
- as_fn_error $? "Package requirements (
- x11
-+ ice
- ) were not met:
-
- $X11_PKG_ERRORS
-@@ -14495,9 +14495,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
-
-
-
</del></span></pre>
</div>
</div>
</body>
</html>