From nobody Mon Dec 12 15:18:08 2022 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 4NW4y91ZlHz4kc0K; Mon, 12 Dec 2022 15:18:09 +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 4NW4y913QDz3Byk; Mon, 12 Dec 2022 15:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670858289; 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=Wb09AZkKDVvj9AL26njslyu3WWWMqZvypShf1tLmSho=; b=we8ICTuB97cHMZ1UW38fSH5VSn3LD9kTnyyeS+7fi21CWs2S2iM+ckGg0jCcxLbVwhD1u9 irr/NreGr3Up6v8iyeFA4U/sYAbP9UaIsdftXoJu7N7B3g58N2oERq04HEKnRrtlFveRGB VgPKH/eU0NNrOXtyVB1cinOF7Qu3B/QBNLSRee7nx8sIUcXqoOrdlymdAaXLTNjsTzF0Fg 4ZEL/KXLgjv7CIJnCI3bruK5IGu6ND9e7ZmwMZ17sB5VztZpS1zgOmUkTSP1jQXb0hV0aw 8xxY7Vlmfg7ljlupzKXHvv8NmeNvlhd/gUpUX1wLVwZfoAqG2cj7S+Tp23KU1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670858289; 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=Wb09AZkKDVvj9AL26njslyu3WWWMqZvypShf1tLmSho=; b=PyGHZ/AF3bJMO+/bKLDvY94MPlh4vWRKF7NJ+EFYfECFx56nEYkmTi7V/WjBEuVTcVyXjz 41TTkl6vf3B4dKkxeVVryVpgJirIDi741LNV6pUXpSqrUYEh8Jvfn1T3XX7I/jImDAMxjm T7btZuzOvUBh9GzuLpuxzfPy3YgT/X+8U5eGkss+C+WRsCEDsDN18p7Syn4UP2SGEUhbms i8UttLAwA7WX+OK0wB6wFIDyTKmnmJdkZws5FFVFT5YFAFM8Ny82AdhVYxjV5rz8mc61IY Jx91drB+ZGYVLI3fReCPKv/e+gjo/yurPTBaqrR+2ibN+e+LnKZmKoJmSsPW7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670858289; a=rsa-sha256; cv=none; b=GpOfNY8E56l+Xvt7S/PPKD68Bl9nKyuwRbdwWppF4orOPwYOoa+Du9y3feXUXJeFgQjpVu tapEOgI1Bgq7e30+cqs9tfO/pdCTCtZqQO4GbuEtjmg/xZbSIj8/5NU+4073yPGpu8q87c BVm+UmynQjY8Fqot27UQaeVR9L76jdbJwF63icLGnwzDyCd4mioXYj1zOtmu4XukaNHlZf 5Na1KVCk5gFRxCkjeMdwKVwIy1fQBjzwKeGRZRvv7b2wca5/jE+3GDGe9/P5pZq4+Ned1p PyDHNBD7Dbo9sWyzCLcbiYHgOmsyoRmCzkblnHQ+RqSQMy7bxhSZNIrpjZSK4Q== 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 4NW4y874qlzfJV; Mon, 12 Dec 2022 15:18:08 +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 2BCFI8Ug029360; Mon, 12 Dec 2022 15:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BCFI8m5029359; Mon, 12 Dec 2022 15:18:08 GMT (envelope-from git) Date: Mon, 12 Dec 2022 15:18:08 GMT Message-Id: <202212121518.2BCFI8m5029359@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: c7823054d431 - main - x11-toolkits/pangox-compat: fix build with clang 15 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: c7823054d431d2e7a0ff064b8c40d51b97156220 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c7823054d431d2e7a0ff064b8c40d51b97156220 commit c7823054d431d2e7a0ff064b8c40d51b97156220 Author: Dimitry Andric AuthorDate: 2022-12-10 16:30:35 +0000 Commit: Dimitry Andric CommitDate: 2022-12-12 15:17:02 +0000 x11-toolkits/pangox-compat: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that x11-toolkits/pangox-compat failed to build with clang 15: pangox.c:983:15: error: incompatible integer to pointer conversion assigning to 'PangoFontMetrics *' (aka 'struct _PangoFontMetrics *') from 'int' [-Wint-conversion] metrics = pango_font_metrics_new (); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ pangox-fontmap.c:944:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *files_str = pango_config_key_get ("PangoX/AliasFiles"); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is because pangox-compat uses two private functions from the main pango library, which are not declared in the public pango headers. Fix the errors by adding the two private functions in pango-impl-utils.h, copying the declarations from pango-font-private.h and pango-utils-private.h. PR: 268301 Approved by: fluffy (maintainer) MFH: 2022Q4 --- x11-toolkits/pangox-compat/files/patch-pango-impl-utils.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/x11-toolkits/pangox-compat/files/patch-pango-impl-utils.h b/x11-toolkits/pangox-compat/files/patch-pango-impl-utils.h new file mode 100644 index 000000000000..3323d9064c89 --- /dev/null +++ b/x11-toolkits/pangox-compat/files/patch-pango-impl-utils.h @@ -0,0 +1,14 @@ +--- pango-impl-utils.h.orig 2012-08-27 23:19:32 UTC ++++ pango-impl-utils.h +@@ -174,6 +174,11 @@ pango_glyph_string_reverse_range (PangoGlyphString *gl + } + } + ++/* From pango-font-private.h */ ++PangoFontMetrics *pango_font_metrics_new (void); ++ ++/* From pango-utils-private.h */ ++char *pango_config_key_get (const char *key); + + G_END_DECLS +