<!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>[135558] trunk/dports/gnome/gtksourceview</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/135558">135558</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-26 06:22:55 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtksourceview: patch to fix build, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtksourceviewPortfile">trunk/dports/gnome/gtksourceview/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtksourceviewfilesautogensh">trunk/dports/gnome/gtksourceview/files/autogen.sh</a></li>
<li><a href="#trunkdportsgnomegtksourceviewfilespatchconfigureindiff">trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff</a></li>
<li><a href="#trunkdportsgnomegtksourceviewfilespatchgconst_returndiff">trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegtksourceviewPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gtksourceview/Portfile (135557 => 135558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtksourceview/Portfile 2015-04-26 08:58:23 UTC (rev 135557)
+++ trunk/dports/gnome/gtksourceview/Portfile 2015-04-26 13:22:55 UTC (rev 135558)
</span><span class="lines">@@ -29,7 +29,10 @@
</span><span class="cx"> depends_build port:intltool \
</span><span class="cx"> port:pkgconfig \
</span><span class="cx"> port:gnome-common \
</span><del>- port:gtk-doc
</del><ins>+ port:gtk-doc \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk2 \
</span><span class="cx"> port:gnome-vfs \
</span><span class="lines">@@ -39,15 +42,22 @@
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:gnuregex
</span><span class="cx">
</span><del>-patchfiles patch-glib-2.32.diff \
</del><ins>+patchfiles patch-configure.in.diff \
+ patch-glib-2.32.diff \
+ patch-gconst_return.diff \
</ins><span class="cx"> patch-gtksourceregex.c.diff \
</span><span class="cx"> patch-gtksourcelanguage.c.diff
</span><span class="cx">
</span><del>-# autoreconf to reconfigure with our intltool.m4
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
</ins><span class="cx">
</span><ins>+configure.cmd ./autogen.sh
+
+configure.args --enable-compile-warnings=minimum
+
</ins><span class="cx"> #test-widget.c:186:26: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
</span><span class="cx"> # tmp = g_strdup_vprintf (msg, ap);
</span><span class="cx"> # ^~~
</span><span class="lines">@@ -57,7 +67,7 @@
</span><span class="cx"> # TODO: fix code rather than suppress fatal error
</span><span class="cx">
</span><span class="cx"> configure.cflags-append \
</span><del>- -Wno-error=format-nonliteral -Wno-error=format-security
</del><ins>+ -Wno-error=format-nonliteral -Wno-error=format-security -Wno-implicit-function-declaration
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
</span></span></pre></div>
<a id="trunkdportsgnomegtksourceviewfilesautogensh"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gtksourceview/files/autogen.sh (0 => 135558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtksourceview/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/autogen.sh 2015-04-26 13:22:55 UTC (rev 135558)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gtksourceview"
+
+(test -f $srcdir/configure.in \
+ && test -f $srcdir/README \
+ && test -d $srcdir/gtksourceview) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.7.2
+
+USE_GNOME2_MACROS=1 NOCONFIGURE=1 . gnome-autogen.sh
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+echo $srcdir/configure $conf_flags "$@"
+$srcdir/configure $conf_flags "$@"
+
</ins></span></pre></div>
<a id="trunkdportsgnomegtksourceviewfilespatchconfigureindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff (0 => 135558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-configure.in.diff 2015-04-26 13:22:55 UTC (rev 135558)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- configure.in.orig 2015-04-26 06:14:05.000000000 -0700
++++ configure.in 2015-04-26 06:14:34.000000000 -0700
+@@ -45,7 +45,7 @@
+ GNOME_COMMON_INIT
+ if test x$MAINT = x; then
+ GNOME_COMPILE_WARNINGS(error)
+- DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
++ DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+ else
+ GNOME_COMPILE_WARNINGS(maximum)
+ DEPRECATED_FLAGS=""
</ins></span></pre></div>
<a id="trunkdportsgnomegtksourceviewfilespatchgconst_returndiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff (0 => 135558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-gconst_return.diff 2015-04-26 13:22:55 UTC (rev 135558)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+diff -ur gtksourceview.orig/gtksourcemarker.c gtksourceview/gtksourcemarker.c
+--- gtksourceview.orig/gtksourcemarker.c 2015-04-26 06:05:08.000000000 -0700
++++ gtksourceview/gtksourcemarker.c 2015-04-26 06:06:45.000000000 -0700
+@@ -110,7 +110,7 @@
+ *
+ * Return value: the name.
+ **/
+-G_CONST_RETURN gchar *
++const gchar *
+ gtk_source_marker_get_name (GtkSourceMarker *marker)
+ {
+ g_return_val_if_fail (marker != NULL, NULL);
+Only in gtksourceview: gtksourcemarker.c-e
+diff -ur gtksourceview.orig/gtksourcemarker.h gtksourceview/gtksourcemarker.h
+--- gtksourceview.orig/gtksourcemarker.h 2015-04-26 06:05:08.000000000 -0700
++++ gtksourceview/gtksourcemarker.h 2015-04-26 06:06:45.000000000 -0700
+@@ -41,7 +41,7 @@
+ const gchar *type);
+ gchar *gtk_source_marker_get_marker_type (GtkSourceMarker *marker);
+ gint gtk_source_marker_get_line (GtkSourceMarker *marker);
+-G_CONST_RETURN gchar *gtk_source_marker_get_name (GtkSourceMarker *marker);
++const gchar *gtk_source_marker_get_name (GtkSourceMarker *marker);
+ GtkSourceBuffer *gtk_source_marker_get_buffer (GtkSourceMarker *marker);
+ GtkSourceMarker *gtk_source_marker_next (GtkSourceMarker *marker);
+ GtkSourceMarker *gtk_source_marker_prev (GtkSourceMarker *marker);
+Only in gtksourceview: gtksourcemarker.h-e
</ins></span></pre>
</div>
</div>
</body>
</html>