commit: 1ff44296baaa36da67ec82da907a3878e370ccbd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 2 19:35:37 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 2 19:40:14 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ff44296
app-office/libalkimia: Re-org cmake- and pkgconfig patches, rebase Closes: https://bugs.gentoo.org/947339 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libalkimia/files/libalkimia-8.1.0-cmake.patch | 54 ---------------------- .../libalkimia/files/libalkimia-8.1.2-cmake.patch | 23 +++++++++ .../files/libalkimia-8.1.2-pkgconfig.patch | 25 ++++++++++ .../files/libalkimia-8.1.92-pkgconfig.patch | 25 ++++++++++ app-office/libalkimia/libalkimia-8.9999.ebuild | 2 +- app-office/libalkimia/libalkimia-9999.ebuild | 5 +- 6 files changed, 78 insertions(+), 56 deletions(-) diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch deleted file mode 100644 index 652e951c4b..0000000000 --- a/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 12 Jun 2019 19:44:12 +0200 -Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for - alkimia target - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7c0f0f7..0774032 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) - - install(TARGETS alkimia - EXPORT alkimiaTargets -- ${INSTALL_TARGETS_DEFAULT_ARGS} -+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} - ) - - if(BUILD_QT4) --- -2.23.0 - - -From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 12 Jun 2019 16:43:54 +0200 -Subject: [PATCH 2/2] Fix pkgconfig libdir path - ---- - src/libalkimia.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in -index c2087c9..6ada277 100644 ---- a/src/libalkimia.pc.in -+++ b/src/libalkimia.pc.in -@@ -4,8 +4,8 @@ - # General installation directories - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@KDE4_LIB_DIR@ --includedir=@INCLUDE_INSTALL_DIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=${prefix}/@INCLUDE_INSTALL_DIR@ - - # Human-readable name - Name: Alkimia --- -2.23.0 - diff --git a/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch new file mode 100644 index 0000000000..5a699d8ec3 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch @@ -0,0 +1,23 @@ +From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Jun 2019 19:44:12 +0200 +Subject: Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for alkimia target + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + + install(TARGETS alkimia + EXPORT alkimiaTargets +- ${INSTALL_TARGETS_DEFAULT_ARGS} ++ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} + ) + + if(BUILD_QT4) +-- +2.23.0 diff --git a/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch b/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch new file mode 100644 index 0000000000..0696d1cfdb --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch @@ -0,0 +1,25 @@ +From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Jun 2019 16:43:54 +0200 +Subject: Fix pkgconfig libdir path + +--- + src/libalkimia.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in +--- a/src/libalkimia.pc.in ++++ b/src/libalkimia.pc.in +@@ -4,8 +4,8 @@ + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@KDE4_LIB_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +-- +2.23.0 diff --git a/app-office/libalkimia/files/libalkimia-8.1.92-pkgconfig.patch b/app-office/libalkimia/files/libalkimia-8.1.92-pkgconfig.patch new file mode 100644 index 0000000000..06b44ed526 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.92-pkgconfig.patch @@ -0,0 +1,25 @@ +From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Jun 2019 16:43:54 +0200 +Subject: Fix pkgconfig libdir path + +--- + src/libalkimia.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in +--- a/src/libalkimia.pc.in ++++ b/src/libalkimia.pc.in +@@ -4,8 +4,8 @@ + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +-- +2.23.0 diff --git a/app-office/libalkimia/libalkimia-8.9999.ebuild b/app-office/libalkimia/libalkimia-8.9999.ebuild index 301fb97759..1eebb4469f 100644 --- a/app-office/libalkimia/libalkimia-8.9999.ebuild +++ b/app-office/libalkimia/libalkimia-8.9999.ebuild @@ -49,7 +49,7 @@ BDEPEND=" doc? ( app-text/doxygen ) " -PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) +PATCHES=( "${FILESDIR}"/${PN}-8.1.2-{cmake,pkgconfig}.patch ) src_configure() { local mycmakeargs=( diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild index 457f8a2703..8e3461024d 100644 --- a/app-office/libalkimia/libalkimia-9999.ebuild +++ b/app-office/libalkimia/libalkimia-9999.ebuild @@ -48,7 +48,10 @@ BDEPEND=" doc? ( app-text/doxygen ) " -PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-8.1.2-cmake.patch" + "${FILESDIR}/${PN}-8.1.92-pkgconfig.patch" +) src_configure() { local mycmakeargs=(
