diff options
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-5.3.0-slot.patch (renamed from dev-libs/grantlee/files/grantlee-9999-slot.patch) | 30 | ||||
| -rw-r--r-- | dev-libs/grantlee/grantlee-9999.ebuild | 14 |
2 files changed, 21 insertions, 23 deletions
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch index 9490df2327e..896290499dc 100644 --- a/dev-libs/grantlee/files/grantlee-9999-slot.patch +++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch @@ -1,31 +1,28 @@ -From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001 +From f9dda5f8a81c18c59eabcea515084253c284803a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> 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. - -Amended with target_include_directories fix by jospezial. - --- 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 +index 07a192c..9049bdc 100644 --- a/templates/lib/CMakeLists.txt +++ b/templates/lib/CMakeLists.txt -@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND) +@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND OR Qt6Qml_FOUND) target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) + target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") - target_link_libraries(Grantlee_Templates - PRIVATE Qt5::Qml - ) -@@ -152,10 +153,10 @@ install(FILES + if (GRANTLEE_BUILD_WITH_QT6) + target_link_libraries(Grantlee_Templates + PRIVATE Qt6::Qml +@@ -164,10 +165,10 @@ install(FILES token.h util.h variable.h @@ -39,18 +36,18 @@ index 5058481..3ef29a4 100644 + DESTINATION include/grantlee5 COMPONENT Templates ) diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt -index 2c5a96f..c42d32a 100644 +index a472267..8134d83 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/grantlee5>") ++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 + if (GRANTLEE_BUILD_WITH_QT6) + target_link_libraries(Grantlee_TextDocument +@@ -65,10 +66,10 @@ install(FILES texthtmlbuilder.h mediawikimarkupbuilder.h ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h @@ -64,4 +61,5 @@ index 2c5a96f..c42d32a 100644 + DESTINATION include/grantlee5 COMPONENT TextDocument ) -- -2.24.0 +2.37.3 + diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index 26b6932c53b..133c2a70f0b 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -15,10 +15,8 @@ SLOT="5" KEYWORDS="" IUSE="debug doc test" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) - test? ( dev-qt/linguist-tools:5 ) -" +RESTRICT="!test? ( test )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -27,12 +25,14 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " - -RESTRICT="!test? ( test )" +BDEPEND=" + doc? ( app-doc/doxygen[dot] ) + test? ( dev-qt/linguist-tools:5 ) +" PATCHES=( "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" - "${FILESDIR}/${P}-slot.patch" + "${FILESDIR}/${PN}-5.3.0-slot.patch" # TODO: Qt5 specific ) src_configure() { |