diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-19 12:41:52 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-19 12:41:52 +0100 |
commit | f866a680b3a46e1a5e12856ffcd6457ce45683c5 (patch) | |
tree | b3cef3bf4467f88616a2fbd24059b7937d370ce5 /dev-libs/grantlee/files | |
parent | media-libs/mlt: Drop 6.16.0-r1 and 6.16.0-r2 (diff) | |
download | gentoo-f866a680b3a46e1a5e12856ffcd6457ce45683c5.tar.gz gentoo-f866a680b3a46e1a5e12856ffcd6457ce45683c5.tar.bz2 gentoo-f866a680b3a46e1a5e12856ffcd6457ce45683c5.zip |
dev-libs/grantlee: Drop 5.1.0
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/grantlee/files')
-rw-r--r-- | dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch | 24 | ||||
-rw-r--r-- | dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch | 27 | ||||
-rw-r--r-- | dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 |
3 files changed, 0 insertions, 90 deletions
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch deleted file mode 100644 index d049d6c96f81..000000000000 --- a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sat, 20 Jul 2019 17:35:30 +0200 -Subject: [PATCH] Fix compile with newer Qt/cmake combination - -Without this i get huge errors about Qt needing C++11 support ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d51110..0859788 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,9 @@ endif() - - project(Grantlee) - -+set (CMAKE_CXX_STANDARD 11) -+set (CMAKE_CXX_EXTENSIONS OFF) -+ - # Workaround for http://public.kitware.com/Bug/view.php?id=12301 - if (MINGW) - if(NOT CMAKE_BUILD_TYPE) diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch b/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch deleted file mode 100644 index 67a92c1f869b..000000000000 --- a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001 -From: Michael Pyne <mpyne@kde.org> -Date: Tue, 18 Dec 2018 17:47:21 -0500 -Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2. - -At this point Grantlee doesn't build for me because QList is an -incomplete type. I think the compiler is right to complain, so I fix by -including the appropriate header. - -Fixes issue #47. ---- - templates/lib/lexer_p.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h -index 275aeea..1ae451a 100644 ---- a/templates/lib/lexer_p.h -+++ b/templates/lib/lexer_p.h -@@ -24,7 +24,7 @@ - #include "textprocessingmachine_p.h" - #include "token.h" - --template <typename T> class QList; -+#include <QList> - - namespace Grantlee - { 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 5b0d61d5c1eb..000000000000 --- 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 |