Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src stop building libXfontcache as it is obsolete for a decade.



details:   https://anonhg.NetBSD.org/src/rev/1f0f8f68b182
branches:  trunk
changeset: 321312:1f0f8f68b182
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 11 07:18:49 2018 +0000

description:
stop building libXfontcache as it is obsolete for a decade.

diffstat:

 distrib/sets/lists/xbase/shl.mi                   |   5 +---
 distrib/sets/lists/xcomp/mi                       |  14 +++++-----
 distrib/sets/lists/xcomp/shl.mi                   |   4 +-
 distrib/sets/lists/xdebug/mi                      |   4 +-
 distrib/sets/lists/xdebug/shl.mi                  |   4 +-
 external/mit/xorg/lib/Makefile                    |   4 +-
 external/mit/xorg/lib/libXfontcache/Makefile      |  27 -----------------------
 external/mit/xorg/lib/libXfontcache/shlib_version |   4 ---
 share/mk/bsd.README                               |   3 +-
 share/mk/bsd.own.mk                               |   4 +-
 10 files changed, 19 insertions(+), 54 deletions(-)

diffs (221 lines):

diff -r 333e0e9d030f -r 1f0f8f68b182 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Sun Mar 11 00:17:28 2018 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.79 2018/01/24 09:51:26 wiz Exp $
+# $NetBSD: shl.mi,v 1.80 2018/03/11 07:18:49 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -92,9 +92,6 @@
 ./usr/X11R7/lib/libXfont.so                    -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3                  -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3.0                        -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so               -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so.2             -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so.2.0           -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libXft.so                      -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3                    -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3.0                  -unknown-               xorg,compatx11file
diff -r 333e0e9d030f -r 1f0f8f68b182 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Sun Mar 11 00:17:28 2018 +0000
+++ b/distrib/sets/lists/xcomp/mi       Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.192 2017/03/06 05:58:00 nakayama Exp $
+#       $NetBSD: mi,v 1.193 2018/03/11 07:18:49 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1138,8 +1138,8 @@
 ./usr/X11R7/lib/libXfixes_p.a                          -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfont.a                             -unknown-       xorg,compatx11file
 ./usr/X11R7/lib/libXfont_p.a                           -unknown-       profile,xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.a                                -unknown-       xorg,compatx11file
-./usr/X11R7/lib/libXfontcache_p.a                      -unknown-       profile,xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.a                                -unknown-       obsolete
+./usr/X11R7/lib/libXfontcache_p.a                      -unknown-       obsolete
 ./usr/X11R7/lib/libXft.a                               -unknown-       xorg,compatx11file
 ./usr/X11R7/lib/libXft_p.a                             -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libXi.a                                        -unknown-       xorg,compatx11file
@@ -1976,7 +1976,7 @@
 ./usr/X11R7/man/cat3/XevieSendEvent.0                  -unknown-       .cat,xorg
 ./usr/X11R7/man/cat3/XevieStart.0                      -unknown-       .cat,xorg
 ./usr/X11R7/man/cat3/Xfixes.0                          -unknown-       .cat,xorg
-./usr/X11R7/man/cat3/Xfontcache.0                      -unknown-       .cat,xorg
+./usr/X11R7/man/cat3/Xfontcache.0                      -unknown-       obsolete
 ./usr/X11R7/man/cat3/Xft.0                             -unknown-       .cat,xorg
 ./usr/X11R7/man/cat3/Xinerama.0                                -unknown-       .cat,xorg
 ./usr/X11R7/man/cat3/XineramaIsActive.0                        -unknown-       .cat,xorg
@@ -2887,7 +2887,7 @@
 ./usr/X11R7/man/html3/XevieSendEvent.html              -unknown-       html,xorg
 ./usr/X11R7/man/html3/XevieStart.html                  -unknown-       html,xorg
 ./usr/X11R7/man/html3/Xfixes.html                      -unknown-       html,xorg
-./usr/X11R7/man/html3/Xfontcache.html                  -unknown-       html,xorg
+./usr/X11R7/man/html3/Xfontcache.html                  -unknown-       obsolete
 ./usr/X11R7/man/html3/Xft.html                         -unknown-       html,xorg
 ./usr/X11R7/man/html3/Xinerama.html                    -unknown-       html,xorg
 ./usr/X11R7/man/html3/XineramaIsActive.html            -unknown-       html,xorg
