summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-19 00:02:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-07-19 00:24:49 +0200
commitb61e1102c86c9ef0058ef316023b9e4681966a96 (patch)
tree2689434e4778871a3dade99f3b84826c7497136e /kde-misc/krename
parentkde-misc/tellico: Prioritise local copy of FindTaglib.cmake (diff)
downloadgentoo-b61e1102c86c9ef0058ef316023b9e4681966a96.tar.gz
gentoo-b61e1102c86c9ef0058ef316023b9e4681966a96.tar.bz2
gentoo-b61e1102c86c9ef0058ef316023b9e4681966a96.zip
kde-misc/krename: Prioritise local copy of FindTaglib.cmake
Fixes build with ECM 5.72 which ships a newer incompatible version. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/krename')
-rw-r--r--kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch36
-rw-r--r--kde-misc/krename/krename-5.0.0-r1.ebuild5
2 files changed, 40 insertions, 1 deletions
diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
new file mode 100644
index 00000000000..672d0c10681
--- /dev/null
+++ b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
@@ -0,0 +1,36 @@
+From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Fri, 19 Jun 2020 16:44:47 +0100
+Subject: [PATCH] use local cmake modules first, fixes build failure
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 602129b..4550621 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(krename)
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ # search packages used by KDE
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
+ include(KDEInstallDirs)
+ include(ECMInstallIcons)
+@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS
+ XmlGui
+ )
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+- ${CMAKE_SOURCE_DIR}/cmake/modules)
++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
++ ${CMAKE_MODULE_PATH})
+
+ add_definitions(
+ -DQT_DEPRECATED_WARNINGS
+--
+GitLab
+
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild
index 3884d54fa10..b650df235fa 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.0-r1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${DEPEND}
!kde-misc/krename:4
"
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-exiv2-0.27.patch"
+ "${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
+)
src_configure() {
local mycmakeargs=(