summaryrefslogtreecommitdiff
path: root/dev-libs/grantlee/files
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-12-25 12:41:04 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-12-25 12:41:04 +0100
commitcf66454be3b2c2b5cdba95fe7ff1289afc088fe2 (patch)
tree111abf4f918942d6cc307f36236f1ac3bff683ef /dev-libs/grantlee/files
parente402b0a11e8232c36426726067f2e4f3d5c21c94 (diff)
downloadkde-cf66454be3b2c2b5cdba95fe7ff1289afc088fe2.tar.gz
kde-cf66454be3b2c2b5cdba95fe7ff1289afc088fe2.tar.bz2
kde-cf66454be3b2c2b5cdba95fe7ff1289afc088fe2.zip
dev-libs/grantlee: treeclean
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.patch17
-rw-r--r--dev-libs/grantlee/files/grantlee-5.3.0-slot.patch65
2 files changed, 0 insertions, 82 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
deleted file mode 100644
index b35dc46586e..00000000000
--- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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-5.3.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
deleted file mode 100644
index 444274b0992..00000000000
--- a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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.
----
- 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 07a192c..9049bdc 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -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>")
- 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
-- 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 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>")
-
- 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
-- 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.37.3
-