r50647 - in /branches/upstream/libalien-wxwidgets-perl/current: Changes MANIFEST META.yml inc/My/Build/Win32_MSVC_Bakefile.pm lib/Alien/wxWidgets.pm patches/wxMSW-2.8.10-mingw64.patch

Sun Jan 10 16:41:57 UTC 2010

Author: jawnsy-guest
Date: Sun Jan 10 16:41:50 2010
New Revision: 50647

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50647
Log:
[svn-upgrade] Integrating new upstream version, libalien-wxwidgets-perl (0.50+dfsg)

Added:
    branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.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/inc/My/Build/Win32_MSVC_Bakefile.pm
    branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm

Modified: branches/upstream/libalien-wxwidgets-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Changes?rev=50647&op=diff
==============================================================================

--- branches/upstream/libalien-wxwidgets-perl/current/Changes (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Changes Sun Jan 10 16:41:50 2010
@@ -1,4 +1,10 @@
 Revision history for Perl extension Alien::wxWidgets.
+
+0.50  Sun Jan 10 16:16:44 CET 2010
+	- When compiling on Windows with MSVC 9, make the generated
+	  wxWidgets DLL load correctly by adding a manifest to them
+	  (suggested by IKEGAMI).
+	- Add a missing file to the distribution.
 
 0.49  Sat Jan  9 10:39:02 CET 2010
 	- Support GCC 4 and 64 bit GCC builds on Windows (patch by KMX).

Modified: branches/upstream/libalien-wxwidgets-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/MANIFEST?rev=50647&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/MANIFEST (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/MANIFEST Sun Jan 10 16:41:50 2010
@@ -38,6 +38,7 @@
 patches/wxMSW-2.8.0-setup.patch
 patches/wxMSW-2.8.0-setup_u.patch
 patches/wxMSW-2.8.10-config.patch
+patches/wxMSW-2.8.10-mingw64.patch
 patches/wxMSW-2.8.10-version.patch
 patches/wxMSW-2.9.0-config.patch
 patches/wxMSW-2.9.0-makefiles.patch

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=50647&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/META.yml (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/META.yml Sun Jan 10 16:41:50 2010
@@ -1,6 +1,6 @@
 ---
 name: Alien-wxWidgets
-version: 0.49
+version: 0.50
 author:
   - 'Mattia Barbon <mbarbon at cpan.org>'
 abstract: 'building, finding and using wxWidgets binaries'
@@ -22,7 +22,7 @@
 provides:
   Alien::wxWidgets:
     file: lib/Alien/wxWidgets.pm
-    version: 0.49
+    version: 0.50
   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/Win32_MSVC_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm?rev=50647&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm Sun Jan 10 16:41:50 2010
@@ -80,8 +80,22 @@
 
 sub build_wxwidgets {
     my( $self ) = shift;
+    my $old_dir = Cwd::cwd();
 
     $self->My::Build::Win32_Bakefile::build_wxwidgets( @_ );
+
+    # Compiling with MSVC 9 (VS 2008) and probably with VS 2005, the
+    # linker creates a manifest that must be embedded in the DLL to
+    # make it load correctly
+    chdir File::Spec->catdir( $ENV{WXDIR} );
+    foreach my $dll ( glob( 'lib/vc_dll*/*.dll' ) ) {
+        next unless -f "${dll}.manifest";
+        $self->_system( 'mt', '-nologo', '-manifest', "${dll}.manifest",
+                        "-outputresource:${dll};2" );
+        unlink "${dll}.manifest";
+    }
+
+    chdir $old_dir;
 }
 
 1;

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=50647&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm Sun Jan 10 16:41:50 2010
@@ -43,7 +43,7 @@
                       instantiate   => 'config';
 
 our $AUTOLOAD;
-our $VERSION = '0.49';
+our $VERSION = '0.50';
 our %VALUES;
 our $dont_remap;
 

Added: branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.patch
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.patch?rev=50647&op=file
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.patch (added)
+++ branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.patch Sun Jan 10 16:41:50 2010
@@ -1,0 +1,11 @@
+--- src/msw/mslu.cpp	2010-01-07 22:38:40.000000000 +0100
++++ src/msw/mslu.cpp	2010-01-07 22:39:45.000000000 +0100
+@@ -61,7 +61,7 @@
+ #include <io.h>
+ #include <sys/stat.h>
+ 
+-#ifdef __VISUALC__
++#if defined(__VISUALC__) || defined(__MINGW64_VERSION_MAJOR)
+     #include <direct.h>
+ #endif
+ 


