Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=9d4493c15f1a6dc9ce5863e9e2643b81c070c6b1
commit 9d4493c15f1a6dc9ce5863e9e2643b81c070c6b1 Author: James Buren <[email protected]> Date: Sun Jun 15 09:32:39 2014 -0500 wxmathplot-0.1.2-5-x86_64 * wxgtk -> wxwidget diff --git a/source/xlib-extra/wxmathplot/FrugalBuild b/source/xlib-extra/wxmathplot/FrugalBuild index df773ce..f4c0e72 100644 --- a/source/xlib-extra/wxmathplot/FrugalBuild +++ b/source/xlib-extra/wxmathplot/FrugalBuild @@ -1,16 +1,20 @@ # Compiling Time: 0.14 SBU # Maintainer: Slown <[email protected]> +options+=('asneeded') + pkgname=wxmathplot pkgver=0.1.2 -pkgrel=2 +pkgrel=5 pkgdesc="wxMathPlot is a library to add 2D scientific plot functionnality to wxWidgets" -depends=('wxgtk>=2.8.12-3') +depends=('wxwidget>=3.0.0-5') groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet') _F_sourceforge_name="wxMathPlot" Finclude sourceforge cmake -sha1sums=('24be41c1ce3b5683561c380d518260c89ffc392c') +source=($source wxwidget-compatible.patch) +sha1sums=('24be41c1ce3b5683561c380d518260c89ffc392c' \ + 'e74b7e904d9fd64ad0f41ad92b5533cb9c18ec6b') # optimization OK diff --git a/source/xlib-extra/wxmathplot/wxwidget-compatible.patch b/source/xlib-extra/wxmathplot/wxwidget-compatible.patch new file mode 100644 index 0000000..a5eed8e --- /dev/null +++ b/source/xlib-extra/wxmathplot/wxwidget-compatible.patch @@ -0,0 +1,85 @@ +diff -Naur wxMathPlot-0.1.2/mathplot.cpp wxMathPlot-0.1.2.new/mathplot.cpp +--- wxMathPlot-0.1.2/mathplot.cpp 2009-11-18 12:07:46.000000000 +0100 ++++ wxMathPlot-0.1.2.new/mathplot.cpp 2014-02-10 18:23:47.235332930 +0100 +@@ -16,8 +16,9 @@ + #endif + + // For compilers that support precompilation, includes "wx.h". +-#include <wx/window.h> +-//#include <wx/wxprec.h> ++#include <wx/wx.h> ++// #include <wx/window.h> ++// #include <wx/wxprec.h> + + // Comment out for release operation: + // (Added by J.L.Blanco, Aug 2007) +@@ -137,7 +138,11 @@ + + bool mpInfoLayer::Inside(wxPoint& point) + { ++#if wxCHECK_VERSION(2, 8, 0) + return m_dim.Contains(point); ++#else ++ return m_dim.Inside(point); ++#endif + } + + void mpInfoLayer::Move(wxPoint delta) +@@ -2236,7 +2241,7 @@ + } + // Once drawing is complete, actually save screen shot + wxImage screenImage = screenBuffer.ConvertToImage(); +- return screenImage.SaveFile(filename, type); ++ return screenImage.SaveFile(filename, (wxBitmapType) type); + } + + void mpWindow::SetMargins(int top, int right, int bottom, int left) +@@ -2607,7 +2612,7 @@ + // Just in case... + if (m_shape_xs.size()!=m_shape_ys.size()) + { +- ::wxLogError(wxT("[mpMovableObject::ShapeUpdated] Error, m_shape_xs and m_shape_ys have different lengths!")); ++ wxLogError(wxT("[mpMovableObject::ShapeUpdated] Error, m_shape_xs and m_shape_ys have different lengths!")); + } + else + { +@@ -2746,9 +2751,9 @@ + m_shape_ys.clear(); + + // Preliminar checks: +- if (m_quantiles<0) { ::wxLogError(wxT("[mpCovarianceEllipse] Error: quantiles must be non-negative")); return; } +- if (m_cov_00<0) { ::wxLogError(wxT("[mpCovarianceEllipse] Error: cov(0,0) must be non-negative")); return; } +- if (m_cov_11<0) { ::wxLogError(wxT("[mpCovarianceEllipse] Error: cov(1,1) must be non-negative")); return; } ++ if (m_quantiles<0) { wxLogError(wxT("[mpCovarianceEllipse] Error: quantiles must be non-negative")); return; } ++ if (m_cov_00<0) { wxLogError(wxT("[mpCovarianceEllipse] Error: cov(0,0) must be non-negative")); return; } ++ if (m_cov_11<0) { wxLogError(wxT("[mpCovarianceEllipse] Error: cov(1,1) must be non-negative")); return; } + + m_shape_xs.resize( m_segments,0 ); + m_shape_ys.resize( m_segments,0 ); +@@ -2760,7 +2765,7 @@ + + double D = b*b - 4*c; + +- if (D<0) { ::wxLogError(wxT("[mpCovarianceEllipse] Error: cov is not positive definite")); return; } ++ if (D<0) { wxLogError(wxT("[mpCovarianceEllipse] Error: cov is not positive definite")); return; } + + double eigenVal0 =0.5*( -b + sqrt(D) ); + double eigenVal1 =0.5*( -b - sqrt(D) ); +@@ -2844,7 +2849,7 @@ + { + if ( points_xs.size()!=points_ys.size() ) + { +- ::wxLogError(wxT("[mpPolygon] Error: points_xs and points_ys must have the same number of elements")); ++ wxLogError(wxT("[mpPolygon] Error: points_xs and points_ys must have the same number of elements")); + } + else + { +@@ -2874,7 +2879,7 @@ + { + if (!inBmp.Ok()) + { +- ::wxLogError(wxT("[mpBitmapLayer] Assigned bitmap is not Ok()!")); ++ wxLogError(wxT("[mpBitmapLayer] Assigned bitmap is not Ok()!")); + } + else + { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
