[137700] trunk/dports/python/quodlibet

[elelay at macports.org]

Revision: 137700
          https://trac.macports.org/changeset/137700
Author:   elelay at macports.org
Date:     2015-06-17 12:16:39 -0700 (Wed, 17 Jun 2015)
Log Message:
-----------
quodlibet: update to 3.4.1

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

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

Modified: trunk/dports/python/quodlibet/Portfile
===================================================================
--- trunk/dports/python/quodlibet/Portfile	2015-06-17 18:06:14 UTC (rev 137699)
+++ trunk/dports/python/quodlibet/Portfile	2015-06-17 19:16:39 UTC (rev 137700)
@@ -4,9 +4,10 @@
 PortSystem          1.0
 PortGroup           python 1.0
 PortGroup           app 1.0
+PortGroup           active_variants 1.1
 
 name                quodlibet
-version             3.2.2
+version             3.4.1
 categories-append   audio gnome
 maintainers         elelay openmaintainer
 license             GPL-2
@@ -23,8 +24,8 @@
 homepage            http://code.google.com/p/quodlibet/
 master_sites        https://bitbucket.org/lazka/quodlibet-files/raw/default/releases
 
-checksums           rmd160  a4289928cc486f56856eff3237aec8d88366b6fc \
-                    sha256  ad2ebf375e1ce7e8cee0bb85c3e58100d82bdec13b3fcf9b7e2210d506e025fa
+checksums           rmd160  55bc3ff6b9cf16d3e38adbfcb5821a8e2b0e7a55 \
+                    sha256  73b75ee431b1eaee0513e5e82d3dceecf05a026ce29f2eefc4461e4b19ad14c6
 
 python.default_version 27
 
@@ -36,19 +37,19 @@
                     port:py27-feedparser \
                     port:python-musicbrainz2 \
                     port:py27-gobject3 \
-                    port:gnome-icon-theme
+                    port:gnome-icon-theme \
+                    port:py27-pyobjc-cocoa
 
 # - 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
+patchfiles          patch-ignore_psn.diff
 
 variant quartz {
-    # to keep the icon in the doc when not x11 (see post-destroot)
+
+    depends_lib-append  port:gtk-osx-application
+
+    require_active_variants gtk-osx-application gtk3 ""
 }
 
 post-patch {

Deleted: trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff
===================================================================
--- trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff	2015-06-17 18:06:14 UTC (rev 137699)
+++ trunk/dports/python/quodlibet/files/patch-de134e03-fix_normalize_darwin_path.diff	2015-06-17 19:16:39 UTC (rev 137700)
@@ -1,46 +0,0 @@
-# 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/20150617/24589a08/attachment.html>