From nobody Fri Oct 14 21:11:15 2022 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 4MpzZq3C54z4fL9H; Fri, 14 Oct 2022 21:11:15 +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 4MpzZq2YhMz3bqP; Fri, 14 Oct 2022 21:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665781875; 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=LjJfMIpW4+tImZBgBGDYiR/tU38/n0HSww+wYG3JVTw=; b=ULVql0AFQza8yNyL6UqRMYk7OnYN1yv+A4WmQWx52WMB5/oA1VUoSlj2kUi13bYLQEvXPG 96WmF4J6QQob4U7ESTe3hSHylWJ7QDrwVD1HhWpPFA0i4E1/ickA0ZGRLeB/vW+AS8Z1B4 cJ8zzWEt9Pn+Xku2G12/Q4ml03XyElRYQ15Td3drxnkQUzpsSgVz7TAXZbQSFrJTzpCPNE G+ZVA3eCWeeGVvXPhUOeSTtzB3Nf8YviyP5PlTwxckEDo55NSjEOgJ6E/gx3I2hKviGWAp yBx1oZEoGaGtWSp0mPNpc0Nt12U8WbhtE2m1RgX7VVYu3LqoZLvV/IzQ05HnSg== 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 4MpzZq1Qtlztq6; Fri, 14 Oct 2022 21:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29ELBF1c025237; Fri, 14 Oct 2022 21:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29ELBF3T025236; Fri, 14 Oct 2022 21:11:15 GMT (envelope-from git) Date: Fri, 14 Oct 2022 21:11:15 GMT Message-Id: <202210142111.29ELBF3T025236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f06e9ca2524b - main - math/mathgl: unbreak build after print/libharu update to 2.4.3 (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f06e9ca2524b70edfb4ce95cf473fb6cf3f4d34f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665781875; 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=LjJfMIpW4+tImZBgBGDYiR/tU38/n0HSww+wYG3JVTw=; b=Tb3SoODhxUqlLMwWLAsMvzKgAymTV/b/8qHKBsdTo/9NrO7UZCcBMsIMXOravuf40fGTL/ piPBfy1Ehs45df6y301XCNQbRY6DJZn+1ME3ZK2p2Ts4h2UWKIONwOsAVmtVbXYPy1JhV7 vBs9Kq8WHhCL+7mET9DtMUA+9aYGMMgvQs/XMTHIZxo/j2Dzfi1/rDstX7SmMSevqD+lgX NY6Hps6OXdI2DrgWO0fmJPyuZjlE5CQgEr1BcMZjhW8n2amiFVPaj1nAzXHU/LEIcGMVUe BARpmZiNz6yK3tIhtslgnk2vLtZr9Xj1ziKGsqNFtFmMNnyjH2/Q3+u2EM74BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665781875; a=rsa-sha256; cv=none; b=n1unj18RxBWO1QDssq6HJmPntGE2BvXWo/RBJ5Sf6io7T+Q3pB8NtpcxMa6FX23Xk5cN2+ D6933ZAP0k7gKUnyoOFn3aV1PPK2CyLhhv0on5KHJbjl5App9bhO3yNcNhHTkSorXk7nmm QTzo0mnwEs02pLeixsCvRT2cRad70gng0iplvq0VfeFwMh/KEFc1nWBgaRL7lQ6L52Rwgn s+h6Id9avgXEcge/pkw1Bw3yG++NjtdXCqf/9UTeHUXR9MRQz7TYmekbFQ2uW7hEcb0xYn /PlzyfplclPI0dPslZMtJ77juAS5zDSFEfU3WYzUlPNlLADXuuoypbwLxtwCYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f06e9ca2524b70edfb4ce95cf473fb6cf3f4d34f commit f06e9ca2524b70edfb4ce95cf473fb6cf3f4d34f Author: Dima Panov AuthorDate: 2022-10-14 21:02:09 +0000 Commit: Dima Panov CommitDate: 2022-10-14 21:09:27 +0000 math/mathgl: unbreak build after print/libharu update to 2.4.3 (+) Backport patch from upstream While here, apply dos2unix conversion Bump PORTREVISION --- math/mathgl/Makefile | 5 +++-- math/mathgl/files/patch-src_prc.cpp | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile index 8b6a04c89738..639e67ba4b6d 100644 --- a/math/mathgl/Makefile +++ b/math/mathgl/Makefile @@ -1,6 +1,6 @@ PORTNAME= mathgl DISTVERSION= 2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/ @@ -19,10 +19,11 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ libpng.so:graphics/png \ libsz.so:science/libaec -USES= cmake compiler:c++11-lang gettext-runtime gl jpeg xorg +USES= cmake compiler:c++11-lang dos2unix gettext-runtime gl jpeg xorg USE_GL= gl glu glut USE_XORG= xi xmu USE_LDCONFIG= yes +DOS2UNIX_GLOB= *.cpp *.h .for v in double gif glut gsl hdf5 jpeg ltdl mgl2 opengl pdf png zlib CMAKE_ARGS+= -Denable-${v}=ON diff --git a/math/mathgl/files/patch-src_prc.cpp b/math/mathgl/files/patch-src_prc.cpp new file mode 100644 index 000000000000..863bf044492f --- /dev/null +++ b/math/mathgl/files/patch-src_prc.cpp @@ -0,0 +1,24 @@ +--- src/prc.cpp.orig 2021-12-08 05:59:55 UTC ++++ src/prc.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #endif // MGL_HAVE_PDF + + +@@ -959,7 +960,12 @@ void MGL_EXPORT mgl_write_prc(HMGL gr, const char *fna + HPDF_U3D_SetDefault3DView(u3d, "DefaultView"); + + // Create annotation +- annot = HPDF_Page_Create3DAnnot (page, rect, u3d ); ++ annot ++ #if HPDF_VERSION_ID >= 20400 ++ = HPDF_Page_Create3DAnnot (page, rect, HPDF_FALSE, HPDF_FALSE, u3d, NULL); ++ #else ++ = HPDF_Page_Create3DAnnot (page, rect, u3d); ++ #endif + + // Enable toolbar + HPDF_Dict action = (HPDF_Dict)HPDF_Dict_GetItem (annot, "3DA", HPDF_OCLASS_DICT);