[prev in list] [next in list] [prev in thread] [next in thread] 

List:       macports-changes
Subject:    [118364] trunk/dports/gnome/gtksourceview
From:       devans () macports ! org
Date:       2014-03-31 22:45:19
Message-ID: 20140331224519.BB77B140FD4 () svn ! macports ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 118364
          https://trac.macports.org/changeset/118364
Author:   devans@macports.org
Date:     2014-03-31 15:45:19 -0700 (Mon, 31 Mar 2014)
Log Message:
-----------
gtksourceview: autoreconf to fix intltool configuration, add build fix, update build \
deps.

Modified Paths:
--------------
    trunk/dports/gnome/gtksourceview/Portfile
    trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff

Added Paths:
-----------
    trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff

Modified: trunk/dports/gnome/gtksourceview/Portfile
===================================================================
--- trunk/dports/gnome/gtksourceview/Portfile	2014-03-31 22:39:39 UTC (rev 118363)
+++ trunk/dports/gnome/gtksourceview/Portfile	2014-03-31 22:45:19 UTC (rev 118364)
@@ -27,7 +27,9 @@
                 rmd160 978c59d5f99baeb5d8b9c3c14246ffc48ce150f8
 
 depends_build   port:intltool \
-                port:pkgconfig
+                port:pkgconfig \
+                port:gnome-common \
+                port:gtk-doc
 
 depends_lib     port:gtk2 \
                 port:gnome-vfs \
@@ -37,12 +39,26 @@
                 port:gettext \
                 port:gnuregex
 
-patchfiles      patch-glib-2.32.diff patch-gtksourceregex.c.diff
+patchfiles      patch-glib-2.32.diff \
+                patch-gtksourceregex.c.diff \
+                patch-gtksourcelanguage.c.diff
 
-configure.args  --enable-gnuregex
+# autoreconf to reconfigure with our intltool.m4
 
-configure.cppflags-append   -L${prefix}/lib
+use_autoreconf  yes
+autoreconf.args -fvi
 
+#test-widget.c:186:26: error: format string is not a string literal \
[-Werror,-Wformat-nonliteral] +#        tmp = g_strdup_vprintf (msg, ap);
+#                                ^~~
+#test-widget.c:193:7: error: format string is not a string literal (potentially \
insecure) [-Werror,-Wformat-security] +#                                         \
tmp); +#                                          ^~~
+# TODO: fix code rather than suppress fatal error
+
+configure.cflags-append \
+                -Wno-error=format-nonliteral -Wno-error=format-security
+
 livecheck.type  regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

