Skip to content

Commit

Permalink
testsuite: Fix pangomm1.4 build with latest pango
Browse files Browse the repository at this point in the history
This probably needs updating to the latest upstream version, but not
today, so just apply a patch to make it build with latest pango.
  • Loading branch information
jon-turney committed Jan 15, 2024
1 parent 4183b59 commit d389eaa
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From f065a2967e22658565f4228b73b1511d291e343f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <[email protected]>
Date: Wed, 25 Aug 2021 19:24:35 +0200
Subject: [PATCH] Don't include individual pango headers

As in every gnome library, you are only supposed
to include the main pango.h header from the outside.

This was causing build failures after some recent
pango header rearrangements.
---
pango/src/attributes.hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pango/src/attributes.hg b/pango/src/attributes.hg
index e234497..bd09f0f 100644
--- a/pango/src/attributes.hg
+++ b/pango/src/attributes.hg
@@ -21,7 +21,7 @@
#include <pangomm/rectangle.h>
#include <pangomm/color.h>
#include <pangomm/fontdescription.h>
-#include <pango/pango-attributes.h>
+#include <pango/pango.h>
#include <glibmm/slisthandle.h>

_DEFS(pangomm,pango)
--- a/pango/pangomm/attributes.h
+++ b/pango/pangomm/attributes.h
@@ -29,7 +29,7 @@
#include <pangomm/rectangle.h>
#include <pangomm/color.h>
#include <pangomm/fontdescription.h>
-#include <pango/pango-attributes.h>
+#include <pango/pango.h>
#include <glibmm/slisthandle.h>


2 changes: 2 additions & 0 deletions testsuite/autotools/gtkmm/pangomm1.4.cygport
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ PKG_NAMES="lib${NAME}_1 lib${NAME}-devel lib${NAME}-doc"
libpangomm1_4_1_CONTENTS="usr/bin/*mm-1.4-1.dll usr/share/doc/${NAME}/"
libpangomm1_4_devel_CONTENTS="usr/include/ usr/lib/"
libpangomm1_4_doc_CONTENTS='usr/share/devhelp/ usr/share/doc/pangomm-1.4/'

PATCH_URI="0001-Don-t-include-individual-pango-headers.patch"

0 comments on commit d389eaa

Please sign in to comment.