Hello community, here is the log from the commit of package kig for openSUSE:Factory checked in at 2013-07-08 07:32:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kig (Old) and /work/SRC/openSUSE:Factory/.kig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kig" Changes: -------- --- /work/SRC/openSUSE:Factory/kig/kig.changes 2013-06-11 09:32:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kig.new/kig.changes 2013-07-08 07:32:50.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:17:01 UTC 2013 - [email protected] + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:21:37 UTC 2013 - [email protected] + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- kig-4.10.4.tar.xz New: ---- kig-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kig.spec ++++++ --- /var/tmp/diff_new_pack.ZzKG4t/_old 2013-07-08 07:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ZzKG4t/_new 2013-07-08 07:32:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: kig -Version: 4.10.4 +Version: 4.10.90 Release: 0 Summary: Interactive Geometry License: GPL-2.0+ ++++++ kig-4.10.4.tar.xz -> kig-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/CMakeLists.txt new/kig-4.10.90/CMakeLists.txt --- old/kig-4.10.4/CMakeLists.txt 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/CMakeLists.txt 2013-06-10 20:52:14.000000000 +0200 @@ -1,9 +1,6 @@ project(kig) -# -# taken from kdeedu/CMakeList.txt -# from here... -set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake ) +set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake/modules) # search packages used by KDE find_package(KDE4 4.3.80 REQUIRED) @@ -28,7 +25,6 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) -# ...to here find_package(BoostPython) kde4_no_enable_final(kig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/cmake/COPYING-CMAKE-SCRIPTS new/kig-4.10.90/cmake/COPYING-CMAKE-SCRIPTS --- old/kig-4.10.4/cmake/COPYING-CMAKE-SCRIPTS 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/cmake/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/cmake/FindBoostPython.cmake new/kig-4.10.90/cmake/FindBoostPython.cmake --- old/kig-4.10.4/cmake/FindBoostPython.cmake 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/cmake/FindBoostPython.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -# - Try to find the a valid boost+python combination -# Once done this will define -# -# BOOST_PYTHON_FOUND - system has a valid boost+python combination -# BOOST_PYTHON_INCLUDES - the include directory for boost+python -# BOOST_PYTHON_LIBS - the needed libs for boost+python - -# Copyright (c) 2006, Pino Toscano, <[email protected]> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - # Already in cache, be silent - set(BOOST_PYTHON_FIND_QUIETLY TRUE) -endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - -# some needed includes -include(CheckCXXSourceCompiles) -include(CheckIncludeFileCXX) -include(CheckLibraryExists) - -find_package(PkgConfig) - -# reset vars -set(BOOST_PYTHON_INCLUDES) -set(BOOST_PYTHON_LIBS) - -# handy arrays -set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") -set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") -set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") -set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") - -if(WIN32) - set(PythonLibs_FIND_VERSION 2.7.0) - find_package(PythonLibs) - find_package(Boost COMPONENTS python QUIET) - if(PYTHONLIBS_FOUND AND Boost_FOUND) - set(BOOST_PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) - set(BOOST_PYTHON_LIBS ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES}) - endif(PYTHONLIBS_FOUND AND Boost_FOUND) -else(WIN32) -# 1st: check for boost/shared_ptr.hpp -check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) - -if(HAVE_BOOST_SHARED_PTR_HPP) - - # try pkg-config next - set(_found FALSE) - foreach(_pyver ${PYTHON_VERSIONS}) - if(NOT _found) - pkg_check_modules(_python QUIET ${_pyver}) - if (_python_FOUND) - find_package(Boost 1.33 COMPONENTS python) - if (Boost_PYTHON_FOUND) - set(_found TRUE) - set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") - set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") - endif(Boost_PYTHON_FOUND) - endif(_python_FOUND) - endif(NOT _found) - endforeach(_pyver ${PYTHON_VERSIONS}) - -endif(HAVE_BOOST_SHARED_PTR_HPP) - -if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) - # save the old flags and setting the new ones - set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - - foreach(_pyver ${PYTHON_VERSIONS}) - if(NOT _found) - foreach(_pydir ${PYTHON_INCLUDE_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) - string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) - - if(EXISTS ${_pydir}) - if(EXISTS ${_pydir}/Python.h) - - foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) - - foreach(_pblib ${PYTHON_LIBS}) - - if(NOT _found) - - set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") - set(CMAKE_REQUIRED_INCLUDES ${_pydir}) - set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) - - check_cxx_source_compiles(" -#include <boost/python.hpp> -const char* greet() { return \"Hello world!\"; } -BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } - -int main() { return 0; } - -// some vars, in case of the compilation fail... -// python include dir: ${_pydir} -// python lib dir: ${_pylibdir} -// boost python lib: ${_pblib} - -" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) - - set(CMAKE_REQUIRED_FLAGS) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - - if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - set(_found TRUE) - - set(BOOST_PYTHON_INCLUDES ${_pydir}) - set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") - - endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - endif(NOT _found) - - endforeach(_pblib ${PYTHON_LIBS}) - - endif(NOT _found) - - endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - endif(EXISTS ${_pydir}/Python.h) - endif(EXISTS ${_pydir}) - - endif(NOT _found) - - endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) - - endif(NOT _found) - - endforeach(_pyver ${PYTHON_VERSIONS}) - - set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) - -endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -endif(WIN32) - -if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - set(BOOST_PYTHON_FOUND TRUE) -endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - -if(BOOST_PYTHON_FOUND) - if(NOT BoostPython_FIND_QUIETLY) - message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") - endif(NOT BoostPython_FIND_QUIETLY) - set(KIG_ENABLE_PYTHON_SCRIPTING 1) -else (BOOST_PYTHON_FOUND) - if (BoostPython_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find Boost+Python") - endif(BoostPython_FIND_REQUIRED) - set(KIG_ENABLE_PYTHON_SCRIPTING 0) -endif(BOOST_PYTHON_FOUND) - -mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/cmake/modules/COPYING-CMAKE-SCRIPTS new/kig-4.10.90/cmake/modules/COPYING-CMAKE-SCRIPTS --- old/kig-4.10.4/cmake/modules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 +++ new/kig-4.10.90/cmake/modules/COPYING-CMAKE-SCRIPTS 2013-06-10 20:52:14.000000000 +0200 @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/cmake/modules/FindBoostPython.cmake new/kig-4.10.90/cmake/modules/FindBoostPython.cmake --- old/kig-4.10.4/cmake/modules/FindBoostPython.cmake 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/cmake/modules/FindBoostPython.cmake 2013-06-10 20:52:14.000000000 +0200 @@ -15,10 +15,9 @@ set(BOOST_PYTHON_FIND_QUIETLY TRUE) endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -# some needed includes -include(CheckCXXSourceCompiles) include(CheckIncludeFileCXX) -include(CheckLibraryExists) + +find_package(PkgConfig) # reset vars set(BOOST_PYTHON_INCLUDES) @@ -26,93 +25,28 @@ # handy arrays set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") -set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") -set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") -set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") # 1st: check for boost/shared_ptr.hpp check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) if(HAVE_BOOST_SHARED_PTR_HPP) + # try pkg-config next set(_found FALSE) - - # save the old flags and setting the new ones - set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - foreach(_pyver ${PYTHON_VERSIONS}) if(NOT _found) - foreach(_pydir ${PYTHON_INCLUDE_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) - string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) - - if(EXISTS ${_pydir}) - if(EXISTS ${_pydir}/Python.h) - - foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) - - foreach(_pblib ${PYTHON_LIBS}) - - if(NOT _found) - - set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") - set(CMAKE_REQUIRED_INCLUDES ${_pydir}) - set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) - - check_cxx_source_compiles(" -#include <boost/python.hpp> -const char* greet() { return \"Hello world!\"; } -BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } - -int main() { return 0; } - -// some vars, in case of the compilation fail... -// python include dir: ${_pydir} -// python lib dir: ${_pylibdir} -// boost python lib: ${_pblib} - -" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) - - set(CMAKE_REQUIRED_FLAGS) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - - if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - set(_found TRUE) - - set(BOOST_PYTHON_INCLUDES ${_pydir}) - set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") - - endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - endif(NOT _found) - - endforeach(_pblib ${PYTHON_LIBS}) - - endif(NOT _found) - - endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - endif(EXISTS ${_pydir}/Python.h) - endif(EXISTS ${_pydir}) - - endif(NOT _found) - - endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) - + pkg_check_modules(_python QUIET ${_pyver}) + if (_python_FOUND) + find_package(Boost 1.33 COMPONENTS python) + if (Boost_PYTHON_FOUND) + set(_found TRUE) + set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") + set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") + endif(Boost_PYTHON_FOUND) + endif(_python_FOUND) endif(NOT _found) - endforeach(_pyver ${PYTHON_VERSIONS}) - set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) - endif(HAVE_BOOST_SHARED_PTR_HPP) if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) @@ -121,7 +55,7 @@ if(BOOST_PYTHON_FOUND) if(NOT BoostPython_FIND_QUIETLY) - message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") + message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") endif(NOT BoostPython_FIND_QUIETLY) set(KIG_ENABLE_PYTHON_SCRIPTING 1) else (BOOST_PYTHON_FOUND) Files old/kig-4.10.4/doc/index.cache.bz2 and new/kig-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/doc/index.docbook new/kig-4.10.90/doc/index.docbook --- old/kig-4.10.4/doc/index.docbook 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/doc/index.docbook 2013-06-10 20:52:14.000000000 +0200 @@ -894,7 +894,7 @@ <para> Working with &kig; should be very straightforward. Constructing objects is easy and interactive, with -preliminary results being shown, &etc;. Moving, selecting +preliminary results being shown, &etc; Moving, selecting and building all work as one would expect them to. Undo support should also be very intuitive. </para> @@ -1049,7 +1049,7 @@ <acronym>GPL</acronym>; you can find the terms of this license in the <filename>COPYING</filename> file in the &kig; source tree, and in the <link linkend="credits">Credits and -Licenses</link> chapter in this manual. +License</link> chapter in this manual. </para> </sect1> </appendix> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/asyexporter.cc new/kig-4.10.90/filters/asyexporter.cc --- old/kig-4.10.4/filters/asyexporter.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/asyexporter.cc 2013-06-10 20:52:14.000000000 +0200 @@ -108,7 +108,7 @@ { // TODO: Polar grid // Vertical lines - double startingpoint = startingpoint = static_cast<double>( KDE_TRUNC( left ) ); + double startingpoint = static_cast<double>( KDE_TRUNC( left ) ); for ( double i = startingpoint; i < left+width; ++i ) { stream << "draw((" << i << "," << bottom << ")--(" << i << "," << bottom+height << "),gray);\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/asyexporterimpvisitor.h new/kig-4.10.90/filters/asyexporterimpvisitor.h --- old/kig-4.10.4/filters/asyexporterimpvisitor.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/asyexporterimpvisitor.h 2013-06-10 20:52:14.000000000 +0200 @@ -51,6 +51,7 @@ : mstream( s ), mw( w ), msr( mw.showingRect() ) { } + using ObjectImpVisitor::visit; void visit( const LineImp* imp ); void visit( const PointImp* imp ); void visit( const TextImp* imp ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/cabri-filter.cc new/kig-4.10.90/filters/cabri-filter.cc --- old/kig-4.10.4/filters/cabri-filter.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/cabri-filter.cc 2013-06-10 20:52:14.000000000 +0200 @@ -229,7 +229,6 @@ std::vector<ObjectCalcer*> args; ObjectCalcer* oc = 0; - bool gridspecified = false; std::vector<uint> idsToSkip; int previd = 0; uint lowerbound = 2; @@ -251,7 +250,6 @@ if ( obj->type == "Grid" ) { havegrid = obj->visible; - gridspecified = true; idsToSkip.push_back( obj->id ); if ( obj->id == lowerbound + 1 ) ++lowerbound; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/latexexporter.cc new/kig-4.10.90/filters/latexexporter.cc --- old/kig-4.10.4/filters/latexexporter.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/latexexporter.cc 2013-06-10 20:52:14.000000000 +0200 @@ -104,6 +104,7 @@ : mstream( s ), mw( w ), msr( mw.showingRect() ) { } + using ObjectImpVisitor::visit; void visit( const LineImp* imp ); void visit( const PointImp* imp ); void visit( const TextImp* imp ); @@ -787,7 +788,7 @@ { // TODO: Polar grid // vertical lines... - double startingpoint = startingpoint = static_cast<double>( KDE_TRUNC( left ) ); + double startingpoint = static_cast<double>( KDE_TRUNC( left ) ); for ( double i = startingpoint; i < left+width; ++i ) { stream << "draw((" << i << "," << bottom << ")--(" << i << "," << bottom+height << "),gray);\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/latexexporteroptions.cc new/kig-4.10.90/filters/latexexporteroptions.cc --- old/kig-4.10.4/filters/latexexporteroptions.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/latexexporteroptions.cc 2013-06-10 20:52:14.000000000 +0200 @@ -50,6 +50,9 @@ case Asymptote: expwidget->asyRadioButton->setChecked(true); break; + // This enum member is just to track the number of formats, nothing to do here + case FormatCount: + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/pgfexporterimpvisitor.h new/kig-4.10.90/filters/pgfexporterimpvisitor.h --- old/kig-4.10.4/filters/pgfexporterimpvisitor.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/pgfexporterimpvisitor.h 2013-06-10 20:52:14.000000000 +0200 @@ -53,6 +53,7 @@ : mstream( s ), mw( w ), msr( mw.showingRect() ) { } + using ObjectImpVisitor::visit; void visit( const LineImp* imp ); void visit( const PointImp* imp ); void visit( const TextImp* imp ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/filters/xfigexporter.cc new/kig-4.10.90/filters/xfigexporter.cc --- old/kig-4.10.4/filters/xfigexporter.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/filters/xfigexporter.cc 2013-06-10 20:52:14.000000000 +0200 @@ -113,6 +113,7 @@ mcolormap[Qt::yellow] = 6; mcolormap[Qt::white] = 7; } + using ObjectImpVisitor::visit; void visit( const LineImp* imp ); void visit( const PointImp* imp ); void visit( const TextImp* imp ); Files old/kig-4.10.4/icons/hi22-action-projection.png and new/kig-4.10.90/icons/hi22-action-projection.png differ Files old/kig-4.10.4/icons/hi32-action-projection.png and new/kig-4.10.90/icons/hi32-action-projection.png differ Files old/kig-4.10.4/icons/hisc-action-projection.svgz and new/kig-4.10.90/icons/hisc-action-projection.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/kig/kig.cpp new/kig-4.10.90/kig/kig.cpp --- old/kig-4.10.4/kig/kig.cpp 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/kig/kig.cpp 2013-06-10 20:52:14.000000000 +0200 @@ -57,16 +57,11 @@ // this routine will find and load our Part. it finds the Part by // name which is a bad idea usually.. but it's alright in this // case since our Part is made for this Shell + KPluginLoader libraryLoader( "kigpart" ); - // we use globalLibrary() because if we use python scripting, then - // we need the python symbols to be exported, in order for python to - // be able to load its dll modules.. Another part of the problem is - // that boost.python fails to link against python ( on Debian at - // least ). - KLibrary* library = KLibLoader::self()->library( "kigpart", QLibrary::ExportExternalSymbolsHint ); - KPluginFactory* factory = 0; - if ( library ) factory = library->factory(); - if (factory) + libraryLoader.setLoadHints( QLibrary::ExportExternalSymbolsHint ); + + if ( KPluginFactory* factory = libraryLoader.factory() ) { // now that the Part is loaded, we cast it to a Part to get // our hands on it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/kig/kig.desktop new/kig-4.10.90/kig/kig.desktop --- old/kig-4.10.4/kig/kig.desktop 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/kig/kig.desktop 2013-06-10 20:52:14.000000000 +0200 @@ -192,7 +192,7 @@ Comment[x-test]=xxExplore Geometric Constructionsxx Comment[zh_CN]=探索几何构造 Comment[zh_TW]=作出幾何圖形 -Exec=kig %i -caption "%c" +Exec=kig %i -caption %c MimeType=application/x-kig;application/x-kgeo; Icon=kig Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/kig/kigpartui.rc new/kig-4.10.90/kig/kigpartui.rc --- old/kig-4.10.4/kig/kigpartui.rc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/kig/kigpartui.rc 2013-06-10 20:52:14.000000000 +0200 @@ -37,6 +37,7 @@ <text>&Points</text> <Action name="objects_new_normalpoint" /> <Action name="objects_new_midpoint" /> + <Action name="objects_new_projection" /> <Action name="objects_new_intersection" /> <Action name="objects_new_point_xy" /> <Action name="objects_new_point_by_coords" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/kig/main.cpp new/kig-4.10.90/kig/main.cpp --- old/kig-4.10.4/kig/main.cpp 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/kig/main.cpp 2013-06-10 20:52:14.000000000 +0200 @@ -82,9 +82,10 @@ static int convertToNative( const KUrl& file, const QByteArray& outfile ) { KComponentData maindata( KCmdLineArgs::aboutData() ); - KLibrary* library = KLibLoader::self()->library( "kigpart", QLibrary::ExportExternalSymbolsHint ); + KPluginLoader libraryLoader( "kigpart" ); + QLibrary library( libraryLoader.fileName() ); int ( *converterfunction )( const KUrl&, const QByteArray& ); - converterfunction = ( int ( * )( const KUrl&, const QByteArray& ) ) library->resolveFunction( "convertToNative" ); + converterfunction = ( int ( * )( const KUrl&, const QByteArray& ) ) library.resolve( "convertToNative" ); if ( !converterfunction ) { kError() << "Error: broken Kig installation: different library and application version !" << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/misc/builtin_stuff.cc new/kig-4.10.90/misc/builtin_stuff.cc --- old/kig-4.10.4/misc/builtin_stuff.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/misc/builtin_stuff.cc 2013-06-10 20:52:14.000000000 +0200 @@ -665,6 +665,14 @@ // ctors->add( c ); // actions->add( new ConstructibleAction( c, "objects_new_measuretransport" ) ); + c = new SimpleObjectTypeConstructor( + ProjectedPointType::instance(), + I18N_NOOP( "Point Projection" ), + I18N_NOOP( "Project a point on a line" ), + "projection" ); + ctors->add( c ); + actions->add( new ConstructibleAction( c, "objects_new_projection" ) ); + // the generic intersection constructor.. c = new GenericIntersectionConstructor(); ctors->add( c ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/misc/calcpaths.cc new/kig-4.10.90/misc/calcpaths.cc --- old/kig-4.10.4/misc/calcpaths.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/misc/calcpaths.cc 2013-06-10 20:52:14.000000000 +0200 @@ -178,14 +178,16 @@ static void addNonCache( ObjectCalcer* o, std::vector<ObjectCalcer*>& ret ) { if ( ! o->imp()->isCache() ) + { if ( std::find( ret.begin(), ret.end(), o ) == ret.end() ) ret.push_back( o ); - else - { - std::vector<ObjectCalcer*> parents = o->parents(); - for ( uint i = 0; i < parents.size(); ++i ) - addNonCache( parents[i], ret ); - }; + else + { + std::vector<ObjectCalcer*> parents = o->parents(); + for ( uint i = 0; i < parents.size(); ++i ) + addNonCache( parents[i], ret ); + }; + } } static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from, std::vector<ObjectCalcer*>& ret ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/misc/special_constructors.cc new/kig-4.10.90/misc/special_constructors.cc --- old/kig-4.10.4/misc/special_constructors.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/misc/special_constructors.cc 2013-06-10 20:52:14.000000000 +0200 @@ -1585,9 +1585,9 @@ GenericAffinityConstructor::~GenericAffinityConstructor() {} -bool GenericAffinityConstructor::isAlreadySelectedOK(const std::vector< ObjectCalcer* >& os, const uint& ) const +bool GenericAffinityConstructor::isAlreadySelectedOK(const std::vector< ObjectCalcer* >& , const uint& ) const { - return true; + return true; } GenericProjectivityConstructor::GenericProjectivityConstructor() @@ -1614,9 +1614,9 @@ GenericProjectivityConstructor::~GenericProjectivityConstructor() {} -bool GenericProjectivityConstructor::isAlreadySelectedOK(const std::vector< ObjectCalcer* >& os, const uint& ) const +bool GenericProjectivityConstructor::isAlreadySelectedOK(const std::vector< ObjectCalcer* >& , const uint& ) const { - return true; + return true; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/modes/base_mode.h new/kig-4.10.90/modes/base_mode.h --- old/kig-4.10.4/modes/base_mode.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/modes/base_mode.h 2013-06-10 20:52:14.000000000 +0200 @@ -36,6 +36,7 @@ QPoint mplc; std::vector<ObjectHolder*> moco; +public: void leftClicked( QMouseEvent* e, KigWidget* v ); void leftMouseMoved( QMouseEvent*, KigWidget* ); void leftReleased( QMouseEvent* e, KigWidget* v ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/modes/construct_mode.h new/kig-4.10.90/modes/construct_mode.h --- old/kig-4.10.4/modes/construct_mode.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/modes/construct_mode.h 2013-06-10 20:52:14.000000000 +0200 @@ -37,6 +37,11 @@ public: PointConstructMode( KigPart& d ); ~PointConstructMode(); + + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; + protected: void leftClickedObject( ObjectHolder* o, const QPoint& p, KigWidget& w, bool ctrlOrShiftDown ); @@ -76,9 +81,13 @@ void leftReleased( QMouseEvent* e, KigWidget* v ); public: + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; void selectObject( ObjectHolder* o, KigWidget& w ); void selectObjects( const std::vector<ObjectHolder*>& os, KigWidget& w ); virtual ~BaseConstructMode(); + protected: BaseConstructMode( KigPart& d ); protected: @@ -138,6 +147,10 @@ TestConstructMode( KigPart& d, const ArgsParserObjectType* type ); ~TestConstructMode(); + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; + void handlePrelim( const std::vector<ObjectCalcer*>& os, const QPoint& p, KigPainter&, KigWidget& w ); QString selectStatement( const std::vector<ObjectCalcer*>& args, const KigWidget& w ); int isAlreadySelectedOK( const std::vector<ObjectCalcer*>&, const int& ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/modes/macro.h new/kig-4.10.90/modes/macro.h --- old/kig-4.10.4/modes/macro.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/modes/macro.h 2013-06-10 20:52:14.000000000 +0200 @@ -34,9 +34,9 @@ void dragRect( const QPoint& p, KigWidget& w ); void leftClickedObject( ObjectHolder* o, const QPoint& p, KigWidget& w, bool ctrlOrShiftDown ); - void rightClicked( const std::vector<ObjectHolder*>& oco, const QPoint& p, KigWidget& w ); - void midClicked( const QPoint& p, KigWidget& w ); - void mouseMoved( const std::vector<ObjectHolder*>& os, const QPoint& p, KigWidget& w, bool shiftpressed ); + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; // called by MacroWizard class void givenPageEntered(); @@ -49,6 +49,9 @@ bool hasFinalArgs() const; protected: + void rightClicked( const std::vector<ObjectHolder*>& oco, const QPoint& p, KigWidget& w ); + void midClicked( const QPoint& p, KigWidget& w ); + void mouseMoved( const std::vector<ObjectHolder*>& os, const QPoint& p, KigWidget& w, bool shiftpressed ); void enableActions(); /** * quit this mode... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/modes/normal.h new/kig-4.10.90/modes/normal.h --- old/kig-4.10.4/modes/normal.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/modes/normal.h 2013-06-10 20:52:14.000000000 +0200 @@ -29,6 +29,11 @@ public: NormalMode( KigPart& ); ~NormalMode(); + + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; + protected: void dragRect( const QPoint& p, KigWidget& w ); void dragObject( const std::vector<ObjectHolder*>& os, const QPoint& pointClickedOn, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/objects/conic_types.h new/kig-4.10.90/objects/conic_types.h --- old/kig-4.10.4/objects/conic_types.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/objects/conic_types.h 2013-06-10 20:52:14.000000000 +0200 @@ -151,6 +151,7 @@ ~ParabolaBDPType(); public: static const ParabolaBDPType* instance(); + using ObjectLPType::calc; ObjectImp* calc( const LineData& l, const Coordinate& c ) const; const ObjectImpType* resultId() const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/objects/line_type.h new/kig-4.10.90/objects/line_type.h --- old/kig-4.10.4/objects/line_type.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/objects/line_type.h 2013-06-10 20:52:14.000000000 +0200 @@ -70,6 +70,7 @@ ~LinePerpendLPType(); public: static LinePerpendLPType* instance(); + using ObjectLPType::calc; ObjectImp* calc( const LineData& a, const Coordinate& b ) const; const ObjectImpType* resultId() const; }; @@ -81,6 +82,7 @@ ~LineParallelLPType(); public: static LineParallelLPType* instance(); + using ObjectLPType::calc; ObjectImp* calc( const LineData& a, const Coordinate& b ) const; const ObjectImpType* resultId() const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/objects/point_type.cc new/kig-4.10.90/objects/point_type.cc --- old/kig-4.10.4/objects/point_type.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/objects/point_type.cc 2013-06-10 20:52:15.000000000 +0200 @@ -807,3 +807,45 @@ return PointImp::stype(); } +static const ArgsParser::spec argsspecProjectedPoint[] = +{ + { PointImp::stype(), "Point to project", + I18N_NOOP( "Select a point to project onto a line..." ), false }, + { AbstractLineImp::stype(), "Line where to project", + I18N_NOOP( "Line where the projected point will lie..." ), true } +}; + +KIG_INSTANTIATE_OBJECT_TYPE_INSTANCE( ProjectedPointType ) + +ProjectedPointType::ProjectedPointType() + : ArgsParserObjectType( "ProjectedPoint", argsspecProjectedPoint, 2 ) +{ +} + +ProjectedPointType::~ProjectedPointType() +{ +} + +const ProjectedPointType* ProjectedPointType::instance() +{ + static const ProjectedPointType t; + return &t; +} + +ObjectImp* ProjectedPointType::calc(const Args& parents, const KigDocument& ) const +{ + if( parents.size() == 2 ) + { + const PointImp* point = static_cast<const PointImp*>( parents[0] ); + const LineImp* line = static_cast<const LineImp*>( parents[1] ); + + return new PointImp( calcPointProjection( point->coordinate(), line->data() ) ); + } + + return new InvalidImp(); +} + +const ObjectImpType* ProjectedPointType::resultId() const +{ + return PointImp::stype(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/objects/point_type.h new/kig-4.10.90/objects/point_type.h --- old/kig-4.10.4/objects/point_type.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/objects/point_type.h 2013-06-10 20:52:14.000000000 +0200 @@ -189,4 +189,16 @@ const ObjectImpType* resultId() const; }; +class ProjectedPointType + : public ArgsParserObjectType +{ + ProjectedPointType(); + ~ProjectedPointType(); +public: + static const ProjectedPointType* instance(); + + ObjectImp* calc( const Args& parents, const KigDocument& ) const; + const ObjectImpType * resultId() const; +}; + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/scripting/python_scripter.cc new/kig-4.10.90/scripting/python_scripter.cc --- old/kig-4.10.4/scripting/python_scripter.cc 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/scripting/python_scripter.cc 2013-06-10 20:52:14.000000000 +0200 @@ -19,13 +19,13 @@ // been moved before all qt includes in order to avoid a clash related to // the "slots" identifier // krazy:excludeall=includes +#undef _XOPEN_SOURCE // it will be defined inside Python #include <Python.h> #include "python_scripter.h" #include <iostream> #include <string> -//#include <Python.h> // (see above) #include <boost/python.hpp> #include <boost/mpl/bool.hpp> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.10.4/scripting/script_mode.h new/kig-4.10.90/scripting/script_mode.h --- old/kig-4.10.4/scripting/script_mode.h 2013-05-28 20:46:58.000000000 +0200 +++ new/kig-4.10.90/scripting/script_mode.h 2013-06-10 20:52:14.000000000 +0200 @@ -52,8 +52,11 @@ public: virtual ~ScriptModeBase(); + using BaseMode::midClicked; + using BaseMode::rightClicked; + using BaseMode::mouseMoved; + void dragRect( const QPoint& p, KigWidget& w ); -// void dragObject( const Objects& os, const QPoint& pointClickedOn, KigWidget& w, bool ctrlOrShiftDown ); void leftClickedObject( ObjectHolder* o, const QPoint& p, KigWidget& w, bool actrlOrShiftDown ); void mouseMoved( const std::vector<ObjectHolder*>& os, const QPoint& p, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
