r50579 - in /branches/upstream/libalien-wxwidgets-perl/current: ./ inc/My/Build/ lib/Alien/ patches/
ryan at users.alioth.debian.org
ryan at users.alioth.debian.org
Sat Jan 9 18:09:50 UTC 2010
Author: ryan
Date: Sat Jan 9 18:09:30 2010
New Revision: 50579
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50579
Log:
[svn-upgrade] Integrating new upstream version, libalien-wxwidgets-perl (0.49+dfsg)
Modified:
branches/upstream/libalien-wxwidgets-perl/current/Build.PL
branches/upstream/libalien-wxwidgets-perl/current/Changes
branches/upstream/libalien-wxwidgets-perl/current/META.yml
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config_Bakefile.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW.pm
branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.8.10
branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.9.0
Modified: branches/upstream/libalien-wxwidgets-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Build.PL?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Build.PL (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Build.PL Sat Jan 9 18:09:30 2010
@@ -50,6 +50,15 @@
'wxWidgets-version' => { type => '=s' },
},
create_makefile_pl => 'passthrough',
+ meta_merge =>
+ { resources =>
+ { 'license' => 'http://dev.perl.org/licenses/',
+ 'homepage' => 'http://wxperl.eu/',
+ 'bugtracker' => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=Alien-wxWidgets',
+ 'repository' => 'https://wxperl.svn.sourceforge.net/svnroot/wxperl/Alien-wxWidgets',
+ 'MailingList' => 'http://lists.perl.org/list/wxperl-users.html',
+ },
+ },
);
my $accept_defaults = $ENV{PERL5_CPANPLUS_IS_RUNNING}
Modified: branches/upstream/libalien-wxwidgets-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Changes?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Changes (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Changes Sat Jan 9 18:09:30 2010
@@ -1,4 +1,8 @@
Revision history for Perl extension Alien::wxWidgets.
+
+0.49 Sat Jan 9 10:39:02 CET 2010
+ - Support GCC 4 and 64 bit GCC builds on Windows (patch by KMX).
+ - Fix monolithic build handling for wxWidgets' 2.8.x.
0.48 Fri Dec 25 18:23:56 CET 2009
- Fix the compiler check for Visual C++.
Modified: branches/upstream/libalien-wxwidgets-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/META.yml?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/META.yml (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/META.yml Sat Jan 9 18:09:30 2010
@@ -1,12 +1,16 @@
---
name: Alien-wxWidgets
-version: 0.48
+version: 0.49
author:
- 'Mattia Barbon <mbarbon at cpan.org>'
abstract: 'building, finding and using wxWidgets binaries'
license: perl
resources:
+ MailingList: http://lists.perl.org/list/wxperl-users.html
+ bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Alien-wxWidgets
+ homepage: http://wxperl.eu/
license: http://dev.perl.org/licenses/
+ repository: https://wxperl.svn.sourceforge.net/svnroot/wxperl/Alien-wxWidgets
build_requires:
ExtUtils::CBuilder: 0.24
Module::Build: 0.28
@@ -18,7 +22,7 @@
provides:
Alien::wxWidgets:
file: lib/Alien/wxWidgets.pm
- version: 0.48
+ version: 0.49
Alien::wxWidgets::Utility:
file: lib/Alien/wxWidgets/Utility.pm
generated_by: Module::Build version 0.35
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm Sat Jan 9 18:09:30 2010
@@ -7,7 +7,8 @@
our $WX_CONFIG_LIBSEP;
our @LIBRARIES = qw(base net xml adv animate aui core fl gizmos
gl html media qa richtext stc xrc);
-our @MONO_LIBRARIES = qw(core gl);
+our @MONO_LIBRARIES_2_9 = qw(core gl);
+our @MONO_LIBRARIES_2_8 = qw(core stc gl);
our @CONTRIB_LIBRARIES = qw(gizmos_xrc ogl plot svg);
our @CRITICAL = qw(base core);
our @IMPORTANT = qw(net xml adv aui gl html media richtext stc xrc);
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config_Bakefile.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config_Bakefile.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config_Bakefile.pm Sat Jan 9 18:09:30 2010
@@ -16,10 +16,13 @@
$data{ld} =~ s/\-o\s*$/ /; # wxWidgets puts 'ld -o' into LD
$data{libs} =~ s/\-lwx\S+//g;
+ my @mono_libs = $self->_version_2_dec( $data{version} ) >= 2.009 ?
+ @My::Build::Any_wx_config::MONO_LIBRARIES_2_9 :
+ @My::Build::Any_wx_config::MONO_LIBRARIES_2_8;
my $arg = 'libs' . $My::Build::Any_wx_config::WX_CONFIG_LIBSEP .
join ',', grep { !m/base/ }
( $self->awx_is_monolithic ?
- @My::Build::Any_wx_config::MONO_LIBRARIES :
+ @mono_libs :
@My::Build::Any_wx_config::LIBRARIES );
my $libraries = $self->_call_wx_config( $arg );
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm Sat Jan 9 18:09:30 2010
@@ -8,6 +8,7 @@
use File::Basename ();
use Fatal qw(open close unlink);
use Data::Dumper;
+use File::Glob qw(bsd_glob);
sub ACTION_build {
my $self = shift;
@@ -394,7 +395,10 @@
foreach my $d ( File::Spec->path ) {
my $full = File::Spec->catfile( $d, $file );
- return $full if -f $full;
+ # we are gonna use glob() to accept wildcards
+ foreach my $f ( bsd_glob( $full ) ) {
+ return $f if -f $f;
+ }
}
return;
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm Sat Jan 9 18:09:30 2010
@@ -7,6 +7,7 @@
use Config;
use Fatal qw(open close);
use Carp qw(cluck);
+use File::Glob qw(bsd_glob);
my $initialized;
@@ -56,10 +57,10 @@
( $self->awx_debug ? 'd' : '' );
my @dlls = grep { m/${digits}\d*${suff}_/ }
- glob( File::Spec->catfile( $libdir, '*.dll' ) );
+ bsd_glob( File::Spec->catfile( $libdir, '*.dll' ) );
my @libs = grep { m/(?:lib)?wx(?:wince|msw|base)[\w\.]+$/ }
grep { m/${digits}\d*${suff}(_|\.)/ }
- glob( File::Spec->catfile( $libdir, "*$Config{lib_ext}" ) );
+ bsd_glob( File::Spec->catfile( $libdir, "*$Config{lib_ext}" ) );
foreach my $full ( @dlls, @libs ) {
my( $name, $type );
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW.pm Sat Jan 9 18:09:30 2010
@@ -5,9 +5,12 @@
use My::Build::Utility qw(awx_arch_file awx_install_arch_file
awx_install_arch_dir awx_arch_dir);
use Config;
+use File::Basename qw();
+use File::Glob qw(bsd_glob);
sub _find_make {
- my( @try ) = qw(mingw32-make make);
+ my( @try ) = qw(mingw32-make gmake make);
+ push @try, $Config{gmake} if $Config{gmake};
foreach my $name ( @try ) {
foreach my $dir ( File::Spec->path ) {
@@ -88,8 +91,16 @@
sub files_to_install {
my $self = shift;
- my $dll = 'mingwm10.dll';
- my $dll_from = $self->awx_path_search( $dll );
+ my( @try ) = qw(mingwm10.dll libgcc_*.dll);
+ my( $dll, $dll_from );
+
+ foreach my $d ( @try ) {
+ $dll_from = $self->awx_path_search( $d );
+ if( defined $dll_from ) {
+ $dll = File::Basename::basename( $dll_from );
+ last;
+ }
+ }
return ( $self->SUPER::files_to_install(),
( $dll_from => awx_arch_file( "rEpLaCe/lib/$dll" ) ) );
@@ -97,7 +108,7 @@
sub awx_strip_dlls {
my( $self ) = @_;
- my( $dir ) = grep !/Config/, glob( awx_arch_dir( '*' ) );
+ my( $dir ) = grep !/Config/, bsd_glob( awx_arch_dir( '*' ) );
$self->_system( "attrib -r $dir\\lib\\*.dll" );
$self->_system( "strip $dir\\lib\\*.dll" );
Modified: branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm Sat Jan 9 18:09:30 2010
@@ -43,7 +43,7 @@
instantiate => 'config';
our $AUTOLOAD;
-our $VERSION = '0.48';
+our $VERSION = '0.49';
our %VALUES;
our $dont_remap;
Modified: branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.8.10
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.8.10?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.8.10 (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.8.10 Sat Jan 9 18:09:30 2010
@@ -10,12 +10,14 @@
wxMSW-2.8.10-config.patch
wxMSW-2.8.0-makefiles.patch
wxMSW-2.8.10-version.patch
+wxMSW-2.8.10-mingw64.patch
), @common ],
ansi => [ qw(
wxMSW-2.8.0-setup.patch
wxMSW-2.8.10-config.patch
wxMSW-2.8.0-makefiles.patch
wxMSW-2.8.10-version.patch
+wxMSW-2.8.10-mingw64.patch
), @common ],
},
mac => { unicode => [ qw(
Modified: branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.9.0
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.9.0?rev=50579&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.9.0 (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/patches/data-2.9.0 Sat Jan 9 18:09:30 2010
@@ -11,6 +11,7 @@
wxMSW-2.9.0-config.patch
wxMSW-2.9.0-makefiles.patch
wxMSW-2.9.0-version.patch
+wxMSW-2.8.10-mingw64.patch
), @common ],
},
mac => { unicode => [ qw(wxMac-2.9.0-textctrl.patch
More information about the Pkg-perl-cvs-commits
mailing list