[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/files/

[Michael Palimaka]

commit:     a07f83d09a5ac44c2cbd6d1757d422409aaf47b5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 17:49:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 17:49:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a07f83d0

dev-libs/grantlee: rebase slot patch

Package-Manager: portage-2.2.27

 dev-libs/grantlee/files/grantlee-slot.patch | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch
index 814fb9d..ab3557e 100644
--- a/dev-libs/grantlee/files/grantlee-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-slot.patch
@@ -1,12 +1,10 @@
-Install headers to a custom location to permit slotting with Qt4 version.
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45f8673..7832a3b 100644
+index dca14ec..d25656d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
+@@ -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${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} )
+ 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 )
@@ -14,19 +12,19 @@ index 45f8673..7832a3b 100644
  
  # set up RPATH/install_name_dir
 diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index 789205c..7045449 100644
+index 741fe65..20179fc 100644
 --- a/templates/lib/CMakeLists.txt
 +++ b/templates/lib/CMakeLists.txt
-@@ -79,6 +79,7 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates)
- generate_export_header(Grantlee_Templates)
- set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates)
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
+@@ -81,6 +81,7 @@ if (Qt5Script_FOUND)
  
- if (BUILD_TESTS)
-   set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT")
+   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 14163db..7c609f9 100644
+index 4c94203..e203539 100644
 --- a/textdocument/lib/CMakeLists.txt
 +++ b/textdocument/lib/CMakeLists.txt
 @@ -24,7 +24,7 @@ add_library(Grantlee_TextDocument SHARED