[125347] trunk/dports/python/quodlibet

[elelay at macports.org]

Revision: 125347
          https://trac.macports.org/changeset/125347
Author:   elelay at macports.org
Date:     2014-09-14 02:37:37 -0700 (Sun, 14 Sep 2014)
Log Message:
-----------
quodlibet: fix no file can be added to library (upstream bug 1465)

Modified Paths:
--------------
    trunk/dports/python/quodlibet/Portfile

Added Paths:
-----------
    trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff

Modified: trunk/dports/python/quodlibet/Portfile
===================================================================
--- 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)
@@ -7,6 +7,8 @@
 
 name                quodlibet
 version             3.2.1
+# FIXME: remove revision upon next release!
+revision            1
 categories-append   audio gnome
 maintainers         elelay rmstonecipher openmaintainer
 license             GPL-2
@@ -38,9 +40,14 @@
                     port:py27-gobject3 \
                     port:gnome-icon-theme
 
-# 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
+# - 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
 
 variant quartz description {use the native OSX toolkit} {
     # to keep the icon in the doc when not x11 (see post-destroot)

Added: trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff
===================================================================
--- 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)
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Christoph Reiter <reiter.christoph at 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140914/146d32f5/attachment.html>