From b87e2a4916684944c31d452166631b39a01e57c6 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Wed, 23 Jan 2019 12:20:24 +0000 Subject: [PATCH] Remove references to pango --- .build.yml | 1 - README.md | 1 - include/pool-buffer.h | 2 -- meson.build | 4 ---- pool-buffer.c | 5 ----- 5 files changed, 13 deletions(-) diff --git a/.build.yml b/.build.yml index 1c1bc12..59bc722 100644 --- a/.build.yml +++ b/.build.yml @@ -1,7 +1,6 @@ image: alpine/edge packages: - meson - - pango-dev - cairo-dev - wayland-dev - wayland-protocols diff --git a/README.md b/README.md index bae1753..3f30cd5 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ Install dependencies: * wayland * wayland-protocols \* * libxkbcommon -* pango * cairo * gdk-pixbuf2 \*\* * pam (optional) diff --git a/include/pool-buffer.h b/include/pool-buffer.h index 54f5be0..0ebf787 100644 --- a/include/pool-buffer.h +++ b/include/pool-buffer.h @@ -1,7 +1,6 @@ #ifndef _SWAY_BUFFERS_H #define _SWAY_BUFFERS_H #include -#include #include #include #include @@ -10,7 +9,6 @@ struct pool_buffer { struct wl_buffer *buffer; cairo_surface_t *surface; cairo_t *cairo; - PangoContext *pango; uint32_t width, height; void *data; size_t size; diff --git a/meson.build b/meson.build index c937e19..3255d39 100644 --- a/meson.build +++ b/meson.build @@ -38,8 +38,6 @@ wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols', version: '>=1.14') xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') -pango = dependency('pango') -pangocairo = dependency('pangocairo') gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) libpam = cc.find_library('pam', required: get_option('pam')) crypt = cc.find_library('crypt', required: not libpam.found()) @@ -120,8 +118,6 @@ dependencies = [ client_protos, gdk_pixbuf, math, - pango, - pangocairo, xkbcommon, wayland_client, ] diff --git a/pool-buffer.c b/pool-buffer.c index 2eadb4f..b3f1ef2 100644 --- a/pool-buffer.c +++ b/pool-buffer.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -93,7 +92,6 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm, buf->surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride); buf->cairo = cairo_create(buf->surface); - buf->pango = pango_cairo_create_context(buf->cairo); wl_buffer_add_listener(buf->buffer, &buffer_listener, buf); return buf; @@ -109,9 +107,6 @@ void destroy_buffer(struct pool_buffer *buffer) { if (buffer->surface) { cairo_surface_destroy(buffer->surface); } - if (buffer->pango) { - g_object_unref(buffer->pango); - } if (buffer->data) { munmap(buffer->data, buffer->size); }