From 165bae16da7fa060fb8a441115b39954f809d0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 8 Sep 2020 23:09:50 +0200 Subject: [PATCH] kig: update to 20.08.1. --- ...boost-python-bindung-with-boost-1.67.patch | 22 +++++++++---------- srcpkgs/kig/template | 7 +++--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch index 1bcd9f1a540..851ed6e439c 100644 --- a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch +++ b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch @@ -30,13 +30,13 @@ index 229d2723..f0138bf4 100644 -find_package(BoostPython) +find_package(Boost) -+find_package(PythonLibs 2.7) ++find_package(PythonLibs 3.8) + +if(Boost_FOUND AND PYTHONLIBS_FOUND) + if(${Boost_VERSION} GREATER 106699) + message("Searching for python boost") -+ find_package(Boost COMPONENTS python27 REQUIRED) -+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON27_LIBRARY}) ++ find_package(Boost COMPONENTS python38 REQUIRED) ++ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON38_LIBRARY}) + else() + find_package(Boost COMPONENTS python) + endif() @@ -49,11 +49,11 @@ index 229d2723..f0138bf4 100644 add_subdirectory( pykig ) -if(BoostPython_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) ++if(Boost_PYTHON38_FOUND AND PYTHONLIBS_FOUND) add_subdirectory( scripting ) add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) -endif(BoostPython_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) ++endif(Boost_PYTHON38_FOUND AND PYTHONLIBS_FOUND) set_package_properties( BoostPython PROPERTIES @@ -64,10 +64,10 @@ index 229d2723..f0138bf4 100644 -if(BoostPython_FOUND) - include_directories(${BoostPython_INCLUDE_DIRS}) -endif(BoostPython_FOUND) -+if(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++if(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) + include_directories(${Boost_INCLUDE_DIRS}) + include_directories(${PYTHON_INCLUDE_PATH}) -+endif(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++endif(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) # kigpart @@ -76,7 +76,7 @@ index 229d2723..f0138bf4 100644 ) -if(BoostPython_FOUND) -+if(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++if(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) set(kigpart_PART_SRCS ${kigpart_PART_SRCS} modes/popup/scriptactionsprovider.cc scripting/newscriptwizard.cc @@ -85,7 +85,7 @@ index 229d2723..f0138bf4 100644 kde_source_files_enable_exceptions(scripting/python_scripter.cc) -endif(BoostPython_FOUND) -+endif(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++endif(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) add_library(kigpart MODULE ${kigpart_PART_SRCS}) @@ -96,10 +96,10 @@ index 229d2723..f0138bf4 100644 -if(BoostPython_FOUND) - target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS}) -endif(BoostPython_FOUND) -+if(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++if(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) + message("testing") + target_link_libraries(kigpart ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${KDE5_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON27_FOUND OR Boost_PYTHON_FOUND) ++endif(Boost_PYTHON38_FOUND OR Boost_PYTHON_FOUND) if (Qt5XmlPatterns_FOUND) target_link_libraries(kigpart Qt5::XmlPatterns) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index b6007282acc..c03c7391ef3 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,15 +1,14 @@ # Template file for 'kig' pkgname=kig -version=20.04.3 +version=20.08.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" -makedepends="boost-devel kparts-devel ktexteditor-devel python-devel" +makedepends="boost-devel kparts-devel ktexteditor-devel python3-devel" short_desc="KDE education tool for interactive geometry" maintainer="Piotr Wójcik " license="GPL-2.0-only" homepage="https://www.kde.org/applications/education/kig/" distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz" -checksum=ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023 -python_version=2 +checksum=f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745