Hello community, here is the log from the commit of package kig for openSUSE:Factory checked in at 2013-12-02 12:32:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-03 15:58:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kig.new/kig.changes 2013-12-02 12:32:31.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 17:55:16 UTC 2013 - [email protected] + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sat Nov 9 22:56:33 UTC 2013 - [email protected] + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:10:22 UTC 2013 - [email protected] + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- kig-4.11.2.tar.xz New: ---- kig-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kig.spec ++++++ --- /var/tmp/diff_new_pack.ku5c0U/_old 2013-12-02 12:32:32.000000000 +0100 +++ /var/tmp/diff_new_pack.ku5c0U/_new 2013-12-02 12:32:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: kig -Version: 4.11.2 +Version: 4.11.90 Release: 0 Summary: Interactive Geometry License: GPL-2.0+ ++++++ kig-4.11.2.tar.xz -> kig-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.11.2/CMakeLists.txt new/kig-4.11.90/CMakeLists.txt --- old/kig-4.11.2/CMakeLists.txt 2013-08-28 19:02:43.000000000 +0200 +++ new/kig-4.11.90/CMakeLists.txt 2013-10-27 13:52:39.000000000 +0100 @@ -25,10 +25,10 @@ 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}) -find_package(BoostPython) - kde4_no_enable_final(kig) +find_package(BoostPython) + include(KigConfigureChecks.cmake) add_subdirectory( doc ) @@ -40,16 +40,26 @@ #add_subdirectory( kfile ) add_subdirectory( data ) add_subdirectory( pykig ) -if(BOOST_PYTHON_FOUND) +if(BoostPython_FOUND) add_subdirectory( scripting ) -endif(BOOST_PYTHON_FOUND) +endif(BoostPython_FOUND) + +macro_log_feature( + BoostPython_FOUND + "Boost.Python" + "Kig can optionally use Boost.Python for Python scripting" + "http://www.boost.org/"; + FALSE + "1.31" + "" +) macro_display_feature_log() include_directories( ${CMAKE_SOURCE_DIR}/modes ) -if(BOOST_PYTHON_FOUND) - include_directories(${BOOST_PYTHON_INCLUDES}) -endif(BOOST_PYTHON_FOUND) +if(BoostPython_FOUND) + include_directories(${BoostPython_INCLUDE_DIRS}) +endif(BoostPython_FOUND) # kigpart @@ -178,7 +188,7 @@ misc/kigcoordinateprecisiondialog.ui ) -if(BOOST_PYTHON_FOUND) +if(BoostPython_FOUND) set(kigpart_PART_SRCS ${kigpart_PART_SRCS} modes/popup/scriptactionsprovider.cc scripting/newscriptwizard.cc @@ -189,18 +199,17 @@ ) set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") -endif(BOOST_PYTHON_FOUND) +endif(BoostPython_FOUND) kde4_add_plugin(kigpart ${kigpart_PART_SRCS}) target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ) -if(BOOST_PYTHON_FOUND) - target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) -endif(BOOST_PYTHON_FOUND) +if(BoostPython_FOUND) + target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) +endif(BoostPython_FOUND) install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) - # unit tests add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.11.2/KigConfigureChecks.cmake new/kig-4.11.90/KigConfigureChecks.cmake --- old/kig-4.11.2/KigConfigureChecks.cmake 2013-06-28 19:19:41.000000000 +0200 +++ new/kig-4.11.90/KigConfigureChecks.cmake 2013-10-27 13:52:39.000000000 +0100 @@ -9,21 +9,10 @@ set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) -macro_optional_find_package(BoostPython) - # at the end, output the configuration configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kig.h ) -macro_log_feature( - BOOST_PYTHON_FOUND - "Boost.Python" - "Kig can optionally use Boost.Python for Python scripting" - "http://www.boost.org/"; - FALSE - "1.31" - "" -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.11.2/Messages.sh new/kig-4.11.90/Messages.sh --- old/kig-4.11.2/Messages.sh 2013-06-28 19:19:41.000000000 +0200 +++ new/kig-4.11.90/Messages.sh 2013-10-27 13:52:39.000000000 +0100 @@ -8,7 +8,7 @@ cat "$file" | grep '<UseText>' | sed -e 's/^ *<UseText>\([^<]*\)<\/UseText>/i18n( "\1" );/' | sed -e 's/&/\&/g' >> rc.cpp cat "$file" | grep '<SelectStatement>' | sed -e 's/^ *<SelectStatement>\([^<]*\)<\/SelectStatement>/i18n( "\1" );/' | sed -e 's/&/\&/g' >> rc.cpp done -$XGETTEXT tips.cpp rc.cpp filters/*.h kig/*.h misc/*.h modes/*.h objects/*.h scripting/*.h */*.cc kig/*.cpp misc/*.cpp modes/*.cpp -o $podir/kig.pot +$XGETTEXT tips.cpp rc.cpp $(find . -name "*.cpp" -o -name "*.h" -o -name "*.cc" | grep -v \./kfile/) -o $podir/kig.pot $XGETTEXT kfile/kfile_drgeo.cpp kfile/kfile_drgeo.h -o $podir/kfile_drgeo.pot $XGETTEXT kfile/kfile_kig.cpp kfile/kfile_kig.h -o $podir/kfile_kig.pot rm -f tips.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.11.2/cmake/modules/FindBoostPython.cmake new/kig-4.11.90/cmake/modules/FindBoostPython.cmake --- old/kig-4.11.2/cmake/modules/FindBoostPython.cmake 2013-08-28 19:02:43.000000000 +0200 +++ new/kig-4.11.90/cmake/modules/FindBoostPython.cmake 2013-10-27 13:52:39.000000000 +0100 @@ -1,68 +1,110 @@ # - 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 +# BoostPython_FOUND - system has a valid boost+python combination +# BoostPython_INCLUDE_DIRS - the include directory for boost+python +# BoostPython_LIBRARIES - 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) +if(BoostPython_INCLUDE_DIRS AND BoostPython_LIBRARIES) # Already in cache, be silent - set(BOOST_PYTHON_FIND_QUIETLY TRUE) -endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) + set(BoostPython_FIND_QUIETLY TRUE) +endif(BoostPython_INCLUDE_DIRS AND BoostPython_LIBRARIES) include(CheckIncludeFileCXX) +include(CMakePushCheckState) +include(FindPackageHandleStandardArgs) -find_package(PkgConfig) +# Set varname to true if we found good combination of Boost and Python. +# NOTE: varname should be different each time, or test won't run. +# Also, varname is printed as test name, so it should not be too cryptic. +macro(BoostPython_TRY_COMPILE varname) + 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; } +" ${varname} ) +endmacro(BoostPython_TRY_COMPILE) + +find_package(Boost QUIET COMPONENTS python) + +cmake_push_check_state() +set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}) +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS}) +set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Boost_PYTHON_LIBRARY}) -# 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") - -# 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(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) +# This variable is not checked/used when user provide both +# BoostPython_INCLUDE_DIRS and BoostPython_LIBRARIES, by design. +# If user wants to speed up configure stage, he's allowed to do this. +# If user wants to shoot himself in the foot, he is allowed to do this, too. +set(BoostPython_COMPILES) + +# If shared_ptr.hpp or Python library is not available, then there is +# no point to do anything. +if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) + if(NOT BoostPython_INCLUDE_DIRS OR NOT BoostPython_LIBRARIES) + # First try: check if CMake Python is suitable. + set(Python_ADDITIONAL_VERSIONS "2.7;2.6;2.5;2.4;2.3;2.2") + find_package(PythonLibs QUIET) + if(PYTHONLIBS_FOUND) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${PYTHON_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${PYTHON_LIBRARIES}) + BoostPython_TRY_COMPILE(BoostPython_FromCMake) + cmake_pop_check_state() + + if(BoostPython_FromCMake) + set(BoostPython_COMPILES Yes) + set(BoostPython_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} + CACHE INTERNAL "Includes search path for Boost+Python") + set(BoostPython_LIBRARIES ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} + CACHE INTERNAL "Linker flags for Boost+Python") + endif(BoostPython_FromCMake) + endif(PYTHONLIBS_FOUND) + endif(NOT BoostPython_INCLUDE_DIRS OR NOT BoostPython_LIBRARIES) + + if(NOT BoostPython_INCLUDE_DIRS OR NOT BoostPython_LIBRARIES) + # Second try: try pkg-config way + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) + set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") + foreach(_pyver ${PYTHON_VERSIONS}) + if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) + pkg_check_modules(${_pyver} QUIET ${_pyver}) + if(${_pyver}_FOUND) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${${_pyver}_LDFLAGS}) + BoostPython_TRY_COMPILE(BoostPython_${_pyver}) + cmake_pop_check_state() + + if(BoostPython_${_pyver}) + set(BoostPython_COMPILES Yes) + set(BoostPython_INCLUDE_DIRS ${${_pyver}_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} + CACHE INTERNAL "Includes search path for Boost+Python") + set(BoostPython_LIBRARIES ${${_pyver}_LDFLAGS} ${Boost_PYTHON_LIBRARY} + CACHE INTERNAL "Linker flags for Boost+Python") + endif(BoostPython_${_pyver}) + + endif(${_pyver}_FOUND) + endif(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) + endforeach(_pyver ${PYTHON_VERSIONS}) + endif(PKG_CONFIG_FOUND) + endif(NOT BoostPython_INCLUDE_DIRS OR NOT BoostPython_LIBRARIES ) +endif(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) + +cmake_pop_check_state() + +find_package_handle_standard_args(BoostPython + FOUND_VAR BoostPython_FOUND + REQUIRED_VARS BoostPython_LIBRARIES BoostPython_INCLUDE_DIRS + ) -mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) +mark_as_advanced(BoostPython_INCLUDE_DIRS BoostPython_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.11.2/kig/kig.desktop new/kig-4.11.90/kig/kig.desktop --- old/kig-4.11.2/kig/kig.desktop 2013-08-28 19:02:43.000000000 +0200 +++ new/kig-4.11.90/kig/kig.desktop 2013-10-27 13:52:39.000000000 +0100 @@ -186,7 +186,7 @@ Comment[sl]=Raziskovanje geometrijskih konstrukcij Comment[sv]=Utforska geometriska konstruktioner Comment[tr]=Geometrik Yapıları Keşfet -Comment[ug]=گېئومېتىرىيىلىك قۇرۇلمىلارنى كۆرۈو چىقىش +Comment[ug]=گېئومېتىرىيىلىك قۇرۇلمىلارنى ئانالىز قىلىش Comment[uk]=Дослідження геометричних конструкцій Comment[vi]=Khám phá các phép Dụng Hình học Comment[x-test]=xxExplore Geometric Constructionsxx -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
