isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/pango: Drop PANGO_ENABLE_BACKEND usage

Browse Source 
Dropped before Pango 1.46 which is the min required version
so the backward compatibility is no longer needed

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3491>
This commit is contained in:
Bilal Elmoussaoui 2024-01-05 09:23:12 +01:00
parent 3b4fe5d577
commit 0f6df633fe
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-settings.c
View File

@ -21,7 +21,6 @@
#ifdef HAVE_PANGO_FT2 #ifdef HAVE_PANGO_FT2
/* for pango_fc_font_map_cache_clear() */ /* for pango_fc_font_map_cache_clear() */
#define PANGO_ENABLE_BACKEND
#include <pango/pangofc-fontmap.h> #include <pango/pangofc-fontmap.h>
#endif /* HAVE_PANGO_FT2 */ #endif /* HAVE_PANGO_FT2 */

6
cogl/cogl-pango/cogl-pango-fontmap.c
View File

@ -28,12 +28,6 @@
#include "config.h" #include "config.h"
/* This is needed to get the Pango headers to export stuff needed to
subclass */
#ifndef PANGO_ENABLE_BACKEND
#define PANGO_ENABLE_BACKEND 1
#endif
#include <pango/pango-fontmap.h> #include <pango/pango-fontmap.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <pango/pango-renderer.h> #include <pango/pango-renderer.h>

14
cogl/cogl-pango/cogl-pango-render.c
View File

@ -35,17 +35,6 @@
#include "config.h" #include "config.h"
#ifndef PANGO_ENABLE_BACKEND
#define PANGO_ENABLE_BACKEND 1
#endif
#ifndef PANGO_UNKNOWN_GLYPH_WIDTH
#define PANGO_UNKNOWN_GLYPH_WIDTH 10
#endif
#ifndef PANGO_UNKNOWN_GLYPH_HEIGHT
#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
#endif
#include <pango/pango-fontmap.h> #include <pango/pango-fontmap.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <pango/pango-renderer.h> #include <pango/pango-renderer.h>
@ -59,6 +48,9 @@
#include "cogl-pango/cogl-pango-glyph-cache.h" #include "cogl-pango/cogl-pango-glyph-cache.h"
#include "cogl-pango/cogl-pango-display-list.h" #include "cogl-pango/cogl-pango-display-list.h"
#define PANGO_UNKNOWN_GLYPH_WIDTH 10
#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
enum enum
{ {
PROP_0, PROP_0,