-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
testsuite: Fix pangomm1.4 build with latest pango
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
1 parent
4183b59
commit d389eaa
Showing
2 changed files
with
40 additions
and
0 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
testsuite/autotools/gtkmm/0001-Don-t-include-individual-pango-headers.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters