r28228 - in /branches/upstream/libwx-perl/current: ./ XS/ build/Wx/build/MakeMaker/ ext/aui/ ext/aui/XS/ ext/aui/t/ ext/mdi/ ext/mdi/XS/ ext/socket/cpp/ lib/Wx/ t/

roberto at users.alioth.debian.org roberto at users.alioth.debian.org
Sun Dec 14 01:28:58 UTC 2008


Author: roberto
Date: Sun Dec 14 01:28:53 2008
New Revision: 28228

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28228
Log:
[svn-upgrade] Integrating new upstream version, libwx-perl (0.89)

Added:
    branches/upstream/libwx-perl/current/ext/aui/t/03_threads.t
Modified:
    branches/upstream/libwx-perl/current/Changes
    branches/upstream/libwx-perl/current/MANIFEST
    branches/upstream/libwx-perl/current/META.yml
    branches/upstream/libwx-perl/current/Makefile.PL
    branches/upstream/libwx-perl/current/Wx.pm
    branches/upstream/libwx-perl/current/XS/Cursor.xs
    branches/upstream/libwx-perl/current/XS/Icon.xs
    branches/upstream/libwx-perl/current/build/Wx/build/MakeMaker/Any_OS.pm
    branches/upstream/libwx-perl/current/ext/aui/XS/AuiManager.xsp
    branches/upstream/libwx-perl/current/ext/aui/XS/AuiPaneInfo.xsp
    branches/upstream/libwx-perl/current/ext/aui/typemap
    branches/upstream/libwx-perl/current/ext/mdi/XS/MDIParentFrame.xs
    branches/upstream/libwx-perl/current/ext/mdi/typemap
    branches/upstream/libwx-perl/current/ext/socket/cpp/sk_constants.cpp
    branches/upstream/libwx-perl/current/lib/Wx/Mini.pm
    branches/upstream/libwx-perl/current/t/04_userdata.t

Modified: branches/upstream/libwx-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/Changes?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/Changes (original)
+++ branches/upstream/libwx-perl/current/Changes Sun Dec 14 01:28:53 2008
@@ -1,4 +1,7 @@
 Revision history for Perl extension Wx.
+
+0.89  Sat Dec  6 11:39:54 CET 2008
+	- Fix crash when using AUI and threads.
 
 0.88  Sun Nov  9 18:03:25 CET 2008
 	- Skip author tests unless $ENV{AUTHOR_TESTS} is set.

Modified: branches/upstream/libwx-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/MANIFEST?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/MANIFEST (original)
+++ branches/upstream/libwx-perl/current/MANIFEST Sun Dec 14 01:28:53 2008
@@ -276,6 +276,7 @@
 ext/aui/lib/Wx/AUI.pm
 ext/aui/t/01_load.t
 ext/aui/t/02_inheritance.t
+ext/aui/t/03_threads.t
 ext/aui/typemap
 ext/aui/typemap.xsp
 

Modified: branches/upstream/libwx-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/META.yml?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/META.yml (original)
+++ branches/upstream/libwx-perl/current/META.yml Sun Dec 14 01:28:53 2008
@@ -1,6 +1,6 @@
 # http://module-build.sourceforge.net/META-spec.html
 name:         Wx
-version:      0.88
+version:      0.89
 version_from: Wx.pm
 installdirs:  site
 author:       Mattia Barbon <mbarbon at cpan.org>

Modified: branches/upstream/libwx-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/Makefile.PL?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/Makefile.PL (original)
+++ branches/upstream/libwx-perl/current/Makefile.PL Sun Dec 14 01:28:53 2008
@@ -5,7 +5,7 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     01/10/2000
-## RCS-ID:      $Id: Makefile.PL 2458 2008-09-03 21:03:04Z mbarbon $
+## RCS-ID:      $Id: Makefile.PL 2511 2008-11-09 17:20:18Z mbarbon $
 ## Copyright:   (c) 2000-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself

Modified: branches/upstream/libwx-perl/current/Wx.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/Wx.pm?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/Wx.pm (original)
+++ branches/upstream/libwx-perl/current/Wx.pm Sun Dec 14 01:28:53 2008
@@ -4,7 +4,7 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     01/10/2000
-## RCS-ID:      $Id: Wx.pm 2497 2008-11-05 19:35:30Z mbarbon $
+## RCS-ID:      $Id: Wx.pm 2513 2008-11-10 19:43:52Z mbarbon $
 ## Copyright:   (c) 2000-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
@@ -21,7 +21,7 @@
 $_msw = 1; $_gtk = 2; $_motif = 3; $_mac = 4; $_x11 = 5;
 
 @ISA = qw(Exporter);
-$VERSION = '0.88';
+$VERSION = '0.89';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 

Modified: branches/upstream/libwx-perl/current/XS/Cursor.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/XS/Cursor.xs?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/XS/Cursor.xs (original)
+++ branches/upstream/libwx-perl/current/XS/Cursor.xs Sun Dec 14 01:28:53 2008
@@ -4,8 +4,8 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     29/10/2000
-## RCS-ID:      $Id: Cursor.xs 2069 2007-07-08 15:33:40Z mbarbon $
-## Copyright:   (c) 2000-2004, 2006-2007 Mattia Barbon
+## RCS-ID:      $Id: Cursor.xs 2517 2008-11-30 20:14:22Z mbarbon $
+## Copyright:   (c) 2000-2004, 2006-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
 #############################################################################
@@ -61,7 +61,7 @@
 
 #endif
 
-#if !defined( __WXGTK__ )
+#if !defined( __WXGTK__ ) && !defined(__WXMAC__)
 
 wxCursor*
 newData( CLASS, bits, width, height, hotSpotX = -1, hotSpotY = -1, maskBits = 0 )

Modified: branches/upstream/libwx-perl/current/XS/Icon.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/XS/Icon.xs?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/XS/Icon.xs (original)
+++ branches/upstream/libwx-perl/current/XS/Icon.xs Sun Dec 14 01:28:53 2008
@@ -4,7 +4,7 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     29/10/2000
-## RCS-ID:      $Id: Icon.xs 2382 2008-04-27 16:51:03Z mbarbon $
+## RCS-ID:      $Id: Icon.xs 2517 2008-11-30 20:14:22Z mbarbon $
 ## Copyright:   (c) 2000-2004, 2006-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
@@ -64,7 +64,7 @@
     int desH
   CODE:
 #if defined( __WXMOTIF__ ) || defined( __WXX11__ ) || defined( __WXGTK__ ) \
-    || ( defined(__WXMSW__) && WXPERL_W_VERSION_GE( 2, 9, 0 ) )
+    || WXPERL_W_VERSION_GE( 2, 9, 0 )
     RETVAL = new wxIcon( name, wxBitmapType(type), desW, desH );
 #else
     RETVAL = new wxIcon( name, type, desW, desH );

