From nobody Thu Jan 06 18:30:14 2022 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 2D6A3193AB1E; Thu, 6 Jan 2022 18:30:15 +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 4JVFJk6QqKz4dXq; Thu, 6 Jan 2022 18:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B893C24938; Thu, 6 Jan 2022 18:30:14 +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 206IUEMf005355; Thu, 6 Jan 2022 18:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206IUEer005350; Thu, 6 Jan 2022 18:30:14 GMT (envelope-from git) Date: Thu, 6 Jan 2022 18:30:14 GMT Message-Id: <202201061830.206IUEer005350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 20c0152349bc - main - x11-toolkits/pangoxsl: unbreak build with pango >= 1.50 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20c0152349bce047bb3198451234946f849f3d6b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641493814; 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=8PTfp5wtjL7X0AlzXXgnVpVi9dN/ZRFbdsHnJNzISGw=; b=FD8u7kFHkFhlz3m1ECr+ViSKVopiNcsolao4yOBmEp5Fn/qN1OtKuEHlr8CWfZ+Xwci2IZ Rfu3oY6oUHSmYq+wucT/lsR+x9kmLwn79sMl2LiPobCTXPk8AQbhOPrMHp5mujHwtzbxor swSZ9GC+XALmAu4N1WXsdJczQKww+ABgq74UeFPbPUPyfXKPzbi11URqUuO4colDRFcShr LpA93JNkr/JnmdkbMRvRxBhZr7kWIO5vN/tFgZI5tjErqnLKloAlQNPax7VFnxveLFigJW JrQbqPaWYDcqxZZAJ/0GVmVesRbZ1kl9EwXbmfj53ACQHCLKolnRAiUuWXkRWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641493814; a=rsa-sha256; cv=none; b=dtBjpwvVlgsGHE/JZABDTChtuikxtCmwsZSP/qmiv73jDFIEttnITrQrEo4CIJMrh/SwcY EHjP/hml8sZTeUWkCpL13V/CCCIhmJ7NMzFcRuQ9fQDySDy2aI+RWFX2Fto/59VnOvXWza 5QxHll1hgfXS6M6ICjheDSKag/beoHjuK018rpp82tIdNsJKgTs+Zb8938c71cy0tQMZkk SqJu5pzBHUFLHgHov+ymMr65sTSR9jSSWiTJdJT+/9CHbOMDyz14z1ntGoNbqwRSEts+zp BRJnAEnljMrOs1rlffCOPMUux8tyiuyjiNw+umuU23sdI+nmL5mpYe9Z4K/uhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=20c0152349bce047bb3198451234946f849f3d6b commit 20c0152349bce047bb3198451234946f849f3d6b Author: Jan Beich AuthorDate: 2022-01-06 18:27:16 +0000 Commit: Jan Beich CommitDate: 2022-01-06 18:29:37 +0000 x11-toolkits/pangoxsl: unbreak build with pango >= 1.50 In file included from pango-xsl-attributes.c:25: ./pango-xsl-attributes.h:116:18: error: conflicting types for 'pango_attr_line_height_new' PangoAttribute * pango_attr_line_height_new (gint line_height); ^ /usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here PangoAttribute * pango_attr_line_height_new (double factor); ^ pango-xsl-attributes.c:620:1: error: conflicting types for 'pango_attr_line_height_new' pango_attr_line_height_new (gint line_height) ^ /usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here PangoAttribute * pango_attr_line_height_new (double factor); ^ PR: 260916 Reported by: antoine (via exp-run) Regressed by: https://gitlab.gnome.org/GNOME/pango/-/commit/623134f48ad9 --- x11-toolkits/pangoxsl/files/patch-pango-1.50 | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/x11-toolkits/pangoxsl/files/patch-pango-1.50 b/x11-toolkits/pangoxsl/files/patch-pango-1.50 new file mode 100644 index 000000000000..2ecfe8b5163d --- /dev/null +++ b/x11-toolkits/pangoxsl/files/patch-pango-1.50 @@ -0,0 +1,53 @@ +In file included from pango-xsl-attributes.c:25: +./pango-xsl-attributes.h:116:18: error: conflicting types for 'pango_attr_line_height_new' +PangoAttribute * pango_attr_line_height_new (gint line_height); + ^ +/usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here +PangoAttribute * pango_attr_line_height_new (double factor); + ^ +pango-xsl-attributes.c:620:1: error: conflicting types for 'pango_attr_line_height_new' +pango_attr_line_height_new (gint line_height) +^ +/usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here +PangoAttribute * pango_attr_line_height_new (double factor); + ^ +2 errors generated. + +--- pangoxsl/pango-xsl-attributes.h.orig 2004-10-10 23:44:39 UTC ++++ pangoxsl/pango-xsl-attributes.h +@@ -25,6 +25,7 @@ + #define __PANGO_XSL_ATTRIBUTES_H__ + + #include ++#include + + G_BEGIN_DECLS + +@@ -113,7 +114,9 @@ PangoAttrType pango_attr_keep_with_previous_within_ + PangoAttribute * pango_attr_keep_with_previous_within_line_new (gint strength); + + PangoAttrType pango_attr_line_height_get_type (void); ++#if !PANGO_VERSION_CHECK(1,50,0) + PangoAttribute * pango_attr_line_height_new (gint line_height); ++#endif + + PangoAttrType pango_attr_line_stacking_strategy_get_type (void); + PangoAttribute * pango_attr_line_stacking_strategy_new (PangoLineStackingStrategy line_stacking_strategy); +--- pangoxsl/pango-xsl-attributes.c.orig 2004-10-10 23:44:39 UTC ++++ pangoxsl/pango-xsl-attributes.c +@@ -616,6 +616,7 @@ pango_attr_line_height_get_type (void) + * + * Return value: the new #PangoAttribute. + **/ ++#if !PANGO_VERSION_CHECK(1,50,0) + PangoAttribute * + pango_attr_line_height_new (gint line_height) + { +@@ -631,6 +632,7 @@ pango_attr_line_height_new (gint line_height) + + return pango_attr_int_new (&klass, line_height); + } ++#endif + + /** + * pango_attr_line_stacking_strategy_get_type: