packages: quodlibet/quodlibet-nopy.patch, quodlibet/quodlibet.spec - update...

wrobell wrobell at pld-linux.org
Sat Jun 16 18:44:33 CEST 2012


Author: wrobell                      Date: Sat Jun 16 16:44:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated nopy patch to fix dynamic loading of format modules
- rel. 2

---- Files affected:
packages/quodlibet:
   quodlibet-nopy.patch (1.2 -> 1.3) , quodlibet.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: packages/quodlibet/quodlibet-nopy.patch
diff -u packages/quodlibet/quodlibet-nopy.patch:1.2 packages/quodlibet/quodlibet-nopy.patch:1.3
--- packages/quodlibet/quodlibet-nopy.patch:1.2	Sun Apr  3 19:21:01 2011
+++ packages/quodlibet/quodlibet-nopy.patch	Sat Jun 16 18:44:28 2012
@@ -1,6 +1,7 @@
---- quodlibet-2.1/quodlibet/devices/__init__.py.wiget	2009-07-04 06:40:37.000000000 +0200
-+++ quodlibet-2.1/quodlibet/devices/__init__.py	2009-09-27 16:34:01.000000000 +0200
-@@ -24,8 +24,11 @@ from quodlibet import const
+diff -Nur quodlibet-2.4.orig/quodlibet/devices/__init__.py quodlibet-2.4/quodlibet/devices/__init__.py
+--- quodlibet-2.4.orig/quodlibet/devices/__init__.py	2012-03-18 15:19:05.000000000 +0000
++++ quodlibet-2.4/quodlibet/devices/__init__.py	2012-06-16 17:35:53.000000000 +0100
+@@ -31,8 +31,11 @@
  base = dirname(__file__)
  self = basename(base)
  parent = basename(dirname(base))
@@ -9,14 +10,33 @@
 +exts = ('.py', '.pyo', '.pyc')
 +modules = set()
 +for ext in exts:
-+    modules = modules | set([f[:-len(ext)] for f in glob(join(base, "[!_]*" + ext))])
-+modules = set(["%s.%s.%s" % (parent, self, basename(m)) for m in modules])
++    modules = modules | set(f[:-len(ext)] for f in glob(join(base, "[!_]*" + ext)))
++modules = set("%s.%s.%s" % (parent, self, basename(m)) for m in modules)
  
  devices = []
  for _name in modules:
---- quodlibet-2.1/quodlibet/plugins/__init__.py.wiget	2009-07-04 06:40:37.000000000 +0200
-+++ quodlibet-2.1/quodlibet/plugins/__init__.py	2009-09-27 16:34:01.000000000 +0200
-@@ -130,7 +130,11 @@ class Manager(object):
+diff -Nur quodlibet-2.4.orig/quodlibet/formats/__init__.py quodlibet-2.4/quodlibet/formats/__init__.py
+--- quodlibet-2.4.orig/quodlibet/formats/__init__.py	2012-03-18 15:19:05.000000000 +0000
++++ quodlibet-2.4/quodlibet/formats/__init__.py	2012-06-16 17:41:46.000000000 +0100
+@@ -18,8 +18,12 @@
+     # Windows needs to load .pyc files
+     glob_pattern = "[!_]*.py*"
+ else: glob_pattern = "[!_]*.py"
+-modules = [splitext(f)[0] for f in glob(join(base, glob_pattern))]
+-modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in set(modules)]
++
++exts = ('.py', '.pyo', '.pyc')
++modules = set()
++for ext in exts:
++    modules = modules | set(f[:-len(ext)] for f in glob(join(base, "[!_]*" + ext)))
++modules = ["%s.%s.%s" % (parent, self, basename(m)) for m in modules]
+ 
+ _infos = {}
+ for i, name in enumerate(modules):
+diff -Nur quodlibet-2.4.orig/quodlibet/plugins/__init__.py quodlibet-2.4/quodlibet/plugins/__init__.py
+--- quodlibet-2.4.orig/quodlibet/plugins/__init__.py	2012-03-18 15:19:05.000000000 +0000
++++ quodlibet-2.4/quodlibet/plugins/__init__.py	2012-06-16 17:32:18.000000000 +0100
+@@ -140,7 +140,11 @@
          """Check directories for new or changed plugins."""
  
          for scandir in self.scan:

================================================================
Index: packages/quodlibet/quodlibet.spec
diff -u packages/quodlibet/quodlibet.spec:1.76 packages/quodlibet/quodlibet.spec:1.77
--- packages/quodlibet/quodlibet.spec:1.76	Wed Mar 21 12:24:26 2012
+++ packages/quodlibet/quodlibet.spec	Sat Jun 16 18:44:28 2012
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Quod Libet - odtwarzacz dźwięku oparty na GTK+
 Name:		quodlibet
 Version:	2.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Multimedia
 Source0:	http://quodlibet.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -145,6 +145,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2012/06/16 16:44:28  wrobell
+- updated nopy patch to fix dynamic loading of format modules
+- rel. 2
+
 Revision 1.76  2012/03/21 11:24:26  kiesiu
 - updated to 2.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/quodlibet/quodlibet-nopy.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/quodlibet/quodlibet.spec?r1=1.76&r2=1.77



More information about the pld-cvs-commit mailing list