diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-04-30 16:24:37 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-04-30 16:24:37 +0000 |
| commit | 83be9b55981b1e0f3ecc962306e48743913ec7cb (patch) | |
| tree | 880691f8e30b93c24228866a1855d0cfae670585 /media-gfx/xaralx/files/50_update_imagemagick_version_parser | |
| parent | app-misc/gpligc: Moved to virtual/jpeg (diff) | |
| download | sunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.tar.gz sunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.tar.bz2 sunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.zip | |
media-gfx/xaralx: Fix deps for gnome3, Make it compile again, included patches from debian
svn path=/sunrise/; revision=11985
Diffstat (limited to 'media-gfx/xaralx/files/50_update_imagemagick_version_parser')
| -rw-r--r-- | media-gfx/xaralx/files/50_update_imagemagick_version_parser | 27 |
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; |