diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-12 09:34:31 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-12 10:11:53 +0100 |
| commit | a346f86521d1c3b901b8e016f7e829e082536db5 (patch) | |
| tree | 2a755f96ce23d7cb3a19cda78638dcc07a5e1cb4 /dev-libs/grantlee/files | |
| parent | 7a9334741467f0c0db6e79f35573abe7a6909ade (diff) | |
| download | kde-a346f86521d1c3b901b8e016f7e829e082536db5.tar.gz kde-a346f86521d1c3b901b8e016f7e829e082536db5.tar.bz2 kde-a346f86521d1c3b901b8e016f7e829e082536db5.zip | |
dev-libs/grantlee: Revert "Use ecm.eclass", "Moved to kde.org"
This reverts commit 09e7eb596ec6441fc7a523809e3dad3f09b5be50.
This reverts commit ab4c576a77fad0ac660a114d24d226509a8440a9.
Dropped out of kde.org again, next try with KF6.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/grantlee/files')
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch | 17 | ||||
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-9999-slot.patch | 18 |
2 files changed, 26 insertions, 9 deletions
diff --git a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch new file mode 100644 index 00000000000..b35dc46586e --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch @@ -0,0 +1,17 @@ +Do not make linker warnings fatal. + +Gentoo-bug: 430968 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,8 +62,8 @@ + endif() + + if (NOT APPLE) +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") + endif () + + if (NOT MINGW) diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch index b761a66320e..9490df2327e 100644 --- a/dev-libs/grantlee/files/grantlee-9999-slot.patch +++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch @@ -21,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:${KDE_INSTALL_INCLUDEDIR}/grantlee5>") ++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") target_link_libraries(Grantlee_Templates PRIVATE Qt5::Qml ) @@ -29,14 +29,14 @@ index 5058481..3ef29a4 100644 token.h util.h variable.h -- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee COMPONENT Templates -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5/grantlee COMPONENT Templates +- DESTINATION include/grantlee COMPONENT Templates ++ DESTINATION include/grantlee5/grantlee COMPONENT Templates ) install(FILES grantlee_templates.h -- DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Templates -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5 COMPONENT Templates +- 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 @@ -54,14 +54,14 @@ index 2c5a96f..c42d32a 100644 texthtmlbuilder.h mediawikimarkupbuilder.h ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h -- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee COMPONENT TextDocument -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5/grantlee COMPONENT TextDocument +- DESTINATION include/grantlee COMPONENT TextDocument ++ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument ) install(FILES grantlee_textdocument.h -- DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT TextDocument -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5 COMPONENT TextDocument +- DESTINATION include COMPONENT TextDocument ++ DESTINATION include/grantlee5 COMPONENT TextDocument ) -- 2.24.0 |