cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/cutelyst: update to 3.7.0, latest upstream 

- BSD licensed now
- Supports Qt6 (but the port doesn't)
- Does not support Qt5.12 (but the port didn't anyway)
- supports epoll always
This commit is contained in:
Adriaan de Groot 2022-11-27 14:37:31 +01:00
parent 50522376a5
commit de41d6d018
7 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/cutelyst/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= cutelyst
DISTVERSIONPREFIX= v
DISTVERSION= 3.5.0
PORTREVISION= 1
DISTVERSION= 3.7.0
CATEGORIES= www
MAINTAINER= adridg@FreeBSD.org
@ -11,6 +10,8 @@ WWW= https://cutelyst.org
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
USES= cmake compiler:c++11-lang localbase qt:5
USE_GITHUB= yes
USE_LDCONFIG= yes

6
www/cutelyst/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1658233255
SHA256 (cutelyst-cutelyst-v3.5.0_GH0.tar.gz) = 351578d495213c438365f988a70bb8f8c14b1d7dcef79ce0f723dd584388aa77
SIZE (cutelyst-cutelyst-v3.5.0_GH0.tar.gz) = 481812
TIMESTAMP = 1669411904
SHA256 (cutelyst-cutelyst-v3.7.0_GH0.tar.gz) = 3d3589817d813657fbdafc0c299618b1ba6aebec5c954c9c921e173e179bbea2
SIZE (cutelyst-cutelyst-v3.7.0_GH0.tar.gz) = 482108

20
www/cutelyst/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
--- CMakeLists.txt.orig 2022-11-27 12:59:53 UTC
+++ CMakeLists.txt
@@ -160,7 +160,7 @@ if(UNIX AND NOT (APPLE OR HAIKU))
set(LINUX TRUE)
endif()
-if (LINUX)
+if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
# FreeBSD isn't Linux, but it gets claimed as Linux, because it is
# UNIX and not APPLE (see just above).
@@ -179,7 +179,7 @@ if (LINUX)
get_filename_component(EPOLL_SYS_DIR ${EPOLL_H} DIRECTORY)
get_filename_component(EPOLL_DIR ${EPOLL_SYS_DIR} DIRECTORY)
include_directories(${EPOLL_DIR})
- # add_subdirectory(EventLoopEPoll)
+ add_subdirectory(EventLoopEPoll)
endif()
set(LINUX FALSE)
else()

10
www/cutelyst/files/patch-Cutelyst_Plugins_View_Grantlee_grantleeview.cpp
View File

@ -1,10 +0,0 @@
--- Cutelyst/Plugins/View/Grantlee/grantleeview.cpp.orig 2021-06-17 11:59:52 UTC
+++ Cutelyst/Plugins/View/Grantlee/grantleeview.cpp
@@ -23,6 +23,7 @@
#include "response.h"
#include "config.h"
+#include <grantlee/metatype.h>
#include <grantlee/qtlocalizer.h>
#include <QString>

13
www/cutelyst/files/patch-EventLoopEPoll_CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
--- EventLoopEPoll/CMakeLists.txt.orig 2022-11-27 13:04:21 UTC
+++ EventLoopEPoll/CMakeLists.txt
@@ -25,6 +25,10 @@ set_target_properties(Cutelyst${PROJECT_VERSION_MAJOR}
target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll
Qt${QT_VERSION_MAJOR}::Core
)
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ find_package(epoll-shim REQUIRED)
+ target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll epoll-shim::epoll-shim)
+endif()
install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}EventLoopEpoll EXPORT CutelystTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})

20
www/cutelyst/files/patch-server_CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
--- server/CMakeLists.txt.orig 2022-11-27 13:00:17 UTC
+++ server/CMakeLists.txt
@@ -91,7 +91,7 @@ target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}
PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::Core
)
-if (LINUX)
+if (TARGET Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll)
target_link_libraries(Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server
PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll
)
@@ -130,7 +130,7 @@ target_link_libraries(cutelystd
PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::Server
)
-if (LINUX)
+if (TARGET Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll)
target_link_libraries(cutelystd
PRIVATE Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}::EventLoopEPoll
)

3
www/cutelyst/pkg-plist
View File

@ -133,6 +133,9 @@ lib/libCutelyst3Qt5Authentication.so.%%SOVER%%
lib/libCutelyst3Qt5CSRFProtection.so
lib/libCutelyst3Qt5CSRFProtection.so.3
lib/libCutelyst3Qt5CSRFProtection.so.%%SOVER%%
lib/libCutelyst3Qt5EventLoopEpoll.so
lib/libCutelyst3Qt5EventLoopEpoll.so.3
lib/libCutelyst3Qt5EventLoopEpoll.so.%%SOVER%%
lib/libCutelyst3Qt5Server.so
lib/libCutelyst3Qt5Server.so.3
lib/libCutelyst3Qt5Server.so.%%SOVER%%