diff options
author | Pacho Ramos <pacho@gentoo.org> | 2016-11-25 19:50:54 +0100 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2016-11-25 19:56:31 +0100 |
commit | 6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7 (patch) | |
tree | 6c8754691315d96b537d7687d2ea56509d4ba2c0 /sci-libs/mathgl/files | |
parent | sci-biology/treeviewx: Drop old (diff) | |
download | gentoo-6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7.tar.gz gentoo-6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7.tar.bz2 gentoo-6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7.zip |
sci-libs/mathgl: Drop old
Package-Manager: portage-2.3.2
Diffstat (limited to 'sci-libs/mathgl/files')
-rw-r--r-- | sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch | 65 | ||||
-rw-r--r-- | sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch | 25 |
2 files changed, 0 insertions, 90 deletions
diff --git a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch b/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch deleted file mode 100644 index cff27870d365..000000000000 --- a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch +++ /dev/null @@ -1,65 +0,0 @@ - CMakeLists.txt | 1 + - json/CMakeLists.txt | 2 +- - udav/CMakeLists.txt | 2 +- - widgets/CMakeLists.txt | 4 ++-- - 4 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3364973..0c3a645 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -316,6 +316,7 @@ endif(enable-wx) - if(enable-qt) - set(MGL_HAVE_QT 1) - FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit) -+ FIND_PACKAGE(X11) - if(NOT QT4_FOUND) - message(SEND_ERROR "Couldn't find Qt4 library.") - endif(NOT QT4_FOUND) -diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt -index 79d4716..0a53874 100644 ---- a/json/CMakeLists.txt -+++ b/json/CMakeLists.txt -@@ -9,6 +9,6 @@ include_directories(${MathGL_BINARY_DIR}/json) - qt4_wrap_ui(json_ui_src MainWindow.ui) - qt4_wrap_cpp(json_moc_src ${json_moc_hdr} ) - add_executable(MglForJsTestBench ${json_src} ${json_moc_src} ${json_ui_src}) --target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES}) -+target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) - - endif(MGL_HAVE_QT) -diff --git a/udav/CMakeLists.txt b/udav/CMakeLists.txt -index 9a9c574..a1ff2df 100644 ---- a/udav/CMakeLists.txt -+++ b/udav/CMakeLists.txt -@@ -27,7 +27,7 @@ qt4_add_resources(udav_rc_src ${udav_rc} ) - qt4_wrap_cpp(udav_moc_src ${udav_moc_hdr} ) - add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src}) - #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread") --target_link_libraries(udav mgl-qt ${QT_LIBRARIES}) -+target_link_libraries(udav mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) - - if(MGL_HAVE_PTHREAD) - target_link_libraries(udav ${CMAKE_THREAD_LIBS_INIT}) -diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt -index 90ea00c..f582003 100644 ---- a/widgets/CMakeLists.txt -+++ b/widgets/CMakeLists.txt -@@ -93,7 +93,7 @@ if(MGL_HAVE_QT) - set_target_properties(mgl-qt-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(mgl-qt-static PROPERTIES COMPILE_FLAGS -DMGL_STATIC_DEFINE) - target_link_libraries(mgl-qt mgl) -- target_link_libraries(mgl-qt ${QT_LIBRARIES}) -+ target_link_libraries(mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) - - if(enable-mgl2) - set_target_properties(mgl-qt PROPERTIES OUTPUT_NAME "mgl2-qt") -@@ -137,7 +137,7 @@ if(MGL_HAVE_QT AND MGL_HAVE_FLTK) - endif(enable-mgl2) - - target_link_libraries(mgl-wnd mgl) -- target_link_libraries(mgl-wnd ${QT_LIBRARIES}) -+ target_link_libraries(mgl-wnd ${QT_LIBRARIES} ${X11_LIBRARIES}) - # target_link_libraries(mgl-wnd ${wxWidgets_LIBRARIES}) - target_link_libraries(mgl-wnd ${FLTK_LIBRARIES}) - diff --git a/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch b/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch deleted file mode 100644 index 6254321c59a2..000000000000 --- a/sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch +++ /dev/null @@ -1,25 +0,0 @@ - src/fit.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/fit.cpp b/src/fit.cpp -index 6a42a4b..d167022 100644 ---- a/src/fit.cpp -+++ b/src/fit.cpp -@@ -179,6 +179,7 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData &fd, mreal *ini) - const gsl_multifit_fdfsolver_type *T = gsl_multifit_fdfsolver_lmsder;
- gsl_multifit_fdfsolver *s = gsl_multifit_fdfsolver_alloc(T, n, m);
- gsl_multifit_function_fdf f;
-+ gsl_matrix *J;
- f.f = mgl_fit__f; f.df = mgl_fit__df;
- f.fdf = mgl_fit__fdf; f.n = n; f.p = m;
- f.params = &fd;
-@@ -193,7 +194,8 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData &fd, mreal *ini) - }
- while ( status == GSL_CONTINUE && iter < 500 );
- gsl_matrix *covar = gsl_matrix_alloc(m, m);
-- gsl_multifit_covar (s->J, 0.0, covar );
-+ gsl_multifit_fdfsolver_jac (s, J);
-+ gsl_multifit_covar (J, 0.0, covar);
- mglFitCovar.Set(covar);
- mreal res = gsl_blas_dnrm2(s->f);
- for(i=0;i<m;i++) ini[i] = gsl_vector_get(s->x, i);
|