From nobody Thu Jul 20 17:43:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R6Kmc696pz4nSXv; Thu, 20 Jul 2023 17:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R6KmT7411z3N2Y; Thu, 20 Jul 2023 17:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689875018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsuFKIGXZ2RB1CbvkRBikN+sNScf5RqMRzL8A2wwAH8=; b=jMn95zfUbDv3al1kr64ZeCEwi1H3jvU9IkBdPVVG1Y2uvRdEKBBWyERPOrRmkaDJ2T6QTR LGMI/tjEX0vi3ZERfQ4cKKSfnZ7P2rV3IUnJLyHg4FQ3pV/c3CtTLWYlGyn0nw/RwLlQoe GssAhh/gvBIjZtfyphux+X7UDYM35+cuQuvQtsagFhefBkFSPhSoniuRUu5EhbPPBQOX/T d53dBp/2xfphahJ1sSiC5k+kxKPlwjqaUgV5ggE3I3pKmmJcod2k2v2hQAld8pvf5AFFDl i0SLWyeD9nNUSKQDyrKphgifFscQvSukBtvDVkTBn3CE+HhPLNd/ExZfupiCIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689875018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsuFKIGXZ2RB1CbvkRBikN+sNScf5RqMRzL8A2wwAH8=; b=GtvpUkdlbBeLxlYRilWWeIxfjZwFX6oMBd73M8sSf+W7/D28gExLLsCvdtws5FCPFuGcws xxQ5aBqyDwPp+3oEs/xq7Vxq0ty8W1jfHqjuWCPIbegvbmG+ABuqnTQ1t1KNNpL/u4GSEo 9h8NnkjB8+t8g54Lare//TdSNoU2dVtNW2um7L5p5iTHeZS+p81dTntxcGc6voq1ysA6CZ cMXcExKLxB3Q7WizCjx+iRKkF8TVKQFud/0bCGYG6nEzV84lknx/sfl4jGYpcF4mvtlOV4 1VOh4OKFtcB2IKvF0pgwNE5jCmpUzekVZb6Tkn54roV+eq/j9nT2WCp2Cn9vLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689875018; a=rsa-sha256; cv=none; b=dtDDmEMrL490J6m9/fIruFT0iiHlnd6zKJ8IMb9IQF5qjJiFVpT6xneLs3QaOpWTYChSkp dLqitQ0+5YMxpPwwfE7TmCEWFBkJgwDVsBWn3ZnKRPlPtSjqexCL8aGQu6/QnjfVU2N/Vi skyE3VY0vFN+ExHw9+Tb37sEtHxwNMtbi1roeMnnpdUopjYtFNNOmgqh+oyCDAYepU4bmK LRB5MXe5mbfLhhLyRxPeSMqDjzmCflpK/IidUbYFsTlUeO+41FoibT7TlDt43t2LSQm+K/ EEtKwoDIFPzELWkgFvRkifsgyJNlpa5AcEnCdoOIdybJgxZPT8UzQ1N9YGu+Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R6KmT5c46zg8j; Thu, 20 Jul 2023 17:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KHhbb5036931; Thu, 20 Jul 2023 17:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KHhbrc036930; Thu, 20 Jul 2023 17:43:37 GMT (envelope-from git) Date: Thu, 20 Jul 2023 17:43:37 GMT Message-Id: <202307201743.36KHhbrc036930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 8fda83e53ea9 - main - editors/calligra: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fda83e53ea9f3da8b7727517fa96ccda68d8cab Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fda83e53ea9f3da8b7727517fa96ccda68d8cab commit 8fda83e53ea9f3da8b7727517fa96ccda68d8cab Author: Muhammad Moinur Rahman AuthorDate: 2023-07-20 17:39:04 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-20 17:42:39 +0000 editors/calligra: Fix build with llvm16 - Pet portclippy Sponsored by: The FreeBSD Foundation --- editors/calligra/Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index bb634a4412da..5391eb27a845 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -17,6 +17,7 @@ WWW= https://calligra.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= pstoedit:graphics/pstoedit LIB_DEPENDS= libImath.so:math/Imath \ libKPropertyCore3.so:x11-toolkits/kproperty \ libKReport3.so:textproc/kreport \ @@ -37,13 +38,12 @@ LIB_DEPENDS= libImath.so:math/Imath \ libwpd-0.10.so:textproc/libwpd010 \ libwpg-0.3.so:graphics/libwpg03 \ libwps-0.4.so:textproc/libwps - -BUILD_DEPENDS= pstoedit:graphics/pstoedit RUN_DEPENDS= pstoedit:graphics/pstoedit USES= cmake cpe compiler:c++17-lang desktop-file-utils eigen:3 \ gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \ pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg +USE_LDCONFIG= yes USE_KDE= akonadicontacts activities archive auth bookmarks codecs completion \ config configwidgets contacts coreaddons crash dbusaddons doctools ecm \ emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \ @@ -56,7 +56,6 @@ USE_QT= buildtools:build concurrent core dbus declarative gui network opengl \ phonon4 printsupport qmake:build \ script sql svg testlib webkit widgets x11extras xml USE_XORG= ice sm x11 xext -USE_LDCONFIG= yes OPTIONS_DEFINE= OPENEXR OPTIONS_DEFAULT= OPENEXR @@ -74,4 +73,14 @@ CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" PLIST_SUB+= SHLIB_VER=17.0.0 -.include +.include + +post-patch: +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 + @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|g' \ + ${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp + @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ + ${WRKSRC}/filters/words/msword-odf/wv2/src/utilities.h +.endif + +.include