svn merge ^/branches/released .

4 files changed, 0 insertions, 280 deletions

diff --git a/fontconfig/fc-arch/Makefile.am b/fontconfig/fc-arch/Makefile.am
deleted file mode 100644
index 806c730b4..000000000
--- a/fontconfig/fc-arch/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# $Id $
-#
-# Copyright © 2003 Keith Packard
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Keith Packard not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission.  Keith Packard makes no
-# representations about the suitability of this software for any purpose.  It
-# is provided "as is" without express or implied warranty.
-#
-# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-
-CC = @CC_FOR_BUILD@
-EXEEXT = @EXEEXT_FOR_BUILD@
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
-
-TMPL=fcarch.tmpl.h
-STMPL=${top_srcdir}/fc-arch/fcarch.tmpl.h
-TARG=fcarch.h
-
-ARCHITECTURE=@ARCHITECTURE@
-.PRECIOUS: $(TARG)
-
-noinst_PROGRAMS=fc-arch
-
-EXTRA_DIST=$(TMPL)
-
-$(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
-	$(AM_V_GEN) $(RM) $(TARG); \
-	./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG).tmp && \
-	mv $(TARG).tmp $(TARG)
-
-ALIAS_FILES = fcalias.h fcaliastail.h
-
-BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
-
-$(ALIAS_FILES): 
-	touch $(ALIAS_FILES)
-
-CLEANFILES=$(TARG) $(ALIAS_FILES)
diff --git a/fontconfig/fc-arch/fc-arch.c b/fontconfig/fc-arch/fc-arch.c
deleted file mode 100644
index 1ef0cf18a..000000000
--- a/fontconfig/fc-arch/fc-arch.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright © 2006 Keith Packard
- * Copyright © 2005 Patrick Lam
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "fcint.h"
-#include <ctype.h>
-
-#define ENDIAN_TEST 0x01020304
-#define MACHINE_SIGNATURE_SIZE 1024
-
-static char *
-FcCacheMachineSignature (void)
-{
-    static char buf[MACHINE_SIGNATURE_SIZE];
-    int32_t magic = ENDIAN_TEST;
-    char * m = (char *)&magic;
-
-    sprintf (buf, "%01x%01x%01x%01x_"
-	     "%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_"
-	     "%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x_%02x",
-	     m[0], m[1], m[2], m[3],
-	     (unsigned int)sizeof (FcAlign),
-	     (unsigned int)sizeof (char),
-	     (unsigned int)sizeof (char *),
-	     (unsigned int)sizeof (int),
-	     (unsigned int)sizeof (intptr_t),
-	     (unsigned int)sizeof (FcPattern),
-	     (unsigned int)sizeof (FcPatternEltPtr),
-	     (unsigned int)sizeof (struct  FcPatternElt *),
-	     (unsigned int)sizeof (FcPatternElt),
-	     (unsigned int)sizeof (FcObject),
-	     (unsigned int)sizeof (FcValueListPtr),
-	     (unsigned int)sizeof (FcValue),
-	     (unsigned int)sizeof (FcValueBinding),
-	     (unsigned int)sizeof (struct  FcValueList *),
-	     (unsigned int)sizeof (FcStrSet *), /* For FcLangSet */
-	     (unsigned int)sizeof (FcCharSet),
-	     (unsigned int)sizeof (FcCharLeaf **),
-	     (unsigned int)sizeof (FcChar16 *),
-	     (unsigned int)sizeof (FcChar16),
-	     (unsigned int)sizeof (FcCharLeaf),
-	     (unsigned int)sizeof (FcChar32),
-	     (unsigned int)sizeof (FcCache));
-
-    return buf;
-}
-
-int
-main (int argc, char **argv)
-{
-    static char		line[1024];
-    char		*signature;
-    int			signature_length;
-    char		*space;
-    char		*arch = NULL;
-    int			lineno = 0;
-    
-    if (argc != 2)
-	fprintf (stderr, "Usage: %s <architecture>|auto < fcarch.tmpl.h > fcarch.h\n",
-		 argv[0]);
-    arch = argv[1];
-    /*
-     * Scan the input until the marker is found
-     */
-    
-    while (fgets (line, sizeof (line), stdin))
-    {
-	lineno++;
-	if (!strncmp (line, "@@@", 3))
-	    break;
-	fputs (line, stdout);
-    }
-    signature = FcCacheMachineSignature();
-    signature_length = strlen (signature);
-    
-    if (strcmp (arch, "auto") == 0)
-    {
-	arch = NULL;
-	/*
-	 * Search for signature
-	 */
-	while (fgets (line, sizeof (line), stdin)) 
-	{
-	    lineno++;
-	    /*
-	     * skip comments
-	     */
-	    if (!strncmp (line, "@@@", 3))
-		continue;
-	    space = line;
-	    while (*space && !isspace (*space))
-		space++;
-	    if (!space)
-	    {
-		fprintf (stderr, "%s: malformed input on line %d\n",
-			 argv[0], lineno);
-		exit (1);
-	    }
-	    *space++ = '\0';
-	    while (isspace (*space))
-		space++;
-	    if (!strncmp (space, signature, signature_length))
-	    {
-		arch = line;
-		break;
-	    }
-	}
-    }
-    if (!arch)
-    {
-	fprintf (stderr, "%s: unknown signature \"%s\"\n", argv[0], signature);
-	fprintf (stderr, "\tPlease update fcarch.tmpl.h and rebuild\n");
-	exit (1);
-    }
-    printf ("#define FC_ARCHITECTURE \"%s\"\n", arch);
-    fflush (stdout);
-    exit (ferror (stdout));
-}
-
diff --git a/fontconfig/fc-arch/fcarch.tmpl.h b/fontconfig/fc-arch/fcarch.tmpl.h
deleted file mode 100644
index 363e11aa1..000000000
--- a/fontconfig/fc-arch/fcarch.tmpl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-@@@ 
-@@@ Each unique machine architecture needs an entry in this file
-@@@ If fc-arch runs and doesn't find a matching entry, it will print
-@@@ out the archtecture signature in the error message. Take that
-@@@ signature and place it in this file along with a suitable architecture
-@@@ name. Architecture names are used to construct file names, so
-@@@ use something reasonable and don't include any spaces
-@@@
-@@@ So far the differences boil down to: endianness, 32 vs 64 bit pointers,
-@@@ and on @@@ 32bit ones, whether double is aligned to one word or two words.
-@@@ Those result in the 6 formats listed below.
-@@@
-@@@ ,name (endianness,pointer-size,double-alignment)
-@@@ |   ,endian
-@@@ |   |    ,FcAlign
-@@@ |   |    |  ,char
-@@@ |   |    |  |  ,char*
-@@@ |   |    |  |  |  ,int
-@@@ |   |    |  |  |  |  ,intptr_t
-@@@ |   |    |  |  |  |  |  ,Pattern
-@@@ |   |    |  |  |  |  |  |  ,EltPtr
-@@@ |   |    |  |  |  |  |  |  |  ,Elt *
-@@@ |   |    |  |  |  |  |  |  |  |  ,Elt
-@@@ |   |    |  |  |  |  |  |  |  |  |  ,ObjPtr
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  ,ValueListPtr
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  ,Value
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  ,ValueBinding
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  ,ValueList *
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,StrSet *
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,CharSet
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,CharLeaf **
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,Char16 *
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,Char16
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,CharLeaf
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,Char32
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  ,Cache
-@@@ |   |    |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
-le32d4	4321_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
-le32d8	4321_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
-le64	4321_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
-be32d4	1234_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
-be32d8	1234_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
-be64	1234_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
diff --git a/fontconfig/fc-arch/makefile b/fontconfig/fc-arch/makefile
deleted file mode 100644
index 2f18dff42..000000000
--- a/fontconfig/fc-arch/makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-ifneq ($(NORELDBG),1)
-$(error NORELDBG should have been set to 1)
-endif
-
-INCLUDES+=..\src
-
-TMPL=fcarch.tmpl.h
-STMPL=fcarch.tmpl.h
-TARG=fcarch.h
-
-ARCHITECTURE=x86-vc
-
-TTYAPP=fc-arch
-CSRCS=fc-arch.c
-
-DEFINES += HAVE_CONFIG_H
-INCLUDES := .. $(INCLUDES)
-
-$(TARG): $(OBJDIR)\fc-arch.exe $(STMPL) ..\src\fcint.h ..\config.h
-	del -e $(TARG)
-	$(OBJDIR)\fc-arch.exe $(ARCHITECTURE) < $(STMPL) > $(TARG).tmp
-	move $(TARG).tmp $(TARG)
-