From nobody Fri Aug 16 15:44:45 2024 X-Original-To: dev-commits-ports-branches@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 4WlmWx6zdcz5T7gG; Fri, 16 Aug 2024 15:44:45 +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 4WlmWx6Cwlz4f9m; Fri, 16 Aug 2024 15:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823085; 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=i1oD1lfjlNNfsZql/SJORSX25ABB1sdjbzcIRkNolNs=; b=TDdX1nOgl0cZmle/qgJw5y6UmIWpr8ZJVZYs/APFnI4uhUAtWoGCiBXZEPWahHJko9W60r 9LPXk7S2ZyAhUUsG5imz6rV+hBXixjXwQauiCH3d3CTAYUFZmddq09QnV2Y9BwhgZu/UMY H6fYGyxmc+VwMi/LQkzex1LZW1M8kIS8jjAeT9j9Zf74AYX0kHf4hFrhcK8j1Po5HuLUw7 9qOobkxrhVebHysdWS1v8uiSVMZRZ1WzCzNPRXPnKQH2cfcFJvpOVucwp5XXBkAPNgqJ7m +MVhATAHsL358drXpjdrK+TtVjovDDWTtqjToLXsWmsx10rEKosN9KNqlXog1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723823085; a=rsa-sha256; cv=none; b=SywP97mD+StRPWXuiaJfWeZqFk+Z9YrBOakmsqFAG09ollW52wsZ7R0aEXAtO49K7Hcl6r 3PQ+zxCLkV4zbJfaNgc6EVtiUa9JW6kG8qz+Ag7Y/4CJPyi1nzQ8oGZmmcxS1MAMTwFPJu BqcTTGGeve/uHkP+s6GMrZwL4ihz+ZQGYq1KgoLPbBZECNk46tjweGLU+1Uf8a6mfUnpR4 K5DpChMxMfZBZ5750xfuT34nOCjghAkpR4FPQGeHQRjUgqwz0wyrL//KjFhxK5XFtJ1CPw HpVVIlvgDaEz9qVT68TrHZhzF7gOs4EzvCvuhMuxa3WX3rSZA/HOKNmoJ8pgXw== 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=1723823085; 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=i1oD1lfjlNNfsZql/SJORSX25ABB1sdjbzcIRkNolNs=; b=OgBFfBgeMG+A6xjWfG3WmPb6INKEZ+rx4Ay3tDvC82jee1Co7nE9kMHfpAHKsFrjLYOR5a M0ep9SO+9joorhTsIP6uHtfFuiHF7e5fjM7pT7TKisqQYEAJ2BUMtN8k6Z4BWhBkZrOgh2 +7LomDTJuYf9q5Q4hY8vB5vjCuYs+5iwisgoaOfTkXFuZlSUJRwLSQYGRVLSU8ixaY9pe7 t1q341xlZqNYRCeKxZ+3U9PGoYtBoN20Vw0jyAKsn+p7NEJm0Ujt6APkAZ7wYgx43MKfTC odQ4Q8P4HfmvJGPKEQoaFTu98z40TuwMMuMpjjBIlIajNpA92qUu9rlXZV8phQ== 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 4WlmWx5qWfz1Bv0; Fri, 16 Aug 2024 15:44:45 +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 47GFijVf095864; Fri, 16 Aug 2024 15:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFijUD095861; Fri, 16 Aug 2024 15:44:45 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:44:45 GMT Message-Id: <202408161544.47GFijUD095861@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 6930d099097e - 2024Q3 - graphics/poppler: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 6930d099097eb9de5321e7bb9728e82efaabf0f6 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=6930d099097eb9de5321e7bb9728e82efaabf0f6 commit 6930d099097eb9de5321e7bb9728e82efaabf0f6 Author: Dimitry Andric AuthorDate: 2024-08-01 19:48:37 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:43:43 +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 (cherry picked from commit 6bf6ee19368dea736b8a402d115c797f271a0f47) --- 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