[libwx-perl] 01/02: Add patches from Niko Tyni to handle missing wxwidgets3.0 symbol on arm{el, hf}.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libwx-perl.

commit 92d0de84992b73ea6e238e89689da69dd64d8de6
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Aug 15 16:32:07 2014 +0200

    Add patches from Niko Tyni to handle missing wxwidgets3.0 symbol on arm{el,hf}.
    
    - Wx.xs: return 0 if wxPluginManager::LoadLibrary fails
    - t/01_load.t: skip failing tests
    
    Cf. #758127.
---
 ...d_plugin-segfaulting-when-wxPluginManager.patch | 30 ++++++++++++++++++++++
 ...ily-skip-tests-when-the-use-Wx-qw-.-fails.patch | 28 ++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 60 insertions(+)

diff --git a/debian/patches/0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch b/debian/patches/0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
new file mode 100644
index 0000000..b6cbf46
--- /dev/null
+++ b/debian/patches/0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
@@ -0,0 +1,30 @@
+From 95be329c6f7eaefda58edf4db4180a59f44ae9aa Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Thu, 14 Aug 2014 21:50:00 +0000
+Subject: [PATCH 1/2] Fix Wx::_load_plugin() segfaulting when
+ wxPluginManager::LoadLibrary fails
+
+Bug-Debian: https://bugs.debian.org/758127
+---
+ Wx.xs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Wx.xs b/Wx.xs
+index 01029fc..3f5dede 100644
+--- a/Wx.xs
++++ b/Wx.xs
+@@ -422,7 +422,10 @@ _load_plugin( string, int flags = 0 /* to be compatible with dl_load_file */ )
+ #endif
+ #endif
+     wxDynamicLibrary *lib = wxPluginManager::LoadLibrary( string, wxDL_VERBATIM );
+-    RETVAL = PTR2IV( lib->GetLibHandle() );
++    if (lib)
++        RETVAL = PTR2IV( lib->GetLibHandle() );
++    else
++        RETVAL = 0;
+   OUTPUT:
+     RETVAL
+ 
+-- 
+2.1.0.rc1
+
diff --git a/debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch b/debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch
new file mode 100644
index 0000000..b89367a
--- /dev/null
+++ b/debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch
@@ -0,0 +1,28 @@
+From 6f28d00f4ad9db47f3c8df876e97154f07bdb206 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Thu, 14 Aug 2014 22:02:18 +0000
+Subject: [PATCH 2/2] Temporarily skip tests when the 'use Wx qw(...)' fails
+
+This is a workaround for wxwidgets3.0 breakage, see
+https://bugs.debian.org/758127
+---
+ t/01_load.t | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/t/01_load.t b/t/01_load.t
+index 2237a97..c4042c9 100755
+--- a/t/01_load.t
++++ b/t/01_load.t
+@@ -11,7 +11,8 @@ my $x = wxYES;
+ ok( 1, "Exported constant" );
+ 
+ SKIP: {
+-  use Wx qw(:frame :allclasses wxNO_3D wxTAB_TRAVERSAL);
++  eval "use Wx qw(:frame :allclasses wxNO_3D wxTAB_TRAVERSAL)";
++  skip("loading :allclasses et al. failed: $@", 2) if $@;
+ 
+   $x = wxTAB_TRAVERSAL();
+   $x = wxCAPTION();
+-- 
+2.1.0.rc1
+
diff --git a/debian/patches/series b/debian/patches/series
index fc928c8..f88536e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ skip-splashfast-tests.patch
 hashbang.patch
 fix-fake-pod.patch
 spelling.patch
+0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
+0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwx-perl.git