graphics/drawpile: update 2.1.20 → 2.2.0

Reported by: portscout
freebsd · Jan 14, 2024 · 7140932 · 7140932
1 parent 88606de
commit 7140932
Show file tree

Hide file tree

Showing 7 changed files with 265 additions and 72 deletions.
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
@@ -1,27 +1,38 @@
 PORTNAME=	Drawpile
-DISTVERSION=	2.1.20
-PORTREVISION=	4
+DISTVERSION=	2.2.0
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collaborative drawing program
 WWW=		https://drawpile.net
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules
-LIB_DEPENDS=	libgif.so:graphics/giflib \
-		libmicrohttpd.so:www/libmicrohttpd \
-		libminiupnpc.so:net/miniupnpc \
-		libsodium.so:security/libsodium \
-		libvpx.so:multimedia/libvpx
+LIB_DEPENDS=	libsodium.so:security/libsodium
+
+USES=		cargo cmake compiler:c++17-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
+USE_QT=		core gui multimedia network sql svg widgets xml \
+		buildtools:build linguisttools:build qmake:build
+USE_KDE=	archive dnssd
 
-USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}
-USE_QT=		core gui multimedia network sql svg widgets buildtools:build linguisttools:build qmake:build
-USE_KDE=	archive dnssd
+
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+CARGO_CRATES=	aho-corasick-1.0.5 \
+		anyhow-1.0.75 \
+		memchr-2.6.1 \
+		once_cell-1.18.0 \
+		regex-1.9.4 \
+		regex-automata-0.3.7 \
+		regex-syntax-0.7.5 \
+		xflags-0.3.1 \
+		xflags-macros-0.3.1
+
+BINARY_ALIAS=	lconvert=${QT_BINDIR}/lconvert
 
 OPTIONS_DEFINE=	DOCS
 
@@ -34,8 +45,8 @@ PORTSCOUT=	limit:^\d+\. # prevent tags like 'continuous'
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv7
-BROKEN_FreeBSD_15=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276269
-.endif
+#.if ${ARCH} == armv7
+#BROKEN_FreeBSD_15=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276269
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/drawpile/distinfo b/graphics/drawpile/distinfo
@@ -1,3 +1,21 @@
-TIMESTAMP = 1631775747
-SHA256 (drawpile-Drawpile-2.1.20_GH0.tar.gz) = 93b3195ce9ac3425a8e135e14583d7cd43c4d221411b87f638f5e1de30503c85
-SIZE (drawpile-Drawpile-2.1.20_GH0.tar.gz) = 2631098
+TIMESTAMP = 1705254930
+SHA256 (rust/crates/aho-corasick-1.0.5.crate) = 0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783
+SIZE (rust/crates/aho-corasick-1.0.5.crate) = 172064
+SHA256 (rust/crates/anyhow-1.0.75.crate) = a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6
+SIZE (rust/crates/anyhow-1.0.75.crate) = 43901
+SHA256 (rust/crates/memchr-2.6.1.crate) = f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae
+SIZE (rust/crates/memchr-2.6.1.crate) = 93821
+SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
+SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
+SHA256 (rust/crates/regex-1.9.4.crate) = 12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29
+SIZE (rust/crates/regex-1.9.4.crate) = 253112
+SHA256 (rust/crates/regex-automata-0.3.7.crate) = 49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629
+SIZE (rust/crates/regex-automata-0.3.7.crate) = 607421
+SHA256 (rust/crates/regex-syntax-0.7.5.crate) = dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da
+SIZE (rust/crates/regex-syntax-0.7.5.crate) = 343366
+SHA256 (rust/crates/xflags-0.3.1.crate) = c4554b580522d0ca238369c16b8f6ce34524d61dafe7244993754bbd05f2c2ea
+SIZE (rust/crates/xflags-0.3.1.crate) = 6642
+SHA256 (rust/crates/xflags-macros-0.3.1.crate) = f58e7b3ca8977093aae6b87b6a7730216fc4c53a6530bab5c43a783cd810c1a8
+SIZE (rust/crates/xflags-macros-0.3.1.crate) = 12229
+SHA256 (drawpile-Drawpile-2.2.0_GH0.tar.gz) = 41122fef2d590f621226570aa62cc7bae8bd0b1cf758c3f001f37cc8c9199683
+SIZE (drawpile-Drawpile-2.2.0_GH0.tar.gz) = 5288561
diff --git a/graphics/drawpile/files/patch-cmake_DrawdanceCompilerOptions.cmake b/graphics/drawpile/files/patch-cmake_DrawdanceCompilerOptions.cmake
@@ -0,0 +1,13 @@
+--- cmake/DrawdanceCompilerOptions.cmake.orig	2024-01-14 11:12:43 UTC
++++ cmake/DrawdanceCompilerOptions.cmake
+@@ -32,7 +32,7 @@ else()
+         $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+         $<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes>
+     )
+-	if(UNIX AND NOT APPLE)
+-		add_compile_definitions(_XOPEN_SOURCE=600)
+-	endif()
++	#if(UNIX AND NOT APPLE)
++	#	add_compile_definitions(_XOPEN_SOURCE=600)
++	#endif()
+ endif()
diff --git a/graphics/drawpile/files/patch-doc_CMakeLists.txt b/graphics/drawpile/files/patch-doc_CMakeLists.txt
diff --git a/graphics/drawpile/files/patch-src_drawdance_libcommon_dpcommon_common.h b/graphics/drawpile/files/patch-src_drawdance_libcommon_dpcommon_common.h
@@ -0,0 +1,11 @@
+--- src/drawdance/libcommon/dpcommon/common.h.orig	2024-01-14 11:11:04 UTC
++++ src/drawdance/libcommon/dpcommon/common.h
+@@ -40,6 +40,8 @@
+ #        define DP_PLATFORM "darwin"
+ #    elif defined(__linux__)
+ #        define DP_PLATFORM "linux"
++#    elif defined(__FreeBSD__)
++#        define DP_PLATFORM "freebsd"
+ #    else
+ #        error "unknown platform"
+ #    endif
diff --git a/graphics/drawpile/files/patch-src_drawdance_libengine_dpengine_save.c b/graphics/drawpile/files/patch-src_drawdance_libengine_dpengine_save.c
@@ -0,0 +1,11 @@
+--- src/drawdance/libengine/dpengine/save.c.orig	2024-01-14 11:13:49 UTC
++++ src/drawdance/libengine/dpengine/save.c
+@@ -832,7 +832,7 @@ DP_SaveResult DP_save(DP_CanvasState *cs, DP_DrawConte
+ #if defined(_WIN32)
+ #    define PREFERRED_PATH_SEPARATOR "\\"
+ #    define POSSIBLE_PATH_SEPARATORS "\\/"
+-#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__)
++#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
+ #    define PREFERRED_PATH_SEPARATOR "/"
+ #    define POSSIBLE_PATH_SEPARATORS "/"
+ #else