Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x

Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14

19 files changed, 0 insertions, 302 deletions

diff --git a/nx-X11/lib/font/stubs/Imakefile b/nx-X11/lib/font/stubs/Imakefile
deleted file mode 100644
index 555bbf614..000000000
--- a/nx-X11/lib/font/stubs/Imakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-XCOMM $XFree86: xc/lib/font/stubs/Imakefile,v 1.3 1999/12/15 01:14:35 robin Exp $
-
-#include <Server.tmpl>
-
-INCLUDES = -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC)
-SRCS = cauthgen.c csignal.c delfntcid.c errorf.c fatalerror.c \
-       findoldfnt.c getcres.c getdefptsize.c getnewfntcid.c gettime.c \
-       initfshdl.c regfpefunc.c rmfshdl.c servclient.c setfntauth.c \
-       stfntcfnt.c xpstubs.c
-OBJS = cauthgen.o csignal.o delfntcid.o errorf.o fatalerror.o \
-       findoldfnt.o getcres.o getdefptsize.o getnewfntcid.o gettime.o \
-       initfshdl.o regfpefunc.o rmfshdl.o servclient.o setfntauth.o \
-       stfntcfnt.o xpstubs.o
-
-#undef _LinkBuildLibrary
-#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(fntstubs,$(OBJS))
-LintLibraryTarget(fntstubs,$(SRCS))
-InstallLibrary(fntstubs,$(USRLIBDIR))
-NormalLintTarget($(SRCS))
-DependTarget()
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/cauthgen.c b/nx-X11/lib/font/stubs/cauthgen.c
deleted file mode 100644
index dec438d08..000000000
--- a/nx-X11/lib/font/stubs/cauthgen.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int
-client_auth_generation(ClientPtr client)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/csignal.c b/nx-X11/lib/font/stubs/csignal.c
deleted file mode 100644
index c957eb837..000000000
--- a/nx-X11/lib/font/stubs/csignal.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-Bool
-ClientSignal(ClientPtr client)
-{
-    return True;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/delfntcid.c b/nx-X11/lib/font/stubs/delfntcid.c
deleted file mode 100644
index af5c0a881..000000000
--- a/nx-X11/lib/font/stubs/delfntcid.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-void
-DeleteFontClientID(Font id)
-{
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/errorf.c b/nx-X11/lib/font/stubs/errorf.c
deleted file mode 100644
index 52c6042a6..000000000
--- a/nx-X11/lib/font/stubs/errorf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-void
-ErrorF(const char *f, ...)
-{
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/fatalerror.c b/nx-X11/lib/font/stubs/fatalerror.c
deleted file mode 100644
index 7dff1704d..000000000
--- a/nx-X11/lib/font/stubs/fatalerror.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-void
-FatalError(const char *f, ...)
-{
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/findoldfnt.c b/nx-X11/lib/font/stubs/findoldfnt.c
deleted file mode 100644
index 218ecd479..000000000
--- a/nx-X11/lib/font/stubs/findoldfnt.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-FontPtr
-find_old_font(FSID id)
-{
-    return (FontPtr)NULL;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/getcres.c b/nx-X11/lib/font/stubs/getcres.c
deleted file mode 100644
index da0de9174..000000000
--- a/nx-X11/lib/font/stubs/getcres.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-FontResolutionPtr
-GetClientResolutions(int *num)
-{
-  return (FontResolutionPtr) 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/getdefptsize.c b/nx-X11/lib/font/stubs/getdefptsize.c
deleted file mode 100644
index 10a46c86e..000000000
--- a/nx-X11/lib/font/stubs/getdefptsize.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int
-GetDefaultPointSize(void)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/getnewfntcid.c b/nx-X11/lib/font/stubs/getnewfntcid.c
deleted file mode 100644
index 5a1e9270a..000000000
--- a/nx-X11/lib/font/stubs/getnewfntcid.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-Font
-GetNewFontClientID(void)
-{
-    return (Font)0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/gettime.c b/nx-X11/lib/font/stubs/gettime.c
deleted file mode 100644
index 60a4e3951..000000000
--- a/nx-X11/lib/font/stubs/gettime.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-unsigned long
-GetTimeInMillis (void)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/initfshdl.c b/nx-X11/lib/font/stubs/initfshdl.c
deleted file mode 100644
index 15a337a29..000000000
--- a/nx-X11/lib/font/stubs/initfshdl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int
-init_fs_handlers(FontPathElementPtr fpe,
-                 BlockHandlerProcPtr block_handler)
-{
-  return Successful;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/regfpefunc.c b/nx-X11/lib/font/stubs/regfpefunc.c
deleted file mode 100644
index d6fcf3be3..000000000
--- a/nx-X11/lib/font/stubs/regfpefunc.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int 
-RegisterFPEFunctions(NameCheckFunc name_func, 
-		     InitFpeFunc init_func, 
-		     FreeFpeFunc free_func, 
-		     ResetFpeFunc reset_func, 
-		     OpenFontFunc open_func, 
-		     CloseFontFunc close_func, 
-		     ListFontsFunc list_func, 
-		     StartLfwiFunc start_lfwi_func, 
-		     NextLfwiFunc next_lfwi_func, 
-		     WakeupFpeFunc wakeup_func, 
-		     ClientDiedFunc client_died, 
-		     LoadGlyphsFunc load_glyphs, 
-		     StartLaFunc start_list_alias_func, 
-		     NextLaFunc next_list_alias_func, 
-		     SetPathFunc set_path_func)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/rmfshdl.c b/nx-X11/lib/font/stubs/rmfshdl.c
deleted file mode 100644
index ae0ab7863..000000000
--- a/nx-X11/lib/font/stubs/rmfshdl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-void 
-remove_fs_handlers(FontPathElementPtr fpe,
-                   BlockHandlerProcPtr blockHandler,
-                   Bool all)
-{
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/servclient.c b/nx-X11/lib/font/stubs/servclient.c
deleted file mode 100644
index 25c853f87..000000000
--- a/nx-X11/lib/font/stubs/servclient.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $XFree86$ */
-
-void *serverClient = 0;
diff --git a/nx-X11/lib/font/stubs/setfntauth.c b/nx-X11/lib/font/stubs/setfntauth.c
deleted file mode 100644
index 843f155e5..000000000
--- a/nx-X11/lib/font/stubs/setfntauth.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int
-set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/stfntcfnt.c b/nx-X11/lib/font/stubs/stfntcfnt.c
deleted file mode 100644
index c062677f6..000000000
--- a/nx-X11/lib/font/stubs/stfntcfnt.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $XFree86$ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-int
-StoreFontClientFont(FontPtr pfont, Font id)
-{
-    return 0;
-}
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/stubs.h b/nx-X11/lib/font/stubs/stubs.h
deleted file mode 100644
index d687a77e3..000000000
--- a/nx-X11/lib/font/stubs/stubs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */
-
-/* This directory includes dummy entry for bdftopcf and mkfontdir */
-
-#include <stdio.h>
-#include <X11/fonts/fntfilst.h>
-#include <X11/fonts/font.h>
-
-
-#ifndef True
-#define True (-1)
-#endif
-#ifndef False
-#define False (0)
-#endif
-
-extern FontPtr find_old_font ( FSID id );
-extern int set_font_authorizations ( char **authorizations, 
-				     int *authlen, 
-				     ClientPtr client );
-
-extern unsigned long GetTimeInMillis (void);
-
-extern void ErrorF(const char *format, ...);
-extern void FatalError(const char *format, ...);
-
-/* end of file */
diff --git a/nx-X11/lib/font/stubs/xpstubs.c b/nx-X11/lib/font/stubs/xpstubs.c
deleted file mode 100644
index 444915367..000000000
--- a/nx-X11/lib/font/stubs/xpstubs.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $XFree86$ */
-
-/*
-  stub for XpClient* functions.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-Bool
-XpClientIsBitmapClient(ClientPtr client)
-{
-    return True;
-}
-
-Bool
-XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe)
-{
-    return False;
-}
-
-/* end of file */