diff --git a/dev-libs/grantlee/grantlee-5.1.0.recipe b/dev-libs/grantlee/grantlee-5.2.0.recipe similarity index 90% rename from dev-libs/grantlee/grantlee-5.1.0.recipe rename to dev-libs/grantlee/grantlee-5.2.0.recipe index c8273d4e9..8d054ee98 100644 --- a/dev-libs/grantlee/grantlee-5.1.0.recipe +++ b/dev-libs/grantlee/grantlee-5.2.0.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2010-2017 Stephen Kelly" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/steveire/grantlee/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="3836572fe5e49d28a1d99186c6d96f88ff839644b4bc77b73b6d8208f6ccc9d1" +CHECKSUM_SHA256="139acee5746b957bdf1327ec0d97c604d4c0b9be42aec5d584297cb5ed6a990a" SOURCE_FILENAME="grantlee-$portVersion.tar.gz" PATCHES="grantlee-$portVersion.patchset" @@ -47,7 +47,10 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake + cmd:doxygen + cmd:dot cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make " @@ -62,12 +65,15 @@ BUILD() $cmakeDirArgs make $jobArgs + make docs } INSTALL() { cd build make install + mkdir -p $docDir + install -Dm644 apidox/* $docDir/ # Remove unneeded include, no idea, where does it comes from. Aliens? sed -i 's/;.*\"/"/' "$libDir"/cmake/Grantlee5/GrantleeTargets.cmake @@ -78,7 +84,8 @@ INSTALL() packageEntries devel \ $libDir/cmake \ - $developDir + $developDir \ + $documentationDir } TEST() diff --git a/dev-libs/grantlee/patches/grantlee-5.1.0.patchset b/dev-libs/grantlee/patches/grantlee-5.1.0.patchset deleted file mode 100644 index 1e06c6d6c..000000000 --- a/dev-libs/grantlee/patches/grantlee-5.1.0.patchset +++ /dev/null @@ -1,51 +0,0 @@ -From 40ec0143d423e9a8884553e71717f2fbed0973b6 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Mon, 18 Dec 2017 19:51:10 +0300 -Subject: Fix INCLUDE_INSTALL_DIR - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1324566..0b11884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,8 +100,12 @@ 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 ) -+if (HAIKU) -+set (INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/develop/headers CACHE PATH "Installation prefix for C header files" FORCE) -+else (HAIKU) -+set( INCLUDE_INSTALL_DIR include/grantlee5 ) - set( DATA_INSTALL_DIR share/apps ) -+endif (HAIKU) - - # set up RPATH/install_name_dir - set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_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 "$") - 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 "$") - - target_link_libraries(Grantlee_TextDocument - LINK_PUBLIC Qt5::Gui --- -2.15.0 - diff --git a/dev-libs/grantlee/patches/grantlee-5.2.0.patchset b/dev-libs/grantlee/patches/grantlee-5.2.0.patchset new file mode 100644 index 000000000..eaeb60d19 --- /dev/null +++ b/dev-libs/grantlee/patches/grantlee-5.2.0.patchset @@ -0,0 +1,76 @@ +From dfccc71cc750359a41d2274ddaa4c716da8c67d6 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Mon, 18 Dec 2017 19:51:10 +0300 +Subject: Fix INCLUDE_INSTALL_DIR + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20edcdc..e5c138e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,6 +80,9 @@ 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} ) ++if (HAIKU) ++set (INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/develop/headers CACHE PATH "Installation prefix for C header files" FORCE) ++endif (HAIKU) + + # set up RPATH/install_name_dir + set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) +diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt +index 5058481..1336270 100644 +--- a/templates/lib/CMakeLists.txt ++++ b/templates/lib/CMakeLists.txt +@@ -125,7 +125,8 @@ install(TARGETS Grantlee_Templates EXPORT grantlee_targets + RUNTIME DESTINATION bin COMPONENT Templates + LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates +- INCLUDES DESTINATION include ++ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} ++ + ) + + install(FILES +@@ -152,10 +153,10 @@ install(FILES + token.h + util.h + variable.h +- DESTINATION include/grantlee COMPONENT Templates ++ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT Templates + ) + + install(FILES + grantlee_templates.h +- DESTINATION include COMPONENT Templates ++ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Templates + ) +diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt +index 2c5a96f..2f122e3 100644 +--- a/textdocument/lib/CMakeLists.txt ++++ b/textdocument/lib/CMakeLists.txt +@@ -48,7 +48,7 @@ install(TARGETS Grantlee_TextDocument EXPORT grantlee_targets + RUNTIME DESTINATION bin COMPONENT TextDocument + LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument +- INCLUDES DESTINATION include ++ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} + ) + + install(FILES +@@ -59,10 +59,10 @@ install(FILES + texthtmlbuilder.h + mediawikimarkupbuilder.h + ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h +- DESTINATION include/grantlee COMPONENT TextDocument ++ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT TextDocument + ) + + install(FILES + grantlee_textdocument.h +- DESTINATION include COMPONENT TextDocument ++ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT TextDocument + ) +-- +2.30.0 +