Update grantlee-qt5 to 5.2.0

This commit is contained in:
rsadowski 2020-08-31 19:06:18 +00:00
parent 6585d95d88
commit 14d2fc19f5
21 changed files with 45 additions and 355 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2020/02/25 18:07:16 rsadowski Exp $
# $OpenBSD: Makefile,v 1.7 2020/08/31 19:06:18 rsadowski Exp $
COMMENT = template and text document library for Qt5
VERSION = 5.1.0
VERSION = 5.2.0
PKGNAME = grantlee-qt5-${VERSION}
DISTNAME = grantlee-${VERSION}
REVISION = 3
SHARED_LIBS += Grantlee_Templates 0.0 # 5.1
SHARED_LIBS += Grantlee_Templates 1.0 # 5.1
SHARED_LIBS += Grantlee_TextDocument 0.0 # 5.1
CATEGORIES = devel x11

View File

@ -1,2 +1,2 @@
SHA256 (grantlee-5.1.0.tar.gz) = 6i5AJGbHS7Uz7uLHJSIJ7GHNk6XSNv7NYltKDrE6FHg=
SIZE (grantlee-5.1.0.tar.gz) = 1175380
SHA256 (grantlee-5.2.0.tar.gz) = 1s0E3jmgc6eHyauOcqCIjkB3nSG4P7x4ihs20xrGWdU=
SIZE (grantlee-5.2.0.tar.gz) = 1166467

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2019/09/22 09:10:55 cwen Exp $
Hunk #2: ports-gcc fix because with it, -ansi means -std=c++98, and
grantlee wants c++11
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -34,14 +34,14 @@ include(GenerateExportHeader)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+if (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "Ninja")
# create coverage build type
set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage )
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug" "Release" "MinSizeRel" "RelWithDebInfo" "Coverage" "TestCocoon")
endif()
-if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+if (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "Ninja")
set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
@@ -56,7 +56,7 @@ endif()
if (CMAKE_COMPILER_IS_GNUCXX)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
# Needed on 64 bit
@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of libr
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

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_books_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: examples/books/CMakeLists.txt
--- examples/books/CMakeLists.txt.orig
+++ examples/books/CMakeLists.txt
@@ -32,5 +32,5 @@ target_link_libraries(
Grantlee5::Templates
Qt5::Widgets
Qt5::Sql
-
+ c pthread
)

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-examples_codegen_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: examples/codegen/CMakeLists.txt
--- examples/codegen/CMakeLists.txt.orig
+++ examples/codegen/CMakeLists.txt
@@ -41,4 +41,5 @@ target_link_libraries(
codegen
Grantlee5::Templates
Qt5::Widgets
+ c pthread
)

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-examples_contacts_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: examples/contacts/CMakeLists.txt
--- examples/contacts/CMakeLists.txt.orig
+++ examples/contacts/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(
contacts_linguist
Grantlee5::Templates
Qt5::WebKitWidgets
+ c pthread
)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/../../scripts" "${PROJECT_SOURCE_DIR}/scripts")

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-examples_htmlapps_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: examples/htmlapps/CMakeLists.txt
--- examples/htmlapps/CMakeLists.txt.orig
+++ examples/htmlapps/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(customplugin
Grantlee5::Templates
Qt5::XmlPatterns
Qt5::Network
+ c pthread
)
add_executable(htmlapps

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-examples_textedit_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: examples/textedit/CMakeLists.txt
--- examples/textedit/CMakeLists.txt.orig
+++ examples/textedit/CMakeLists.txt
@@ -20,6 +20,7 @@ grantlee_adjust_plugin_name(customtags)
target_link_libraries(customtags
${Grantlee_TEMPLATES_LIBRARIES}
${Grantlee_TEXTDOCUMENT_LIBRARIES}
+ c pthread
)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-templates_defaultfilters_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/defaultfilters/CMakeLists.txt
--- templates/defaultfilters/CMakeLists.txt.orig
+++ templates/defaultfilters/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(grantlee_defaultfilters MODULE
stringfilters.cpp
)
set_property(TARGET grantlee_defaultfilters PROPERTY EXPORT_NAME defaultfilters)
-target_link_libraries(grantlee_defaultfilters Grantlee5::Templates)
+target_link_libraries(grantlee_defaultfilters Grantlee5::Templates c pthread)
target_compile_features(grantlee_defaultfilters PRIVATE cxx_auto_type)
grantlee_adjust_plugin_name(grantlee_defaultfilters)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-templates_defaulttags_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/defaulttags/CMakeLists.txt
--- templates/defaulttags/CMakeLists.txt.orig
+++ templates/defaulttags/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(grantlee_defaulttags MODULE
with.cpp
)
set_property(TARGET grantlee_defaulttags PROPERTY EXPORT_NAME defaulttags)
-target_link_libraries(grantlee_defaulttags Grantlee5::Templates)
+target_link_libraries(grantlee_defaulttags Grantlee5::Templates c pthread)
target_compile_features(grantlee_defaulttags
PRIVATE cxx_auto_type cxx_variadic_templates
)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-templates_i18n_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/i18n/CMakeLists.txt
--- templates/i18n/CMakeLists.txt.orig
+++ templates/i18n/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(grantlee_i18ntags MODULE
with_locale.cpp
)
set_property(TARGET grantlee_i18ntags PROPERTY EXPORT_NAME i18ntags)
-target_link_libraries(grantlee_i18ntags Grantlee5::Templates)
+target_link_libraries(grantlee_i18ntags Grantlee5::Templates c pthread)
target_compile_features(grantlee_i18ntags PRIVATE cxx_auto_type)
grantlee_adjust_plugin_name(grantlee_i18ntags)

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-templates_lib_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/lib/CMakeLists.txt
--- templates/lib/CMakeLists.txt.orig
+++ templates/lib/CMakeLists.txt
@@ -109,6 +109,7 @@ if (Qt5Script_FOUND)
target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
target_link_libraries(Grantlee_Templates
LINK_PRIVATE Qt5::Script
+ c pthread
)
endif()
@@ -137,7 +138,7 @@ install(TARGETS Grantlee_Templates EXPORT grantlee_tar
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Templates
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
- INCLUDES DESTINATION include
+ INCLUDES DESTINATION include/grantlee5
)
install(FILES

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-templates_lib_lexer_p_h,v 1.1 2020/02/25 18:07:16 rsadowski Exp $
https://github.com/steveire/grantlee/commit/1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85#diff-a32621549f7e9585e444419c645b0d82
Index: templates/lib/lexer_p.h
--- templates/lib/lexer_p.h.orig
+++ 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
{

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-templates_loadertags_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/loadertags/CMakeLists.txt
--- templates/loadertags/CMakeLists.txt.orig
+++ templates/loadertags/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(grantlee_loadertags MODULE
include.cpp
)
set_property(TARGET grantlee_loadertags PROPERTY EXPORT_NAME loadertags)
-target_link_libraries(grantlee_loadertags Grantlee5::Templates)
+target_link_libraries(grantlee_loadertags Grantlee5::Templates c pthread)
target_compile_features(grantlee_loadertags PRIVATE cxx_auto_type)
grantlee_adjust_plugin_name(grantlee_loadertags)

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-templates_scriptabletags_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/scriptabletags/CMakeLists.txt
--- templates/scriptabletags/CMakeLists.txt.orig
+++ templates/scriptabletags/CMakeLists.txt
@@ -16,6 +16,7 @@ grantlee_adjust_plugin_name(grantlee_scriptabletags)
target_link_libraries(grantlee_scriptabletags
Grantlee5::Templates
Qt4::QtScript
+ c pthread
)
install(TARGETS grantlee_scriptabletags

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-templates_tests_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/tests/CMakeLists.txt
--- templates/tests/CMakeLists.txt.orig
+++ templates/tests/CMakeLists.txt
@@ -88,7 +88,7 @@ add_library(template_test_builtins STATIC coverageobje
coverageobject.cpp
${_testresource_rcc_src}
)
-target_link_libraries(template_test_builtins Qt5::Test)
+target_link_libraries(template_test_builtins Qt5::Test c)
target_compile_definitions(template_test_builtins PUBLIC cxx_auto_type)
macro(GRANTLEE_TEMPLATES_UNIT_TESTS)
@@ -97,7 +97,7 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS)
${_testname}.cpp
)
add_test(${_testname} ${_testname}_exec )
- target_link_libraries(${_testname}_exec Grantlee5::Templates template_test_builtins)
+ target_link_libraries(${_testname}_exec Grantlee5::Templates template_test_builtins c pthread)
if (Qt5Script_FOUND)
target_compile_definitions(${_testname}_exec PRIVATE HAVE_QTSCRIPT_LIB)

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-templates_tests_pluginpointertest_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/tests/pluginpointertest/CMakeLists.txt
--- templates/tests/pluginpointertest/CMakeLists.txt.orig
+++ templates/tests/pluginpointertest/CMakeLists.txt
@@ -17,6 +17,7 @@ set_target_properties(myplugin
)
target_link_libraries(myplugin
Qt5::Core
+ c pthread
)
add_executable(main_app main.cpp ${myplugin_sources} ${_plugin_moc_srcs})
@@ -26,4 +27,5 @@ target_include_directories(main_app
)
target_link_libraries(main_app
Qt5::Core
+ c pthread
)

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-templates_tests_templatedirs_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: templates/tests/templatedirs/CMakeLists.txt
--- templates/tests/templatedirs/CMakeLists.txt.orig
+++ templates/tests/templatedirs/CMakeLists.txt
@@ -22,4 +22,5 @@ target_link_libraries(
template_dirs_test
Qt4::QtCore
${Grantlee_TEMPLATES_LIBRARIES}
+ c pthread
)

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-textdocument_lib_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: textdocument/lib/CMakeLists.txt
--- textdocument/lib/CMakeLists.txt.orig
+++ textdocument/lib/CMakeLists.txt
@@ -45,6 +45,8 @@ endif()
target_link_libraries(Grantlee_TextDocument
LINK_PUBLIC Qt5::Gui
+ c
+ pthread
)
if (NOT CMAKE_BUILD_TYPE MATCHES TestCocoon)
@@ -58,7 +60,7 @@ install(TARGETS Grantlee_TextDocument EXPORT grantlee_
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT TextDocument
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
- INCLUDES DESTINATION include
+ INCLUDES DESTINATION include/grantlee5
)
install(FILES

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-textdocument_tests_CMakeLists_txt,v 1.1.1.1 2018/07/21 09:48:39 rsadowski Exp $
Index: textdocument/tests/CMakeLists.txt
--- textdocument/tests/CMakeLists.txt.orig
+++ textdocument/tests/CMakeLists.txt
@@ -7,14 +7,14 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR
add_library(textdocument_test_builtins STATIC
coverageobject.cpp
)
-target_link_libraries(textdocument_test_builtins Qt5::Test)
+target_link_libraries(textdocument_test_builtins Qt5::Test c pthread)
target_compile_features(textdocument_test_builtins PUBLIC cxx_auto_type)
macro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS)
foreach(_testname ${ARGN})
add_executable(${_testname}_exec ${_testname}.cpp)
add_test(${_testname} ${_testname}_exec )
- target_link_libraries(${_testname}_exec Grantlee::TextDocument textdocument_test_builtins)
+ target_link_libraries(${_testname}_exec Grantlee::TextDocument textdocument_test_builtins c pthread)
set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" )
endforeach(_testname)
endmacro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS)

View File

@ -1,38 +1,38 @@
@comment $OpenBSD: PLIST,v 1.2 2018/08/14 05:23:08 rsadowski Exp $
include/grantlee5/
include/grantlee5/grantlee/
include/grantlee5/grantlee/abstractlocalizer.h
include/grantlee5/grantlee/abstractmarkupbuilder.h
include/grantlee5/grantlee/bbcodebuilder.h
include/grantlee5/grantlee/cachingloaderdecorator.h
include/grantlee5/grantlee/context.h
include/grantlee5/grantlee/engine.h
include/grantlee5/grantlee/exception.h
include/grantlee5/grantlee/filter.h
include/grantlee5/grantlee/filterexpression.h
include/grantlee5/grantlee/grantlee_templates_export.h
include/grantlee5/grantlee/grantlee_textdocument_export.h
include/grantlee5/grantlee/grantlee_version.h
include/grantlee5/grantlee/markupdirector.h
include/grantlee5/grantlee/mediawikimarkupbuilder.h
include/grantlee5/grantlee/metatype.h
include/grantlee5/grantlee/node.h
include/grantlee5/grantlee/outputstream.h
include/grantlee5/grantlee/parser.h
include/grantlee5/grantlee/plaintextmarkupbuilder.h
include/grantlee5/grantlee/qtlocalizer.h
include/grantlee5/grantlee/rendercontext.h
include/grantlee5/grantlee/safestring.h
include/grantlee5/grantlee/taglibraryinterface.h
include/grantlee5/grantlee/template.h
include/grantlee5/grantlee/templateloader.h
include/grantlee5/grantlee/texthtmlbuilder.h
include/grantlee5/grantlee/token.h
include/grantlee5/grantlee/typeaccessor.h
include/grantlee5/grantlee/util.h
include/grantlee5/grantlee/variable.h
include/grantlee5/grantlee_templates.h
include/grantlee5/grantlee_textdocument.h
@comment $OpenBSD: PLIST,v 1.3 2020/08/31 19:06:19 rsadowski Exp $
@conflict grantlee-*
include/grantlee/
include/grantlee/abstractlocalizer.h
include/grantlee/abstractmarkupbuilder.h
include/grantlee/bbcodebuilder.h
include/grantlee/cachingloaderdecorator.h
include/grantlee/context.h
include/grantlee/engine.h
include/grantlee/exception.h
include/grantlee/filter.h
include/grantlee/filterexpression.h
include/grantlee/grantlee_templates_export.h
include/grantlee/grantlee_textdocument_export.h
include/grantlee/grantlee_version.h
include/grantlee/markupdirector.h
include/grantlee/mediawikimarkupbuilder.h
include/grantlee/metatype.h
include/grantlee/node.h
include/grantlee/outputstream.h
include/grantlee/parser.h
include/grantlee/plaintextmarkupbuilder.h
include/grantlee/qtlocalizer.h
include/grantlee/rendercontext.h
include/grantlee/safestring.h
include/grantlee/taglibraryinterface.h
include/grantlee/template.h
include/grantlee/templateloader.h
include/grantlee/texthtmlbuilder.h
include/grantlee/token.h
include/grantlee/typeaccessor.h
include/grantlee/util.h
include/grantlee/variable.h
include/grantlee_templates.h
include/grantlee_textdocument.h
lib/cmake/Grantlee5/
lib/cmake/Grantlee5/Grantlee5Config.cmake
lib/cmake/Grantlee5/Grantlee5ConfigVersion.cmake
@ -40,10 +40,10 @@ lib/cmake/Grantlee5/GrantleeMacros.cmake
lib/cmake/Grantlee5/GrantleeTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Grantlee5/GrantleeTargets.cmake
lib/grantlee/
lib/grantlee/5.1/
lib/grantlee/5.1/grantlee_defaultfilters.so
lib/grantlee/5.1/grantlee_defaulttags.so
lib/grantlee/5.1/grantlee_i18ntags.so
lib/grantlee/5.1/grantlee_loadertags.so
lib/grantlee/5.2/
@so lib/grantlee/5.2/grantlee_defaultfilters.so
@so lib/grantlee/5.2/grantlee_defaulttags.so
@so lib/grantlee/5.2/grantlee_i18ntags.so
@so lib/grantlee/5.2/grantlee_loadertags.so
@lib lib/libGrantlee_Templates.so.${LIBGrantlee_Templates_VERSION}
@lib lib/libGrantlee_TextDocument.so.${LIBGrantlee_TextDocument_VERSION}