[PATCH 1/6] Remove deprecated fontcacheproto
Yaakov (Cygwin/X)
yselkowitz at users.sourceforge.net
Thu Apr 8 12:47:30 PDT 2010
From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
Makefile.am | 1 -
configure.ac | 2 -
fontcacheproto/.gitignore | 78 ---------------------
fontcacheproto/COPYING | 24 -------
fontcacheproto/Makefile.am | 11 ---
fontcacheproto/README | 30 --------
fontcacheproto/fontcache.h | 106 ----------------------------
fontcacheproto/fontcacheP.h | 40 -----------
fontcacheproto/fontcacheproto.pc.in | 9 ---
fontcacheproto/fontcachstr.h | 130 -----------------------------------
10 files changed, 0 insertions(+), 431 deletions(-)
delete mode 100644 fontcacheproto/.gitignore
delete mode 100644 fontcacheproto/COPYING
delete mode 100644 fontcacheproto/Makefile.am
delete mode 100644 fontcacheproto/README
delete mode 100644 fontcacheproto/fontcache.h
delete mode 100644 fontcacheproto/fontcacheP.h
delete mode 100644 fontcacheproto/fontcacheproto.pc.in
delete mode 100644 fontcacheproto/fontcachstr.h
diff --git a/Makefile.am b/Makefile.am
index 8581524..5f79d54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS = \
dri2proto \
evieproto \
fixesproto \
- fontcacheproto \
fontsproto \
glproto \
inputproto \
diff --git a/configure.ac b/configure.ac
index b89b73b..c8a5e6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,8 +298,6 @@ AC_OUTPUT([Makefile
evieproto/evieproto.pc
fixesproto/Makefile
fixesproto/fixesproto.pc
- fontcacheproto/Makefile
- fontcacheproto/fontcacheproto.pc
fontsproto/Makefile
fontsproto/fontsproto.pc
glproto/Makefile
diff --git a/fontcacheproto/.gitignore b/fontcacheproto/.gitignore
deleted file mode 100644
index 51f6b55..0000000
--- a/fontcacheproto/.gitignore
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# X.Org module default exclusion patterns
-# The next section if for module specific patterns
-#
-# Do not edit the following section
-# GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-# Do not edit the following section
-# Edit Compile Debug Document Distribute
-*~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-# Add & Override patterns for fontcacheproto
-#
-# Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-#
diff --git a/fontcacheproto/COPYING b/fontcacheproto/COPYING
deleted file mode 100644
index 3e473ad..0000000
--- a/fontcacheproto/COPYING
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama at jp.FreeBSD.org>.
-All rights reserved.
-Copyright (c) 1998-1999 X-TrueType Server Project, All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/fontcacheproto/Makefile.am b/fontcacheproto/Makefile.am
deleted file mode 100644
index 37a8ce2..0000000
--- a/fontcacheproto/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-fontcachedir = $(includedir)/X11/extensions
-fontcache_HEADERS = \
- fontcache.h \
- fontcacheP.h \
- fontcachstr.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = fontcacheproto.pc
-
-EXTRA_DIST = fontcacheproto.pc.in
-
diff --git a/fontcacheproto/README b/fontcacheproto/README
deleted file mode 100644
index 7cce9a7..0000000
--- a/fontcacheproto/README
+++ /dev/null
@@ -1,30 +0,0 @@
- FontCache Extension
-
-This extension defines a protocol to allow client control over the caching
-of server-side core fonts.
-
-Extension name: FontCache
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/proto/fontcacheproto
-
- http://cgit.freedesktop.org/xorg/proto/fontcacheproto
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff --git a/fontcacheproto/fontcache.h b/fontcacheproto/fontcache.h
deleted file mode 100644
index b767db1..0000000
--- a/fontcacheproto/fontcache.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama at jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcache.h,v 1.6 1999/01/31 12:41:32 akiyama Exp $
- */
-/* $XFree86: xc/include/extensions/fontcache.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _EXT_FONTCACHE_H_
-#define _EXT_FONTCACHE_H_
-
-#define X_FontCacheQueryVersion 0
-#define X_FontCacheGetCacheSettings 1
-#define X_FontCacheChangeCacheSettings 2
-#define X_FontCacheGetCacheStatistics 3
-
-#define FontCacheNumberEvents 0
-
-#define FontCacheBadProtocol 0
-#define FontCacheCannotAllocMemory 1
-#define FontCacheNumberErrors (FontCacheCannotAllocMemory + 1)
-
-typedef struct {
- long himark;
- long lowmark;
- long balance;
-} FontCacheSettings, *FontCacheSettingsPtr;
-
-struct cacheinfo {
- long hits;
- long misshits;
- long purged;
- long usage;
-};
-
-typedef struct {
- long purge_runs;
- long purge_stat;
- long balance;
- struct cacheinfo f;
- struct cacheinfo v;
-} FontCacheStatistics, *FontCacheStatisticsPtr;
-
-#ifndef _FONTCACHE_SERVER_
-
-#include <X11/Xlib.h>
-
-_XFUNCPROTOBEGIN
-
-Bool FontCacheQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool FontCacheQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Status FontCacheGetCacheSettings(
- Display* /* dpy */,
- FontCacheSettings* /* cache info */
-);
-
-Status FontCacheChangeCacheSettings(
- Display* /* dpy */,
- FontCacheSettings* /* cache info */
-);
-
-Status FontCacheGetCacheStatistics(
- Display* /* dpy */,
- FontCacheStatistics* /* cache statistics info */
-);
-
-_XFUNCPROTOEND
-
-#endif /* !_FONTCACHE_SERVER_ */
-
-#endif /* _EXT_FONTCACHE_H_ */
diff --git a/fontcacheproto/fontcacheP.h b/fontcacheproto/fontcacheP.h
deleted file mode 100644
index 75677f3..0000000
--- a/fontcacheproto/fontcacheP.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama at jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $
- */
-/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.4 2000/03/01 01:04:21 dawes Exp $ */
-
-#ifndef _FONTCACHEP_H_
-#define _FONTCACHEP_H_
-
-#include <X11/extensions/fontcache.h>
-
-int FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */);
-void FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */);
-void FontCacheGetStatistics(FontCacheStatisticsPtr /* cstats */);
-
-#endif /* _FONTCACHEP_H_ */
diff --git a/fontcacheproto/fontcacheproto.pc.in b/fontcacheproto/fontcacheproto.pc.in
deleted file mode 100644
index 50706a5..0000000
--- a/fontcacheproto/fontcacheproto.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: FontcacheProto
-Description: Fontcache extension headers
-Version: @FONTCACHEPROTO_VERSION@
-Cflags: -I${includedir}
diff --git a/fontcacheproto/fontcachstr.h b/fontcacheproto/fontcachstr.h
deleted file mode 100644
index eab704e..0000000
--- a/fontcacheproto/fontcachstr.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama at jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $
- */
-/* $XFree86$ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _FONTCACHESTR_H_
-#define _FONTCACHESTR_H_
-
-#include <X11/extensions/fontcache.h>
-
-#define FONTCACHENAME "FontCache"
-
-#define FONTCACHE_MAJOR_VERSION 0 /* current version numbers */
-#define FONTCACHE_MINOR_VERSION 1
-
-typedef struct _FontCacheQueryVersion {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheQueryVersion */
- CARD16 length B16;
-} xFontCacheQueryVersionReq;
-#define sz_xFontCacheQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Font-Cache */
- CARD16 minorVersion B16; /* minor version of Font-Cache */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xFontCacheQueryVersionReply;
-#define sz_xFontCacheQueryVersionReply 32
-
-typedef struct _FontCacheGetCacheSettings {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheGetCacheSettings */
- CARD16 length B16;
-} xFontCacheGetCacheSettingsReq;
-#define sz_xFontCacheGetCacheSettingsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
-} xFontCacheGetCacheSettingsReply;
-#define sz_xFontCacheGetCacheSettingsReply 32
-
-typedef struct _FontCacheChangeCacheSettings {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheChangeCacheSettings */
- CARD16 length B16;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
- CARD32 reserve3 B32;
-} xFontCacheChangeCacheSettingsReq;
-#define sz_xFontCacheChangeCacheSettingsReq 32
-
-typedef struct _FontCacheGetCacheStatistics {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheGetCacheStatistics */
- CARD16 length B16;
-} xFontCacheGetCacheStatisticsReq;
-#define sz_xFontCacheGetCacheStatisticsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 purge_runs B32;
- CARD32 purge_stat B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 f_hits B32;
- CARD32 f_misshits B32;
- CARD32 f_purged B32;
- CARD32 f_usage B32;
- CARD32 f_reserve0 B32;
- CARD32 v_hits B32;
- CARD32 v_misshits B32;
- CARD32 v_purged B32;
- CARD32 v_usage B32;
- CARD32 v_reserve0 B32;
-} xFontCacheGetCacheStatisticsReply;
-#define sz_xFontCacheGetCacheStatisticsReply 64
-
-#endif /* _FONTCACHESTR_H_ */
--
1.6.6.1
More information about the xorg-devel
mailing list