From nobody Fri Aug 16 15:39:11 2024 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 4WlmPW6ZLlz5T7Bw; Fri, 16 Aug 2024 15:39:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlmPW5jGBz4cdP; Fri, 16 Aug 2024 15:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723822751; 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=hSMJ4wvLwrcq54p5S1XJ1PVb/dSZD1E/kShRz7L9WI0=; b=pwLwSsly/UI8W1gHWgJv837G0aVXlIKAwBSpy3QiBUSkdWkCqD3eniPjWJuWW56rVw1v4s AqHOdec5yGbC9gvkcEg7+ZM77X4dxqbDQeIkFLBj8sJ07sU0Vz3FF1DHro22Nrp+6xTCNC XR7EiPm3SzndcYpKTHonGRS4cJHW5X2MUFu7/ta5t6GlWD53EIFh8T8X+6jy6OR88j7lk7 pAJtvq/eE5q8xWmAYn8dJ1tP++Wfz47t87vEXevrUX/OaQ0mVisjUnn1ktfgDNCT1n1oka FpV36mqjavIy27upnuuGUsPdpiXcMI0Ljajy021s5egkPirX1xeswUGKX4+kwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723822751; a=rsa-sha256; cv=none; b=Vm3VMu0vGh696ezSnZWNN2OQKUMAT1LMDMP07xibMhUPdjfBTXiHh1kooKMEQC/xJ7pI50 qBNfRnTtNdwAxN7dP6GR+zJ9O+2D14WGD36NHuyxwbkAvMwYGCW6b4sOvSSFry5px+ozHl lTZaLyaWj22GD0x0dkKE1dVan9mbJVxpWGMrhfsUAhv2Gdq8iD7R6K9X22lj3odB7TqtLg +aE59XYp/jyaQ+dNhRIYDIdByDpVBIXEv2T2G7S1f9Zlg79qz/pqBfOt6mXVrpBtf0DdPL oCxv5z3LTzNt4LcwkkvpgfUAa/gmaTmxPMJK/U4AXuAQaHLnRyIXPE6ZN1s86w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723822751; 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=hSMJ4wvLwrcq54p5S1XJ1PVb/dSZD1E/kShRz7L9WI0=; b=R8q+Idp6UclHnibBv1s21vumizwQpd6Ni+7Aw2rNqYVyLm90NoG3/nfQ1NShr82vWhiFJD J/GE2nDYd3L2bDZ+5SlUHrHDRfeI03QN1zcJsPEiBbHokgLtspzyhKUHPByl+WZw8nLeUR TzbA59IPJE9euO4Z8WRWQjMA1SCTHGcoftjOUcI1uF06EqDmeW/q5JOg0dqEUg+Xf9HLzV muQPwXj4eJnesWg5tuqF6zSouLdGME69MTT1YC+Cyq75ofF9GhAj/TJmmZpMJJ5w8sAvhk Qr95W4D6OYGwCy2ilF17JpZa5xnmCfuOOm1RfTvl1h1XTzpvNjvwp5GPxAGP1A== 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 4WlmPW53h5z1Br6; Fri, 16 Aug 2024 15:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GFdBUl079440; Fri, 16 Aug 2024 15:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFdBX2079437; Fri, 16 Aug 2024 15:39:11 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:39:11 GMT Message-Id: <202408161539.47GFdBX2079437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 6bf6ee19368d - main - graphics/poppler: fix build with libc++ 19 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bf6ee19368dea736b8a402d115c797f271a0f47 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bf6ee19368dea736b8a402d115c797f271a0f47 commit 6bf6ee19368dea736b8a402d115c797f271a0f47 Author: Dimitry Andric AuthorDate: 2024-08-01 19:48:37 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:32:25 +0000 graphics/poppler: fix build with libc++ 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes graphics/poppler to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/graphics/poppler/work/poppler-24.02.0/cpp/poppler-global.h:101:43: note: in instantiation of template class 'std::basic_string' requested here 101 | class POPPLER_CPP_EXPORT ustring : public std::basic_string | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Upstream poppler has fixed this in commit b4ac7d9a [2], so add it as a PATCHFILES entry in the Makefile, until the next version of poppler is released. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/b4ac7d9a PR: 280564 Approved by: maintainer timeout (2 weeks) MFH: 2024Q3 --- graphics/poppler/Makefile | 3 +++ graphics/poppler/distinfo | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index c929c6151c56..80f7919f330a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -4,6 +4,9 @@ PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ +PATCH_SITES= https://gitlab.freedesktop.org/poppler/${PORTNAME}/-/commit/ +PATCHFILES+= b4ac7d9a.patch:-p1 # deprecated char_traits template has been removed in libc++ 19 + MAINTAINER?= desktop@FreeBSD.org COMMENT?= PDF rendering library WWW= https://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 54fa5a1fcc08..90d8fd359057 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1707805389 +TIMESTAMP = 1722540994 SHA256 (poppler-24.02.0.tar.xz) = 19187a3fdd05f33e7d604c4799c183de5ca0118640c88b370ddcf3136343222e SIZE (poppler-24.02.0.tar.xz) = 1897604 +SHA256 (b4ac7d9a.patch) = 0e03b8df2d44531b552dc6881ffe858e426eedd96019241b42bc37d979e66770 +SIZE (b4ac7d9a.patch) = 911