From 2c8a1bf18064d2c41aff0d678057259795674019 Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Nov 24 2015 06:44:57 +0000 Subject: Update to new 2.3.3 version --- diff --git a/mathgl-2.2.1-examples.patch b/mathgl-2.2.1-examples.patch deleted file mode 100644 index 3ec1fa8..0000000 --- a/mathgl-2.2.1-examples.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- examples/CMakeLists.txt 2014-01-28 17:02:51.498837020 +0700 -+++ examples/CMakeLists.txt-examples 2014-01-28 17:04:52.118182901 +0700 -@@ -4,22 +4,26 @@ endif(MGL_HAVE_GSL) - - add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) - target_link_libraries(mgl_example mgl) -+SET(MGL_INSTALL_EXAMPLES_LIST mgl_example) - - if(MGL_HAVE_FLTK) - include_directories(${FLTK_INCLUDE_DIR}) - add_executable(mgl_fltk_example wnd_samples.cpp fltk_example.cpp) - target_link_libraries(mgl_fltk_example mgl-fltk) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_fltk_example) - endif(MGL_HAVE_FLTK) - - if(MGL_HAVE_GLUT) - add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp) - target_link_libraries(mgl_glut_example mgl-glut) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_glut_example) - endif(MGL_HAVE_GLUT) - - if(MGL_HAVE_WX) - include(${wxWidgets_USE_FILE}) - add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp) - target_link_libraries(mgl_wx_example mgl-wx) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_wx_example) - endif(MGL_HAVE_WX) - - if(enable-qt) -@@ -31,4 +35,10 @@ if(enable-qt) - include(../cmake-qt4.txt) - target_link_libraries(mgl_qt_example mgl-qt4) - endif(enable-qt5) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qt_example) - endif(enable-qt) -+ -+install( -+ TARGETS ${MGL_INSTALL_EXAMPLES_LIST} -+ RUNTIME DESTINATION bin -+) diff --git a/mathgl-2.3-fltk-skip-fluid.patch b/mathgl-2.3-fltk-skip-fluid.patch deleted file mode 100644 index 8dbe368..0000000 --- a/mathgl-2.3-fltk-skip-fluid.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.initial 2014-10-09 17:52:44.289738669 +0700 -+++ CMakeLists.txt 2014-10-09 17:52:59.011544253 +0700 -@@ -381,6 +381,7 @@ endif(enable-glut) - - if(enable-fltk) - set(MGL_HAVE_FLTK 1) -+ set(FLTK_SKIP_FLUID 1) - include(FindFLTK) - if(NOT FLTK_FOUND) - message(SEND_ERROR "Couldn't find FLTK library.") diff --git a/mathgl-2.3-includes.patch b/mathgl-2.3-includes.patch deleted file mode 100644 index 08c16bd..0000000 --- a/mathgl-2.3-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -wrupN mathgl-2.3/json/Backend.hpp mathgl-2.3-new/json/Backend.hpp ---- mathgl-2.3/json/Backend.hpp 2014-08-07 14:12:37.000000000 +0200 -+++ mathgl-2.3-new/json/Backend.hpp 2015-07-26 22:48:50.750733852 +0200 -@@ -1,5 +1,6 @@ - #pragma once - -+#include - #include - - class Backend : public QObject diff --git a/mathgl-2.3-no-hdf4-and-hdf5-simultaneously.patch b/mathgl-2.3-no-hdf4-and-hdf5-simultaneously.patch deleted file mode 100644 index 2ea56eb..0000000 --- a/mathgl-2.3-no-hdf4-and-hdf5-simultaneously.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.initial 2014-10-07 17:16:53.271970273 +0700 -+++ CMakeLists.txt 2014-10-07 17:17:01.168867231 +0700 -@@ -265,7 +265,7 @@ endif(enable-gsl) - # set(MGL_HAVE_LTDL 0) - #endif(enable-all OR enable-ltdl) - --if(enable-hdf4) -+if(enable-hdf4 AND (NOT enable-hdf5)) - set(MGL_HAVE_HDF4 1) - find_library(HDF4_LIB df) - find_library(HDF4MF_LIB mfhdf) -@@ -276,9 +276,9 @@ if(enable-hdf4) - message(SEND_ERROR "${HDF4_INCLUDE_DIR}") - message(SEND_ERROR "Couldn't find HDF4 libraries.") - endif(NOT HDF4_LIB OR NOT HDF4MF_LIB OR NOT HDF4_INCLUDE_DIR) --else(enable-hdf4) -+else(enable-hdf4 AND (NOT enable-hdf5)) - set(MGL_HAVE_HDF4 0) --endif(enable-hdf4) -+endif(enable-hdf4 AND (NOT enable-hdf5)) - - if(enable-hdf5) - set(MGL_HAVE_HDF5 1) diff --git a/mathgl-2.3-no_octave.patch b/mathgl-2.3-no_octave.patch deleted file mode 100644 index d0bf1fa..0000000 --- a/mathgl-2.3-no_octave.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2014-10-07 17:17:01.168867231 +0700 -+++ CMakeLists.txt 2014-10-07 17:17:47.528262312 +0700 -@@ -111,6 +111,8 @@ MGL_DEPENDENT_OPTION(enable-python "Enab - MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -+SET( enable-octave OFF ) -+SET( enable-octave-install OFF ) - - include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) - set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2") diff --git a/mathgl-2.3-no_qt4.patch b/mathgl-2.3-no_qt4.patch deleted file mode 100644 index ecfdbfe..0000000 --- a/mathgl-2.3-no_qt4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt.initial 2014-10-10 09:31:36.918128974 +0700 -+++ CMakeLists.txt 2014-10-10 09:31:59.853828521 +0700 -@@ -92,7 +92,8 @@ CMAKE_DEPENDENT_OPTION(enable-gif "Enabl - CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+#CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+set(enable-qt4 OFF) - CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - diff --git a/mathgl-2.3-x11.patch b/mathgl-2.3-x11.patch deleted file mode 100644 index 4354cf6..0000000 --- a/mathgl-2.3-x11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- udav/CMakeLists.txt.orig 2015-03-21 14:42:01.325397847 +0600 -+++ udav/CMakeLists.txt 2015-03-21 14:42:15.145923191 +0600 -@@ -38,7 +38,7 @@ endif(enable-qt5) - add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src}) - #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread") - if(enable-qt5) -- target_link_libraries(udav mgl-qt5) -+ target_link_libraries(udav mgl-qt5 X11) - qt5_use_modules(udav Core Widgets Gui PrintSupport) - else(enable-qt5) - target_link_libraries(udav mgl-qt4) diff --git a/mathgl-2.3.3-examples.patch b/mathgl-2.3.3-examples.patch new file mode 100644 index 0000000..b3b71b4 --- /dev/null +++ b/mathgl-2.3.3-examples.patch @@ -0,0 +1,45 @@ +--- examples/CMakeLists.txt 2015-11-24 12:19:29.605547590 +0600 ++++ examples/CMakeLists.txt 2015-11-24 12:24:58.377140217 +0600 +@@ -4,22 +4,26 @@ endif(MGL_HAVE_GSL) + + add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) + target_link_libraries(mgl_example mgl) ++SET(MGL_INSTALL_EXAMPLES_LIST mgl_example) + + if(MGL_HAVE_FLTK) + include_directories(${FLTK_INCLUDE_DIR}) + add_executable(mgl_fltk_example wnd_samples.cpp fltk_example.cpp) + target_link_libraries(mgl_fltk_example mgl-fltk) ++ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_fltk_example) + endif(MGL_HAVE_FLTK) + + if(MGL_HAVE_GLUT) + add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp) + target_link_libraries(mgl_glut_example mgl-glut) ++ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_glut_example) + endif(MGL_HAVE_GLUT) + + if(MGL_HAVE_WX) + include(${wxWidgets_USE_FILE}) + add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp) + target_link_libraries(mgl_wx_example mgl-wx) ++ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_wx_example) + endif(MGL_HAVE_WX) + + if(enable-qt) +@@ -41,6 +45,7 @@ if(enable-qt) + target_link_libraries(mgl_qgl_example mgl) + target_link_libraries(mgl_qgl_example ${QT_LIBRARIES}) + endif(enable-qt5) ++ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qt_example) + + endif(enable-qt) + +@@ -50,3 +55,7 @@ if(MGL_HAVE_LTDL) + target_link_libraries(mgl_module mgl) # for compatibility with win32 + endif(MGL_HAVE_LTDL) + ++install( ++ TARGETS ${MGL_INSTALL_EXAMPLES_LIST} ++ RUNTIME DESTINATION bin ++) diff --git a/mathgl-2.3.3-fltk-skip-fluid.patch b/mathgl-2.3.3-fltk-skip-fluid.patch new file mode 100644 index 0000000..5097e92 --- /dev/null +++ b/mathgl-2.3.3-fltk-skip-fluid.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt 2015-11-24 12:29:02.177681649 +0600 ++++ CMakeLists.txt 2015-11-24 12:30:50.909910702 +0600 +@@ -406,6 +406,7 @@ endif(enable-glut) + + if(enable-fltk) + set(MGL_HAVE_FLTK 1) ++ set(FLTK_SKIP_FLUID 1) + include(FindFLTK) + if(NOT FLTK_FOUND) + message(SEND_ERROR "Couldn't find FLTK library.") diff --git a/mathgl-2.3.3-gsl2.patch b/mathgl-2.3.3-gsl2.patch new file mode 100644 index 0000000..e5be1d8 --- /dev/null +++ b/mathgl-2.3.3-gsl2.patch @@ -0,0 +1,48 @@ +diff -urp mathgl-2.3.3/CMakeLists.txt mathgl-2.3.3-gsl2/CMakeLists.txt +--- CMakeLists.txt 2015-06-01 13:29:26.000000000 +0600 ++++ CMakeLists.txt 2015-11-24 12:10:43.580786919 +0600 +@@ -259,6 +259,13 @@ endif(enable-pthread) + + if(enable-gsl) + set(MGL_HAVE_GSL 1) ++ FIND_PACKAGE(PkgConfig) ++ pkg_check_modules(GSL2 REQUIRED gsl) ++ if ( GSL2_FOUND ) ++ if ( NOT ${GSL2_VERSION} LESS 2.0 ) ++ SET(ISGSL2 1) ++ endif ( NOT ${GSL_VERSION} LESS 2.0 ) ++ endif ( GSL2_FOUND ) + find_library(GSL_LIB gsl) + find_library(GSL_CBLAS_LIB gslcblas) + find_path(GSL_INCLUDE_DIR gsl/gsl_fft_complex.h) +diff -urp mathgl-2.3.3/src/CMakeLists.txt mathgl-2.3.3-gsl2/src/CMakeLists.txt +--- mathgl-2.3.3/src/CMakeLists.txt 2015-06-01 13:29:02.000000000 +0600 ++++ mathgl-2.3.3-gsl2/src/CMakeLists.txt 2015-11-24 12:11:14.494707480 +0600 +@@ -23,6 +23,9 @@ ${MathGL_BINARY_DIR}/include/mgl2/dllexp + ) + + add_definitions(-DMGL_SRC) ++if(DEFINED ISGSL2) ++add_definitions(-DHAVE_GSL_2) ++endif(DEFINED ISGSL2) + + if(MGL_HAVE_PNG) + set(prc_src prc/PRCbitStream.cc prc/PRCdouble.cc prc/oPRCFile.cc prc/writePRC.cc prc.cpp ) +diff -urp mathgl-2.3.3/src/fit.cpp mathgl-2.3.3-gsl2/src/fit.cpp +--- mathgl-2.3.3/src/fit.cpp 2015-06-01 13:29:02.000000000 +0600 ++++ mathgl-2.3.3-gsl2/src/fit.cpp 2015-11-24 12:13:39.912670946 +0600 +@@ -193,7 +193,14 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitD + } + while ( status == GSL_CONTINUE && iter < 500 ); + gsl_matrix *covar = gsl_matrix_alloc(m, m); ++#ifdef HAVE_GSL_2 ++ gsl_matrix *J = gsl_matrix_alloc(s->fdf->n, s->fdf->p); ++ gsl_multifit_fdfsolver_jac(s, J); ++ gsl_multifit_covar (J, 0.0, covar); ++ gsl_matrix_free (J); ++#else + gsl_multifit_covar (s->J, 0.0, covar ); ++#endif + mglFitCovar.Set(covar); + mreal res = gsl_blas_dnrm2(s->f); + for(i=0;ix, i); diff --git a/mathgl-2.3.3-includes.patch b/mathgl-2.3.3-includes.patch new file mode 100644 index 0000000..4d09a5f --- /dev/null +++ b/mathgl-2.3.3-includes.patch @@ -0,0 +1,9 @@ +--- json/Backend.hpp 2015-11-24 12:34:41.587916006 +0600 ++++ json/Backend.hpp 2015-11-24 12:37:37.116832634 +0600 +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + + class Backend : public QObject diff --git a/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch b/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch new file mode 100644 index 0000000..c77850c --- /dev/null +++ b/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch @@ -0,0 +1,23 @@ +--- CMakeLists.txt 2015-11-24 12:15:35.787678739 +0600 ++++ CMakeLists.txt 2015-11-24 12:20:24.562634222 +0600 +@@ -292,7 +292,7 @@ else(enable-all OR enable-ltdl) + set(MGL_HAVE_LTDL 0) + endif(enable-all OR enable-ltdl) + +-if(enable-hdf4) ++if(enable-hdf4 AND (NOT enable-hdf5)) + set(MGL_HAVE_HDF4 1) + find_library(HDF4_LIB df) + find_library(HDF4MF_LIB mfhdf) +@@ -303,9 +303,9 @@ if(enable-hdf4) + message(SEND_ERROR "${HDF4_INCLUDE_DIR}") + message(SEND_ERROR "Couldn't find HDF4 libraries.") + endif(NOT HDF4_LIB OR NOT HDF4MF_LIB OR NOT HDF4_INCLUDE_DIR) +-else(enable-hdf4) ++else(enable-hdf4 AND (NOT enable-hdf5)) + set(MGL_HAVE_HDF4 0) +-endif(enable-hdf4) ++endif(enable-hdf4 AND (NOT enable-hdf5)) + + if(enable-hdf5) + set(MGL_HAVE_HDF5 1) diff --git a/mathgl-2.3.3-no_octave.patch b/mathgl-2.3.3-no_octave.patch new file mode 100644 index 0000000..c472b0b --- /dev/null +++ b/mathgl-2.3.3-no_octave.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2015-11-24 12:23:06.821006701 +0600 ++++ CMakeLists.txt 2015-11-24 12:29:02.177681649 +0600 +@@ -121,6 +121,8 @@ MGL_DEPENDENT_OPTION(enable-python "Enab + MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) + MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) + MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) ++SET( enable-octave OFF ) ++SET( enable-octave-install OFF ) + + include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) + set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2") diff --git a/mathgl-2.3.3-no_qt4.patch b/mathgl-2.3.3-no_qt4.patch new file mode 100644 index 0000000..fd221d1 --- /dev/null +++ b/mathgl-2.3.3-no_qt4.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt 2015-11-24 12:30:50.909910702 +0600 ++++ CMakeLists.txt 2015-11-24 12:33:38.836090820 +0600 +@@ -102,7 +102,8 @@ CMAKE_DEPENDENT_OPTION(enable-gif "Enabl + CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) + CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) + CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) +-CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) ++#CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) ++set(enable-qt4 OFF) + CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) + CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) + diff --git a/mathgl-2.3.3-x11.patch b/mathgl-2.3.3-x11.patch new file mode 100644 index 0000000..dcee70a --- /dev/null +++ b/mathgl-2.3.3-x11.patch @@ -0,0 +1,15 @@ +--- udav/CMakeLists.txt 2015-11-24 12:33:30.016396488 +0600 ++++ udav/CMakeLists.txt 2015-11-24 12:35:44.813724765 +0600 +@@ -40,10 +40,10 @@ endif(enable-qt5) + add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src}) + #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + if(enable-qt5) +- target_link_libraries(udav mgl-qt5) ++ target_link_libraries(udav mgl-qt5 X11) + qt5_use_modules(udav Core Widgets Gui PrintSupport) + else(enable-qt5) +- target_link_libraries(udav mgl-qt4) ++ target_link_libraries(udav mgl-qt4 X11) + target_link_libraries(udav ${QT_LIBRARIES}) + endif(enable-qt5) +