<!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>[125347] trunk/dports/python/quodlibet</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/125347">125347</a></dd>
<dt>Author</dt> <dd>elelay@macports.org</dd>
<dt>Date</dt> <dd>2014-09-14 02:37:37 -0700 (Sun, 14 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>quodlibet: fix no file can be added to library (upstream bug 1465)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonquodlibetPortfile">trunk/dports/python/quodlibet/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonquodlibetfilespatchde134e03fix_normalize_darwin_pathdiff">trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonquodlibetPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/quodlibet/Portfile (125346 => 125347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/quodlibet/Portfile 2014-09-14 03:32:43 UTC (rev 125346)
+++ trunk/dports/python/quodlibet/Portfile 2014-09-14 09:37:37 UTC (rev 125347)
</span><span class="lines">@@ -7,6 +7,8 @@
</span><span class="cx">
</span><span class="cx"> name quodlibet
</span><span class="cx"> version 3.2.1
</span><ins>+# FIXME: remove revision upon next release!
+revision 1
</ins><span class="cx"> categories-append audio gnome
</span><span class="cx"> maintainers elelay rmstonecipher openmaintainer
</span><span class="cx"> license GPL-2
</span><span class="lines">@@ -38,9 +40,14 @@
</span><span class="cx"> port:py27-gobject3 \
</span><span class="cx"> port:gnome-icon-theme
</span><span class="cx">
</span><del>-# when run as an application, the argument -psn_x_xxxxx is passed to the program
-# but quodlibet is not prepared to handle it...
-patchfiles patch-ignore_psn.diff
</del><ins>+# - patch-ignore_psn.diff
+# when run as an application, the argument -psn_x_xxxxx is passed to the program
+# but quodlibet is not prepared to handle it...
+# - patch-de134e03-fix_normalize_darwin_path.diff
+# fix regression on OS X preventing any file from being added to library
+# TODO: remove after next release
+patchfiles patch-ignore_psn.diff \
+ patch-de134e03-fix_normalize_darwin_path.diff
</ins><span class="cx">
</span><span class="cx"> variant quartz description {use the native OSX toolkit} {
</span><span class="cx"> # to keep the icon in the doc when not x11 (see post-destroot)
</span></span></pre></div>
<a id="trunkdportspythonquodlibetfilespatchde134e03fix_normalize_darwin_pathdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff (0 => 125347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff (rev 0)
+++ trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff 2014-09-14 09:37:37 UTC (rev 125347)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+# HG changeset patch
+# User Christoph Reiter <reiter.christoph@gmail.com>
+# Date 1410332863 -7200
+# Node ID de134e036c45d99c08481c43a08955f31ea1dff7
+# Parent 6342e2e6ed4bbb5bd1e2d6901bdc60ebb525399f
+Fix normalize_path() on darwin. Closes issue 1465.
+
+diff --git quodlibet/util/path.py.orig quodlibet/util/path.py
+--- quodlibet/util/path.py.orig
++++ quodlibet/util/path.py
+@@ -343,7 +343,8 @@
+ return drive + tail
+
+
+-def _normalize_darwin_path(filename, strict=False, _cache={}, _statcache={}):
++def _normalize_darwin_path(filename, canonicalise=False, strict=False,
++ _cache={}, _statcache={}):
+ """Get a normalized version of the path by calling listdir
+ and comparing the inodes with our file.
+
+@@ -352,6 +353,9 @@
+ - Supports relative and absolute paths (and returns the same).
+ """
+
++ if canonicalise:
++ filename = os.path.realpath(filename)
++
+ if filename in (".", "..", "/", ""):
+ return filename
+
+diff --git tests/test_util.py.orig tests/test_util.py
+--- tests/test_util.py
++++ tests/test_util.py
+@@ -695,8 +695,11 @@
+ os.rmdir(name)
+
+ def test_canonicalise(self):
+- from quodlibet.util.path import _normalize_path as norm
++ from quodlibet.util.path import _normalize_path, _normalize_darwin_path
++ self._test_canonicalise(_normalize_path)
++ self._test_canonicalise(_normalize_darwin_path)
+
++ def _test_canonicalise(self, norm):
+ f, path = tempfile.mkstemp()
+ os.close(f)
+ path = norm(path)
</ins></span></pre>
</div>
</div>
</body>
</html>