Re: [Gtk-osx-devs] re pygtk patch in stable moduleset

[John Ralls <jralls ceridwen fremont ca us>]

On Jul 12, 2010, at 6:23 AM, Richard Procter wrote:

> Hi again,
> 
> Two issues - when building pygtk from the latest stable modulesets,  
> the patch doesn't apply cleanly; looks like a minor strip issue.
> 
> Looking at the patch though, this would result in the third if  
> statement now being parsed to occur inside the preceding if's block,  
> which is possibly not what is intended, i.e it is in effect:
> 
> if (source != NULL) {
>   if (real_source->fds[0] != 0) {
>      // close();
>      if (real_source->fds[1] != 0) {  // now conditional on fds[0], too
>         [...]
>      }
>   }
> }
> 
> regards,
> Richard.
> 
> 
> http://github.com/jralls/gtk-osx-build/raw/master/patches/pygtk.patch
> 
> diff --git a/gtk/gtk.override b/gtk/gtk.override
> index fa05771..bdf9c27 100644
> --- a/gtk/gtk.override
> +++ b/gtk/gtk.override
> @@ -1195,7 +1195,7 @@ pygtk_main_watch_finalize(GSource *source)
> 
>      if (source != NULL) {
>  	if (real_source->fds[0] != 0)
> -	    close(real_source->fds[0]);
> +//	    close(real_source->fds[0]);
>  	
>  	if (real_source->fds[1] != 0) {
>  #if HAVE_PYSIGNAL_SETWAKEUPFD
> 
> 
> <!-- The patch addresses bug 613783, a hang during shutdown of PyGtk
>      programs that use threads. -->
>   <autotools id="pygtk" autogen-sh="configure">
>     <branch version="2.16.0" module="pygtk/2.16/pygtk-2.16.0.tar.bz2"
> 
> hash="sha256:7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7 
> 444a8">
>       <patch file="http://github.com/jralls/gtk-osx-build/raw/master/ 
> patches/pygtk.patch" strip="0"/>
>     </branch>
>     <dependencies>
>       <dep package="pygobject"/>
>       <dep package="meta-gtk-osx-core"/>
>       <dep package="pycairo"/>
>       <dep package="libglade"/>
>     </dependencies>
>   </autotools>

Fixed in git.Thanks. 

Regards,
John Ralls