commit: b6abc062970ba42d56ab6fccb338dbae9e95d011 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon May 9 00:22:44 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon May 9 00:22:44 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6abc062
dev-libs/kopeninghours: Rebase cmake patch on top of HEAD Bug: https://bugs.gentoo.org/840002 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...90-boostpython.patch => kopeninghours-22.04.0-boostpython.patch} | 6 +++--- dev-libs/kopeninghours/kopeninghours-22.04.49.9999.ebuild | 2 +- dev-libs/kopeninghours/kopeninghours-9999.ebuild | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch b/dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch similarity index 93% rename from dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch rename to dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch index 939bcbcd9e..d51fb7d45f 100644 --- a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch +++ b/dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch @@ -26,7 +26,7 @@ index 7c50b40..a9a9328 100644 +cmake_minimum_required(VERSION 3.12) # KDE Application Version, managed by release script - set (RELEASE_SERVICE_VERSION_MAJOR "21") + set (RELEASE_SERVICE_VERSION_MAJOR "22") @@ -56,22 +56,16 @@ set_package_properties(FLEX PROPERTIES PURPOSE "Lexer generator for parsing open find_package(BISON REQUIRED) set_package_properties(BISON PROPERTIES PURPOSE "Grammar generator for parsing opening hours expressions") @@ -63,9 +63,9 @@ index 771cedf..e755ea7 100644 # Set up the libraries and header search paths for this target -target_link_libraries(PyKOpeningHours PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} KOpeningHours) --target_include_directories(PyKOpeningHours PRIVATE ${PYTHON_INCLUDE_DIRS}) +-target_include_directories(PyKOpeningHours PRIVATE ${Boost_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS}) +target_link_libraries(PyKOpeningHours PUBLIC Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${Python3_LIBRARIES} KOpeningHours) -+target_include_directories(PyKOpeningHours PRIVATE ${Python3_INCLUDE_DIRS}) ++target_include_directories(PyKOpeningHours PRIVATE ${Boost_INCLUDE_DIR} ${Python3_INCLUDE_DIRS}) -set(_install_dir lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages) - diff --git a/dev-libs/kopeninghours/kopeninghours-22.04.49.9999.ebuild b/dev-libs/kopeninghours/kopeninghours-22.04.49.9999.ebuild index e209aeaf09..9fe3f4ab2a 100644 --- a/dev-libs/kopeninghours/kopeninghours-22.04.49.9999.ebuild +++ b/dev-libs/kopeninghours/kopeninghours-22.04.49.9999.ebuild @@ -44,7 +44,7 @@ BDEPEND=" sys-devel/flex " -PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch ) +PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch ) pkg_setup() { ecm_pkg_setup diff --git a/dev-libs/kopeninghours/kopeninghours-9999.ebuild b/dev-libs/kopeninghours/kopeninghours-9999.ebuild index e209aeaf09..9fe3f4ab2a 100644 --- a/dev-libs/kopeninghours/kopeninghours-9999.ebuild +++ b/dev-libs/kopeninghours/kopeninghours-9999.ebuild @@ -44,7 +44,7 @@ BDEPEND=" sys-devel/flex " -PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch ) +PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch ) pkg_setup() { ecm_pkg_setup
