commit: d06b947121315c794bf438e99e4aea6aba1f8f27 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sat Aug 2 00:32:43 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 2 03:36:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06b9471
kde-apps/kig: modify patch to apply after upstream changes Upstream commit: 5f3a08a7922c6fc502555c32d5a37d3043e11519 Closes: https://bugs.gentoo.org/960961 See-Also: https://github.com/gentoo/kde/commit/6d7dfb3b656c574bd75810936243740a7c257e8b Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43286 Closes: https://github.com/gentoo/gentoo/pull/43286 Signed-off-by: Sam James <sam <AT> gentoo.org> .../kig/files/kig-25.07.80-cmake-boostpython.patch | 79 ++++++++++++++++++++++ kde-apps/kig/kig-25.07.90.ebuild | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch b/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch new file mode 100644 index 000000000000..87e017d0e5bb --- /dev/null +++ b/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch @@ -0,0 +1,79 @@ +From c656b9ce0d8727302fea126d2ad70c36ce99f9e8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Mon, 13 Jul 2020 00:41:25 +0200 +Subject: [PATCH] Use CMake's own FindBoost module to detect Boost Python + +Introduces BOOSTPYTHON_VERSION_MAJOR_MINOR for packaging. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d05dae46..1c792102 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,8 @@ endif() + + include(KigConfigureChecks.cmake) + +-find_package(BoostPython) ++set(BOOSTPYTHON_VERSION_MAJOR_MINOR python37 CACHE STRING "Version of BoostPython to feed CMake's FindBoost") ++find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR}) + + if(KF6DocTools_FOUND) + add_subdirectory( doc ) +@@ -67,15 +68,15 @@ add_subdirectory( mimetypes ) + add_subdirectory( macros ) + add_subdirectory( pykig ) + +-if(BoostPython_FOUND) ++if(Boost_FOUND) ++ find_package(PythonLibs 3 REQUIRED) ++ include_directories(${PYTHON_INCLUDE_DIRS}) + add_subdirectory( scripting ) + add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) + endif() + + set_package_properties( +- BoostPython PROPERTIES +- DESCRIPTION "Python scripting support in Boost" +- URL "https://www.boost.org/"; ++ Boost PROPERTIES + TYPE OPTIONAL + PURPOSE "Kig can optionally use Boost.Python for Python scripting" + ) +@@ -93,9 +94,6 @@ endif() + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + + include_directories( ${CMAKE_SOURCE_DIR}/modes ) +-if(BoostPython_FOUND) +- include_directories(${BoostPython_INCLUDE_DIRS}) +-endif() + + # kigpart + +@@ -345,7 +343,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS + misc/kigcoordinateprecisiondialog.ui + ) + +-if(BoostPython_FOUND) ++if(Boost_FOUND) + set(kigpart_PART_SRCS ${kigpart_PART_SRCS} + modes/popup/scriptactionsprovider.cc + scripting/newscriptwizard.cc +@@ -376,8 +374,8 @@ target_link_libraries(kigpart + KF6::Archive + ) + +-if(BoostPython_FOUND) +- target_link_libraries(kigpart ${BoostPython_LIBRARIES} KF6::TextEditor) ++if(Boost_FOUND) ++ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${PYTHON_LIBRARIES} KF6::TextEditor) + endif() + + if (Qt${QT_MAJOR_VERSION}XmlPatterns_FOUND) +-- +2.50.1 + diff --git a/kde-apps/kig/kig-25.07.90.ebuild b/kde-apps/kig/kig-25.07.90.ebuild index 0d786b054a3b..40c46477de4c 100644 --- a/kde-apps/kig/kig-25.07.90.ebuild +++ b/kde-apps/kig/kig-25.07.90.ebuild @@ -45,7 +45,7 @@ DEPEND="${RDEPEND} >=kde-frameworks/ktexteditor-${KFMIN}:6 " -PATCHES=( "${FILESDIR}"/${PN}-25.07.70-cmake-boostpython.patch ) +PATCHES=( "${FILESDIR}"/${PN}-25.07.80-cmake-boostpython.patch ) src_prepare() { ecm_src_prepare
