diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile index 4f64851b7dd8..150320ef06b2 100644 --- a/net-mgmt/seafile-client/Makefile +++ b/net-mgmt/seafile-client/Makefile @@ -1,50 +1,50 @@ PORTNAME= seafile-client DISTVERSIONPREFIX= v -DISTVERSION= 7.0.9 +DISTVERSION= 8.0.7 CATEGORIES= net-mgmt MAINTAINER= ultima@FreeBSD.org COMMENT= Open Source Cloud Storage (Client) LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libcurl.so:ftp/curl \ libinotify.so:devel/libinotify \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash USES= autoreconf gnome iconv libarchive libtool localbase \ pathfix pkgconfig python:3.6+ shebangfix sqlite ssl USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= seafile USE_GNOME= glib20 USE_LDCONFIG= yes CONFLICTS= seafile-server SHEBANG_FILES= *.sh scripts/*.sh app/seaf-cli integration-tests/*.sh GNU_CONFIGURE= yes CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" CPPFLAGS+= -I${LOCALBASE}/include/evhtp INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS NLS_USES= gettext post-patch: # Fix P_KTHREAD r295435 ${REINPLACE_CMD} 's/P_KTHREAD/P_KPROC/' ${WRKSRC}/lib/utils.c .include diff --git a/net-mgmt/seafile-client/distinfo b/net-mgmt/seafile-client/distinfo index c9320a27eaf7..4b91b8d10ba2 100644 --- a/net-mgmt/seafile-client/distinfo +++ b/net-mgmt/seafile-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600241412 -SHA256 (haiwen-seafile-v7.0.9_GH0.tar.gz) = f127b735e5d4cbd7e692d52eda54113f1a4ca31bd8328fbccf01a5462bbba5e8 -SIZE (haiwen-seafile-v7.0.9_GH0.tar.gz) = 706859 +TIMESTAMP = 1653164969 +SHA256 (haiwen-seafile-v8.0.7_GH0.tar.gz) = c6c703476907b9c84ec25fd681d85bced876ee2528409060f7e24058c73cad0a +SIZE (haiwen-seafile-v8.0.7_GH0.tar.gz) = 737925 diff --git a/net-mgmt/seafile-client/files/patch-lib_utils.h b/net-mgmt/seafile-client/files/patch-lib_utils.h index 6d9d2709e1a0..2fd56d0ed075 100644 --- a/net-mgmt/seafile-client/files/patch-lib_utils.h +++ b/net-mgmt/seafile-client/files/patch-lib_utils.h @@ -1,23 +1,33 @@ ---- lib/utils.h.orig 2015-09-21 03:42:11 UTC +--- lib/utils.h.orig 2022-04-25 10:27:18 UTC +++ lib/utils.h -@@ -3,6 +3,9 @@ - #ifndef CCNET_UTILS_H - #define CCNET_UTILS_H +@@ -11,6 +11,10 @@ + #include + #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) +#include +#endif ++ + #ifndef WIN32 #include - #include - #include -@@ -13,7 +16,9 @@ + #include +@@ -23,7 +27,9 @@ #include #include -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include +#elif defined(__NetBSD__) || defined(__OpenBSD__) #include #else #include +@@ -33,7 +39,7 @@ + #include + #endif + +-#ifdef __OpenBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + #include + #endif + diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile index 0404b07934b6..0e8dbc019450 100644 --- a/net-mgmt/seafile-gui/Makefile +++ b/net-mgmt/seafile-gui/Makefile @@ -1,41 +1,41 @@ PORTNAME= seafile-gui DISTVERSIONPREFIX= v -DISTVERSION= 7.0.9 +DISTVERSION= 8.0.7 CATEGORIES= net-mgmt devel MAINTAINER= ultima@FreeBSD.org COMMENT= Open Source Cloud Storage (Client) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libsearpc.so:devel/libsearpc \ libseafile.so:net-mgmt/seafile-client \ libsqlite3.so:databases/sqlite3 \ libjansson.so:devel/jansson \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid USES= compiler:c++11-lang cmake gnome pkgconfig qt:5 shebangfix ssl SHEBANG_FILES= extensions/*.sh scripts/*.sh fsplugin/*.sh \ scripts/*.py USE_GITHUB= yes GH_ACCOUNT= haiwen GH_PROJECT= seafile-client USE_GNOME= glib20 USE_QT= core dbus gui network widgets \ qmake_build buildtools_build linguisttools_build CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \ -DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \ -DOPENSSL_LIBRARIES="-L${OPENSSLLIB} -lcrypto" OPTIONS_DEFINE= DEBUG NLS NLS_USES= gettext # Note that per PR 197984, cairo must be built with X11 and XCB options # otherwise configure fails with "cairo needs x11 enabled" message .include diff --git a/net-mgmt/seafile-gui/distinfo b/net-mgmt/seafile-gui/distinfo index 7eb452fba94d..26011edd70b1 100644 --- a/net-mgmt/seafile-gui/distinfo +++ b/net-mgmt/seafile-gui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600241429 -SHA256 (haiwen-seafile-client-v7.0.9_GH0.tar.gz) = 200b258339cafcaf809f85d88cc53ff15b265673d74f3777c86809e26bf49738 -SIZE (haiwen-seafile-client-v7.0.9_GH0.tar.gz) = 2367747 +TIMESTAMP = 1653165001 +SHA256 (haiwen-seafile-client-v8.0.7_GH0.tar.gz) = e7d66cf8d2fa738a1ad2d87d0459fed3914b5a316e794477962b691538058636 +SIZE (haiwen-seafile-client-v8.0.7_GH0.tar.gz) = 11712880 diff --git a/net-mgmt/seafile-gui/files/patch-CMakeLists.txt b/net-mgmt/seafile-gui/files/patch-CMakeLists.txt index d9b7a2081d24..0b43f30d67fb 100644 --- a/net-mgmt/seafile-gui/files/patch-CMakeLists.txt +++ b/net-mgmt/seafile-gui/files/patch-CMakeLists.txt @@ -1,55 +1,38 @@ ---- CMakeLists.txt.orig 2020-07-29 02:24:40 UTC +--- CMakeLists.txt.orig 2022-04-25 04:00:03 UTC +++ CMakeLists.txt -@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0) - SET(SEAFILE_CLIENT_VERSION_PATCH 9) - SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") - ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) -+ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26) - INCLUDE(FindPkgConfig) - - ## Build crash repoter on release build as default -@@ -109,7 +110,7 @@ IF (WIN32) - SET(SPARKLE_LIBS ${CMAKE_SOURCE_DIR}/WinSparkle.lib) - ENDIF() - --ELSEIF (LINUX) -+ELSEIF (LINUX OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") - INCLUDE_DIRECTORIES(${QT_QTDBUS_INCLUDE_DIR}) - LINK_DIRECTORIES(${QT_QTDBUS_LIBRARIES}) - SET(EXTRA_LIBS ${EXTRA_LIBS} ${QT_QTDBUS_LIBRARIES}) -@@ -185,7 +186,7 @@ IF (BUILD_SHIBBOLETH_SUPPORT) +@@ -171,7 +171,7 @@ IF (BUILD_SHIBBOLETH_SUPPORT) ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT) ENDIF() -IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") +IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "DBus") ENDIF() -@@ -372,7 +373,7 @@ PKG_CHECK_MODULES(JANSSON REQUIRED jansson>=2.0) +@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(JANSSON REQUIRED jansson>=2.0) PKG_CHECK_MODULES(LIBSEARPC REQUIRED libsearpc>=1.0) -PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) +#PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) PKG_CHECK_MODULES(LIBSEAFILE REQUIRED libseafile>=1.7) -@@ -583,7 +584,7 @@ IF (WIN32) - src/utils/registry.cpp - src/utils/utils-win.cpp - ) --ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") -+ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") +@@ -601,7 +601,7 @@ LIST(APPEND utils_sources + src/utils/stl.cpp + src/utils/seafile-error.cpp + ) +-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") ++IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") LIST(APPEND utils_sources src/utils/process-linux.cpp ) -@@ -794,7 +795,7 @@ target_link_libraries(seafile-applet Qt5::${WEBKIT_NAM +@@ -797,7 +797,7 @@ IF (BUILD_SHIBBOLETH_SUPPORT) ENDIF() ## QtBus -IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") +IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") - target_link_libraries(seafile-applet Qt5::DBus) - ENDIF() - + IF(QT_VERSION_MAJOR EQUAL 6) + target_link_libraries(seafile-applet Qt6::DBus) + ELSE()