r50649 - in /trunk/libalien-wxwidgets-perl: Changes MANIFEST META.yml debian/changelog inc/My/Build/Win32_MSVC_Bakefile.pm lib/Alien/wxWidgets.pm patches/wxMSW-2.8.10-mingw64.patch

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Jan 10 16:43:16 UTC 2010


Author: jawnsy-guest
Date: Sun Jan 10 16:43:08 2010
New Revision: 50649

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50649
Log:
integrate another new upstream release

Added:
    trunk/libalien-wxwidgets-perl/patches/wxMSW-2.8.10-mingw64.patch
      - copied unchanged from r50648, branches/upstream/libalien-wxwidgets-perl/current/patches/wxMSW-2.8.10-mingw64.patch
Modified:
    trunk/libalien-wxwidgets-perl/Changes
    trunk/libalien-wxwidgets-perl/MANIFEST
    trunk/libalien-wxwidgets-perl/META.yml
    trunk/libalien-wxwidgets-perl/debian/changelog
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm
    trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm

Modified: trunk/libalien-wxwidgets-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/Changes?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/Changes (original)
+++ trunk/libalien-wxwidgets-perl/Changes Sun Jan 10 16:43:08 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: trunk/libalien-wxwidgets-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/MANIFEST?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/MANIFEST (original)
+++ trunk/libalien-wxwidgets-perl/MANIFEST Sun Jan 10 16:43:08 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: trunk/libalien-wxwidgets-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/META.yml?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/META.yml (original)
+++ trunk/libalien-wxwidgets-perl/META.yml Sun Jan 10 16:43:08 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: trunk/libalien-wxwidgets-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/debian/changelog?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/debian/changelog (original)
+++ trunk/libalien-wxwidgets-perl/debian/changelog Sun Jan 10 16:43:08 2010
@@ -1,4 +1,4 @@
-libalien-wxwidgets-perl (0.49+dfsg-1) UNRELEASED; urgency=low
+libalien-wxwidgets-perl (0.50+dfsg-1) UNRELEASED; urgency=low
 
   [ Jonathan Yu ]
   * New upstream release
@@ -8,7 +8,7 @@
   * Add myself to Uploaders
   * New upstream release
 
- -- Ryan Niebur <ryan at debian.org>  Sat, 09 Jan 2010 10:10:42 -0800
+ -- Jonathan Yu <jawnsy at cpan.org>  Sun, 10 Jan 2010 11:45:42 -0500
 
 libalien-wxwidgets-perl (0.46+dfsg-1) unstable; urgency=low
 

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm Sun Jan 10 16:43:08 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: trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm?rev=50649&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm (original)
+++ trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm Sun Jan 10 16:43:08 2010
@@ -43,7 +43,7 @@
                       instantiate   => 'config';
 
 our $AUTOLOAD;
-our $VERSION = '0.49';
+our $VERSION = '0.50';
 our %VALUES;
 our $dont_remap;
 




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