summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/xaralx/files/50_update_imagemagick_version_parser')
-rw-r--r--media-gfx/xaralx/files/50_update_imagemagick_version_parser27
1 files changed, 27 insertions, 0 deletions
diff --git a/media-gfx/xaralx/files/50_update_imagemagick_version_parser b/media-gfx/xaralx/files/50_update_imagemagick_version_parser
new file mode 100644
index 000000000..ddf3328de
--- /dev/null
+++ b/media-gfx/xaralx/files/50_update_imagemagick_version_parser
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_update_imagemagick_version_parser.dpatch by Joachim Breitner <nomeata@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xaralx-0.7r1785~/wxOil/imgmgkft.cpp xaralx-0.7r1785/wxOil/imgmgkft.cpp
+--- xaralx-0.7r1785~/wxOil/imgmgkft.cpp 2009-10-08 11:42:12.000000000 +0200
++++ xaralx-0.7r1785/wxOil/imgmgkft.cpp 2009-10-08 11:43:31.000000000 +0200
+@@ -1490,14 +1490,14 @@
+ s_ImageMagickPath = DIP_QUOTE(DEFAULT_IMAGEMAGICK_PATH);
+
+ wxArrayString output;
+- long /*TYPENOTE: Correct*/ ret=::wxExecute(wxString((const TCHAR *)s_ImageMagickPath)/*+_T(" --version")*/, output, wxEXEC_SYNC | wxEXEC_NODISABLE);
++ long /*TYPENOTE: Correct*/ ret=::wxExecute(wxString((const TCHAR *)s_ImageMagickPath)+_T(" --version"), output, wxEXEC_SYNC | wxEXEC_NODISABLE);
+ if (!ret && output.GetCount()>0)
+ {
+ wxString check = output[0];
+ wxString version;
+ if (check.StartsWith(_T("Version: ImageMagick "),&version))
+ {
+- wxStringTokenizer tk(version, _T(".: "));
++ wxStringTokenizer tk(version, _T(".:- "));
+ if (tk.CountTokens()>=3)
+ {
+ long /*TYPENOTE: Correct*/ v1,v2,v3=0;