Added: trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff
===================================================================
--- trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff	            \
                (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff	2014-03-31 \
22:45:19 UTC (rev 118364) @@ -0,0 +1,10 @@
+--- gtksourceview/gtksourcelanguage.c.orig	2014-03-31 13:07:52.000000000 -0700
++++ gtksourceview/gtksourcelanguage.c	2014-03-31 13:08:31.000000000 -0700
+@@ -31,6 +31,7 @@
+ #include <libxml/xmlreader.h>
+ 
+ #include <glib.h>
++#include <glib/gstdio.h>
+ 
+ #include "gtksourceview-i18n.h"
+ 

Modified: trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff
===================================================================
--- trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff	2014-03-31 \
                22:39:39 UTC (rev 118363)
+++ trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff	2014-03-31 \
22:45:19 UTC (rev 118364) @@ -1,5 +1,5 @@
---- gtksourceview/gtksourceregex.c.org	Fri Nov 28 11:23:58 2003
-+++ gtksourceview/gtksourceregex.c	Fri Nov 28 11:24:18 2003
+--- gtksourceview/gtksourceregex.c.orig	2007-01-03 07:40:28.000000000 -0800
++++ gtksourceview/gtksourceregex.c	2014-03-31 13:12:04.000000000 -0700
 @@ -26,12 +26,7 @@
  #include <stdlib.h>
  #include <glib.h>
@@ -9,8 +9,8 @@
 -#include <regex.h>
 -#else
 -#include "gnu-regex/regex.h"
+-#endif
 +#include <gnuregex.h>
--#endif
  
- #include "gtksourceview-i18n.h"
  #include "gtksourceregex.h"
+ 


[Attachment #5 (text/html)]

<!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>[118364] 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/118364">118364</a></dd> <dt>Author</dt> \
<dd>devans@macports.org</dd> <dt>Date</dt> <dd>2014-03-31 15:45:19 -0700 (Mon, 31 Mar \
2014)</dd> </dl>

<h3>Log Message</h3>
<pre>gtksourceview: autoreconf to fix intltool configuration, add build fix, update \
build deps.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtksourceviewPortfile">trunk/dports/gnome/gtksourceview/Portfile</a></li>
 <li><a href="#trunkdportsgnomegtksourceviewfilespatchgtksourceregexcdiff">trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff</a></li>
 </ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtksourceviewfilespatchgtksourcelanguagecdiff">trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.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 (118363 \
=> 118364)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtksourceview/Portfile	2014-03-31 22:39:39 \
                UTC (rev 118363)
+++ trunk/dports/gnome/gtksourceview/Portfile	2014-03-31 22:45:19 UTC (rev 118364)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx">                 rmd160 \
978c59d5f99baeb5d8b9c3c14246ffc48ce150f8 </span><span class="cx"> 
</span><span class="cx"> depends_build   port:intltool \
</span><del>-                port:pkgconfig
</del><ins>+                port:pkgconfig \
+                port:gnome-common \
+                port:gtk-doc
</ins><span class="cx"> 
</span><span class="cx"> depends_lib     port:gtk2 \
</span><span class="cx">                 port:gnome-vfs \
</span><span class="lines">@@ -37,12 +39,26 @@
</span><span class="cx">                 port:gettext \
</span><span class="cx">                 port:gnuregex
</span><span class="cx"> 
</span><del>-patchfiles      patch-glib-2.32.diff patch-gtksourceregex.c.diff
</del><ins>+patchfiles      patch-glib-2.32.diff \
+                patch-gtksourceregex.c.diff \
+                patch-gtksourcelanguage.c.diff
</ins><span class="cx"> 
</span><del>-configure.args  --enable-gnuregex
</del><ins>+# autoreconf to reconfigure with our intltool.m4
</ins><span class="cx"> 
</span><del>-configure.cppflags-append   -L${prefix}/lib
</del><ins>+use_autoreconf  yes
+autoreconf.args -fvi
</ins><span class="cx"> 
</span><ins>+#test-widget.c:186:26: error: format string is not a string literal \
[-Werror,-Wformat-nonliteral] +#        tmp = g_strdup_vprintf (msg, ap);
+#                                ^~~
+#test-widget.c:193:7: error: format string is not a string literal (potentially \
insecure) [-Werror,-Wformat-security] +#                                         \
tmp); +#                                          ^~~
+# TODO: fix code rather than suppress fatal error
+
+configure.cflags-append \
+                -Wno-error=format-nonliteral -Wno-error=format-security
+
</ins><span class="cx"> livecheck.type  regex
</span><span class="cx"> livecheck.url   \
http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/ </span><span class="cx"> \
livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)} </span></span></pre></div>
<a id="trunkdportsgnomegtksourceviewfilespatchgtksourcelanguagecdiff"></a>
<div class="addfile"><h4>Added: \
trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff (0 => \
118364)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff	                \
                (rev 0)
+++ trunk/dports/gnome/gtksourceview/files/patch-gtksourcelanguage.c.diff	2014-03-31 \
22:45:19 UTC (rev 118364) </span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- gtksourceview/gtksourcelanguage.c.orig	2014-03-31 13:07:52.000000000 \
-0700 ++++ gtksourceview/gtksourcelanguage.c	2014-03-31 13:08:31.000000000 -0700
+@@ -31,6 +31,7 @@
+ #include &lt;libxml/xmlreader.h&gt;
+ 
+ #include &lt;glib.h&gt;
++#include &lt;glib/gstdio.h&gt;
+ 
+ #include &quot;gtksourceview-i18n.h&quot;
+ 
</ins></span></pre></div>
<a id="trunkdportsgnomegtksourceviewfilespatchgtksourceregexcdiff"></a>
<div class="modfile"><h4>Modified: \
trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff (118363 => \
118364)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff	2014-03-31 \
                22:39:39 UTC (rev 118363)
+++ trunk/dports/gnome/gtksourceview/files/patch-gtksourceregex.c.diff	2014-03-31 \
22:45:19 UTC (rev 118364) </span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- gtksourceview/gtksourceregex.c.org	Fri Nov 28 11:23:58 2003
-+++ gtksourceview/gtksourceregex.c	Fri Nov 28 11:24:18 2003
</del><ins>+--- gtksourceview/gtksourceregex.c.orig	2007-01-03 07:40:28.000000000 \
-0800 ++++ gtksourceview/gtksourceregex.c	2014-03-31 13:12:04.000000000 -0700
</ins><span class="cx"> @@ -26,12 +26,7 @@
</span><span class="cx">  #include &lt;stdlib.h&gt;
</span><span class="cx">  #include &lt;glib.h&gt;
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> -#include &lt;regex.h&gt;
</span><span class="cx"> -#else
</span><span class="cx"> -#include &quot;gnu-regex/regex.h&quot;
</span><ins>+-#endif
</ins><span class="cx"> +#include &lt;gnuregex.h&gt;
</span><del>--#endif
</del><span class="cx">  
</span><del>- #include &quot;gtksourceview-i18n.h&quot;
</del><span class="cx">  #include &quot;gtksourceregex.h&quot;
</span><ins>+ 
</ins></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-changes


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic