font: initialise fontconfig ourselves
fontconfig 2.16 warns on every start when Pango reaches it before FcInit(); calling it first keeps stderr quiet.
This commit is contained in:
4
Makefile
4
Makefile
@@ -7,8 +7,8 @@ IBUS_CFLAGS = $(shell $(PKG_CONFIG) --cflags dbus-1 xkbcommon)
|
||||
IBUS_LIBS = $(shell $(PKG_CONFIG) --libs dbus-1 xkbcommon)
|
||||
XIM_CFLAGS = $(shell $(PKG_CONFIG) --cflags xcb-imdkit xcb-xkb xkbcommon-x11)
|
||||
XIM_LIBS = $(shell $(PKG_CONFIG) --libs xcb-imdkit xcb-xkb xkbcommon-x11)
|
||||
TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo)
|
||||
TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo)
|
||||
TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo fontconfig)
|
||||
TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo fontconfig)
|
||||
POPUP_CFLAGS = $(shell $(PKG_CONFIG) --cflags xcb-randr)
|
||||
POPUP_LIBS = $(shell $(PKG_CONFIG) --libs xcb-randr)
|
||||
PROJECT_CPPFLAGS =
|
||||
|
||||
2
font.c
2
font.c
@@ -1,4 +1,5 @@
|
||||
#include "dat.h"
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#include <pango/pangocairo.h>
|
||||
#include "fn.h"
|
||||
|
||||
@@ -53,6 +54,7 @@ int
|
||||
textinit(void)
|
||||
{
|
||||
textclose();
|
||||
FcInit();
|
||||
fontmap = pango_cairo_font_map_new();
|
||||
if(fontmap == nil){
|
||||
fprint(2, "strans: popup: can't initialize PangoCairo\n");
|
||||
|
||||
@@ -6,8 +6,8 @@ CFLAGS ?= -O2 -g
|
||||
UNIT_CPPFLAGS = -I.. -I../cutest
|
||||
UNIT_CFLAGS = -std=c99 -Wall -Wextra
|
||||
HOST_CFLAGS = -std=c99 -Wall -Wextra
|
||||
TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo)
|
||||
TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo)
|
||||
TEXT_CFLAGS = $(shell $(PKG_CONFIG) --cflags pangocairo cairo fontconfig)
|
||||
TEXT_LIBS = $(shell $(PKG_CONFIG) --libs pangocairo cairo fontconfig)
|
||||
DBUS_CFLAGS = $(shell $(PKG_CONFIG) --cflags dbus-1)
|
||||
DBUS_LIBS = $(shell $(PKG_CONFIG) --libs dbus-1)
|
||||
GTK_CFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-3.0)
|
||||
|
||||
Reference in New Issue
Block a user