snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

kig: fix python scripting

This commit is contained in:
Piotr Wójcik 2023-01-12 22:15:24 +01:00
parent 1fc930d4ef
commit 41bf413426
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
View File

@ -17,13 +17,13 @@ index beed7bbb..ed94d104 100644
-find_package(BoostPython) -find_package(BoostPython)
+find_package(Boost) +find_package(Boost)
+find_package(PythonLibs 3.10) +find_package(PythonLibs 3.11)
+ +
+if(Boost_FOUND AND PYTHONLIBS_FOUND) +if(Boost_FOUND AND PYTHONLIBS_FOUND)
+ if(${Boost_VERSION} GREATER 106699) + if(${Boost_VERSION} GREATER 106699 OR ${Boost_VERSION} VERSION_GREATER_EQUAL 1.67)
+ message("Searching for python boost") + message("Searching for python boost")
+ find_package(Boost COMPONENTS python310 REQUIRED) + find_package(Boost COMPONENTS python311 REQUIRED)
+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON310_LIBRARY}) + set(Boost_PYTHON_LIBRARY ${Boost_PYTHON311_LIBRARY})
+ else() + else()
+ find_package(Boost COMPONENTS python) + find_package(Boost COMPONENTS python)
+ endif() + endif()
@ -36,11 +36,11 @@ index beed7bbb..ed94d104 100644
add_subdirectory( pykig ) add_subdirectory( pykig )
-if(BoostPython_FOUND) -if(BoostPython_FOUND)
+if(Boost_PYTHON310_FOUND AND PYTHONLIBS_FOUND) +if(Boost_PYTHON311_FOUND AND PYTHONLIBS_FOUND)
add_subdirectory( scripting ) add_subdirectory( scripting )
add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING)
-endif(BoostPython_FOUND) -endif(BoostPython_FOUND)
+endif(Boost_PYTHON310_FOUND AND PYTHONLIBS_FOUND) +endif(Boost_PYTHON311_FOUND AND PYTHONLIBS_FOUND)
set_package_properties( set_package_properties(
BoostPython PROPERTIES BoostPython PROPERTIES
@ -51,10 +51,10 @@ index beed7bbb..ed94d104 100644
-if(BoostPython_FOUND) -if(BoostPython_FOUND)
- include_directories(${BoostPython_INCLUDE_DIRS}) - include_directories(${BoostPython_INCLUDE_DIRS})
-endif(BoostPython_FOUND) -endif(BoostPython_FOUND)
+if(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +if(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
+ include_directories(${Boost_INCLUDE_DIRS}) + include_directories(${Boost_INCLUDE_DIRS})
+ include_directories(${PYTHON_INCLUDE_PATH}) + include_directories(${PYTHON_INCLUDE_PATH})
+endif(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +endif(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
# kigpart # kigpart
@ -63,7 +63,7 @@ index beed7bbb..ed94d104 100644
) )
-if(BoostPython_FOUND) -if(BoostPython_FOUND)
+if(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +if(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
set(kigpart_PART_SRCS ${kigpart_PART_SRCS} set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
modes/popup/scriptactionsprovider.cc modes/popup/scriptactionsprovider.cc
scripting/newscriptwizard.cc scripting/newscriptwizard.cc
@ -72,7 +72,7 @@ index beed7bbb..ed94d104 100644
kde_source_files_enable_exceptions(scripting/python_scripter.cc) kde_source_files_enable_exceptions(scripting/python_scripter.cc)
-endif(BoostPython_FOUND) -endif(BoostPython_FOUND)
+endif(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +endif(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
add_library(kigpart MODULE ${kigpart_PART_SRCS}) add_library(kigpart MODULE ${kigpart_PART_SRCS})
@ -83,10 +83,10 @@ index beed7bbb..ed94d104 100644
-if(BoostPython_FOUND) -if(BoostPython_FOUND)
- target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS}) - target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS})
-endif(BoostPython_FOUND) -endif(BoostPython_FOUND)
+if(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +if(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
+ message("testing") + message("testing")
+ target_link_libraries(kigpart ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${KDE5_KTEXTEDITOR_LIBS}) + target_link_libraries(kigpart ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${KDE5_KTEXTEDITOR_LIBS})
+endif(Boost_PYTHON310_FOUND OR Boost_PYTHON_FOUND) +endif(Boost_PYTHON311_FOUND OR Boost_PYTHON_FOUND)
if (Qt5XmlPatterns_FOUND) if (Qt5XmlPatterns_FOUND)
target_link_libraries(kigpart Qt5::XmlPatterns) target_link_libraries(kigpart Qt5::XmlPatterns)

2
srcpkgs/kig/template
View File

@ -1,7 +1,7 @@
# Template file for 'kig' # Template file for 'kig'
pkgname=kig pkgname=kig
version=22.12.1 version=22.12.1
revision=1 revision=2
build_style=cmake build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake" pkg-config qt5-host-tools qt5-qmake"