[libwx-perl] 02/03: updated patches from Niko Tyni to temporarily disable failing propgrid tests on arm*

[Damyan Ivanov]

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

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

commit 34bac7cdac6ef30ef6aff0731664213a5f688447
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sun Aug 17 19:46:21 2014 +0000

    updated patches from Niko Tyni to temporarily disable failing propgrid tests on arm*
---
 ...d_plugin-segfaulting-when-wxPluginManager.patch |  8 +++--
 ...skip-tests-in-t-01_load.t-when-use-Wx-qw.patch} |  5 +--
 ...3-Temporarily-skip-all-ext-propgrid-tests.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  3 +-
 4 files changed, 47 insertions(+), 5 deletions(-)

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
index b6cbf46..aca626d 100644
--- a/debian/patches/0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
+++ b/debian/patches/0001-Fix-Wx-_load_plugin-segfaulting-when-wxPluginManager.patch
@@ -1,9 +1,13 @@
-From 95be329c6f7eaefda58edf4db4180a59f44ae9aa Mon Sep 17 00:00:00 2001
+From 067aacc2dc8ab1b02286693656df801e08dec49e 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
+Subject: [PATCH 1/3] Fix Wx::_load_plugin() segfaulting when
  wxPluginManager::LoadLibrary fails
 
+It would be nice to also signal an error message upwards in the caller
+stack, but I can't see an easy way to set dl_last_error in DynaLoader
+from here.
+
 Bug-Debian: https://bugs.debian.org/758127
 ---
  Wx.xs | 5 ++++-
diff --git a/debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch b/debian/patches/0002-Temporarily-skip-tests-in-t-01_load.t-when-use-Wx-qw.patch
similarity index 80%
rename from debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch
rename to debian/patches/0002-Temporarily-skip-tests-in-t-01_load.t-when-use-Wx-qw.patch
index b89367a..7d121e6 100644
--- a/debian/patches/0002-Temporarily-skip-tests-when-the-use-Wx-qw-.-fails.patch
+++ b/debian/patches/0002-Temporarily-skip-tests-in-t-01_load.t-when-use-Wx-qw.patch
@@ -1,7 +1,8 @@
-From 6f28d00f4ad9db47f3c8df876e97154f07bdb206 Mon Sep 17 00:00:00 2001
+From 20880ed3c176b400df548c84db13355c7c7007e4 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
+Subject: [PATCH 2/3] Temporarily skip tests in t/01_load.t when 'use Wx
+ qw(:allclasses)' fails
 
 This is a workaround for wxwidgets3.0 breakage, see
 https://bugs.debian.org/758127
diff --git a/debian/patches/0003-Temporarily-skip-all-ext-propgrid-tests.patch b/debian/patches/0003-Temporarily-skip-all-ext-propgrid-tests.patch
new file mode 100644
index 0000000..c6ee82a
--- /dev/null
+++ b/debian/patches/0003-Temporarily-skip-all-ext-propgrid-tests.patch
@@ -0,0 +1,36 @@
+From fe7b1b7b6630b30ad652e93caa1d2acb9e837994 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Sat, 16 Aug 2014 07:11:51 +0000
+Subject: [PATCH 3/3] Temporarily skip all ext/propgrid tests
+
+This is a workaround for for wxwidgets3.0 breakage, see
+https://bugs.debian.org/758127
+---
+ ext/propgrid/Makefile.PL | 2 ++
+ ext/propgrid/faketest    | 2 ++
+ 2 files changed, 4 insertions(+)
+ create mode 100755 ext/propgrid/faketest
+
+diff --git a/ext/propgrid/Makefile.PL b/ext/propgrid/Makefile.PL
+index 093817d..80e0718 100644
+--- a/ext/propgrid/Makefile.PL
++++ b/ext/propgrid/Makefile.PL
+@@ -22,4 +22,6 @@ wxWriteMakefile( NAME         => 'Wx::PropertyGrid',
+                  WX_CORE_LIB  => 'propgrid adv core base',
+                  REQUIRE_WX_LIB  => 'propgrid',
+                  NO_WX_PLATFORMS => [ ],
++                 # temporary workaround for https://bugs.debian.org/758127
++                 test => { TESTS => ($Config{archname} =~ /^arm/ ? 'faketest' : 't/*.t') },
+                );
+\ No newline at end of file
+diff --git a/ext/propgrid/faketest b/ext/propgrid/faketest
+new file mode 100755
+index 0000000..83f7d05
+--- /dev/null
++++ b/ext/propgrid/faketest
+@@ -0,0 +1,2 @@
++#!/bin/sh
++echo 1..0
+-- 
+2.1.0.rc1
+
diff --git a/debian/patches/series b/debian/patches/series
index f88536e..29216bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ 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
+0002-Temporarily-skip-tests-in-t-01_load.t-when-use-Wx-qw.patch
+0003-Temporarily-skip-all-ext-propgrid-tests.patch

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