Update to fstobdf 1.0.3

This commit is contained in:
matthieu 2008-06-13 00:10:59 +00:00
parent a22a0d05d6
commit ab31903cb7
10 changed files with 361 additions and 124 deletions

View File

@ -1,12 +1,89 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Copyright 1990, 1991, 1998 The Open Group
Please submit updated COPYING files to the Xorg bugzilla:
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.
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://lists.freedesktop.org/mailman/listinfo/xorg
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1990, 1991 Network Computing Devices;
Portions Copyright 1987 by Digital Equipment Corporation
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 names of Network Computing Devices, or Digital
not be used in advertising or publicity pertaining to distribution
of the software without specific, written prior permission.
NETWORK COMPUTING DEVICES, AND DIGITAL DISCLAIM ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES,
OR DIGITAL 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.
Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of the XFree86 Project shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from the
XFree86 Project.
Copyright 2005 Red Hat, Inc.
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 Red Hat not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Red Hat makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL RED HAT 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.

View File

@ -1,40 +1,221 @@
2006-04-26 Adam Jackson <ajax@freedesktop.org>
commit 3c13b4d1e7d143149cfb34e1771cb28f903be2e2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:54:12 2008 -0700
* configure.ac:
Bump to 1.0.2.
fstobdf 1.0.3
2006-04-03 Adam Jackson <ajax@freedesktop.org>
commit 30631bd1a0fae41c6544a40b2984229c5ed781e9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:48:35 2008 -0700
Fill in COPYING with copyright/license notices from sources
commit 76ce8815598d849228d27a0593bb8af75502bf75
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 22 20:10:40 2008 -0700
Move extern declarations to fstobdf.h
commit a115e4506842b51f4bf76b5afb9d2ded2dacd51d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 22 20:06:13 2008 -0700
Clarify syntax of -server & FONTSERVER in man page
commit f27374f843995264e0f2c7c3e2728811bcbd0f29
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:36:59 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 50fc125ad63e62879ceb6aab70dea5b6088d15bd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:43:20 2007 -0700
renamed: .cvsignore -> .gitignore
commit b3ea1fe30d53ba671edafc575854d3a832e95dff
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:42:56 2007 -0700
Change fstobdf_CFLAGS to AM_CFLAGS to make automake-1.10 happier
commit 5f2ab39899e6043c73b120ab0b2db92488e489e7
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Apr 26 23:34:13 2006 +0000
Bump to 1.0.2
commit 188c68636a3e22d26ec35b634c801bad757495ef
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 22:17:25 2006 +0000
* chars.c:
Bug #4381: Fix BDF corruption. (Laurent Deniel)
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit db72447aff80d8ffa431d3225c289ec49a4c8c84
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:42 2005 +0000
* configure.ac:
Update package version for X11R7 release.
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit d70e1e74a6ce8d21767664d3bb6388586aaa3920
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:22:40 2005 +0000
Stub COPYING files
commit c766cae078f347be18959a5dc2172bc6c4faf952
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:02 2005 +0000
* configure.ac:
Update package version number for final X11R7 release candidate.
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit bad843b614c14e4cc02345ff4bec5d5c5bb9f993
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:16 2005 +0000
* Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 4329e1ca1f0809914fddd60696e558e72caae494
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:15 2005 +0000
* configure.ac:
Update package version number for X11R7 RC3 release.
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 7ff29b4374c214a0c58a3acd2a180b90a31dfe52
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:01:36 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 820c5e99361d1b6a5656c9853419d1c8ae7db787
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:34:55 2005 +0000
Another pass at .cvsignores for apps.
commit 95d2bcad442604165a2f71d51db7f64ea29f9a47
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 22:08:48 2005 +0000
Add/improve .cvsignore files for apps.
commit 05c773f65adf74398255d59a0ec812dc9b057d11
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:09:19 2005 +0000
* configure.ac:
Update package version number for X11R7 RC2 release.
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 27ad2aec059aea01355e2f6c8b60a04e9d247e08
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 31 16:05:45 2005 +0000
Make extern declarations unsigned to match actual definitions
commit f24de18b73a4a8d5a40999dc217ca505ae96416a
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:48 2005 +0000
* configure.ac:
Update package version number for RC1 release.
commit 2027f7ce5bb247d55038f51213525bbda841c5ce
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 23:56:19 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 0e20abe944a79066a65a1531dbcffcd291e3c366
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:25:41 2005 +0000
Use sed to fill in variables in man page
commit 7efa81258b496d9e5a56c827d10d048736f200e1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 20:25:27 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit 125f805889f269b54c4d1d188da9ac7b3f2903e0
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:29 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 58defa6321b6c44a61d45302ad8abaa71d2f7275
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 20 19:31:48 2005 +0000
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
commit d487591b670d61283aa8482817af8dac6b82badb
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 6 16:22:21 2005 +0000
Add buildsystem for fstobdf
commit b17424c318b7b63dad281d43ac60944309b60d72
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:32 2004 +0000
Merging XORG-CURRENT into trunk
commit 2d7b7aac54d92e036daf84a97e120addae6f5e0e
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:34:50 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 0e2177c6d0111689ad142209377b792ba6bd76e7
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:50 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 222546046bd08aad239c1ee16623b98782fbba7b
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:15 2004 +0000
readding XFree86's cvs IDs
commit 0890d1400abf5cec75dbb4c6dfa69c1edb703bdb
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:54 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit e57cbe87a9b8c8197c51ff12101726ed6924dfdf
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:02 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 6f1b843c87395c617f48793607797face574a188
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:57 2003 +0000
XFree86 4.3.0.1
commit 33b0317bc68027d8814f264a45eaf19c68270cd3
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:57 2003 +0000
Initial revision
commit 0f05b729fa8590f7473af78b1532cd9a3d589f1b
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:52 2003 +0000
R6.6 is the Xorg base-line

