Adapt to split clutter/pango

In https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4106, all of
the fonts rendering related bits are now behind a build option and under
a different header.

So we bail out if mutter was built without it & make sure we include the
new clutter-pango header where needed.

<https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3544>

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3544>
This commit is contained in:
Bilal Elmoussaoui 2024-11-12 16:23:49 +01:00
parent 9a0261f102
commit 8fbaa5e55a
12 changed files with 21 additions and 1 deletions

View File

@ -90,12 +90,17 @@ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
gnome_desktop_dep = dependency('gnome-desktop-4', version: gnome_desktop_req)
pango_dep = dependency('pango', version: pango_req)
have_fonts = mutter_dep.get_variable('have_fonts') == 'true'
have_x11 = mutter_dep.get_variable('have_x11') == 'true'
have_x11_client = mutter_dep.get_variable('have_x11_client') == 'true'
if have_x11_client or have_x11
x11_dep = dependency('x11')
endif
if not have_fonts
error('Shell requires mutter to be built with fonts rendering support')
endif
nm_deps = []
if get_option('networkmanager')

View File

@ -24,6 +24,7 @@
#pragma once
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
G_BEGIN_DECLS

View File

@ -210,7 +210,7 @@ if get_option('tests') and have_x11_client
test_theme = executable('test-theme',
sources: 'test-theme.c',
c_args: st_cflags,
dependencies: [mutter_test_dep, mtk_dep, libxml_dep],
dependencies: [mutter_test_dep, mtk_dep, libxml_dep, pango_dep],
build_rpath: mutter_typelibdir,
link_with: libst
)

View File

@ -36,6 +36,7 @@
#include <glib.h>
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
#include "st-button.h"

View File

@ -45,6 +45,7 @@
#include <glib.h>
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
#include "st-entry.h"

View File

@ -38,6 +38,7 @@
#include <glib.h>
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
#include "st-label.h"
#include "st-private.h"

View File

@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <clutter/clutter-pango.h>
#include "st-private.h"
#include "st-password-entry.h"
#include "st-icon.h"

View File

@ -22,6 +22,8 @@
#include <math.h>
#include <string.h>
#include <clutter/clutter-pango.h>
#include "st-private.h"
#include "st-image-content.h"

View File

@ -17,6 +17,8 @@
#include "st-spinner-content.h"
#include <cairo.h>
#include <st-widget.h>
#define MIN_RADIUS 8

View File

@ -23,6 +23,8 @@
#pragma once
#include <clutter/clutter.h>
#include <pango/pango.h>
#include "st-border-image.h"
#include "st-icon-colors.h"
#include "st-shadow.h"

View File

@ -30,6 +30,7 @@
#include <math.h>
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
#include "st-widget.h"

View File

@ -19,6 +19,8 @@
*/
#include <clutter/clutter.h>
#include <clutter/clutter-pango.h>
#include "st-theme.h"
#include "st-theme-context.h"
#include "st-label.h"