Date: Thu, 6 Jan 2022 18:30:14 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 20c0152349bc - main - x11-toolkits/pangoxsl: unbreak build with pango >= 1.50 Message-ID: <202201061830.206IUEer005350@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=20c0152349bce047bb3198451234946f849f3d6b commit 20c0152349bce047bb3198451234946f849f3d6b Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-06 18:27:16 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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 <pango/pango-attributes.h> ++#include <pango/pango-utils.h> + + 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201061830.206IUEer005350>