This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository ctsim.
commit ecd999aa8f91b992363cf459488df2d35586bb3b Author: Andreas Tille <[email protected]> Date: Mon Aug 11 11:56:39 2014 +0200 Refreshed patch --- debian/patches/wx3.0-compat.patch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/debian/patches/wx3.0-compat.patch b/debian/patches/wx3.0-compat.patch index 693dd9b..e24a454 100644 --- a/debian/patches/wx3.0-compat.patch +++ b/debian/patches/wx3.0-compat.patch @@ -4,7 +4,7 @@ Last-Update: 2014-06-14 --- a/configure +++ b/configure -@@ -5736,13 +5736,13 @@ +@@ -5736,13 +5736,13 @@ if test "$hasx11gtk2" = "true" ; then CFLAGS="${CFLAGS} ${g76GTK_CFLAGS} ${GLIB_CFLAGS}" fi @@ -22,7 +22,7 @@ Last-Update: 2014-06-14 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -5756,29 +5756,29 @@ +@@ -5756,29 +5756,29 @@ return main (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -61,7 +61,7 @@ Last-Update: 2014-06-14 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -5792,17 +5792,17 @@ +@@ -5792,17 +5792,17 @@ return main (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -84,7 +84,7 @@ Last-Update: 2014-06-14 wxwin=true; wx_mac=true; $as_echo "#define HAVE_WXWINDOWS 1" >>confdefs.h -@@ -7359,9 +7359,9 @@ +@@ -7359,9 +7359,9 @@ $as_echo "yes" >&6; } wxdebug="--debug" fi if test "x$wx_gtk" != "x" ; then @@ -96,7 +96,7 @@ Last-Update: 2014-06-14 fi fi fi -@@ -7535,7 +7535,7 @@ +@@ -7535,7 +7535,7 @@ fi if test "$wxwin" = "true" ; then if test "$wx_gtk" = "true" -o "$wx_mac" = "true" ; then @@ -107,7 +107,7 @@ Last-Update: 2014-06-14 wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__" --- a/configure.ac +++ b/configure.ac -@@ -77,8 +77,8 @@ +@@ -77,8 +77,8 @@ if test "$hasx11gtk2" = "true" ; then CFLAGS="${CFLAGS} ${g76GTK_CFLAGS} ${GLIB_CFLAGS}" fi @@ -118,7 +118,7 @@ Last-Update: 2014-06-14 AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false], [-L/usr/lib64 -L/usr/lib]) AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64]) AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false]) -@@ -375,9 +375,9 @@ +@@ -375,9 +375,9 @@ if test "$with_x" != "no" && test "$wxwi wxdebug="--debug" fi if test "x$wx_gtk" != "x" ; then @@ -130,7 +130,7 @@ Last-Update: 2014-06-14 fi fi fi -@@ -451,7 +451,7 @@ +@@ -451,7 +451,7 @@ fi if test "$wxwin" = "true" ; then if test "$wx_gtk" = "true" -o "$wx_mac" = "true" ; then @@ -141,7 +141,7 @@ Last-Update: 2014-06-14 wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__" --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp -@@ -359,7 +359,7 @@ +@@ -359,7 +359,7 @@ SGP::setRasterOp (int ro) { #if HAVE_WXWINDOWS if (m_driver.isWX()) { @@ -150,7 +150,7 @@ Last-Update: 2014-06-14 switch (ro) { case RO_AND: wxFxn = wxAND; -@@ -409,9 +409,10 @@ +@@ -409,9 +409,10 @@ SGP::setRasterOp (int ro) case RO_XOR: wxFxn = wxXOR; break; @@ -165,7 +165,7 @@ Last-Update: 2014-06-14 } --- a/src/ctsim.cpp +++ b/src/ctsim.cpp -@@ -93,15 +93,15 @@ +@@ -93,15 +93,15 @@ CTSimApp::CTSimApp() void CTSimApp::OnInitCmdLine(wxCmdLineParser& parser) { static const wxCmdLineEntryDesc cmdLineDesc[] = { @@ -186,7 +186,7 @@ Last-Update: 2014-06-14 wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ CTSimApp::OnInit() if (m_bPrintCmdLineImages) { wxCommandEvent closeEvent; closeEvent.SetInt (MAINMENU_FILE_EXIT); @@ -195,7 +195,7 @@ Last-Update: 2014-06-14 } if (getStartupTips()) -@@ -891,7 +891,7 @@ +@@ -891,7 +891,7 @@ public: }; BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle) @@ -204,7 +204,7 @@ Last-Update: 2014-06-14 { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); -@@ -961,7 +961,7 @@ +@@ -961,7 +961,7 @@ MainFrame::OnImport (wxCommandEvent& WXU } wxString strFilename = wxFileSelector (wxString(wxConvUTF8.cMB2WX("Import Filename")), wxString(wxConvUTF8.cMB2WX("")), @@ -215,7 +215,7 @@ Last-Update: 2014-06-14 if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM || m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PNG) { --- a/src/ctsim.h +++ b/src/ctsim.h -@@ -126,6 +126,13 @@ +@@ -126,6 +126,13 @@ public: void OnSize (wxSizeEvent& event); @@ -231,7 +231,7 @@ Last-Update: 2014-06-14 {return m_winHelp; } --- a/src/dlgezplot.cpp +++ b/src/dlgezplot.cpp -@@ -102,7 +102,7 @@ +@@ -102,7 +102,7 @@ EZPlotControl::OnPaint (wxPaintEvent& ev wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton) @@ -242,7 +242,7 @@ Last-Update: 2014-06-14 if (! parent) --- a/src/views.cpp +++ b/src/views.cpp -@@ -1315,9 +1315,9 @@ +@@ -1315,9 +1315,9 @@ ImageFileView::OnExport (wxCommandEvent& _T(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); #else const wxString& strFilename = wxFileSelector (_T("Export Filename"), _T(""), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ctsim.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
