[107048] trunk/dports/net/deluge

[devans at macports.org]

Revision: 107048
          https://trac.macports.org/changeset/107048
Author:   devans at macports.org
Date:     2013-06-16 13:49:08 -0700 (Sun, 16 Jun 2013)
Log Message:
-----------
deluge: disable recently added +quartz OS X native menu support (#39430).

Modified Paths:
--------------
    trunk/dports/net/deluge/Portfile

Added Paths:
-----------
    trunk/dports/net/deluge/files/
    trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2013-06-16 19:25:26 UTC (rev 107047)
+++ trunk/dports/net/deluge/Portfile	2013-06-16 20:49:08 UTC (rev 107048)
@@ -6,6 +6,7 @@
 
 name            deluge
 version         1.3.6
+revision        1
 categories      net gnome python
 license         GPL-3
 maintainers     devans openmaintainer
@@ -31,6 +32,8 @@
                 port:boost \
                 port:librsvg
 
+patchfiles      patch-remove-osx-native-menus.diff
+
 build.env       PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
                 PYTHON_LDFLAGS=-L${prefix}/lib \
                 CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \

Added: trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff
===================================================================
--- trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff	                        (rev 0)
+++ trunk/dports/net/deluge/files/patch-remove-osx-native-menus.diff	2013-06-16 20:49:08 UTC (rev 107048)
@@ -0,0 +1,50 @@
+--- deluge/ui/gtkui/gtkui.py.orig	2013-06-16 13:05:13.000000000 -0700
++++ deluge/ui/gtkui/gtkui.py	2013-06-16 13:11:49.000000000 -0700
+@@ -197,12 +197,12 @@
+                     return 1
+             SetConsoleCtrlHandler(win_handler)
+ 
+-        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
+-            import gtk_osxapplication
+-            self.osxapp = gtk_osxapplication.OSXApplication()
+-            def on_die(*args):
+-                reactor.stop()
+-            self.osxapp.connect("NSApplicationWillTerminate", on_die)
++#        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
++#            import gtk_osxapplication
++#            self.osxapp = gtk_osxapplication.OSXApplication()
++#            def on_die(*args):
++#                reactor.stop()
++#            self.osxapp.connect("NSApplicationWillTerminate", on_die)
+ 
+ 
+         # Set process name again to fix gtk issue
+@@ -246,17 +246,17 @@
+         self.statusbar = StatusBar()
+         self.addtorrentdialog = AddTorrentDialog()
+ 
+-        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
+-            def nsapp_open_file(osxapp, filename):
+-                # Will be raised at app launch (python opening main script)
+-                if filename.endswith('Deluge-bin'):
+-                    return True
+-                from deluge.ui.gtkui.ipcinterface import process_args
+-                process_args([filename])
+-            self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file)
+-            from menubar_osx import menubar_osx
+-            menubar_osx(self, self.osxapp)
+-            self.osxapp.ready()
++#        if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz":
++#            def nsapp_open_file(osxapp, filename):
++#                # Will be raised at app launch (python opening main script)
++#                if filename.endswith('Deluge-bin'):
++#                    return True
++#                from deluge.ui.gtkui.ipcinterface import process_args
++#                process_args([filename])
++#            self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file)
++#            from menubar_osx import menubar_osx
++#            menubar_osx(self, self.osxapp)
++#            self.osxapp.ready()
+ 
+         # Initalize the plugins
+         self.plugins = PluginManager()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130616/95364c9e/attachment.html>