[SCM] dvdstyler/master: Add patch from upstream bug report, fix compilation with wx3.0

[unit193-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f94c781db257533dd826d270c3707e151b84d7d4
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Mar 16 20:26:47 2015 -0400

    Add patch from upstream bug report, fix compilation with wx3.0

diff --git a/debian/patches/series b/debian/patches/series
index 86497cd..76d4f99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_desktop_file.patch #Fix errors detected by desktop-file-validate
 genisoimage.patch
+string-conversion-fix-wxwidgets3.patch
diff --git a/debian/patches/string-conversion-fix-wxwidgets3.patch b/debian/patches/string-conversion-fix-wxwidgets3.patch
new file mode 100644
index 0000000..5d82e3e
--- /dev/null
+++ b/debian/patches/string-conversion-fix-wxwidgets3.patch
@@ -0,0 +1,38 @@
+Bug: http://sourceforge.net/p/dvdstyler/discussion/318795/thread/25af343f
+
+Index: src/dvdstyler.cpp
+===================================================================
+--- a/src/dvdstyler.cpp
++++ b/src/dvdstyler.cpp
+@@ -189,14 +189,14 @@ bool DVDStyler::OnInit() {
+ 				wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+ #else
+ #if wxCHECK_VERSION(2,9,0)
+-		{ wxCMD_LINE_SWITCH, "s", "start", _("automatically starts the generation and burning") },
+-		{ wxCMD_LINE_OPTION, "t", "tempDir", _("temporary directory") },
+-		{ wxCMD_LINE_OPTION, "o", "outputDir", _("output directory") },
+-		{ wxCMD_LINE_OPTION, "i", "isoFile", _("output ISO file name") },
+-		{ wxCMD_LINE_OPTION, "d", "device", _("DVD device to burn") },
+-		{ wxCMD_LINE_SWITCH, "e", "stderr", _("write log messages to standard error") },
+-		{ wxCMD_LINE_SWITCH, "v", "version", _("show version of program") },
+-		{ wxCMD_LINE_SWITCH, "h", "help", _("show summary of options") },
++		{ wxCMD_LINE_SWITCH, "s", "start", wxT_2("automatically starts the generation and burning") },
++		{ wxCMD_LINE_OPTION, "t", "tempDir", wxT_2("temporary directory") },
++		{ wxCMD_LINE_OPTION, "o", "outputDir", wxT_2("output directory") },
++		{ wxCMD_LINE_OPTION, "i", "isoFile", wxT_2("output ISO file name") },
++		{ wxCMD_LINE_OPTION, "d", "device", wxT_2("DVD device to burn") },
++		{ wxCMD_LINE_SWITCH, "e", "stderr", wxT_2("write log messages to standard error") },
++		{ wxCMD_LINE_SWITCH, "v", "version", wxT_2("show version of program") },
++		{ wxCMD_LINE_SWITCH, "h", "help", wxT_2("show summary of options") },
+ #else
+ 		{ wxCMD_LINE_SWITCH, wxT("s"), wxT("start"), _("automatically starts the generation and burning") },
+ 		{ wxCMD_LINE_OPTION, wxT("t"), wxT("tempDir"), _("temporary directory") },
+@@ -207,7 +207,7 @@ bool DVDStyler::OnInit() {
+ 		{ wxCMD_LINE_SWITCH, wxT("v"), wxT("version"), _("show version of program") },
+ 		{ wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), _("show summary of options") },
+ #endif
+-		{ wxCMD_LINE_PARAM, NULL, NULL, _("input file"), wxCMD_LINE_VAL_STRING,
++		{ wxCMD_LINE_PARAM, NULL, NULL, wxT_2("input file"), wxCMD_LINE_VAL_STRING,
+ 				wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+ #endif
+ 		{ wxCMD_LINE_NONE }

-- 
dvdstyler packaging