diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-16 20:06:58 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-16 20:07:18 +0100 |
| commit | e55443aaa21a1d967571de0b7f79920de4aec9f2 (patch) | |
| tree | 2436ef5c30c1e452385c9962c40c7bee31aeaf00 /kde-apps/kopete | |
| parent | kde-apps/okular: Drop version check broken by KF-5.100 (diff) | |
| download | gentoo-e55443aaa21a1d967571de0b7f79920de4aec9f2.tar.gz gentoo-e55443aaa21a1d967571de0b7f79920de4aec9f2.tar.bz2 gentoo-e55443aaa21a1d967571de0b7f79920de4aec9f2.zip | |
kde-apps/kopete: Fix version check with KF-5.100
Upstream commit 553fc241b5ec701421cd51ae08eef7cabdeca654
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kopete')
| -rw-r--r-- | kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch | 25 | ||||
| -rw-r--r-- | kde-apps/kopete/kopete-22.08.3.ebuild | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch b/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch new file mode 100644 index 000000000000..421986ee2b3b --- /dev/null +++ b/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch @@ -0,0 +1,25 @@ +From 553fc241b5ec701421cd51ae08eef7cabdeca654 Mon Sep 17 00:00:00 2001 +From: Jonathan Esk-Riddell <jr@jriddell.org> +Date: Fri, 21 Oct 2022 17:39:23 +0000 +Subject: [PATCH] Fix build with KF >= 5.100 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef6090fd0..079d36a2f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -161,7 +161,7 @@ add_subdirectory(styles) + add_subdirectory(doc) + add_subdirectory(tests) + +-if (${ECM_VERSION} STRGREATER "5.58.0") ++if (${ECM_VERSION} VERSION_GREATER "5.58.0") + install( FILES kopete.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) + else() + install( FILES kopete.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +-- +GitLab + diff --git a/kde-apps/kopete/kopete-22.08.3.ebuild b/kde-apps/kopete/kopete-22.08.3.ebuild index fef666a962e7..475d611b6436 100644 --- a/kde-apps/kopete/kopete-22.08.3.ebuild +++ b/kde-apps/kopete/kopete-22.08.3.ebuild @@ -135,6 +135,8 @@ DEPEND="${COMMON_DEPEND} # tests hang, last checked for 4.2.96 RESTRICT="test" +PATCHES=( "${FILESDIR}/${P}-fix-kf-5.100-version-check.patch" ) + src_configure() { local x x2 # Handle common stuff |