commit: 7051d6521ca70f23ea04df3bc29d7bb5dc63beed Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 23:26:04 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 23:26:04 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7051d652
dev-libs/grantlee: Fix slot patch Thanks-to: jospezial <jospezial <AT> gmx.de> Closes: https://bugs.gentoo.org/701534 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/grantlee/files/grantlee-9999-slot.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch index 546d623ef7..9490df2327 100644 --- a/dev-libs/grantlee/files/grantlee-9999-slot.patch +++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch @@ -5,6 +5,9 @@ Subject: [PATCH] Install headers to a custom location to permit slotting That was previously necessary with Qt4 version, let's keep it while Qt6 is around the corner. + +Amended with target_include_directories fix by jospezial. + --- templates/lib/CMakeLists.txt | 5 +++-- textdocument/lib/CMakeLists.txt | 5 +++-- @@ -18,7 +21,7 @@ index 5058481..3ef29a4 100644 target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) -+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") ++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") target_link_libraries(Grantlee_Templates PRIVATE Qt5::Qml ) @@ -43,7 +46,7 @@ index 2c5a96f..c42d32a 100644 ) endforeach() endif() -+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") ++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") target_link_libraries(Grantlee_TextDocument PUBLIC Qt5::Gui @@ -62,4 +65,3 @@ index 2c5a96f..c42d32a 100644 ) -- 2.24.0 -