@@ -3797,7 +3797,7 @@
 ./usr/X11R7/man/man3/XevieSendEvent.3                  -unknown-       .man,xorg
 ./usr/X11R7/man/man3/XevieStart.3                      -unknown-       .man,xorg
 ./usr/X11R7/man/man3/Xfixes.3                          -unknown-       .man,xorg
-./usr/X11R7/man/man3/Xfontcache.3                      -unknown-       .man,xorg
+./usr/X11R7/man/man3/Xfontcache.3                      -unknown-       obsolete
 ./usr/X11R7/man/man3/Xft.3                             -unknown-       .man,xorg
 ./usr/X11R7/man/man3/Xinerama.3                                -unknown-       .man,xorg
 ./usr/X11R7/man/man3/XineramaIsActive.3                        -unknown-       .man,xorg
@@ -4209,7 +4209,7 @@
 ./usr/libdata/lint/llib-lXext.ln                       -unknown-       lint,xorg
 ./usr/libdata/lint/llib-lXfixes.ln                     -unknown-       lint,xorg
 ./usr/libdata/lint/llib-lXfont.ln                      -unknown-       lint,xorg
-./usr/libdata/lint/llib-lXfontcache.ln                 -unknown-       lint,xorg
+./usr/libdata/lint/llib-lXfontcache.ln                 -unknown-       obsolete
 ./usr/libdata/lint/llib-lXft.ln                                -unknown-       lint,xorg
 ./usr/libdata/lint/llib-lXi.ln                         -unknown-       lint,xorg
 ./usr/libdata/lint/llib-lXinerama.ln                   -unknown-       lint,xorg
diff -r 333e0e9d030f -r 1f0f8f68b182 distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi   Sun Mar 11 00:17:28 2018 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi   Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shl.mi,v 1.48 2017/03/05 09:27:52 mrg Exp $
+#      $NetBSD: shl.mi,v 1.49 2018/03/11 07:18:49 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -25,7 +25,7 @@
 ./usr/X11R7/lib/libXext_pic.a                          -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXfixes_pic.a                                -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXfont_pic.a                         -unknown-       xorg,picinstall,compatx11file
-./usr/X11R7/lib/libXfontcache_pic.a                    -unknown-       xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfontcache_pic.a                    -unknown-       obsolete
 ./usr/X11R7/lib/libXft_pic.a                           -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXi_pic.a                            -unknown-       xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXinerama_pic.a                      -unknown-       xorg,picinstall,compatx11file
diff -r 333e0e9d030f -r 1f0f8f68b182 distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi      Sun Mar 11 00:17:28 2018 +0000
+++ b/distrib/sets/lists/xdebug/mi      Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.26 2017/03/05 09:27:52 mrg Exp $
+# $NetBSD: mi,v 1.27 2018/03/11 07:18:49 mrg Exp $
 ./etc/mtree/set.xdebug                                 comp-sys-root
 ./usr/X11R7/lib                                                -unknown-       debuglib,xorg,compatx11dir
 ./usr/X11R7/lib/libFS_g.a                              -unknown-       debuglib,xorg,compatx11file
@@ -25,7 +25,7 @@
 ./usr/X11R7/lib/libXext_g.a                            -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libXfixes_g.a                          -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libXfont_g.a                           -unknown-       debuglib,xorg,compatx11file
-./usr/X11R7/lib/libXfontcache_g.a                      -unknown-       debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXfontcache_g.a                      -unknown-       obsolete
 ./usr/X11R7/lib/libXft_g.a                             -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libXi_g.a                              -unknown-       debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libXinerama_g.a                                -unknown-       debuglib,xorg,compatx11file
