Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2014-02-20 07:55:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2014-01-27 11:15:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2014-02-20 07:55:46.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 1 10:12:29 UTC 2014 - [email protected] + +- Update to 4.12.2 + * KDE 4.12.2 release + * See http://www.kde.org/announcements/announce-4.12.2.php + +------------------------------------------------------------------- Old: ---- cantor-4.12.1.tar.xz New: ---- cantor-4.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.pVb7Vt/_old 2014-02-20 07:55:46.000000000 +0100 +++ /var/tmp/diff_new_pack.pVb7Vt/_new 2014-02-20 07:55:46.000000000 +0100 @@ -19,7 +19,7 @@ %global libMAJOR 1 Name: cantor -Version: 4.12.1 +Version: 4.12.2 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ ++++++ cantor-4.12.1.tar.xz -> cantor-4.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.1/src/backends/python2/CMakeLists.txt new/cantor-4.12.2/src/backends/python2/CMakeLists.txt --- old/cantor-4.12.1/src/backends/python2/CMakeLists.txt 2013-12-22 07:37:50.000000000 +0100 +++ new/cantor-4.12.2/src/backends/python2/CMakeLists.txt 2014-01-26 23:14:30.000000000 +0100 @@ -10,6 +10,11 @@ python2extensions.cpp ) +if(MSVC) + # ssize_t is typedef'd in both kdewin and python headers, this prevents using the kdewin one + add_definitions(-D_SSIZE_T_DEFINED) +endif(MSVC) + include_directories(${PYTHON_LIBRARIES_DIR}) include_directories(${PYTHON_INCLUDE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.1/src/backends/sage/sagesession.cpp new/cantor-4.12.2/src/backends/sage/sagesession.cpp --- old/cantor-4.12.1/src/backends/sage/sagesession.cpp 2013-12-22 07:37:50.000000000 +0100 +++ new/cantor-4.12.2/src/backends/sage/sagesession.cpp 2014-01-26 23:14:30.000000000 +0100 @@ -63,12 +63,12 @@ m_minor=minor; } -int SageSession::VersionInfo::major() const +int SageSession::VersionInfo::majorVersion() const { return m_major; } -int SageSession::VersionInfo::minor() const +int SageSession::VersionInfo::minorVersion() const { return m_minor; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.1/src/backends/sage/sagesession.h new/cantor-4.12.2/src/backends/sage/sagesession.h --- old/cantor-4.12.1/src/backends/sage/sagesession.h 2013-12-22 07:37:50.000000000 +0100 +++ new/cantor-4.12.2/src/backends/sage/sagesession.h 2014-01-26 23:14:30.000000000 +0100 @@ -51,8 +51,10 @@ bool operator >=(const VersionInfo& other) const; bool operator ==( const VersionInfo& other) const; - int major() const; - int minor() const; + // These are not called major() and minor() because some libc's have + // macros with those names. + int majorVersion() const; + int minorVersion() const; private: int m_major; int m_minor; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
