From nobody Mon May 29 17:21:13 2023 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 4QVMkd2MMhz4Y5Vd; Mon, 29 May 2023 17:21:13 +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 4QVMkd1tgqz42bq; Mon, 29 May 2023 17:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685380873; 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=AfB/Gvu7XbilSpPb9qZZ3U/mGsSYZwbsPnVkHcQpF4g=; b=DZxttwFTF6eKbFJWX8d1b/X+OVARND1c7I32OuBk3/N0VESY0nfnNmaL3eAchQCTQbNXML n+8Y0akFX8uP9QVnDRAvelHsEy1Qu+bbl6/OWEEz6cTMi859KmqJFdBnoQPYZk72If7B0M P3xTYnWumKDCDLfSuKZsg6vyhFKdyBCqoquKFlo0gttpr7mWSdnB7Dz1VZidp1onkvmYES UMe6sB23GnjYm7CT0ig/wqSZb66NY7G8VyQrZzsJtu6ECeHs7GcNH9PbJIixyKB65wKwPT mgvIvhqZBNuGHT/FzGI9BhRm8abS+uqnGHvYU2HIzhUqfixFE/5blIhlB+36FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685380873; 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=AfB/Gvu7XbilSpPb9qZZ3U/mGsSYZwbsPnVkHcQpF4g=; b=Nis3pJQMz9rg65D2KbjVbupXEHJbtk0cgujd24EEqjDKJl8uimK0wFd4LgZNKu8UYS8IXh J9b5NjZU5wxC03qYuzE6XZDn/0jlDU6vrGBbSf6ZBTR16n3dRlh8NduY6CvFwzIzmPuxnN bm26jO+pqVJ148q8CQFf1sg+zS/SP9q5SqfsmnoWzXQ42P+aEwaaAkek7yGVWULPrqTbm1 7lKzk1GF08CWvyWs9FPLIT6XqWLdVypxsASjoOzk4JfAm0NXHPD6tAPbV0fXr1fcmKcB8h +uK/lRrwaR10W7XANkUKUjGB6PciX92O995UndMZ0atjQgn5JhhtjjTd2oFNAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685380873; a=rsa-sha256; cv=none; b=LtR8nB+NFgxZx4Bzd8Ig0o452nKYes2S0Fjkpd7sG5YixLnBw4KggSYGmMO3LhWxXLxYRn pKUsIj9FcxSpWwdJDuvKoiB45sRlnGCxLMYPFZVCa4JWVpmAM6IgDkXWBd26GTvzEJlQ2M L6LsD1Lw+0zR62GjYGw0FEEaKSqah1LdH4upFpY064CdHTm6ipPJjAyHEYtKMQA4fbzns7 +48s3/HTCBSzYjNoGTvW4hw2AiN8+flBFjV2TuaiATzPr891zFi2jI1g/m7VplqWNYAW92 WHSxyABxPxpXONeUWZtgeghVCMad4gLVpudf5ICAYvhp6ZHlJFUtsl4BSPxIdA== 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 4QVMkd0xk7zKZL; Mon, 29 May 2023 17:21:13 +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 34THLDJd062033; Mon, 29 May 2023 17:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34THLDht062032; Mon, 29 May 2023 17:21:13 GMT (envelope-from git) Date: Mon, 29 May 2023 17:21:13 GMT Message-Id: <202305291721.34THLDht062032@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: 1f905384aff9 - main - x11-toolkits/pangox-compat: fix build with clang 16 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f905384aff97cb61995ae241e77261bc109a865 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f905384aff97cb61995ae241e77261bc109a865 commit 1f905384aff97cb61995ae241e77261bc109a865 Author: Dimitry Andric AuthorDate: 2023-05-29 16:44:45 +0000 Commit: Dimitry Andric CommitDate: 2023-05-29 17:20:12 +0000 x11-toolkits/pangox-compat: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building x11-toolkits/pangox-compat: basic-x.c:687:23: error: incompatible function pointer types assigning to 'void (*)(PangoEngineShape *, PangoFont *, const char *, unsigned int, const PangoAnalysis *, PangoGlyphString *, const char *, unsigned int)' (aka 'void (*)(struct _PangoEngineShape *, struct _PangoFont *, const char *, unsigned int, const struct _PangoAnalysis *, struct _PangoGlyphString *, const char *, unsigned int)') from 'void (PangoEngineShape *, PangoFont *, const char *, gint, const PangoAnalysis *, PangoGlyphString *)' (aka 'void (struct _PangoEngineShape *, struct _PangoFont *, const char *, int, const struct _PangoAnalysis *, struct _PangoGlyphString *)') [-Wincompatible-function-pointer-types] class->script_shape = basic_engine_shape; ^ ~~~~~~~~~~~~~~~~~~ This is because the 'script_shape' callback function in pango 1.50 has the 'length' argument as 'unsigned int', and also two additional parameters 'paragraph_text' and 'paragraph_length'. Even though it looks like this callback function is never used, correct the arguments to fix the error. PR: 271709 Approved by: fluffy (maintainer) MFH: 2023Q2 --- x11-toolkits/pangox-compat/Makefile | 2 +- x11-toolkits/pangox-compat/files/patch-basic-x.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile index 52cb317a78fb..010b13432572 100644 --- a/x11-toolkits/pangox-compat/Makefile +++ b/x11-toolkits/pangox-compat/Makefile @@ -1,6 +1,6 @@ PORTNAME= pangox-compat DISTVERSION= 0.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pangox-compat/files/patch-basic-x.c b/x11-toolkits/pangox-compat/files/patch-basic-x.c new file mode 100644 index 000000000000..54438bc31cc2 --- /dev/null +++ b/x11-toolkits/pangox-compat/files/patch-basic-x.c @@ -0,0 +1,16 @@ +--- basic-x.c.orig 2012-08-27 23:19:32 UTC ++++ basic-x.c +@@ -556,9 +556,11 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UN + basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, + PangoFont *font, + const char *text, +- gint length, ++ unsigned int length, + const PangoAnalysis *analysis, +- PangoGlyphString *glyphs) ++ PangoGlyphString *glyphs, ++ const char *paragraph_text G_GNUC_UNUSED, ++ unsigned int paragraph_length G_GNUC_UNUSED) + { + int n_chars; + int i;