pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to pango

Browse Source
This commit is contained in:
Ian Fan 2019-01-23 12:20:24 +00:00
parent f698711ddc
commit b87e2a4916
5 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.build.yml
View File

@ -1,7 +1,6 @@
image: alpine/edge image: alpine/edge
packages: packages:
- meson - meson
- pango-dev
- cairo-dev - cairo-dev
- wayland-dev - wayland-dev
- wayland-protocols - wayland-protocols

1
README.md
View File

@ -34,7 +34,6 @@ Install dependencies:
* wayland * wayland
* wayland-protocols \* * wayland-protocols \*
* libxkbcommon * libxkbcommon
* pango
* cairo * cairo
* gdk-pixbuf2 \*\* * gdk-pixbuf2 \*\*
* pam (optional) * pam (optional)

2
include/pool-buffer.h
View File

@ -1,7 +1,6 @@
#ifndef _SWAY_BUFFERS_H #ifndef _SWAY_BUFFERS_H
#define _SWAY_BUFFERS_H #define _SWAY_BUFFERS_H
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <pango/pangocairo.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <wayland-client.h> #include <wayland-client.h>
@ -10,7 +9,6 @@ struct pool_buffer {
struct wl_buffer *buffer; struct wl_buffer *buffer;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_t *cairo; cairo_t *cairo;
PangoContext *pango;
uint32_t width, height; uint32_t width, height;
void *data; void *data;
size_t size; size_t size;

4
meson.build
View File

@ -38,8 +38,6 @@ wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_protos = dependency('wayland-protocols', version: '>=1.14')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')
cairo = dependency('cairo') cairo = dependency('cairo')
pango = dependency('pango')
pangocairo = dependency('pangocairo')
gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
libpam = cc.find_library('pam', required: get_option('pam')) libpam = cc.find_library('pam', required: get_option('pam'))
crypt = cc.find_library('crypt', required: not libpam.found()) crypt = cc.find_library('crypt', required: not libpam.found())
@ -120,8 +118,6 @@ dependencies = [
client_protos, client_protos,
gdk_pixbuf, gdk_pixbuf,
math, math,
pango,
pangocairo,
xkbcommon, xkbcommon,
wayland_client, wayland_client,
] ]

5
pool-buffer.c
View File

@ -2,7 +2,6 @@
#include <assert.h> #include <assert.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <fcntl.h> #include <fcntl.h>
#include <pango/pangocairo.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -93,7 +92,6 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm,
buf->surface = cairo_image_surface_create_for_data(data, buf->surface = cairo_image_surface_create_for_data(data,
CAIRO_FORMAT_ARGB32, width, height, stride); CAIRO_FORMAT_ARGB32, width, height, stride);
buf->cairo = cairo_create(buf->surface); buf->cairo = cairo_create(buf->surface);
buf->pango = pango_cairo_create_context(buf->cairo);
wl_buffer_add_listener(buf->buffer, &buffer_listener, buf); wl_buffer_add_listener(buf->buffer, &buffer_listener, buf);
return buf; return buf;
@ -109,9 +107,6 @@ void destroy_buffer(struct pool_buffer *buffer) {
if (buffer->surface) { if (buffer->surface) {
cairo_surface_destroy(buffer->surface); cairo_surface_destroy(buffer->surface);
} }
if (buffer->pango) {
g_object_unref(buffer->pango);
}
if (buffer->data) { if (buffer->data) {
munmap(buffer->data, buffer->size); munmap(buffer->data, buffer->size);
} }