From 83be9b55981b1e0f3ecc962306e48743913ec7cb Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 30 Apr 2011 16:24:37 +0000 Subject: media-gfx/xaralx: Fix deps for gnome3, Make it compile again, included patches from debian svn path=/sunrise/; revision=11985 --- .../files/50_update_imagemagick_version_parser | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 media-gfx/xaralx/files/50_update_imagemagick_version_parser (limited to 'media-gfx/xaralx/files/50_update_imagemagick_version_parser') 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 +## +## 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; -- cgit v1.2.3-65-gdbad