sysutils/passwordsafe: switch back to using clang on powerpc*

freebsd · Apr 25, 2022 · 45aa2de · 45aa2de
1 parent b3b6b26
commit 45aa2de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	zip:archivers/zip
 
 CONFLICTS=	pwsafe
 
-USES=		gmake pkgconfig xorg
+USES=		compiler:c++11-lang gmake pkgconfig xorg
 USE_GITHUB=	yes
 USE_WX=		3.0+
 USE_XORG=	x11 xtst
@@ -44,14 +44,6 @@ LDFLAGS=	-L${PREFIX}/lib -lqrencode
 
 ALL_TARGET=	unicoderelease
 
-.include <bsd.port.options.mk>
-
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc
-USES+=		compiler:gcc-c++11-lib
-.else
-USES+=		compiler:c++11-lang
-.endif
-
 post-patch:
 .	for f in Makefile.freebsd help/Makefile.freebsd src/os/unix/Makefile \
 		src/os/unix/dir.cpp src/ui/wxWidgets/Makefile

diff --git a/sysutils/passwordsafe/files/patch-src_core_ItemData.cpp b/sysutils/passwordsafe/files/patch-src_core_ItemData.cpp
@@ -0,0 +1,11 @@
+--- src/core/ItemData.cpp.orig	2022-04-25 06:47:08 UTC
++++ src/core/ItemData.cpp
+@@ -1940,6 +1940,7 @@ bool CItemData::DeSerializePlainText(const std::vector
+
+ #ifdef PWS_BIG_ENDIAN
+-    unsigned char buf[len] = {0};
++    unsigned char buf[len];
++    memset(buf, 0, len*sizeof(char));
+
+     switch(type) {
+       case CTIME: