Revision: 77483 http://trac.macports.org/changeset/77483 Author: rmstonecipher@macports.org Date: 2011-03-31 21:20:50 -0700 (Thu, 31 Mar 2011) Log Message: ----------- python/quodlibet upgraded version from 2.2.1 to 2.3 Modified Paths: -------------- trunk/dports/python/quodlibet/Portfile Removed Paths: ------------- trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-properties.py.diff trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-x.py.diff Modified: trunk/dports/python/quodlibet/Portfile =================================================================== --- trunk/dports/python/quodlibet/Portfile 2011-04-01 02:07:00 UTC (rev 77482) +++ trunk/dports/python/quodlibet/Portfile 2011-04-01 04:20:50 UTC (rev 77483) @@ -5,8 +5,7 @@ PortGroup python27 1.0 name quodlibet -version 2.2.1 -revision 4 +version 2.3 categories-append audio gnome maintainers elelay rmstonecipher openmaintainer platforms darwin @@ -24,14 +23,14 @@ distfiles-append ${name}-plugins-${version}${extract.suffix} -checksums ${name}-${version}${extract.suffix} \ - md5 8e2bf197afbfca98975d0f2103629d2d \ - sha1 f6ae9a000f98a0a0d5928aa63b71244161255551 \ - rmd160 bc24798632767b06288f020acc4043be5223f4ec \ - ${name}-plugins-${version}${extract.suffix} \ - md5 c93d244eb1ceb83f4402de9143c03a2c \ - sha1 bd46e850a66630faec0b6885e98d5921f04c3637 \ - rmd160 6cb4943d9469d74006cbedd340475a48cc360940 +checksums ${name}-${version}.tar.gz \ + md5 e6bdb97decba40c33bd57e039d82c217 \ + sha1 dae756e8224139989f6b253ef2afe18eca55ef9f \ + rmd160 c5d7a8da620921d0b62b5540b77fe349fe05d965 \ + ${name}-plugins-${version}.tar.gz \ + md5 e46020047336db7c0b761167f9c47ba9 \ + sha1 171fbe847424181402343066622af5fd643806cf \ + rmd160 bbb945d748dfe5c5566b52bf07ed18be5898b6b8 depends_lib port:dbus-python27 \ port:gst-plugins-good \ @@ -40,9 +39,8 @@ port:py27-feedparser \ port:python-musicbrainz2 -patchfiles patch-setup.py.diff \ - patch-quodlibet-qltk-properties.py.diff \ - patch-quodlibet-qltk-x.py.diff +patchfiles patch-setup.py.diff + post-patch { foreach file { quodlibet.py exfalso.py } { reinplace "s|/usr/bin/env python|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \ Deleted: trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-properties.py.diff =================================================================== --- trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-properties.py.diff 2011-04-01 02:07:00 UTC (rev 77482) +++ trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-properties.py.diff 2011-04-01 04:20:50 UTC (rev 77483) @@ -1,11 +0,0 @@ ---- quodlibet/qltk/properties.py.orig 2010-04-29 21:21:40.000000000 -0500 -+++ quodlibet/qltk/properties.py 2010-04-29 21:21:59.000000000 -0500 -@@ -24,7 +24,7 @@ - } - - def __init__(self, library, songs, parent=None): -- super(SongProperties, self).__init__() -+ super(SongProperties, self).__init__(dialog=False) - self.set_transient_for(qltk.get_top_parent(parent)) - if len(songs) > 1: self.set_default_size(600, 400) - else: self.set_default_size(400, 400) Deleted: trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-x.py.diff =================================================================== --- trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-x.py.diff 2011-04-01 02:07:00 UTC (rev 77482) +++ trunk/dports/python/quodlibet/files/patch-quodlibet-qltk-x.py.diff 2011-04-01 04:20:50 UTC (rev 77483) @@ -1,72 +0,0 @@ ---- quodlibet/qltk/x.py.orig 2010-04-29 21:21:46.000000000 -0500 -+++ quodlibet/qltk/x.py 2010-04-29 21:21:59.000000000 -0500 -@@ -11,6 +11,7 @@ - import gtk - - from quodlibet import util -+from quodlibet.qltk import get_top_parent - - class Window(gtk.Window): - """A Window that binds the ^W accelerator to close. This should not -@@ -21,11 +22,14 @@ - __gsignals__ = {"close-accel": ( - gobject.SIGNAL_RUN_LAST|gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ())} - def __init__(self, *args, **kwargs): -+ dialog = kwargs.pop("dialog", True) - super(Window, self).__init__(*args, **kwargs) - type(self).childs.append(self) - self.__accels = gtk.AccelGroup() -- self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) -+ if dialog: -+ self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) - self.set_destroy_with_parent(True) -+ self.set_position(gtk.WIN_POS_CENTER_ON_PARENT) - self.add_accel_group(self.__accels) - self.add_accelerator( - 'close-accel', self.__accels, ord('w'), gtk.gdk.CONTROL_MASK, 0) -@@ -34,11 +38,17 @@ - self.connect_object('destroy', type(self).childs.remove, self) - - def set_transient_for(self, parent): -+ if parent is None: -+ from quodlibet.widgets import main as parent - super(Window, self).set_transient_for(parent) -- if parent is not None: -- self.set_position(gtk.WIN_POS_CENTER_ON_PARENT) - - def do_close_accel(self): -+ #Do not close the window if we edit a gtk.CellRendererText. -+ #Focus the treeview instead. -+ if isinstance(self.get_focus(), gtk.Entry) and \ -+ isinstance(self.get_focus().parent, gtk.TreeView): -+ self.get_focus().parent.grab_focus() -+ return - if not self.emit('delete-event', gtk.gdk.Event(gtk.gdk.DELETE)): - self.destroy() - -@@ -50,11 +60,21 @@ - __window = None - - def __new__(klass, *args): -- if klass.__window is None: -+ window = klass.__window -+ if window is None: - return super(UniqueWindow, klass).__new__(klass, *args) -- else: -- klass.__window.present() -- return klass.__window -+ #Look for widgets in the args, if there is one and it has -+ #a new top level window, reparent and reposition the window. -+ widgets = filter(lambda x: isinstance(x, gtk.Widget), args) -+ if widgets: -+ parent = window.get_transient_for() -+ new_parent = get_top_parent(widgets[0]) -+ if parent and new_parent and parent is not new_parent: -+ window.set_transient_for(new_parent) -+ window.hide() -+ window.show() -+ window.present() -+ return window - - @classmethod - def is_not_unique(klass):