commit: 2d4aa530256e8a86df9357042ea6608e4b0d11e4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 30 11:05:46 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 30 11:20:00 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d4aa530
dev-libs/grantlee: Rebase patch on top of master 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-5.1.0-slot.patch | 39 -------------- dev-libs/grantlee/files/grantlee-9999-slot.patch | 65 +++++++++++++++++++++++ dev-libs/grantlee/grantlee-9999.ebuild | 2 +- 3 files changed, 66 insertions(+), 40 deletions(-) diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch deleted file mode 100644 index 5b0d61d5c1..0000000000 --- a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch +++ /dev/null @@ -1,39 +0,0 @@ -Install headers to a custom location to permit slotting with Qt4 version. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1324566..f98d5da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 - set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) - set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) - set( BIN_INSTALL_DIR bin ) --set( INCLUDE_INSTALL_DIR include ) -+set( INCLUDE_INSTALL_DIR include/grantlee5 ) - set( DATA_INSTALL_DIR share/apps ) - - # set up RPATH/install_name_dir -diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt -index dad2ef8..434d163 100644 ---- a/templates/lib/CMakeLists.txt -+++ b/templates/lib/CMakeLists.txt -@@ -107,6 +107,7 @@ if (Qt5Script_FOUND) - - 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_link_libraries(Grantlee_Templates - LINK_PRIVATE Qt5::Script - ) -diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt -index 557d262..d2dbaa1 100644 ---- a/textdocument/lib/CMakeLists.txt -+++ b/textdocument/lib/CMakeLists.txt -@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") - ) - endforeach() - endif() -+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") - - target_link_libraries(Grantlee_TextDocument - LINK_PUBLIC Qt5::Gui diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch new file mode 100644 index 0000000000..546d623ef7 --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch @@ -0,0 +1,65 @@ +From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sat, 30 Nov 2019 11:55:33 +0100 +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. +--- + templates/lib/CMakeLists.txt | 5 +++-- + textdocument/lib/CMakeLists.txt | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt +index 5058481..3ef29a4 100644 +--- a/templates/lib/CMakeLists.txt ++++ b/templates/lib/CMakeLists.txt +@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND) + + 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_link_libraries(Grantlee_Templates + PRIVATE Qt5::Qml + ) +@@ -152,10 +153,10 @@ install(FILES + token.h + util.h + variable.h +- DESTINATION include/grantlee COMPONENT Templates ++ DESTINATION include/grantlee5/grantlee COMPONENT Templates + ) + + install(FILES + grantlee_templates.h +- DESTINATION include COMPONENT Templates ++ DESTINATION include/grantlee5 COMPONENT Templates + ) +diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt +index 2c5a96f..c42d32a 100644 +--- a/textdocument/lib/CMakeLists.txt ++++ b/textdocument/lib/CMakeLists.txt +@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") + ) + endforeach() + endif() ++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") + + target_link_libraries(Grantlee_TextDocument + PUBLIC Qt5::Gui +@@ -59,10 +60,10 @@ install(FILES + texthtmlbuilder.h + mediawikimarkupbuilder.h + ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h +- DESTINATION include/grantlee COMPONENT TextDocument ++ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument + ) + + install(FILES + grantlee_textdocument.h +- DESTINATION include COMPONENT TextDocument ++ DESTINATION include/grantlee5 COMPONENT TextDocument + ) +-- +2.24.0 + diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index 84f512cd9d..3db5604c37 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -32,7 +32,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" - "${FILESDIR}/${PN}-5.1.0-slot.patch" + "${FILESDIR}/${P}-slot.patch" ) src_prepare() {