diff -r 333e0e9d030f -r 1f0f8f68b182 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Sun Mar 11 00:17:28 2018 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.41 2017/10/06 20:26:52 christos Exp $
+# $NetBSD: shl.mi,v 1.42 2018/03/11 07:18:49 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib      -unknown-               xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug  obsolete                xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete                xorg,obsolete
@@ -35,7 +35,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug       -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug        -unknown-               xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug   -unknown-               xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug   -unknown-               obsolete
 ./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug  -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug   -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug     -unknown-               xorg,debug,compatx11file
diff -r 333e0e9d030f -r 1f0f8f68b182 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Sun Mar 11 00:17:28 2018 +0000
+++ b/external/mit/xorg/lib/Makefile    Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.40 2016/08/18 08:11:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.41 2018/03/11 07:18:49 mrg Exp $
 
 # build libraries for xorg
 
@@ -28,7 +28,7 @@
        .WAIT \
        libXi libXxf86vm \
        .WAIT \
-       libGL libXScrnSaver libXTrap libXevie libXfont libXfontcache \
+       libGL libXScrnSaver libXTrap libXevie libXfont \
        libXinerama libXmu libXmuu libXpm libXrender \
        libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
        libxkbui \
diff -r 333e0e9d030f -r 1f0f8f68b182 external/mit/xorg/lib/libXfontcache/Makefile
--- a/external/mit/xorg/lib/libXfontcache/Makefile      Sun Mar 11 00:17:28 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
-
-.include <bsd.own.mk>
-
-LIB=   Xfontcache
-.PATH: ${X11SRCDIR.${LIB}}/src
-.PATH: ${X11SRCDIR.${LIB}}/man
-
-LIBDPLIBS=\
-       Xext    ${.CURDIR}/../libXext \
-       X11     ${.CURDIR}/../libX11/dynamic
-
-SRCS=  FontCache.c
-
-MAN=   Xfontcache.3
-MLINKS=        Xfontcache.3 FontCacheChangeCacheSettings.3 \
-       Xfontcache.3 FontCacheGetCacheSettings.3 \
-       Xfontcache.3 FontCacheGetCacheStatistics.3 \
-       Xfontcache.3 FontCacheQueryExtension.3 \
-       Xfontcache.3 FontCacheQueryVersion.3
-
-#CPPFLAGS+=    ${X11FLAGS.THREADS}
-
-PKGDIST=       ${LIB}
-
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
diff -r 333e0e9d030f -r 1f0f8f68b182 external/mit/xorg/lib/libXfontcache/shlib_version
--- a/external/mit/xorg/lib/libXfontcache/shlib_version Sun Mar 11 00:17:28 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
-#
-major=2
-minor=0
diff -r 333e0e9d030f -r 1f0f8f68b182 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun Mar 11 00:17:28 2018 +0000
+++ b/share/mk/bsd.README       Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.367 2018/03/01 06:34:23 snj Exp $
+#      $NetBSD: bsd.README,v 1.368 2018/03/11 07:18:49 mrg Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1694,7 +1694,6 @@
                LIBXXF86VM?=    ${DESTDIR}/usr/X11R7/lib/libXxf86vm.a
                LIBDPS?=        ${DESTDIR}/usr/X11R7/lib/libdps.a
                LIBFNTSTUBS?=   ${DESTDIR}/usr/X11R7/lib/libfntstubs.a
-               LIBFONTCACHE?=  ${DESTDIR}/usr/X11R7/lib/libfontcache.a
                LIBFONTCONFIG?= ${DESTDIR}/usr/X11R7/lib/libfontconfig.a
                LIBFONTENC?=    ${DESTDIR}/usr/X11R7/lib/libfontenc.a
                LIBFREETYPE?=   ${DESTDIR}/usr/X11R7/lib/libfreetype.a
diff -r 333e0e9d030f -r 1f0f8f68b182 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Mar 11 00:17:28 2018 +0000
+++ b/share/mk/bsd.own.mk       Sun Mar 11 07:18:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1047 2018/03/09 12:58:59 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.1048 2018/03/11 07:18:49 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1385,7 +1385,7 @@
        FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
        Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \
        Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
-       epoxy fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb xshmfence \
+       epoxy fontenc xkbfile xkbui Xaw pciaccess xcb xshmfence \
        pthread-stubs
 X11SRCDIR.${_lib}?=            ${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor



Home | Main Index | Thread Index | Old Index