Modified: branches/upstream/libwx-perl/current/build/Wx/build/MakeMaker/Any_OS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/build/Wx/build/MakeMaker/Any_OS.pm?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/build/Wx/build/MakeMaker/Any_OS.pm (original)
+++ branches/upstream/libwx-perl/current/build/Wx/build/MakeMaker/Any_OS.pm Sun Dec 14 01:28:53 2008
@@ -121,7 +121,6 @@
 sub depend_core {
   my $this = shift;
 
-
   my %files = $this->files_to_install();
   my %depend = ( _depend_common( $this ),
                  $exp              => join( ' ', $this->files_with_constants ),
@@ -132,6 +131,7 @@
                  'blibdirs'        => 'copy_files',
                  'blibdirs.ts'     => 'copy_files',
                  'copy_files'      => join( ' ', keys %files ),
+                 'distmeta'        => 'check_my_metafile',
                );
   my %this_depend = @_;
 
@@ -223,6 +223,9 @@
 
 cpp/v_cback_def.h : script/make_v_cback.pl
 	\$(PERL) script/make_v_cback.pl > cpp/v_cback_def.h
+
+check_my_metafile :
+	\$(PERL) -e "eval 'require ExtUtils::MY_Metafile; 1' || die 'Install ExtUtils::MY_Metafile'"
 
 EOT
 

Modified: branches/upstream/libwx-perl/current/ext/aui/XS/AuiManager.xsp
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/aui/XS/AuiManager.xsp?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/aui/XS/AuiManager.xsp (original)
+++ branches/upstream/libwx-perl/current/ext/aui/XS/AuiManager.xsp Sun Dec 14 01:28:53 2008
@@ -4,8 +4,8 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     11/11/2006
-## RCS-ID:      $Id: AuiManager.xsp 2274 2007-11-10 22:37:30Z mbarbon $
-## Copyright:   (c) 2006-2007 Mattia Barbon
+## RCS-ID:      $Id: AuiManager.xsp 2516 2008-11-30 14:26:44Z mbarbon $
+## Copyright:   (c) 2006-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
 #############################################################################
@@ -199,7 +199,19 @@
 {
     wxAuiManager( wxWindow* managed_wnd = NULL,
                   unsigned int flags = wxAUI_MGR_DEFAULT );
-    ~wxAuiManager();
+
+%{
+static void
+wxAuiManager::CLONE()
+  CODE:
+    wxPli_thread_sv_clone( aTHX_ CLASS, (wxPliCloneSV)wxPli_detach_object );
+%}
+
+    ~wxAuiManager()
+        %code%{  wxPli_thread_sv_unregister( aTHX_ "Wx::AuiManager", THIS, ST(0) );
+                 delete THIS;
+               %};
+
     void UnInit();
 
     void SetFlags( unsigned int flags );

Modified: branches/upstream/libwx-perl/current/ext/aui/XS/AuiPaneInfo.xsp
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/aui/XS/AuiPaneInfo.xsp?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/aui/XS/AuiPaneInfo.xsp (original)
+++ branches/upstream/libwx-perl/current/ext/aui/XS/AuiPaneInfo.xsp Sun Dec 14 01:28:53 2008
@@ -4,8 +4,8 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     11/11/2006
-## RCS-ID:      $Id: AuiPaneInfo.xsp 2274 2007-11-10 22:37:30Z mbarbon $
-## Copyright:   (c) 2006-2007 Mattia Barbon
+## RCS-ID:      $Id: AuiPaneInfo.xsp 2515 2008-11-30 11:14:49Z mbarbon $
+## Copyright:   (c) 2006-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
 #############################################################################
@@ -17,8 +17,17 @@
 %name{Wx::AuiPaneInfo} class wxAuiPaneInfo
 {
     wxAuiPaneInfo();
+
+%{
+static void
+wxAuiPaneInfo::CLONE()
+  CODE:
+    wxPli_thread_sv_clone( aTHX_ CLASS, (wxPliCloneSV)wxPli_detach_object );
+%}
+
     ~wxAuiPaneInfo()
-        %code%{  if( wxPli_object_is_deleteable( aTHX_ ST(0) ) )
+        %code%{  wxPli_thread_sv_unregister( aTHX_ "Wx::AuiPaneInfo", THIS, ST(0) );
+                 if( wxPli_object_is_deleteable( aTHX_ ST(0) ) )
                      delete THIS;
                %};
 

Added: branches/upstream/libwx-perl/current/ext/aui/t/03_threads.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/aui/t/03_threads.t?rev=28228&op=file
==============================================================================
--- branches/upstream/libwx-perl/current/ext/aui/t/03_threads.t (added)
+++ branches/upstream/libwx-perl/current/ext/aui/t/03_threads.t Sun Dec 14 01:28:53 2008
@@ -1,0 +1,30 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Config;
+use if !$Config{useithreads} => 'Test::More' => skip_all => 'no threads';
+use threads;
+
+use Wx qw(:everything);
+use if !Wx::wxTHREADS, 'Test::More' => skip_all => 'No thread support';
+use Test::More tests => 4;
+use Wx::AUI;
+
+my $app = Wx::App->new( sub { 1 } );
+my $auimanager = Wx::AuiManager->new;
+my $auimanager2 = Wx::AuiManager->new;
+my $auipaneinfo = Wx::AuiPaneInfo->new;
+my $auipaneinfo2 = Wx::AuiPaneInfo->new;
+
+undef $auimanager2;
+undef $auipaneinfo2;
+
+my $t = threads->create
+  ( sub {
+        ok( 1, 'In thread' );
+    } );
+ok( 1, 'Before join' );
+$t->join;
+ok( 1, 'After join' );
+
+END { ok( 1, 'At END' ) };

Modified: branches/upstream/libwx-perl/current/ext/aui/typemap
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/aui/typemap?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/aui/typemap (original)
+++ branches/upstream/libwx-perl/current/ext/aui/typemap Sun Dec 14 01:28:53 2008
@@ -4,7 +4,7 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     11/11/2006
-## RCS-ID:      $Id: typemap 2317 2008-01-18 22:00:14Z mbarbon $
+## RCS-ID:      $Id: typemap 2515 2008-11-30 11:14:49Z mbarbon $
 ## Copyright:   (c) 2006, 2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
@@ -13,7 +13,7 @@
 TYPEMAP
 wxAuiNotebookEvent *    O_WXOBJECT_THR
 wxAuiManagerEvent *     O_WXOBJECT_THR
-wxAuiManager *          O_NON_WXOBJECT
-const wxAuiManager *    O_NON_WXOBJECT
-wxAuiPaneInfo *         O_NON_WXOBJECT
+wxAuiManager *          O_NON_WXOBJECT_THR
+const wxAuiManager *    O_NON_WXOBJECT_THR
+wxAuiPaneInfo *         O_NON_WXOBJECT_THR
 wxAuiNotebook *         O_WXEVTHANDLER

Modified: branches/upstream/libwx-perl/current/ext/mdi/XS/MDIParentFrame.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/mdi/XS/MDIParentFrame.xs?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/mdi/XS/MDIParentFrame.xs (original)
+++ branches/upstream/libwx-perl/current/ext/mdi/XS/MDIParentFrame.xs Sun Dec 14 01:28:53 2008
@@ -4,8 +4,8 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     06/09/2001
-## RCS-ID:      $Id: MDIParentFrame.xs 2181 2007-08-18 20:57:50Z mbarbon $
-## Copyright:   (c) 2001-2002, 2004, 2006-2007 Mattia Barbon
+## RCS-ID:      $Id: MDIParentFrame.xs 2517 2008-11-30 20:14:22Z mbarbon $
+## Copyright:   (c) 2001-2002, 2004, 2006-2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
 #############################################################################
@@ -80,10 +80,17 @@
 wxMDIParentFrame::GetClientWindow()
 
 #else
+#if WXPERL_W_VERSION_GE( 2, 9, 0 )
+
+wxMDIClientWindowBase*
+wxMDIParentFrame::GetClientWindow()
+
+#else
 
 wxMDIClientWindow*
 wxMDIParentFrame::GetClientWindow()
 
+#endif
 #endif
 
 #if ( !defined(__WXGTK__) && !defined(__WXMAC__) && !defined(__WXMOTIF__) ) \

Modified: branches/upstream/libwx-perl/current/ext/mdi/typemap
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/mdi/typemap?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/mdi/typemap (original)
+++ branches/upstream/libwx-perl/current/ext/mdi/typemap Sun Dec 14 01:28:53 2008
@@ -4,7 +4,7 @@
 ## Author:      Mattia Barbon
 ## Modified by:
 ## Created:     06/09/2001
-## RCS-ID:      $Id: typemap 2317 2008-01-18 22:00:14Z mbarbon $
+## RCS-ID:      $Id: typemap 2517 2008-11-30 20:14:22Z mbarbon $
 ## Copyright:   (c) 2001, 2003-2004, 2008 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
@@ -14,6 +14,7 @@
 wxMDIParentFrame *      O_WXOBJECT
 wxMDIChildFrame *       O_WXOBJECT
 wxMDIClientWindow *     O_WXOBJECT
+wxMDIClientWindowBase * O_WXOBJECT
 
 wxGenericMDIParentFrame *      O_WXOBJECT
 wxGenericMDIChildFrame *       O_WXOBJECT

Modified: branches/upstream/libwx-perl/current/ext/socket/cpp/sk_constants.cpp
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/ext/socket/cpp/sk_constants.cpp?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/ext/socket/cpp/sk_constants.cpp (original)
+++ branches/upstream/libwx-perl/current/ext/socket/cpp/sk_constants.cpp Sun Dec 14 01:28:53 2008
@@ -3,7 +3,7 @@
 // Purpose:     constants for Wx::Socket
 // Author:      Graciliano M. P.
 // Created:     27/02/2003
-// RCS-ID:      $Id: sk_constants.cpp 2133 2007-08-11 21:31:54Z mbarbon $
+// RCS-ID:      $Id: sk_constants.cpp 2517 2008-11-30 20:14:22Z mbarbon $
 // Copyright:   (c) 2003, 2007 Graciliano M. P.
 // Licence:     This program is free software; you can redistribute it and/or
 //              modify it under the same terms as Perl itself
@@ -66,7 +66,6 @@
         r( wxSOCKET_WOULDBLOCK );
         r( wxSOCKET_TIMEDOUT );
         r( wxSOCKET_MEMERR );
-        r( wxSOCKET_DUMMY );
     break;
     }
 #undef r

Modified: branches/upstream/libwx-perl/current/lib/Wx/Mini.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/lib/Wx/Mini.pm?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/lib/Wx/Mini.pm (original)
+++ branches/upstream/libwx-perl/current/lib/Wx/Mini.pm Sun Dec 14 01:28:53 2008
@@ -12,7 +12,7 @@
     $Wx::dlls = XXXDLLSXXX;
 }
 
-$VERSION = '0.88'; # bootstrap will catch wrong versions
+$VERSION = '0.89'; # bootstrap will catch wrong versions
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 

Modified: branches/upstream/libwx-perl/current/t/04_userdata.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwx-perl/current/t/04_userdata.t?rev=28228&op=diff
==============================================================================
--- branches/upstream/libwx-perl/current/t/04_userdata.t (original)
+++ branches/upstream/libwx-perl/current/t/04_userdata.t Sun Dec 14 01:28:53 2008
@@ -111,9 +111,6 @@
         if !defined $x->[0];
       skip( "wxMSW wxCheckListBox can't store client data yet", 8 )
         if Wx::wxMSW && $name eq 'Wx::CheckListBox';
-      skip( "wxGTK has bugs in versions <= 2.3.3", 8 )
-        if Wx::wxGTK && Wx::wxVERSION < 2.003003 &&
-           ( $name->isa( 'Wx::ListBox' ) || $name->isa( 'Wx::Choice' ) );
 
       $list->Clear;
 




More information about the Pkg-perl-cvs-commits mailing list