From 635f3bb34ebe32545872251cd9f16f3552155106 Mon Sep 17 00:00:00 2001 From: matthieu Date: Fri, 8 Dec 2017 14:50:06 +0000 Subject: [PATCH] link libXfont2 to the build --- distrib/sets/lists/xbase/mi | 3 +++ distrib/sets/lists/xshare/mi | 2 ++ lib/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index 6549517d2..8a37b1327 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -263,6 +263,9 @@ ./usr/X11R6/lib/libXfont.a ./usr/X11R6/lib/libXfont.la ./usr/X11R6/lib/libXfont.so.13.0 +./usr/X11R6/lib/libXfont2.a +./usr/X11R6/lib/libXfont2.la +./usr/X11R6/lib/libXfont2.so.0.0 ./usr/X11R6/lib/libXfontcache.a ./usr/X11R6/lib/libXfontcache.la ./usr/X11R6/lib/libXfontcache.so.5.0 diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index e592efe55..25f035dc8 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -449,6 +449,7 @@ ./usr/X11R6/include/X11/fonts/fsmasks.h ./usr/X11R6/include/X11/fonts/ft.h ./usr/X11R6/include/X11/fonts/ftfuncs.h +./usr/X11R6/include/X11/fonts/libxfont2.h ./usr/X11R6/include/X11/fonts/pcf.h ./usr/X11R6/include/X11/keysym.h ./usr/X11R6/include/X11/keysymdef.h @@ -762,6 +763,7 @@ ./usr/X11R6/lib/pkgconfig/xf86vidmodeproto.pc ./usr/X11R6/lib/pkgconfig/xfixes.pc ./usr/X11R6/lib/pkgconfig/xfont.pc +./usr/X11R6/lib/pkgconfig/xfont2.pc ./usr/X11R6/lib/pkgconfig/xfontcache.pc ./usr/X11R6/lib/pkgconfig/xft.pc ./usr/X11R6/lib/pkgconfig/xi.pc diff --git a/lib/Makefile b/lib/Makefile index 00071cd46..b5c2d2fe6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2017/10/23 16:56:59 matthieu Exp $ +# $OpenBSD: Makefile,v 1.33 2017/12/08 14:50:06 matthieu Exp $ .include @@ -40,7 +40,7 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp ${XCB_LIBS}\ libX11 libXext libXrender libXft libdmx libfontenc \ libFS libICE libSM libXt \ libXmu libXpm libXaw libXfixes libXcomposite \ - libXdamage libXcursor libXfont libXfontcache \ + libXdamage libXcursor libXfont libXfont2 libXfontcache \ libXi libXinerama libxkbfile libxkbui \ libXrandr libXRes libXScrnSaver \ libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm \