Hello community, here is the log from the commit of package analitza for openSUSE:Factory checked in at 2013-06-11 06:14:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/analitza (Old) and /work/SRC/openSUSE:Factory/.analitza.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "analitza" Changes: -------- --- /work/SRC/openSUSE:Factory/analitza/analitza.changes 2013-05-16 15:16:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.analitza.new/analitza.changes 2013-06-11 09:24:33.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 1 09:14:29 UTC 2013 - [email protected] + +- Update to 4.10.4 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.4.php + * resolves bnc#8122760 + +------------------------------------------------------------------- Old: ---- analitza-4.10.3.tar.xz New: ---- analitza-4.10.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ analitza.spec ++++++ --- /var/tmp/diff_new_pack.WxIDS4/_old 2013-06-11 09:24:34.000000000 +0200 +++ /var/tmp/diff_new_pack.WxIDS4/_new 2013-06-11 09:24:34.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: readline-devel BuildRequires: pkgconfig(glu) Url: https://projects.kde.org/projects/kde/kdeedu/analitza -Version: 4.10.3 +Version: 4.10.4 Release: 0 BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ analitza-4.10.3.tar.xz -> analitza-4.10.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-4.10.3/analitza/analyzer.cpp new/analitza-4.10.4/analitza/analyzer.cpp --- old/analitza-4.10.3/analitza/analyzer.cpp 2013-05-03 06:37:38.000000000 +0200 +++ new/analitza-4.10.4/analitza/analyzer.cpp 2013-05-29 09:14:56.000000000 +0200 @@ -1371,9 +1371,12 @@ delete c; root = new Cn(true); } else if(!existsjustvar && deps.size()==1) { - if(allButFirstZero) - root = *c->firstValue(); - else { + if(allButFirstZero) { + Analitza::Apply::iterator first = c->firstValue(); + root = *first; + c->m_params.erase(first); + delete c; + } else { Apply* a = new Apply; a->appendBranch(new Operator(Operator::minus)); @@ -1400,6 +1403,7 @@ a->appendBranch(new Operator(Operator::eq)); a->appendBranch(new Ci(deps.first())); a->appendBranch(r.first()); + delete root; root = a; } else { Apply* na = new Apply; @@ -1411,6 +1415,7 @@ a->appendBranch(o); na->appendBranch(a); } + delete root; root = na; } } else if(!root->isZero()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-4.10.3/analitzagui/plotsview3d.h new/analitza-4.10.4/analitzagui/plotsview3d.h --- old/analitza-4.10.3/analitzagui/plotsview3d.h 2013-05-03 06:37:38.000000000 +0200 +++ new/analitza-4.10.4/analitzagui/plotsview3d.h 2013-05-29 09:14:56.000000000 +0200 @@ -21,6 +21,10 @@ #ifndef PLOTSVIEW3D_H #define PLOTSVIEW3D_H +#ifdef _WIN32 +#include <GL/glew.h> +#endif + #include <QGLWidget> #include <QMouseEvent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-4.10.3/analitzaplot/CMakeLists.txt new/analitza-4.10.4/analitzaplot/CMakeLists.txt --- old/analitza-4.10.3/analitzaplot/CMakeLists.txt 2013-05-03 06:37:38.000000000 +0200 +++ new/analitza-4.10.4/analitzaplot/CMakeLists.txt 2013-05-29 09:14:56.000000000 +0200 @@ -4,6 +4,11 @@ message(FATAL_ERROR "GLU was not found") endif(OPENGL_FOUND AND NOT OPENGL_GLU_FOUND) +if(WIN32) + find_package(GLEW REQUIRED) + include_directories(${GLEW_INCLUDE_DIRS}) +endif(WIN32) + find_path(IEEEFP_DIR ieeefp.h) if(IEEEFP_DIR) include_directories(${IEEEFP_DIR}) @@ -76,6 +81,10 @@ ) endif(HAVE_OPENGL) +if(WIN32) + target_link_libraries(analitzaplot ${GLEW_LIBRARIES}) +endif(WIN32) + set_target_properties(analitzaplot PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS analitzaplot EXPORT AnalitzaTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-4.10.3/analitzaplot/examples/CMakeLists.txt new/analitza-4.10.4/analitzaplot/examples/CMakeLists.txt --- old/analitza-4.10.3/analitzaplot/examples/CMakeLists.txt 2013-05-03 06:37:38.000000000 +0200 +++ new/analitza-4.10.4/analitzaplot/examples/CMakeLists.txt 2013-05-29 09:14:56.000000000 +0200 @@ -8,7 +8,7 @@ if(HAVE_OPENGL) kde4_add_executable(plots3ddemo plots3ddemo.cpp) - target_link_libraries(plots3ddemo ${testLibs}) + target_link_libraries(plots3ddemo ${QT_QTOPENGL_LIBRARY} ${testLibs}) else(HAVE_OPENGL) message(STATUS "disabling plots3ddemo because OpenGL is not available") endif(HAVE_OPENGL) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analitza-4.10.3/analitzaplot/plotter3d.h new/analitza-4.10.4/analitzaplot/plotter3d.h --- old/analitza-4.10.3/analitzaplot/plotter3d.h 2013-05-03 06:37:38.000000000 +0200 +++ new/analitza-4.10.4/analitzaplot/plotter3d.h 2013-05-29 09:14:56.000000000 +0200 @@ -30,6 +30,11 @@ #include <QMatrix4x4> #define GL_GLEXT_PROTOTYPES +#ifdef Q_OS_WIN +#include <windows.h> +#include <GL/glew.h> +#endif + #include <GL/glu.h> class QAbstractItemModel; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
