From nobody Sat Sep 28 09:55:35 2024 X-Original-To: dev-commits-ports-all@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 4XG2lD1Phfz5X5t8; Sat, 28 Sep 2024 09:55:36 +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 4XG2lD0rT0z43ZM; Sat, 28 Sep 2024 09:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727517336; 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=sXqcrCKGa8OiCXLc0WdvntzVImPpaYaU/lgpcWRFz1o=; b=BlwFza01sMaseT6f/bXm5IBNg4mfLwnTqrFrUxVtwp6nND+GoC5VlDdNnJRms+nMJI9RBm hKJ3KjaEyhVfUCOsgIa+fIUjZcT5CVl82bRC39iDmnEQLKZznh4T5+SDncNzyK1xEuTH/V RIiHaANen/vWEx6sgVJR8fZaac5DoA7uouPBKytt5g9USXD2sbgR5D3kr8tL9kvaJWqgUu /TPscJsnN1aXflWZ6yB9U4eHATW7A+LKJKPGWZHwPv4BMox38IEPCn1QJd/XTu4TPZovr6 6QHKH5Aqio+y4xTjIdBGJC9lApWVizRyCuR+J+M4wB4xXuuXomzY1oIa43hRxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727517336; 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=sXqcrCKGa8OiCXLc0WdvntzVImPpaYaU/lgpcWRFz1o=; b=LMdzIPXvC6NhwjvxccwidTUBUf3+sxAn8K4krFz3kLYHk9xFgewSIltlk22PykixEzmj3J 0p2j9JfGrNnTnzeSDRedYAzaETfhpZEBWAoL2IDFgzZIUGm80QYLVMERrZg5HjmPW7fcBv 1pfr8He95RjvR9E+/oC5rEdk+FXfcVUDnekOESQJTWw/nDlAjK659Mh0oCO7SsbVwyKcuZ 9DsyJ9v2jEtSErJLvkggPd+tdoj94l6XLbYj2NXTwCO+6kmfYYCwNy8PJqTh/krFWJUwWo 0fGvBxvCzWMJcAoI/4RqJHdGu1Mf0KN18dam/yuKiprGkL8ebeG5kzEE6kbghA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727517336; a=rsa-sha256; cv=none; b=IpWABmdO636g1IlUxa463ixh54GawziJMG4oubbD+o7Cq/ymQspyZuEwUHrwoWT0futaLN TZNSp2uwGUvUM2YZRE/HvzXtzp2KLOCa1iDXEZrTu838BNSdFe0QbXSwuJqpLabrnejOew QrpFXzFq6D84ZEOcMZAYe6MDpkGmnuDy3dqo5D+m9W9X0/R3n4hKUIuiOlthOhMhQEEIJe t7FpT30UlEXaAUcZoUCT3XsWQMvuWivThXwxN2C8ESmgTZqQbgftROUBtzOqB6gx/pqTPG tz3uGz7oOzi/jyK7nd3tflreaZbPskJOZCJCH6613tecZ3vfsXCY62wXwg5ixQ== 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 4XG2lD09JzzKr3; Sat, 28 Sep 2024 09:55:36 +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 48S9tZUd028212; Sat, 28 Sep 2024 09:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S9tZJT028209; Sat, 28 Sep 2024 09:55:35 GMT (envelope-from git) Date: Sat, 28 Sep 2024 09:55:35 GMT Message-Id: <202409280955.48S9tZJT028209@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: 2b65317363f6 - main - graphics/libemf: fix build with libc++ 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 2b65317363f625eceb125cad5864fd873a66562f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b65317363f625eceb125cad5864fd873a66562f commit 2b65317363f625eceb125cad5864fd873a66562f Author: Dimitry Andric AuthorDate: 2024-09-15 11:55:03 +0000 Commit: Dimitry Andric CommitDate: 2024-09-28 09:53:51 +0000 graphics/libemf: 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/libemf 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, | ^ libemf.cpp:982:30: note: in instantiation of template class 'std::basic_string' requested here 982 | std::basic_string filename_w( filename, filename + filename_count ); | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ libemf should really use char16_t for its 16-bit character type, but the code is full of Windows assumptions that WCHAR is unsigned short. Since std::basic_string is no longer available, use std::basic_string instead, and cast the result to the appropriate type for GetEnhMetaFileW(). [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281516 Approved by: maintainer timeout (~2 weeks) MFH: 2024Q3 --- graphics/libemf/files/patch-libemf_libemf.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/graphics/libemf/files/patch-libemf_libemf.cpp b/graphics/libemf/files/patch-libemf_libemf.cpp index b0da3b4bbe53..e0368f114e08 100644 --- a/graphics/libemf/files/patch-libemf_libemf.cpp +++ b/graphics/libemf/files/patch-libemf_libemf.cpp @@ -1,4 +1,4 @@ ---- libemf/libemf.cpp.orig 2021-11-01 12:21:53 UTC +--- libemf/libemf.cpp.orig 2020-06-07 13:10:20 UTC +++ libemf/libemf.cpp @@ -72,8 +72,7 @@ namespace EMF { if ( not bigEndian() ) { @@ -10,3 +10,15 @@ } /*! +@@ -980,9 +979,9 @@ extern "C" { + + int filename_count = ::strlen( filename ); + +- std::basic_string filename_w( filename, filename + filename_count ); ++ std::basic_string filename_w( filename, filename + filename_count ); + +- HENHMETAFILE handle = GetEnhMetaFileW( filename_w.c_str() ); ++ HENHMETAFILE handle = GetEnhMetaFileW( reinterpret_cast(filename_w.c_str()) ); + + return handle; + }