<!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>[118463] trunk/dports/gnome/gobject-introspection</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/118463">118463</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-02 14:04:50 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gobject-introspection: update to 1.40.0, remove patchfiles integrated upstream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegobjectintrospectionPortfile">trunk/dports/gnome/gobject-introspection/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegobjectintrospectionfilesglibtool_pathpatch">trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch</a></li>
<li><a href="#trunkdportsgnomegobjectintrospectionfilespatchgiscannershlibpyuseabsolutelinkagepathspatch">trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch</a></li>
<li><a href="#trunkdportsgnomegobjectintrospectionfilespatchgiscannerutilspyuseabsolutelinkagepathspatch">trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegobjectintrospectionPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gobject-introspection/Portfile (118462 => 118463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gobject-introspection/Portfile 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/Portfile 2014-04-02 21:04:50 UTC (rev 118463)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name gobject-introspection
</span><del>-version 1.38.0
-revision 1
</del><ins>+version 1.40.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories gnome
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -22,8 +21,8 @@
</span><span class="cx"> master_sites gnome:sources/${name}/${branch}/
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 f01089754ce1586c8517ab0fafeb1f96843a8d5c \
- sha256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73
</del><ins>+checksums rmd160 d7204695a94cbf3c0119e5eec72848942d19f97d \
+ sha256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -34,10 +33,6 @@
</span><span class="cx">
</span><span class="cx"> depends_run bin:glibtool:libtool
</span><span class="cx">
</span><del>-patchfiles patch-giscanner-shlib.py-use-absolute-linkage-paths.patch \
- patch-giscanner-utils.py-use-absolute-linkage-paths.patch \
- glibtool_path.patch
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|'cc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/sourcescanner.py
</span><span class="cx"> reinplace "s|'gcc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/dumper.py
</span></span></pre></div>
<a id="trunkdportsgnomegobjectintrospectionfilesglibtool_pathpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch (118462 => 118463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch 2014-04-02 21:04:50 UTC (rev 118463)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- giscanner/utils.py.orig 2013-05-13 18:04:50.000000000 -0700
-+++ giscanner/utils.py 2013-05-13 18:05:53.000000000 -0700
-@@ -140,13 +140,13 @@ def get_libtool_command(options):
- return libtool_path.split(' ')
-
- try:
-- subprocess.check_call(['libtool', '--version'],
-+ subprocess.check_call(['glibtool', '--version'],
-- stdout=open(os.devnull))
-+ stdout=open(os.devnull, 'wb'))
- except (subprocess.CalledProcessError, OSError):
- # If libtool's not installed, assume we don't need it
- return None
-
-- return ['libtool']
-+ return ['glibtool']
-
-
- def files_are_identical(path1, path2):
</del></span></pre></div>
<a id="trunkdportsgnomegobjectintrospectionfilespatchgiscannershlibpyuseabsolutelinkagepathspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch (118462 => 118463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch 2014-04-02 21:04:50 UTC (rev 118463)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- giscanner/shlibs.py.orig 2012-05-19 04:01:42.000000000 +0200
-+++ giscanner/shlibs.py 2012-05-19 04:03:23.000000000 +0200
-@@ -49,7 +49,7 @@
- # is crazy enough to name a library liblib<foo> when lib<foo> exists.
- #
- def _ldd_library_pattern(library_name):
-- return re.compile("(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-+ return re.compile("([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- % re.escape(library_name))
-
- # This is a what we do for non-la files. We assume that we are on an
</del></span></pre></div>
<a id="trunkdportsgnomegobjectintrospectionfilespatchgiscannerutilspyuseabsolutelinkagepathspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch (118462 => 118463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch 2014-04-02 21:04:50 UTC (rev 118463)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>---- giscanner/utils.py.orig 2012-07-07 12:41:26.000000000 +0200
-+++ giscanner/utils.py 2012-07-07 12:49:08.000000000 +0200
-@@ -21,6 +21,7 @@
- import re
- import os
- import subprocess
-+import platform
-
- _debugflags = None
- def have_debug_flag(flag):
-@@ -78,6 +79,18 @@
- else:
- return None
-
-+_libtool_libdir_pat = re.compile("libdir='([^']+)'")
-+
-+def _extract_libdir_field(la_file):
-+ f = open(la_file)
-+ data = f.read()
-+ f.close()
-+ m = _libtool_libdir_pat.search(data)
-+ if m:
-+ return m.groups()[0]
-+ else:
-+ return None
-+
- # Returns the name that we would pass to dlopen() the library
- # corresponding to this .la file
- def extract_libtool_shlib(la_file):
-@@ -85,6 +98,14 @@
- if dlname is None:
- return None
-
-+ # Darwin uses absolute paths where possible; since the libtool files never
-+ # contain absolute paths, use the libdir field
-+ if platform.system() == 'Darwin':
-+ dlbasename = os.path.basename(dlname)
-+ libdir = _extract_libdir_field(la_file)
-+ if libdir is None:
-+ return dlbasename
-+ return libdir + '/' + dlbasename
- # From the comments in extract_libtool(), older libtools had
- # a path rather than the raw dlname
- return os.path.basename(dlname)
</del></span></pre>
</div>
</div>
</body>
</html>