diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/grantlee/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/grantlee/files')
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch | 14 | ||||
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 |
2 files changed, 0 insertions, 53 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 a25f52b3c63d..000000000000 --- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN grantlee-0.3.0.orig/CMakeLists.txt grantlee-0.3.0/CMakeLists.txt ---- grantlee-0.3.0.orig/CMakeLists.txt 2012-11-01 21:14:18.000000000 +0100 -+++ grantlee-0.3.0/CMakeLists.txt 2013-03-09 12:25:56.498096399 +0100 -@@ -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.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 |