[55721] trunk/dports/python/py25-gnome

[snc at macports.org]

Revision: 55721
          http://trac.macports.org/changeset/55721
Author:   snc at macports.org
Date:     2009-08-17 13:43:01 -0700 (Mon, 17 Aug 2009)
Log Message:
-----------
add variant to patch when using +quartz, ticket #20612

Modified Paths:
--------------
    trunk/dports/python/py25-gnome/Portfile

Added Paths:
-----------
    trunk/dports/python/py25-gnome/files/
    trunk/dports/python/py25-gnome/files/bonobo.diff

Modified: trunk/dports/python/py25-gnome/Portfile
===================================================================
--- trunk/dports/python/py25-gnome/Portfile	2009-08-17 20:14:54 UTC (rev 55720)
+++ trunk/dports/python/py25-gnome/Portfile	2009-08-17 20:43:01 UTC (rev 55721)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -40,6 +41,10 @@
 
 use_parallel_build  yes
 
+variant quartz description {fix bonobo import error when gtk +quartz is used} {
+    patchfiles-append   bonobo.diff
+}
+
 platform darwin 9 {
     post-patch {
         reinplace "s| -export-symbols-regex.*||g" \

Added: trunk/dports/python/py25-gnome/files/bonobo.diff
===================================================================
--- trunk/dports/python/py25-gnome/files/bonobo.diff	                        (rev 0)
+++ trunk/dports/python/py25-gnome/files/bonobo.diff	2009-08-17 20:43:01 UTC (rev 55721)
@@ -0,0 +1,49 @@
+diff -ru bonobo.orig/bonobo.defs bonobo/bonobo.defs
+--- bonobo.orig/bonobo.defs	2009-08-08 20:51:13.000000000 +0200
++++ bonobo/bonobo.defs	2009-08-08 20:52:00.000000000 +0200
+@@ -777,11 +777,6 @@
+   (return-type "gboolean")
+ )
+ 
+-(define-function setup_x_error_handler
+-  (c-name "bonobo_setup_x_error_handler")
+-  (return-type "none")
+-)
+-
+ (define-function orb
+   (c-name "bonobo_orb")
+   (return-type "CORBA_ORB")
+diff -ru bonobo.orig/bonoboui.defs bonobo/bonoboui.defs
+--- bonobo.orig/bonoboui.defs	2009-08-08 20:51:13.000000000 +0200
++++ bonobo/bonoboui.defs	2009-08-08 20:52:37.000000000 +0200
+@@ -1502,11 +1502,6 @@
+   )
+ )
+ 
+-(define-function setup_x_error_handler
+-  (c-name "bonobo_setup_x_error_handler")
+-  (return-type "none")
+-)
+-
+ (define-function debug_shutdown
+   (c-name "bonobo_ui_debug_shutdown")
+   (return-type "int")
+diff -ru bonobo.orig/bonobouimodule.c bonobo/bonobouimodule.c
+--- bonobo.orig/bonobouimodule.c	2009-08-08 20:51:13.000000000 +0200
++++ bonobo/bonobouimodule.c	2009-08-08 20:54:21.000000000 +0200
+@@ -25,15 +25,6 @@
+ 
+     init_pygtk();
+ 
+-    /* we don't call bonobo_ui_init() here, as all it does is call
+-     * bonobo_init() (done by the bonobo module we import),
+-     * gnome_program_init() (meant to be done by the user), and
+-     * gtk_init() (done by the gtk module we import), and call
+-     * bonobo_setup_x_error_handler().  This last call is all that is
+-     * left. */
+-    bonobo_setup_x_error_handler();
+-
+-
+     pybonoboui_register_classes(d);
+ 
+     /* add anything else to the module dictionary (such as constants) */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090817/210dfb2e/attachment.html>