Hi,
libXfontcache and libXxf86misc are implementing the client part of X
extensions that have been disabled/removed for a while in the X
server. So builing them or linking to them is useless.
The patch below stops building them in xenocara. A few ports where
using libXxf86misc. Rebuilding them without this library just requires
an update to WANTLIB (patch below, too).
To test make sure you build xenocara with an empty /usr/X11R6 or that
you remove all files removed from sets manually.
PS: This also prepares for the switch to xorgproto and xserver 1.20.
oks?
Index: lib/Makefile
===
RCS file: /cvs/OpenBSD/xenocara/lib/Makefile,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile
--- lib/Makefile2 Apr 2018 17:06:02 - 1.34
+++ lib/Makefile28 Apr 2018 17:21:29 -
@@ -40,10 +40,10 @@ SUBDIR= freetype fontconfig libxtrans li
libX11 libXext libXrender libXft libdmx libfontenc \
libFS libICE libSM libXt \
libXmu libXpm libXaw libXfixes libXcomposite \
- libXdamage libXcursor libXfont2 libXfontcache \
+ libXdamage libXcursor libXfont2 \
libXi libXinerama libxkbfile libxkbui \
libXrandr libXRes libXScrnSaver \
- libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm \
+ libXtst libXv libXvMC libXxf86dga libXxf86vm \
libpciaccess pixman
.if ${XENOCARA_BUILD_GL:L} == "yes"
Index: proto/Makefile
===
RCS file: /cvs/OpenBSD/xenocara/proto/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- proto/Makefile 13 Apr 2014 11:04:26 - 1.13
+++ proto/Makefile 28 Apr 2018 17:21:29 -
@@ -3,11 +3,11 @@
.include
SUBDIR= bigreqsproto compositeproto dmxproto damageproto \
- fixesproto fontcacheproto fontsproto glproto inputproto \
+ fixesproto fontsproto glproto inputproto \
kbproto pmproto xineramaproto presentproto randrproto \
recordproto renderproto resourceproto scrnsaverproto \
videoproto x11proto xcb-proto xcmiscproto xextproto \
- xf86bigfontproto xf86dgaproto xf86miscproto \
+ xf86bigfontproto xf86dgaproto \
xf86vidmodeproto
.if ${XENOCARA_BUILD_DRI:L} == "yes"
Index: distrib/sets/lists/xbase/md.alpha
===
RCS file: /cvs/OpenBSD/xenocara/distrib/sets/lists/xbase/md.alpha,v
retrieving revision 1.162
diff -u -p -u -r1.162 md.alpha
--- distrib/sets/lists/xbase/md.alpha 17 Feb 2018 02:32:47 - 1.162
+++ distrib/sets/lists/xbase/md.alpha 28 Apr 2018 17:21:29 -
@@ -160,15 +160,6 @@
./usr/X11R6/man/man3/XDGASetViewport.3
./usr/X11R6/man/man3/XDGASync.3
./usr/X11R6/man/man3/XF86DGA.3
-./usr/X11R6/man/man3/XF86Misc.3
-./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
-./usr/X11R6/man/man3/XF86MiscGetMouseSettings.3
-./usr/X11R6/man/man3/XF86MiscGetSaver.3
-./usr/X11R6/man/man3/XF86MiscQueryExtension.3
-./usr/X11R6/man/man3/XF86MiscQueryVersion.3
-./usr/X11R6/man/man3/XF86MiscSetKbdSettings.3
-./usr/X11R6/man/man3/XF86MiscSetMouseSettings.3
-./usr/X11R6/man/man3/XF86MiscSetSaver.3
./usr/X11R6/man/man3/XF86VM.3
./usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3
./usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3
Index: distrib/sets/lists/xbase/md.amd64
===
RCS file: /cvs/OpenBSD/xenocara/distrib/sets/lists/xbase/md.amd64,v
retrieving revision 1.176
diff -u -p -u -r1.176 md.amd64
--- distrib/sets/lists/xbase/md.amd64 17 Feb 2018 02:32:47 - 1.176
+++ distrib/sets/lists/xbase/md.amd64 28 Apr 2018 17:21:29 -
@@ -332,15 +332,6 @@
./usr/X11R6/man/man3/XDGASetViewport.3
./usr/X11R6/man/man3/XDGASync.3
./usr/X11R6/man/man3/XF86DGA.3
-./usr/X11R6/man/man3/XF86Misc.3
-./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
-./usr/X11R6/man/man3/XF86MiscGetMouseSettings.3
-./usr/X11R6/man/man3/XF86MiscGetSaver.3
-./usr/X11R6/man/man3/XF86MiscQueryExtension.3
-./usr/X11R6/man/man3/XF86MiscQueryVersion.3
-./usr/X11R6/man/man3/XF86MiscSetKbdSettings.3
-./usr/X11R6/man/man3/XF86MiscSetMouseSettings.3
-./usr/X11R6/man/man3/XF86MiscSetSaver.3
./usr/X11R6/man/man3/XF86VM.3
./usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3
./usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3
Index: distrib/sets/lists/xbase/md.arm64
===
RCS file: /cvs/OpenBSD/xenocara/distrib/sets/lists/xbase/md.arm64,v
retrieving revision 1.7
diff -u -p -u -r1.7 md.arm64
--- distrib/sets/lists/xbase/md.arm64 17 Feb 2018 02:32:47 - 1.7
+++ distrib/sets/lists/xbase/md.arm64 28 Apr 2018 17:21:29 -
@@ -328,15 +328,6 @@
./usr/X11R6/man/man3/XDGASetViewport.3
./usr/X11R6/man/man3/XDGASync.3
./usr/X11R6/man/man3/XF86DGA.3
-./usr/X11R6/man/man3/XF86Misc.3
-./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