View File

@ -21,7 +21,7 @@
bin_PROGRAMS = fstobdf
fstobdf_CFLAGS = $(FSTOBDF_CFLAGS)
AM_CFLAGS = $(FSTOBDF_CFLAGS)
fstobdf_LDADD = $(FSTOBDF_LIBS)
fstobdf_SOURCES = \
@ -65,3 +65,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog

View File

@ -76,8 +76,8 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_fstobdf_OBJECTS = fstobdf-chars.$(OBJEXT) fstobdf-fstobdf.$(OBJEXT) \
fstobdf-header.$(OBJEXT) fstobdf-props.$(OBJEXT)
am_fstobdf_OBJECTS = chars.$(OBJEXT) fstobdf.$(OBJEXT) \
header.$(OBJEXT) props.$(OBJEXT)
fstobdf_OBJECTS = $(am_fstobdf_OBJECTS)
am__DEPENDENCIES_1 =
fstobdf_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ -207,7 +207,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
fstobdf_CFLAGS = $(FSTOBDF_CFLAGS)
AM_CFLAGS = $(FSTOBDF_CFLAGS)
fstobdf_LDADD = $(FSTOBDF_LIBS)
fstobdf_SOURCES = \
chars.c \
@ -221,7 +221,7 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
SED = sed
@ -242,6 +242,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -330,10 +331,10 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstobdf-chars.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstobdf-fstobdf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstobdf-header.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstobdf-props.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chars.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstobdf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/props.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -348,62 +349,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
fstobdf-chars.o: chars.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-chars.o -MD -MP -MF "$(DEPDIR)/fstobdf-chars.Tpo" -c -o fstobdf-chars.o `test -f 'chars.c' || echo '$(srcdir)/'`chars.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-chars.Tpo" "$(DEPDIR)/fstobdf-chars.Po"; else rm -f "$(DEPDIR)/fstobdf-chars.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='chars.c' object='fstobdf-chars.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-chars.o `test -f 'chars.c' || echo '$(srcdir)/'`chars.c
fstobdf-chars.obj: chars.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-chars.obj -MD -MP -MF "$(DEPDIR)/fstobdf-chars.Tpo" -c -o fstobdf-chars.obj `if test -f 'chars.c'; then $(CYGPATH_W) 'chars.c'; else $(CYGPATH_W) '$(srcdir)/chars.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-chars.Tpo" "$(DEPDIR)/fstobdf-chars.Po"; else rm -f "$(DEPDIR)/fstobdf-chars.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='chars.c' object='fstobdf-chars.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-chars.obj `if test -f 'chars.c'; then $(CYGPATH_W) 'chars.c'; else $(CYGPATH_W) '$(srcdir)/chars.c'; fi`
fstobdf-fstobdf.o: fstobdf.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-fstobdf.o -MD -MP -MF "$(DEPDIR)/fstobdf-fstobdf.Tpo" -c -o fstobdf-fstobdf.o `test -f 'fstobdf.c' || echo '$(srcdir)/'`fstobdf.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-fstobdf.Tpo" "$(DEPDIR)/fstobdf-fstobdf.Po"; else rm -f "$(DEPDIR)/fstobdf-fstobdf.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstobdf.c' object='fstobdf-fstobdf.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-fstobdf.o `test -f 'fstobdf.c' || echo '$(srcdir)/'`fstobdf.c
fstobdf-fstobdf.obj: fstobdf.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-fstobdf.obj -MD -MP -MF "$(DEPDIR)/fstobdf-fstobdf.Tpo" -c -o fstobdf-fstobdf.obj `if test -f 'fstobdf.c'; then $(CYGPATH_W) 'fstobdf.c'; else $(CYGPATH_W) '$(srcdir)/fstobdf.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-fstobdf.Tpo" "$(DEPDIR)/fstobdf-fstobdf.Po"; else rm -f "$(DEPDIR)/fstobdf-fstobdf.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fstobdf.c' object='fstobdf-fstobdf.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-fstobdf.obj `if test -f 'fstobdf.c'; then $(CYGPATH_W) 'fstobdf.c'; else $(CYGPATH_W) '$(srcdir)/fstobdf.c'; fi`
fstobdf-header.o: header.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-header.o -MD -MP -MF "$(DEPDIR)/fstobdf-header.Tpo" -c -o fstobdf-header.o `test -f 'header.c' || echo '$(srcdir)/'`header.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-header.Tpo" "$(DEPDIR)/fstobdf-header.Po"; else rm -f "$(DEPDIR)/fstobdf-header.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='header.c' object='fstobdf-header.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-header.o `test -f 'header.c' || echo '$(srcdir)/'`header.c
fstobdf-header.obj: header.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-header.obj -MD -MP -MF "$(DEPDIR)/fstobdf-header.Tpo" -c -o fstobdf-header.obj `if test -f 'header.c'; then $(CYGPATH_W) 'header.c'; else $(CYGPATH_W) '$(srcdir)/header.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-header.Tpo" "$(DEPDIR)/fstobdf-header.Po"; else rm -f "$(DEPDIR)/fstobdf-header.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='header.c' object='fstobdf-header.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-header.obj `if test -f 'header.c'; then $(CYGPATH_W) 'header.c'; else $(CYGPATH_W) '$(srcdir)/header.c'; fi`
fstobdf-props.o: props.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-props.o -MD -MP -MF "$(DEPDIR)/fstobdf-props.Tpo" -c -o fstobdf-props.o `test -f 'props.c' || echo '$(srcdir)/'`props.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-props.Tpo" "$(DEPDIR)/fstobdf-props.Po"; else rm -f "$(DEPDIR)/fstobdf-props.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='props.c' object='fstobdf-props.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-props.o `test -f 'props.c' || echo '$(srcdir)/'`props.c
fstobdf-props.obj: props.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -MT fstobdf-props.obj -MD -MP -MF "$(DEPDIR)/fstobdf-props.Tpo" -c -o fstobdf-props.obj `if test -f 'props.c'; then $(CYGPATH_W) 'props.c'; else $(CYGPATH_W) '$(srcdir)/props.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fstobdf-props.Tpo" "$(DEPDIR)/fstobdf-props.Po"; else rm -f "$(DEPDIR)/fstobdf-props.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='props.c' object='fstobdf-props.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstobdf_CFLAGS) $(CFLAGS) -c -o fstobdf-props.obj `if test -f 'props.c'; then $(CYGPATH_W) 'props.c'; else $(CYGPATH_W) '$(srcdir)/props.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@ -500,6 +445,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -629,6 +577,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -684,8 +633,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@ -700,6 +649,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.5
[XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi

View File

@ -1,5 +1,5 @@
/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */
/* $XdotOrg: app/fstobdf/chars.c,v 1.4 2006/04/03 22:17:25 ajax Exp $ */
/* $XdotOrg: app/fstobdf/chars.c,v 1.3 2005/10/31 16:05:45 alanc Exp $ */
/*
Copyright 1990, 1998 The Open Group
@ -52,9 +52,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xlib.h>
#include "fstobdf.h"
extern unsigned long yResolution; /* intended vertical resoultion for font */
extern unsigned long pointSize; /* font height in points */
#define BIT_ORDER BitmapFormatBitOrderMSB
#ifdef BYTE_ORDER
#undef BYTE_ORDER

24
app/fstobdf/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for fstobdf 1.0.2.
# Generated by GNU Autoconf 2.59 for fstobdf 1.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='fstobdf'
PACKAGE_TARNAME='fstobdf'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='fstobdf 1.0.2'
PACKAGE_VERSION='1.0.3'
PACKAGE_STRING='fstobdf 1.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG FSTOBDF_CFLAGS FSTOBDF_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
@ -750,7 +750,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures fstobdf 1.0.2 to adapt to many kinds of systems.
\`configure' configures fstobdf 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -816,7 +816,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of fstobdf 1.0.2:";;
short | recursive ) echo "Configuration of fstobdf 1.0.3:";;
esac
cat <<\_ACEOF
@ -946,7 +946,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
fstobdf configure 1.0.2
fstobdf configure 1.0.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -960,7 +960,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by fstobdf $as_me 1.0.2, which was
It was created by fstobdf $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1558,7 +1558,7 @@ fi
# Define the identity of the package.
PACKAGE='fstobdf'
VERSION='1.0.2'
VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF
@ -3265,7 +3265,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@ -3274,7 +3274,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@ -3669,7 +3669,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by fstobdf $as_me 1.0.2, which was
This file was extended by fstobdf $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -3732,7 +3732,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
fstobdf config.status 1.0.2
fstobdf config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(fstobdf,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fstobdf)
AC_INIT(fstobdf,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fstobdf)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE

View File

@ -36,3 +36,5 @@ extern Bool EmitProperties ( FILE *outFile, FSXFontInfoHeader *fontHeader,
extern Bool EmitCharacters ( FILE *outFile, FSServer *fontServer,
FSXFontInfoHeader *fontHeader, Font fontID );
extern unsigned long yResolution; /* intended vertical resoultion for font */
extern unsigned long pointSize; /* font height in points */

View File

@ -26,14 +26,14 @@
.\"
.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $
.\"
.TH FSTOBDF 1 __xorgversion__
.TH FSTOBDF __appmansuffix__ __xorgversion__
.SH NAME
fstobdf \- generate BDF font from X font server
.SH SYNOPSIS
.B "fstobdf"
[
.B \-server
.I server
.I servername
]
.B \-fn
.I fontname
@ -46,15 +46,25 @@ lost BDF files.
.TP 8
.B \-server \fIservername\fP
This option specifies the server from which the font should be read.
.I servername
must be specified in one of the formats defined in the
.I Font Server Names
section of X(__miscmansuffix__). If not specified, the server name in the
.B FONTSERVER
environment variable is used.
.TP 8
.B \-fn \fIfontname\fP
This option specifies the font for which a BDF file should be generated.
.SH ENVIRONMENT
.TP 8
.B FONTSERVER
default server to use
The default server to use. The server name must
be specified in one of the formats defined in the
.I Font Server Names
section of X(__miscmansuffix__).
.SH "SEE ALSO"
xfs(1), bdftopcf(1), fslsfonts(1)
xfs(__appmansuffix__), bdftopcf(__appmansuffix__), showfont(__appmansuffix__),
fslsfonts(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHOR
Olaf Brandt, Network Computing Devices
.br