r41370 - in /branches/upstream/libalien-wxwidgets-perl/current: ./ inc/My/Build/ lib/Alien/ lib/Alien/wxWidgets/ patches/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Wed Aug 5 14:55:00 UTC 2009
Author: jawnsy-guest
Date: Wed Aug 5 14:54:53 2009
New Revision: 41370
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41370
Log:
[svn-upgrade] Integrating new upstream version, libalien-wxwidgets-perl (0.43+dfsg)
Added:
branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch (with props)
Removed:
branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.4-config.patch
Modified:
branches/upstream/libalien-wxwidgets-perl/current/Changes
branches/upstream/libalien-wxwidgets-perl/current/MANIFEST
branches/upstream/libalien-wxwidgets-perl/current/META.yml
branches/upstream/libalien-wxwidgets-perl/current/Makefile.PL
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_Bakefile.pm
branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets/Utility.pm
branches/upstream/libalien-wxwidgets-perl/current/patches/data
Modified: branches/upstream/libalien-wxwidgets-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Changes?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Changes (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Changes Wed Aug 5 14:54:53 2009
@@ -1,4 +1,11 @@
Revision history for Perl extension Alien::wxWidgets.
+
+0.43 Sun May 10 09:46:05 CEST 2009
+ - Fix building under recent FreeBSD versions (patch by Cezary Morga).
+ - Correctly handle monolithic build on wxWidgets' 2.9.x.
+ - Support Cocoa builds for wxWidgets 2.9.x.
+ - Fix building wxWidgets when the build path contains spaces.
+ - Patch and build wxWidgets 2.8.10.
0.42 Sat Nov 8 00:51:18 CET 2008
- Add an option for building with Unicode support in interactive
Modified: branches/upstream/libalien-wxwidgets-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/MANIFEST?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/MANIFEST (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/MANIFEST Wed Aug 5 14:54:53 2009
@@ -31,9 +31,6 @@
inc/Params/Check.pm
inc/Text/Patch.pm
inc/bin/patch
-inc/bin/patch.exe
-inc/src/patch-2.5.9-7-src.zip
-inc/src/patch.exe.manifest
inc/version.pm
inc/version/vpp.pm
lib/Alien/wxWidgets.pm
@@ -42,7 +39,7 @@
patches/wxMSW-2.8.0-makefiles.patch
patches/wxMSW-2.8.0-setup.patch
patches/wxMSW-2.8.0-setup_u.patch
-patches/wxMSW-2.8.4-config.patch
+patches/wxMSW-2.8.10-config.patch
patches/wxMac-2.8.3-brokengcc.patch
patches/wxWidgets-2.8.0-magic.patch
script/make_ppm.pl
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=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/META.yml (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/META.yml Wed Aug 5 14:54:53 2009
@@ -1,6 +1,6 @@
---
name: Alien-wxWidgets
-version: 0.42
+version: 0.43
author:
- 'Mattia Barbon <mbarbon at cpan.org>'
abstract: 'building, finding and using wxWidgets binaries'
@@ -18,10 +18,10 @@
provides:
Alien::wxWidgets:
file: lib/Alien/wxWidgets.pm
- version: 0.42
+ version: 0.43
Alien::wxWidgets::Utility:
file: lib/Alien/wxWidgets/Utility.pm
-generated_by: Module::Build version 0.3
+generated_by: Module::Build version 0.32
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
version: 1.2
Modified: branches/upstream/libalien-wxwidgets-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Makefile.PL?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Makefile.PL (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Makefile.PL Wed Aug 5 14:54:53 2009
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.30
+# Note: this file was auto-generated by Module::Build::Compat version 0.32
require 5.006;
unless (eval "use Module::Build::Compat 0.02; 1" ) {
@@ -28,5 +28,6 @@
eval "use Module::Build::Compat 0.02; 1" or die $@;
use lib '_build/lib';
Module::Build::Compat->run_build_pl(args => \@ARGV);
+ exit(0) unless(-e 'Build'); # cpantesters convention
require My::Build::new_from_context_is_broken;
Module::Build::Compat->write_makefile(build_class => 'My::Build::new_from_context_is_broken');
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=41370&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 Wed Aug 5 14:54:53 2009
@@ -7,7 +7,9 @@
our $WX_CONFIG_LIBSEP;
our @LIBRARIES = qw(base net xml adv animate aui core fl gizmos
- gizmos_xrc gl html media ogl plot qa richtext stc svg xrc);
+ gl html media qa richtext stc xrc);
+our @MONO_LIBRARIES = qw(core 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);
@@ -92,10 +94,9 @@
my $cf = $self->wx_config( 'cxxflags' );
$config{prefix} = $self->wx_config( 'prefix' );
- $cf =~ m/__WX(x11|msw|motif|gtk|mac|osx_carbon)__/i or
+ $cf =~ m/__WX(x11|msw|motif|gtk|mac|osx_carbon|osx_cocoa)__/i or
die "Unable to determine toolkit!";
- my $toolkit = $1 eq 'OSX_CARBON' ? 'MAC' : $1;
- $config{config}{toolkit} = lc $toolkit;
+ $config{config}{toolkit} = lc $1;
$config{config}{build} = $self->awx_is_monolithic ? 'mono' : 'multi';
if( $config{config}{toolkit} eq 'gtk' ) {
@@ -123,14 +124,12 @@
foreach ( split /\s+/, $libs ) {
m{^-[lL]|/} && do { $config{link_libraries} .= " $_"; next; };
- if( $_ eq '-pthread' && $^O =~ m/linux/i ) {
+ if( $_ eq '-pthread' && $^O =~ m/(?:linux|freebsd)/i ) {
$config{link_libraries} .= " -lpthread";
next;
}
$config{link_libraries} .= " $_";
}
-
- $config{link_libraries} .= ' -lc_r' if $^O =~ /freebsd/i;
my %dlls = %{$self->wx_config( 'dlls' )};
$config{_libraries} = {};
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=41370&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 Wed Aug 5 14:54:53 2009
@@ -18,14 +18,17 @@
my $arg = 'libs' . $My::Build::Any_wx_config::WX_CONFIG_LIBSEP .
join ',', grep { !m/base/ }
- @My::Build::Any_wx_config::LIBRARIES;
+ ( $self->awx_is_monolithic ?
+ @My::Build::Any_wx_config::MONO_LIBRARIES :
+ @My::Build::Any_wx_config::LIBRARIES );
my $libraries = $self->_call_wx_config( $arg );
foreach my $lib ( grep { m/\-lwx/ } split ' ', $libraries ) {
$lib =~ m/-l(.*_(\w+)-.*)/ or die $lib;
my( $key, $name ) = ( $2, $1 );
$key = 'base' if $key =~ m/^base[ud]{0,2}/;
- $key = 'base' if $key =~ m/^carbon/; # here for Mac
+ $key = 'base' if $key =~ m/^carbon|^cocoa/ && $name !~ /osx_/; # here for Mac
+ $key = 'core' if $key =~ m/^carbon|^cocoa/ && $name =~ /osx_/; # here for Mac
$key = 'core' if $key =~ m/^mac[ud]{0,2}/;
$key = 'core' if $key =~ m/^gtk2?[ud]{0,2}/
&& $self->awx_is_monolithic
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=41370&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 Wed Aug 5 14:54:53 2009
@@ -108,7 +108,7 @@
$ver =~ m/^(\d+)\.(\d+)\.(\d+)$/ and
$dec = $1 + $2 / 1000 + $3 / 1000000;
- return $dec;
+ return sprintf( "%.6f", $dec );
}
sub _init_config {
@@ -269,12 +269,13 @@
print "Patching wxWidgets...\n";
- chdir File::Spec->rel2abs
- ( $self->notes( 'build_data' )->{data}{directory} );
+ my $wx_dir = $self->notes( 'build_data' )->{data}{directory};
+ my $build_dir = File::Spec->rel2abs( $wx_dir );
+ chdir $wx_dir;
foreach my $i ( @patches ) {
print "Applying patch: ", $i, "\n";
- my $cmd = $self->_patch_command( $old_dir, $i );
+ my $cmd = $self->_patch_command( $build_dir, $i );
print $cmd, "\n";
system $cmd and die 'Error: ', $?;
}
@@ -285,7 +286,8 @@
sub _patch_command {
my( $self, $base_dir, $patch_file ) = @_;
- my $cmd = $^X . ' ' . File::Spec->catfile( $base_dir,
+ $patch_file = File::Spec->abs2rel( $patch_file, $base_dir );
+ my $cmd = $^X . ' ' . File::Spec->catfile( File::Spec->updir,
qw(inc bin patch) )
. " -N -p0 -u -b .bak < $patch_file";
@@ -335,7 +337,8 @@
sub awx_is_monolithic { $_[0]->awx_monolithic }
sub awx_debug { $_[0]->args( 'debug' ) ? 1 : 0 }
sub awx_is_debug { $_[0]->awx_debug }
-sub awx_unicode { $_[0]->notes( 'build_wx_unicode' ) ? 1 : 0 }
+sub awx_unicode { $_[0]->notes( 'build_wx_unicode' )
+ || $_[0]->args( 'unicode' ) ? 1 : 0 }
sub awx_is_unicode { $_[0]->awx_unicode }
sub awx_mslu { 0 }
sub awx_is_mslu { $_[0]->awx_mslu }
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=41370&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 Wed Aug 5 14:54:53 2009
@@ -37,7 +37,8 @@
sub _patch_command {
my( $self, $base_dir, $patch_file ) = @_;
- my $patch_exe = File::Spec->catfile( $base_dir, qw(inc bin patch.exe) );
+ my $patch_exe = File::Spec->catfile( File::Spec->updir,
+ qw(inc bin patch.exe) );
my $cmd = qq{perl -pe "" -- $patch_file} .
qq{ | $patch_exe -N -p0 -u -b -z .bak};
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm Wed Aug 5 14:54:53 2009
@@ -44,7 +44,7 @@
$data{libs} = $_;
} elsif( s/^\s*g\+\+\s+// ) {
s/\s+\S+\.(cpp|o|d)/ /g;
- s/\s+-MD\s+/ /g;
+ s/\s+-M[DP]\b/ /g;
s/(?:\s|^)-[co]//g;
s{[-/]I(\S+)}{'-I' . File::Spec->canonpath
( File::Spec->rel2abs( $1 ) )}egi;
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=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm Wed Aug 5 14:54:53 2009
@@ -43,7 +43,7 @@
instantiate => 'config';
our $AUTOLOAD;
-our $VERSION = '0.42';
+our $VERSION = '0.43';
our %VALUES;
our $dont_remap;
@@ -139,10 +139,11 @@
my $class = shift;
return awx_sort_config awx_grep_config [ $class->_list ], @_;
- }
+}
my $lib_nok = 'adv|base|html|net|xml|media';
-my $lib_mono = 'adv|base|html|net|xml|xrc|media|aui|richtext';
+my $lib_mono_28 = 'adv|base|html|net|xml|xrc|media|aui|richtext';
+my $lib_mono_29 = 'adv|base|html|net|xml|xrc|media|aui|richtext|stc';
sub _grep_libraries {
my $lib_filter = $VALUES{version} >= 2.005001 ? qr/(?!a)a/ : # no match
@@ -156,6 +157,7 @@
@libs = keys %$dlls unless @libs;
push @libs, 'core', 'base' unless grep /^core|mono$/, @libs;
+ my $lib_mono = $VALUES{version} >= 2.009 ? $lib_mono_29 : $lib_mono_28;
if( ( $VALUES{config}{build} || '' ) eq 'mono' ) {
@libs = map { $_ eq 'core' ? ( 'mono' ) :
$_ =~ /^(?:$lib_mono)$/ ? () :
@@ -361,7 +363,7 @@
=item Alien::wxWidgets
-Copyright (c) 2005-2008 Mattia Barbon <mbarbon at cpan.org>
+Copyright (c) 2005-2009 Mattia Barbon <mbarbon at cpan.org>
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself
Modified: branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets/Utility.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets/Utility.pm?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets/Utility.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets/Utility.pm Wed Aug 5 14:54:53 2009
@@ -197,12 +197,20 @@
my $k = shift;
sub { exists $a{$k} ? $a{$k} eq $_->{$k} : 1 }
};
+ my $compare_tk = sub {
+ return 1 unless exists $a{toolkit};
+ my $atk = $a{toolkit} eq 'mac' ? 'osx_carbon' :
+ $a{toolkit};
+ my $btk = $_->{toolkit} eq 'mac' ? 'osx_carbon' :
+ $_->{toolkit};
+ return $atk eq $btk;
+ };
# note tha if the criteria was not supplied, the comparison is a noop
my $wver = $make_cmpr->( 'version' );
my $ckind = $make_cmps->( 'compiler_kind' );
my $cver = $make_cmpn->( 'compiler_version' );
- my $tkit = $make_cmps->( 'toolkit' );
+ my $tkit = $compare_tk;
my $deb = $make_cmpn->( 'debug' );
my $uni = $make_cmpn->( 'unicode' );
my $mslu = $make_cmpn->( 'mslu' );
Modified: branches/upstream/libalien-wxwidgets-perl/current/patches/data
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/patches/data?rev=41370&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/patches/data (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/patches/data Wed Aug 5 14:54:53 2009
@@ -1,4 +1,4 @@
-my $VERSION = '2.8.8';
+my $VERSION = '2.8.10';
my $URL = "http://prdownloads.sourceforge.net/wxwindows";
my $BASE = 'wxWidgets';
# $TYPE from Build.PL
@@ -7,12 +7,12 @@
{ msw => { unicode => [ qw(
wxMSW-2.8.0-setup_u.patch
-wxMSW-2.8.4-config.patch
+wxMSW-2.8.10-config.patch
wxMSW-2.8.0-makefiles.patch
), @common ],
ansi => [ qw(
wxMSW-2.8.0-setup.patch
-wxMSW-2.8.4-config.patch
+wxMSW-2.8.10-config.patch
wxMSW-2.8.0-makefiles.patch
), @common ],
},
Added: branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch?rev=41370&op=file
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch (added)
+++ branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch Wed Aug 5 14:54:53 2009
@@ -1,0 +1,12 @@
+diff -r -u build/msw/config.gcc build/msw/config.gcc
+--- build/msw/config.gcc 2006-12-11 22:50:33.000000000 +0100
++++ build/msw/config.gcc 2007-02-25 19:52:55.000000000 +0100
+@@ -77,7 +77,7 @@
+ USE_RICHTEXT := 1
+
+ # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
+-USE_OPENGL ?= 0
++USE_OPENGL ?= 1
+
+ # Build ODBC database classes (USE_GUI must be 1)? [0,1]
+ USE_ODBC := 0
Propchange: branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-config.patch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-perl-cvs-commits
mailing list