qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to libXft 2.1.14

Browse Source
This commit is contained in:
matthieu 2009-10-31 18:23:14 +00:00
parent 6ac962e3d1
commit fbfe310e31
37 changed files with 8404 additions and 5127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libXft/COPYING
View File

@ -1,4 +1,3 @@
$Id: COPYING,v 1.1.1.1 2006/11/25 17:21:36 matthieu Exp $
Copyright © 2001,2003 Keith Packard

435
lib/libXft/ChangeLog
View File

@ -1,20 +1,427 @@
2006-06-03 Daniel Stone <daniel@freedesktop.org>
commit fc248fb44413d11fed288793d0d8c2af76aeeb40
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 16:45:25 2009 -0700
* configure.ac:
* include/X11/Xft/Xft.h:
Bump to 2.1.9.
* src/*.c:
* include/X11/Xft/Xft.h:
Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith)
libXft 2.1.14
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 0f2a55b55d18272824444071f71473d988112465
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 09:18:43 2009 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
Add generated Xft.h to .gitignore
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit c36e28b3ed913d2dcb5c7876e49ccf2631a11df4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 15:00:04 2009 -0700
* configure.ac:
Update package version number for X11R7 RC3 release.
Fix install of generated Xft.h when builddir != srcdir
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit c498ec3e4fb8e07bad7b053535d832273ac9b402
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 01:01:07 2009 -0700
Split NEWS & README, update both
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit dac73a51981632908ce86cff26af5b0bcfcdd770
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 00:39:14 2009 -0700
Set Xft.h version numbers from configure.ac
Keep the two in sync automatically instead of manually
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit cfa048b4aa351068415c5e2711731246a9c19322
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 23:53:33 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 5957fdd9ba2aba60e90a30bc3744f76ddb27b8d2
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 18:45:48 2009 -0200
Janitor: Correct make distcheck and sparse warnings.
Use only one toplevel .gitignore file.
It was tempting to also modify the code to not, first check if
xrender is >= 0.8.2, and then, if failing, check for libXrender
functions with different build options, but left as is, as it
could be somehow useful at least as an example of being backwards
compatible.
commit cb80b4493e116229d8cc46507dec0fed6febd949
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sat Nov 22 20:45:02 2008 +0100
Added fake bold support (#1579, Novell #38202/223682).
commit 60bb5229f0fb16cee27077552fbc35d53c94f031
Author: Erik Andren <erik.andren@gmail.com>
Date: Sat Oct 25 20:34:27 2008 +0200
Header cleanup (bug#4703)
Remove prototypes for nonexistent functions from Xft.h, and add missing
include in xftglyphs.c
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 1a34928cd823ef1452b973bd7c4c1d12cd976bba
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:42:37 2008 -0400
libXft 2.1.13
commit 19240d3605b5f1e88ca5509afffd48acdb7e1c5f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 11 02:12:05 2008 +0200
Revert "Drop Requires, use Requires.private instead."
This reverts commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab.
Unfortunately this doesn't work on old pkg-config, which made
Requires.private completely useless. That's fixed in 0.22, but...
commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 17:29:27 2008 +0200
Drop Requires, use Requires.private instead.
Users of libXft don't need to link with fontconfig, freetype and
Xrender directly if they don't use them.
commit 541c6194d986e7849ee9541a9fd60b0724647a44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 12:10:19 2008 -0400
Bug #14232: Fix XftDrawRect when Render not supported.
commit 8661a88789dce4fe06d45faec70f8e74834abdd6
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:28:43 2008 +0100
nuke RCS Ids
commit 9e25c9019bd6788076c12cb4356c7d27d6c7d9af
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:28 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 8a7f3d450c1f339f429dbce55df523d026c92375
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sun Nov 4 11:31:44 2007 -0800
Register objects used by libXft.
libXft uses XFT_MAX_GLYPH_MEMORY without first registering with fontconfig.
commit 8ae5ea8c75a7850fa0aca0acc3962b6263f55094
Author: Karl Tomlinson <bugs.freedesktop@karlt.net>
Date: Wed Sep 12 12:00:43 2007 +0100
XftFontOpenInfo: Use of uninitialised value of size 8 (bug 11200)
This is due to XftFontInfoFill using the binary representation of the
XftFontInfo to generate fi->hash.
With 64-bit pointers there is padding between .hash and .file in struct
_XftFontInfo. This padding is not initialized, and the hash uses these
bytes.
This will interfere with finding "a matching previously opened font" in
XftFontOpenInfo, and XftFontInfoEqual, which uses memcmp, will have similar
problems.
This fix makes no assumptions about the sizes and alignment of members of
struct _XftFontInfo by using memset. (It also makes no assumptions about
what FcPatternGet* does to its output parameter when it returns
FcResultNoMatch.)
commit a782fe3fbed05344e2a12f53ede6101e120ed485
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:39 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit 3c68c68fc20b875b405f2640778e32a41a807e27
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Dec 7 12:20:44 2006 +0200
bump to 2.1.12
commit 22112a0ee3bd16b40e414bac32c532a73cbabbcb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Dec 7 12:20:05 2006 +0200
XftNameUnparse: re-export to public API (bug #8900)
Fix botched git import, which reverted some changes from CVS, by
re-exporting XftNameUnparse.
commit 6159d185048fbbb67627667d60dcd475def5bb44
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 17:08:55 2006 -0400
Bump to 2.1.11
commit 661199d47ff8e9842542f9e407da50629c8a17b6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 16:18:47 2006 -0400
Bump to 2.1.10
commit 5e5d0c7597e7f494ad3010f6d4656c5209b09f88
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 13 14:58:58 2006 -0700
renamed: .cvsignore -> .gitignore
commit 8fc012344f8f072ee3bd1b09c336fed8d47826c5
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Thu Jul 13 10:28:30 2006 -0400
Bug #7259: Various Coverity fixes.
commit 824f87ba102e36808c59e92d7f527ca2f8b00026
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:41:03 2006 +0000
Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith). Bump to
2.1.9.
commit 250b95f857cdd7fadab9e06f1a6f69706467aac2
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:30 2005 +0000
Update package version number for final X11R7 release candidate.
commit 2a43efac053b9fa0a460d47f5154511cfaf4f2ba
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:44 2005 +0000
Update package version number for X11R7 RC3 release.
commit 88a1de23e126cde06bf4136b56007dc24ad991e8
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 23:17:41 2005 +0000
Add/improve libs .cvsignores.
commit bcbcdcdb0f41b61351454db5032a514215f2f089
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:49 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit 143f9e1b8d328ebc806067fb44809a8a8fd419e4
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:10 2005 +0000
Update package version number for RC1 release.
commit 34dc7dbd584f2bbef39248c26236186e08c79a25
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:46:56 2005 +0000
lib/Xcomposite/Xcomposite.h
lib/Xft/Imakefile
lib/Xft/Xft.h Update library version numbers to match updated package
versions.
Update driver version numbers for RC1.
commit 11bc8208939991e9cd3eba2900827fd2e37b04a5
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 5 19:46:16 2005 +0000
Clean up generated files
commit edfb44c93c03c41f13240af318a45f0f04dde6d1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 4 16:15:48 2005 +0000
If --with-freetype-config is not specified, try pkgconfig freetype2, then
fall back to freetype-config if pkgconfig fails.
commit a09401affaf007aef2585711cd5eb499f554be9b
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:51 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 0dd89a9e7ba09ed0c3f90a415b506a4ed89b91bb
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 27 21:48:38 2005 +0000
Build system for Xft
commit db7a51a120898eda2824ec15d55641589571ed5d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:00:57 2005 +0000
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
commit 403c9f9886cea9fd390a242e7c031ba2cc26217f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jun 24 22:43:20 2005 +0000
Sync with Xft from xlibs CVS (2.1.7 plus man page updates from Branden
Robinson) - see lib/Xft/ChangeLog for full details
commit 1d14cc37d43bf349ee18e748f62913a0963f6e85
Author: Egbert Eich <eich@suse.de>
Date: Tue May 17 08:10:10 2005 +0000
gcc4 allows to check if sentinels are correct (a sentinel is the
terminating element in a varargs list). A sentinel needs to be NULL,
not 0 - which doesn't make a difference on 32bit but matters on 64bit.
Furthermore it can be told that functions have a printf-like format
string and argument list so that they can verify that both match. To
use these features certain attributes need to be set - which are
compiler specific. To do this we define macros which are expanded
depending on the compiler version. For now we put those in
include/Xfuncproto.h (the XFree86 DDX layer contains a file compiler.h
which however is not visible outside the DDX) (Bugzilla #3268).
commit 0161d08ecd543c80e5625bf63d0091dbccd95f4e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 13 19:03:15 2004 +0000
Fri Aug 13 21:01:34 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Fix the build
commit 0641e99b21eead5aaee0c1136dd2d640028f6783
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 13 18:24:06 2004 +0000
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
Harris.
Call xf86EnableDisableFBAccess though the function pointer instead of
directly. #1041, Patch from Aaron Plattner.
Swap the phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
of proping it. This way it will work with the monolithic version too.
#1062, Patch by Owen Taylor.
commit 14c188e8b0a0d88f97bcde21c8e1b1da8541bdf8
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 11 23:37:34 2004 +0000
Called strlen with (f->file) without checking for NULL (which happens when
directly using FT_Face objects) (Bug #1047, Keith Packard).
commit 591dcad65f73450a07ac7477a3a827d95eb6f726
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:42 2004 +0000
Merging XORG-CURRENT into trunk
commit c7e70c7e31897e00caaeb177176a8c24b834bc78
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:32:10 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 113366a92f315a2178d19c6bb9bed54109697864
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 11 14:16:10 2004 +0000
file Xft.3.in was initially added on branch XORG-RELEASE-1.
commit 30761fcb5a6f3f2f23466f1b0ec1d290b5002e4e
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 11 14:16:09 2004 +0000
file NEWS was initially added on branch XORG-RELEASE-1.
commit be5842a55ddd89141de2f238e9b41541a247d13b
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 11 14:16:09 2004 +0000
file AUTHORS was initially added on branch XORG-RELEASE-1.
commit 4214b9fb11baea4347bb2279b800819ee9792c46
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 9 16:52:30 2004 +0000
file README was initially added on branch XORG-RELEASE-1.
commit 14f8861ef153e64359e062a96212eb5358a32fd4
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 9 16:52:30 2004 +0000
file INSTALL was initially added on branch XORG-RELEASE-1.
commit fabef42954896dca3d43fb414c564e9750112bf5
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 9 16:52:30 2004 +0000
file COPYING was initially added on branch XORG-RELEASE-1.
commit 3ff3e952c6095488466f71da06c6664a056e4c03
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:11:28 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 00bdde8b2e4521b5058ee988c32dd814b852813d
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:33 2004 +0000
readding XFree86's cvs IDs
commit f328c0a0fff3ec647c3f1d7c06b3d701850eb955
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:43 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 1781965aa5fac8f0737251ca883301e1aec7b12b
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:09 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit ac1033d4dc0ff95ab31dd2eb4752e7b4520fe819
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:48 2003 +0000
XFree86 4.3.0.1
commit 52a3d6a04aa1a18223059334f8d5ed2955461b7d
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:48 2003 +0000
Initial revision

12
lib/libXft/Makefile.am
View File

@ -1,6 +1,4 @@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:21:35 matthieu Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@ -30,4 +28,12 @@ pkgconfig_DATA = xft.pc
CLEANFILES = xft-config
EXTRA_DIST = xft-config.in xft.pc.in autogen.sh
EXTRA_DIST = xft-config.in xft.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

4
lib/libXft/Makefile.bsd-wrapper
View File

@ -1,5 +1,5 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/03/15 23:00:47 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2009/10/31 18:23:14 matthieu Exp $
SHARED_LIBS= Xft 7.0
SHARED_LIBS= Xft 8.0
.include <bsd.xorg.mk>

72
lib/libXft/Makefile.in
View File

@ -14,8 +14,6 @@
@SET_MAKE@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:21:35 matthieu Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@ -63,8 +61,9 @@ host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/xft-config.in $(srcdir)/xft.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config.guess config.sub depcomp install-sh ltmain.sh missing
$(top_srcdir)/configure $(top_srcdir)/include/X11/Xft/Xft.h.in \
AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -73,7 +72,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_HEADER = config.h $(top_builddir)/include/X11/Xft/Xft.h
CONFIG_CLEAN_FILES = xft.pc xft-config
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@ -107,11 +106,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -120,8 +122,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -129,6 +133,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -137,10 +144,13 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -149,12 +159,17 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -165,20 +180,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMKMF = @XMKMF@
XRENDER_CFLAGS = @XRENDER_CFLAGS@
XRENDER_LIBS = @XRENDER_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -195,6 +207,10 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ft_config = @ft_config@
host = @host@
@ -202,17 +218,21 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -222,7 +242,8 @@ bin_SCRIPTS = xft-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xft.pc
CLEANFILES = xft-config
EXTRA_DIST = xft-config.in xft.pc.in autogen.sh
EXTRA_DIST = xft-config.in xft.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -275,8 +296,18 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
rm -f stamp-h1
touch $@
include/X11/Xft/Xft.h: include/X11/Xft/stamp-h2
@if test ! -f $@; then \
rm -f include/X11/Xft/stamp-h2; \
$(MAKE) include/X11/Xft/stamp-h2; \
else :; fi
include/X11/Xft/stamp-h2: $(top_srcdir)/include/X11/Xft/Xft.h.in $(top_builddir)/config.status
@rm -f include/X11/Xft/stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status include/X11/Xft/Xft.h
distclean-hdr:
-rm -f config.h stamp-h1
-rm -f config.h stamp-h1 include/X11/Xft/Xft.h include/X11/Xft/stamp-h2
xft.pc: $(top_builddir)/config.status $(srcdir)/xft.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
xft-config: $(top_builddir)/config.status $(srcdir)/xft-config.in
@ -463,7 +494,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/man
$(mkdir_p) $(distdir)/. $(distdir)/include/X11/Xft $(distdir)/man
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@ -505,6 +536,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 \
@ -635,6 +669,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-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -691,7 +726,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@ -705,6 +740,13 @@ uninstall-info: uninstall-info-recursive
tags tags-recursive uninstall uninstall-am \
uninstall-binSCRIPTS uninstall-info-am uninstall-pkgconfigDATA
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
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:

57
lib/libXft/NEWS
View File

@ -0,0 +1,57 @@
Xft
X FreeType library
Version 2.1.14
2009-10-09
Xft version 2.1 is the first stand alone release of Xft, a library that
connects X applications with the FreeType font rasterization library. Xft
uses fontconfig to locate fonts so it has no configuration files.
Version 2.1.14
Added fake bold support (#1579, Novell #38202/223682).
Version 2.1.13
Fix hashing in 64-bit versions. Register objects with freetype.
Fix XftDrawRect when Render not supported.
Version 2.1.12
Fix exporting of XftNameUnparse function.
Version 2.1.9
Stop exporting unnecessary symbols.
Version 2.1.7
Change FC_CHARCELL and FC_MONO interpretation. FC_MONO no longer clips
glyphs to charcell, you must specify FC_CHARCELL for that.
Add support for FT_GlyphSlot_Embolden where it exists (which it usually
doesn't).
Avoid crashing when using FT_Face objects.
Version 2.1.6
Deal with broken FreeType 2.1.7 BDF/PCF loaders by trying both y_ppem/x_ppem
and width/height values.
Version 2.1.5
Left some #warnings from testing in the 2.1.4 release. Spin again.
Version 2.1.4
Work with older versions of Fontconfig by using various pattern elements
only when defined.
Version 2.1.3
Change Freetype includes to new syntax.
Search for nearest bitmap for bitmap-only fonts.
Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.

59
lib/libXft/README
View File

@ -1,65 +1,52 @@
Xft
X FreeType library
Version 2.1.7
2005-3-29
Xft version 2.1 is the first stand alone release of Xft, a library that
connects X applications with the FreeType font rasterization library. Xft
uses fontconfig to locate fonts so it has no configuration files.
Version 2.1.7
Before building Xft you will need to have installed:
freetype http://freetype.org/
fontconfig http://fontconfig.org/
libX11, libXext, & libXrender http://x.org/
Change FC_CHARCELL and FC_MONO interpretation. FC_MONO no longer clips
glyphs to charcell, you must specify FC_CHARCELL for that.
All questions regarding this software should be directed at the
Xorg mailing list:
Add support for FT_GlyphSlot_Embolden where it exists (which it usually
doesn't).
http://lists.freedesktop.org/mailman/listinfo/xorg
Avoid crashing when using FT_Face objects.
Please submit bug reports to the Xorg bugzilla:
Version 2.1.6
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
Deal with broken FreeType 2.1.7 BDF/PCF loaders by trying both y_ppem/x_ppem
and width/height values.
The master development code repository can be found at:
Version 2.1.5
git://anongit.freedesktop.org/git/xorg/lib/libXft
Left some #warnings from testing in the 2.1.4 release. Spin again.
http://cgit.freedesktop.org/xorg/lib/libXft
Version 2.1.4
For patch submission instructions, see:
Work with older versions of Fontconfig by using various pattern elements
only when defined.
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
Version 2.1.3
For more information on the git code manager, see:
Change Freetype includes to new syntax.
Search for nearest bitmap for bitmap-only fonts.
Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.
http://wiki.x.org/wiki/GitPage
To release a version of this library:
1. Update the version numbers
configure.ac
Xft.h
2. Fix the README
1. Update the version number in configure.ac
2. Fix the NEWS file
Change version number
Set the date
add highlights
3. Commit those changes
4. rebuild the configuration files with autogen.sh
sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man
5. make distcheck
6. tag the tree
cvs tag Xft-2_1_xx
7. Copy Xft-2.1.xx.tar.gz and Xft-2.1.xx.tar.bz2 to
freedesktop.org:/srv/xlibs.freedesktop.org/www/release
8. Compute md5sums for release files:
md5sum Xft-2.1.xx.tar.gz Xft-2.1.xx.tar.bz2
9. Post a note to xorg@freedesktop.org. Include the md5sums.
gpg sign the message.
5. Follow the steps listed in
http://xorg.freedesktop.org/wiki/Development/Documentation/ReleaseHOWTO
Keith Packard
keithp@keithp.com

1239
lib/libXft/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

12
lib/libXft/autogen.sh
View File

@ -1,12 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

9
lib/libXft/config.h.in
View File

@ -86,3 +86,12 @@
/* Version number of package */
#undef VERSION
/* Major version of Xft */
#undef XFT_MAJOR
/* Minor version of Xft */
#undef XFT_MINOR
/* Micro revision of Xft */
#undef XFT_REVISION

10934
lib/libXft/configure vendored
View File

File diff suppressed because it is too large Load Diff

36
lib/libXft/configure.ac
View File

@ -1,6 +1,4 @@
dnl
dnl $Id: configure.ac,v 1.1.1.2 2006/12/16 21:12:18 matthieu Exp $
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -27,22 +25,37 @@ AC_PREREQ([2.57])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xft.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xft.h
dnl version. This version number will be substituted into Xft.h
dnl Please bump the minor library number at each release as well.
dnl
AC_INIT(libXft, 2.1.12, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
AC_INIT(libXft, 2.1.14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
# checks for progs
AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
# Set library version for Xft.h from package version set in AC_INIT
# copied from PACKAGE_VERSION_* settings in XORG_VERSION
AC_CONFIG_HEADERS([include/X11/Xft/Xft.h])
AC_DEFINE_UNQUOTED([XFT_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of Xft])
AC_DEFINE_UNQUOTED([XFT_MINOR],
[`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`],
[Minor version of Xft])
AC_DEFINE_UNQUOTED([XFT_REVISION],
[`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`],
[Micro revision of Xft])
#
# Check for Xrender
@ -130,17 +143,6 @@ if test "$VERSION" = "" ; then
VERSION=$PACKAGE_VERSION;
fi
WARN_CFLAGS=""
if test "x$GCC" = "xyes"; then
WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs -fno-strict-aliasing"
fi
AC_SUBST(WARN_CFLAGS)
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
xft.pc
xft-config

27
lib/libXft/include/X11/Xft/Xft.h → lib/libXft/include/X11/Xft/Xft.h.in
View File

@ -1,6 +1,4 @@
/*
* $Id: Xft.h,v 1.1.1.2 2006/12/16 21:12:48 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -26,14 +24,13 @@
#define _XFT_H_
/*
* Current Xft version number. This same number
* must appear in the Xft configure.ac file. Yes,
* it'a a pain to synchronize version numbers like this.
*/
* Current Xft version number, set from version in the Xft configure.ac file.
*/
#undef XFT_MAJOR /* Will be substituted by configure */
#undef XFT_MINOR /* Will be substituted by configure */
#undef XFT_REVISION /* Will be substituted by configure */
#define XFT_MAJOR 2
#define XFT_MINOR 1
#define XFT_REVISION 12
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
@ -129,16 +126,6 @@ XftColorFree (Display *dpy,
Colormap cmap,
XftColor *color);
/* xftcore.c */
/* xftdir.c */
FcBool
XftDirScan (FcFontSet *set, _Xconst char *dir, FcBool force);
FcBool
XftDirSave (FcFontSet *set, _Xconst char *dir);
/* xftdpy.c */
Bool
XftDefaultHasRender (Display *dpy);
@ -621,8 +608,6 @@ XftTextRenderUtf16 (Display *dpy,
FcEndian endian,
int len);
/* xftstr.c */
/* xftxlfd.c */
FcPattern *
XftXlfdParse (_Xconst char *xlfd_orig, Bool ignore_scalable, Bool complete);

2
lib/libXft/include/X11/Xft/XftCompat.h
View File

@ -1,6 +1,4 @@
/*
* $Id: XftCompat.h,v 1.1.1.1 2006/11/25 17:21:40 matthieu Exp $
*
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

286
lib/libXft/ltmain.sh
View File

@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
VERSION=1.5.26
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# See if we are running on zsh, and set the options which allow our
# commands through without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
if test "${LC_ALL+set}" = set; then
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
fi
if test "${LANG+set}" = set; then
save_LANG="$LANG"; LANG=C; export LANG
lt_env=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
if test -n "$lt_env"; then
lt_env="env $lt_env"
fi
# Make sure IFS has a sensible default
@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
#####################################
# Shell function definitions:
@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
$SED -n -e '1,100{
/ I /{
s,.*,import,
p
q
}
}'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
my_xdir="$my_gentop/$my_xlib"
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
*" $my_xlib_u "*)
extracted_serial=`expr $extracted_serial + 1`
my_xlib_u=lt$extracted_serial-$my_xlib ;;
*) break ;;
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@ -454,11 +488,12 @@ do
;;
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
*.f90) xform=f90 ;;
*.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
*.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@ -1131,6 +1168,7 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
single_module="${wl}-single_module"
func_infer_tag $base_compile
@ -1138,8 +1176,9 @@ EOF
for arg
do
case $arg in
-all-static | -static)
if test "X$arg" = "X-all-static"; then
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
else
;;
-static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
fi
;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
;;
esac
build_libtool_libs=no
build_old_libs=yes
break
@ -1600,7 +1647,7 @@ EOF
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@ -1608,6 +1655,11 @@ EOF
continue
;;
-multi_module)
single_module="${wl}-multi_module"
continue
;;
-module)
module=yes
continue
@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
# -pg pass through profiling flag for GCC
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-t[45]*|-txscale*|@*)
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@ -1652,9 +1705,9 @@ EOF
-no-install)
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs.
# and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@ -1713,7 +1766,7 @@ EOF
continue
;;
-static)
-static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@ -2074,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@ -2106,7 +2148,7 @@ EOF
lib=
found=no
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@ -2122,7 +2164,12 @@ EOF
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
if test "$linkmode" = lib; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@ -2503,7 +2550,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
{ { test "$prefer_static_libs" = no ||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@ -2916,12 +2965,18 @@ EOF
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
if test -f "$path/$depdepl" ; then
if test -f "$deplibdir/$depdepl" ; then
depdepl="$deplibdir/$depdepl"
elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
else
# Can't find it, oh well...
depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@ -3069,9 +3124,10 @@ EOF
case $linkmode in
oldlib)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@ -3199,7 +3255,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
darwin|linux|osf|windows)
darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@ -3210,9 +3266,10 @@ EOF
age="0"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor - 1`
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
lt_irix_increment=no
;;
esac
;;
@ -3271,7 +3328,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
freebsd-aout)
@ -3285,8 +3343,11 @@ EOF
;;
irix | nonstopux)
major=`expr $current - $age + 1`
if test "X$lt_irix_increment" = "Xno"; then
major=`expr $current - $age`
else
major=`expr $current - $age + 1`
fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@ -3437,11 +3498,11 @@ EOF
fi
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
#for path in $notinst_path; do
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@ -3542,13 +3603,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@ -3587,9 +3647,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@ -3621,7 +3679,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@ -3907,7 +3965,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
case $archive_cmds in
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@ -4217,9 +4278,10 @@ EOF
;;
obj)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@ -4266,12 +4328,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec
# -Wl from whole_archive_flag_spec and hope we can get by with
# turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@ -4836,7 +4900,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
fi
done
relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@ -5280,6 +5344,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
else
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@ -5422,7 +5500,7 @@ else
;;
esac
$echo >> $output "\
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
\$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@ -5608,7 +5686,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@ -6345,8 +6423,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
if test ! -f "$dir/$dlname"; then
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
fi
fi
;;
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then
LC_ALL="$save_LC_ALL"; export LC_ALL
fi
if test "${save_LANG+set}" = set; then
LANG="$save_LANG"; export LANG
fi
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
fi"
done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@ -6772,9 +6852,9 @@ The following components of LINK-COMMAND are treated specially:
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
try to export only the symbols listed in SYMFILE
try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
try to export only the symbols matching REGEX
try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@ -6788,9 +6868,11 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-static do not do any dynamic linking of libtool libraries
-static do not do any dynamic linking of uninstalled libtool libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.

35
lib/libXft/man/Makefile.in
View File

@ -44,7 +44,8 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/include/X11/Xft/Xft.h
CONFIG_CLEAN_FILES = xft-config.1 Xft.3
SOURCES =
DIST_SOURCES =
@ -55,9 +56,13 @@ NROFF = nroff
MANS = $(dist_man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -66,8 +71,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -75,6 +82,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -83,10 +93,13 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -95,12 +108,17 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -111,20 +129,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMKMF = @XMKMF@
XRENDER_CFLAGS = @XRENDER_CFLAGS@
XRENDER_LIBS = @XRENDER_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -141,6 +156,10 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ft_config = @ft_config@
host = @host@
@ -148,17 +167,21 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@

2
lib/libXft/man/Xft.3.in
View File

@ -1,6 +1,4 @@
.\"
.\" $Id: Xft.3.in,v 1.1.1.1 2006/11/25 17:21:40 matthieu Exp $
.\"
.\" Copyright © 2000 Keith Packard
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its

2
lib/libXft/man/xft-config.1
View File

@ -17,7 +17,7 @@
.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER
.\" DEALINGS IN THE DOCUMENT.
.TH xft-config 1 "Version 2.1.12" "Xft"
.TH xft-config 1 "Version 2.1.14" "Xft"
.SH NAME
xft\-config \- report Xft version, compiler, linker, and/or installation \
directory information

6
lib/libXft/src/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
$(WARN_CFLAGS) -I$(top_srcdir)/include/X11/Xft
$(CWARNFLAGS) -I$(top_builddir)/include/X11/Xft
lib_LTLIBRARIES = libXft.la
@ -24,9 +24,9 @@ libXft_la_SOURCES = xftint.h \
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
# -version-number requires libtool >= 1.5
libXft_la_LDFLAGS = -version-number 2:1:2 -no-undefined
libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \
$(top_srcdir)/include/X11/Xft/Xft.h \
$(top_builddir)/include/X11/Xft/Xft.h \
$(top_srcdir)/include/X11/Xft/XftCompat.h

45
lib/libXft/src/Makefile.in
View File

@ -45,7 +45,8 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/include/X11/Xft/Xft.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@ -63,7 +64,7 @@ am_libXft_la_OBJECTS = xftcolor.lo xftcore.lo xftdbg.lo xftdpy.lo \
xftinit.lo xftlist.lo xftname.lo xftrender.lo xftstr.lo \
xftswap.lo xftxlfd.lo
libXft_la_OBJECTS = $(am_libXft_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/include/X11/Xft
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -82,9 +83,13 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -93,8 +98,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -102,6 +109,9 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -110,10 +120,13 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -122,12 +135,17 @@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -138,20 +156,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XMKMF = @XMKMF@
XRENDER_CFLAGS = @XRENDER_CFLAGS@
XRENDER_LIBS = @XRENDER_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -168,6 +183,10 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ft_config = @ft_config@
host = @host@
@ -175,23 +194,27 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
$(WARN_CFLAGS) -I$(top_srcdir)/include/X11/Xft
$(CWARNFLAGS) -I$(top_builddir)/include/X11/Xft
lib_LTLIBRARIES = libXft.la
libXft_la_SOURCES = xftint.h \
@ -215,10 +238,10 @@ libXft_la_SOURCES = xftint.h \
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
# -version-number requires libtool >= 1.5
libXft_la_LDFLAGS = -version-number 2:1:2 -no-undefined
libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \
$(top_srcdir)/include/X11/Xft/Xft.h \
$(top_builddir)/include/X11/Xft/Xft.h \
$(top_srcdir)/include/X11/Xft/XftCompat.h
all: all-am
@ -404,7 +427,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/../include/X11/Xft
$(mkdir_p) $(distdir)/$(top_builddir)/include/X11/Xft $(distdir)/../include/X11/Xft
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \

2
lib/libXft/src/xftcolor.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftcolor.c,v 1.1.1.1 2006/11/25 17:21:37 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

8
lib/libXft/src/xftcore.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftcore.c,v 1.1.1.1 2006/11/25 17:21:37 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -999,7 +997,7 @@ XftGlyphCore (XftDraw *draw,
else
{
draw->core.use_pixmap--;
image = 0;
image = NULL;
}
if (!image && (depth = XftDrawDepth (draw)))
{
@ -1155,7 +1153,7 @@ XftGlyphSpecCore (XftDraw *draw,
else
{
draw->core.use_pixmap--;
image = 0;
image = NULL;
}
if (!image && (depth = XftDrawDepth (draw)))
{
@ -1306,7 +1304,7 @@ XftGlyphFontSpecCore (XftDraw *draw,
else
{
draw->core.use_pixmap--;
image = 0;
image = NULL;
}
if (!image && (depth = XftDrawDepth (draw)))
{

2
lib/libXft/src/xftdbg.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftdbg.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

20
lib/libXft/src/xftdpy.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftdpy.c,v 1.1.1.1 2006/11/25 17:21:37 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -85,7 +83,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
}
}
if (!createIfNecessary)
return 0;
return NULL;
info = (XftDisplayInfo *) malloc (sizeof (XftDisplayInfo));
if (!info)
@ -96,10 +94,10 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
(void) XESetCloseDisplay (dpy, info->codes->extension, _XftCloseDisplay);
info->display = dpy;
info->defaults = 0;
info->solidFormat = 0;
info->defaults = NULL;
info->solidFormat = NULL;
info->hasRender = (XRenderQueryExtension (dpy, &event_base, &error_base) &&
(XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != 0));
(XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != NULL));
info->use_free_glyphs = FcTrue;
if (info->hasRender)
{
@ -157,12 +155,12 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
info->colors[i].screen = -1;
info->colors[i].pict = 0;
}
info->fonts = 0;
info->fonts = NULL;
info->next = _XftDisplayInfo;
_XftDisplayInfo = info;
info->glyph_memory = 0;
info->glyph_memory = NULL;
info->max_glyph_memory = XftDefaultGetInteger (dpy,
XFT_MAX_GLYPH_MEMORY, 0,
XFT_DPY_MAX_GLYPH_MEMORY);
@ -187,7 +185,7 @@ bail0:
{
printf ("XftDisplayInfoGet failed to initialize, Xft unhappy\n");
}
return 0;
return NULL;
}
/*
@ -395,7 +393,7 @@ _XftDefaultInit (Display *dpy)
bail1:
FcPatternDestroy (pat);
bail0:
return 0;
return NULL;
}
static FcResult

37
lib/libXft/src/xftdraw.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftdraw.c,v 1.1.1.1 2006/11/25 17:21:38 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -136,7 +134,7 @@ XftDrawCreate (Display *dpy,
draw = (XftDraw *) malloc (sizeof (XftDraw));
if (!draw)
return 0;
return NULL;
draw->dpy = dpy;
draw->drawable = drawable;
@ -146,7 +144,7 @@ XftDrawCreate (Display *dpy,
draw->visual = visual;
draw->colormap = colormap;
draw->render.pict = 0;
draw->core.gc = 0;
draw->core.gc = NULL;
draw->core.use_pixmap = 0;
draw->clip_type = XftClipTypeNone;
draw->subwindow_mode = ClipByChildren;
@ -162,16 +160,16 @@ XftDrawCreateBitmap (Display *dpy,
draw = (XftDraw *) malloc (sizeof (XftDraw));
if (!draw)
return 0;
return NULL;
draw->dpy = dpy;
draw->drawable = (Drawable) bitmap;
draw->screen = _XftDrawScreen (dpy, bitmap, 0);
draw->screen = _XftDrawScreen (dpy, bitmap, NULL);
draw->depth = 1;
draw->bits_per_pixel = 1;
draw->visual = 0;
draw->visual = NULL;
draw->colormap = 0;
draw->render.pict = 0;
draw->core.gc = 0;
draw->core.gc = NULL;
draw->core.use_pixmap = 0;
draw->clip_type = XftClipTypeNone;
draw->subwindow_mode = ClipByChildren;
@ -188,16 +186,16 @@ XftDrawCreateAlpha (Display *dpy,
draw = (XftDraw *) malloc (sizeof (XftDraw));
if (!draw)
return 0;
return NULL;
draw->dpy = dpy;
draw->drawable = (Drawable) pixmap;
draw->screen = _XftDrawScreen (dpy, pixmap, 0);
draw->screen = _XftDrawScreen (dpy, pixmap, NULL);
draw->depth = depth;
draw->bits_per_pixel = 0; /* don't find out until we need it */
draw->visual = 0;
draw->visual = NULL;
draw->colormap = 0;
draw->render.pict = 0;
draw->core.gc = 0;
draw->core.gc = NULL;
draw->core.use_pixmap = 0;
draw->clip_type = XftClipTypeNone;
draw->subwindow_mode = ClipByChildren;
@ -211,9 +209,9 @@ _XftDrawFormat (XftDraw *draw)
XftDisplayInfo *info = _XftDisplayInfoGet (draw->dpy, True);
if (!info || !info->hasRender)
return 0;
return NULL;
if (draw->visual == 0)
if (draw->visual == NULL)
{
XRenderPictFormat pf;
@ -246,7 +244,7 @@ XftDrawChange (XftDraw *draw,
if (draw->core.gc)
{
XFreeGC (draw->dpy, draw->core.gc);
draw->core.gc = 0;
draw->core.gc = NULL;
}
}
@ -809,7 +807,10 @@ XftDrawRect (XftDraw *draw,
}
else if (_XftDrawCorePrepare (draw, color))
{
XftRectCore (draw, color, x, y, width, height);
/* note: not XftRectCore() */
XSetForeground (draw->dpy, draw->core.gc, color->pixel);
XFillRectangle (draw->dpy, draw->drawable, draw->core.gc,
x, y, width, height);
}
}
@ -817,7 +818,7 @@ _X_EXPORT Bool
XftDrawSetClip (XftDraw *draw,
Region r)
{
Region n = 0;
Region n = NULL;
/*
* Check for quick exits
@ -906,7 +907,7 @@ XftDrawSetClipRectangles (XftDraw *draw,
_Xconst XRectangle *rects,
int n)
{
XftClipRect *new = 0;
XftClipRect *new = NULL;
/*
* Check for quick exit

4
lib/libXft/src/xftextent.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftextent.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -55,7 +53,7 @@ XftGlyphExtents (Display *dpy,
XftFontLoadGlyphs (dpy, pub, FcFalse, missing, nmissing);
g = glyphs;
n = nglyphs;
xftg = 0;
xftg = NULL;
while (n)
{
glyph = *g++;

28
lib/libXft/src/xftfont.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftfont.c,v 1.1.1.1 2006/11/25 17:21:36 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -33,19 +31,19 @@ XftFontMatch (Display *dpy,
FcPattern *new;
FcPattern *match;
if (!XftInit (0))
return 0;
if (!XftInit (NULL))
return NULL;
new = FcPatternDuplicate (pattern);
if (!new)
return 0;
return NULL;
if (XftDebug () & XFT_DBG_OPENV)
{
printf ("XftFontMatch pattern ");
FcPatternPrint (new);
}
FcConfigSubstitute (0, new, FcMatchPattern);
FcConfigSubstitute (NULL, new, FcMatchPattern);
if (XftDebug () & XFT_DBG_OPENV)
{
printf ("XftFontMatch after FcConfig substitutions ");
@ -57,8 +55,8 @@ XftFontMatch (Display *dpy,
printf ("XftFontMatch after X resource substitutions ");
FcPatternPrint (new);
}
match = FcFontMatch (0, new, result);
match = FcFontMatch (NULL, new, result);
if (XftDebug () & XFT_DBG_OPENV)
{
printf ("XftFontMatch result ");
@ -78,13 +76,13 @@ XftFontOpen (Display *dpy, int screen, ...)
XftFont *font;
va_start (va, screen);
pat = FcPatternVaBuild (0, va);
pat = FcPatternVaBuild (NULL, va);
va_end (va);
if (!pat)
{
if (XftDebug () & XFT_DBG_OPEN)
printf ("XftFontOpen: Invalid pattern argument\n");
return 0;
return NULL;
}
match = XftFontMatch (dpy, screen, pat, &result);
if (XftDebug () & XFT_DBG_OPEN)
@ -101,7 +99,7 @@ XftFontOpen (Display *dpy, int screen, ...)
}
FcPatternDestroy (pat);
if (!match)
return 0;
return NULL;
font = XftFontOpenPattern (dpy, match);
if (!font)
@ -133,7 +131,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name)
}
if (!pat)
return 0;
return NULL;
match = XftFontMatch (dpy, screen, pat, &result);
if (XftDebug () & XFT_DBG_OPEN)
{
@ -147,7 +145,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name)
}
FcPatternDestroy (pat);
if (!match)
return 0;
return NULL;
font = XftFontOpenPattern (dpy, match);
if (!font)
@ -179,7 +177,7 @@ XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd)
}
if (!pat)
return 0;
return NULL;
match = XftFontMatch (dpy, screen, pat, &result);
if (XftDebug () & XFT_DBG_OPEN)
{
@ -193,7 +191,7 @@ XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd)
}
FcPatternDestroy (pat);
if (!match)
return 0;
return NULL;
font = XftFontOpenPattern (dpy, match);
if (!font)

68
lib/libXft/src/xftfreetype.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftfreetype.c,v 1.1.1.1 2006/11/25 17:21:37 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -35,7 +33,7 @@ _X_HIDDEN FT_Library _XftFTlibrary;
*/
static XftFtFile *_XftFtFiles;
_X_HIDDEN int XftMaxFreeTypeFiles = 5;
static int XftMaxFreeTypeFiles = 5;
static XftFtFile *
_XftGetFile (const FcChar8 *file, int id)
@ -43,7 +41,7 @@ _XftGetFile (const FcChar8 *file, int id)
XftFtFile *f;
if (!XftInitFtLibrary ())
return 0;
return NULL;
for (f = _XftFtFiles; f; f = f->next)
{
@ -58,7 +56,7 @@ _XftGetFile (const FcChar8 *file, int id)
}
f = malloc (sizeof (XftFtFile) + strlen ((char *) file) + 1);
if (!f)
return 0;
return NULL;
XftMemAlloc (XFT_MEM_FILE, sizeof (XftFtFile) + strlen ((char *) file) + 1);
if (XftDebug () & XFT_DBG_REF)
@ -74,7 +72,7 @@ _XftGetFile (const FcChar8 *file, int id)
f->id = id;
f->lock = 0;
f->face = 0;
f->face = NULL;
f->xsize = 0;
f->ysize = 0;
f->matrix.xx = f->matrix.xy = f->matrix.yx = f->matrix.yy = 0;
@ -88,13 +86,13 @@ _XftGetFaceFile (FT_Face face)
f = malloc (sizeof (XftFtFile));
if (!f)
return 0;
return NULL;
XftMemAlloc (XFT_MEM_FILE, sizeof(XftFtFile));
f->next = 0;
f->next = NULL;
f->ref = 1;
f->file = 0;
f->file = NULL;
f->id = 0;
f->lock = 0;
f->face = face;
@ -141,7 +139,7 @@ _XftUncacheFiles (void)
printf ("Discard file %s/%d from cache\n",
f->file, f->id);
FT_Done_Face (f->face);
f->face = 0;
f->face = NULL;
}
}
}
@ -257,7 +255,7 @@ _XftSetFace (XftFtFile *f, FT_F26Dot6 xsize, FT_F26Dot6 ysize, FT_Matrix *matrix
(double) matrix->xy / 0x10000,
(double) matrix->yx / 0x10000,
(double) matrix->yy / 0x10000);
FT_Set_Transform (face, matrix, 0);
FT_Set_Transform (face, matrix, NULL);
f->matrix = *matrix;
}
return True;
@ -359,7 +357,7 @@ XftLockFace (XftFont *public)
if (face && !_XftSetFace (fi->file, fi->xsize, fi->ysize, &fi->matrix))
{
_XftUnlockFile (fi->file);
face = 0;
face = NULL;
}
return face;
}
@ -387,16 +385,24 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
FcChar32 hash, *hashp;
FT_Face face;
int nhash;
FcBool bitmap;
if (!info)
return FcFalse;
/*
* Initialize the whole XftFontInfo so that padding doesn't interfere with
* hash or XftFontInfoEqual().
*/
memset (fi, '\0', sizeof(*fi));
/*
* Find the associated file
*/
switch (FcPatternGetString (pattern, FC_FILE, 0, &filename)) {
case FcResultNoMatch:
filename = 0;
filename = NULL;
break;
case FcResultMatch:
break;
@ -419,8 +425,6 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
else if (FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &face) == FcResultMatch
&& face)
fi->file = _XftGetFaceFile (face);
else
fi->file = 0;
if (!fi->file)
goto bail0;
@ -509,8 +513,22 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
*/
fi->load_flags = FT_LOAD_DEFAULT;
#ifndef XFT_EMBEDDED_BITMAP
#define XFT_EMBEDDED_BITMAP "embeddedbitmap"
#endif
switch (FcPatternGetBool (pattern, XFT_EMBEDDED_BITMAP, 0, &bitmap)) {
case FcResultNoMatch:
bitmap = FcFalse;
break;
case FcResultMatch:
break;
default:
goto bail1;
}
/* disable bitmaps when anti-aliasing or transforming glyphs */
if (fi->antialias || fi->transform)
if ((!bitmap && fi->antialias) || fi->transform)
fi->load_flags |= FT_LOAD_NO_BITMAP;
/* disable hinting if requested */
@ -699,7 +717,7 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
bail1:
_XftReleaseFile (fi->file);
fi->file = 0;
fi->file = NULL;
bail0:
return FcFalse;
}
@ -717,12 +735,12 @@ XftFontInfoCreate (Display *dpy, _Xconst FcPattern *pattern)
XftFontInfo *fi = malloc (sizeof (XftFontInfo));
if (!fi)
return 0;
return NULL;
if (!XftFontInfoFill (dpy, pattern, fi))
{
free (fi);
fi = 0;
fi = NULL;
}
XftMemAlloc (XFT_MEM_FONT, sizeof (XftFontInfo));
return fi;
@ -770,7 +788,7 @@ XftFontOpenInfo (Display *dpy,
int num_glyphs;
if (!info)
return 0;
return NULL;
/*
* Find a matching previously opened font
*/
@ -813,7 +831,7 @@ XftFontOpenInfo (Display *dpy,
if (FcPatternGetCharSet (pattern, FC_CHARSET, 0, &charset) == FcResultMatch)
charset = FcCharSetCopy (charset);
else
charset = FcFreeTypeCharSet (face, FcConfigGetBlanks (0));
charset = FcFreeTypeCharSet (face, FcConfigGetBlanks (NULL));
antialias = fi->antialias;
if (!(face->face_flags & FT_FACE_FLAG_SCALABLE))
@ -847,7 +865,7 @@ XftFontOpenInfo (Display *dpy,
goto bail2;
}
else
format = 0;
format = NULL;
if (charset)
{
@ -1000,7 +1018,7 @@ bail2:
bail1:
_XftUnlockFile (fi->file);
bail0:
return 0;
return NULL;
}
_X_EXPORT XftFont *
@ -1010,7 +1028,7 @@ XftFontOpenPattern (Display *dpy, FcPattern *pattern)
XftFont *font;
if (!XftFontInfoFill (dpy, pattern, &info))
return 0;
return NULL;
font = XftFontOpenInfo (dpy, pattern, &info);
XftFontInfoEmpty (dpy, &info);

14
lib/libXft/src/xftglyphs.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftglyphs.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -25,6 +23,10 @@
#include "xftint.h"
#include <freetype/ftoutln.h>
#if HAVE_FT_GLYPHSLOT_EMBOLDEN
#include <freetype/ftsynth.h>
#endif
static const int filters[3][3] = {
/* red */
#if 0
@ -544,7 +546,7 @@ XftFontLoadGlyphs (Display *dpy,
memcpy (xftg->bitmap, bufBitmapRgba, sizergba);
}
else
xftg->bitmap = 0;
xftg->bitmap = NULL;
}
}
else
@ -590,7 +592,7 @@ XftFontLoadGlyphs (Display *dpy,
memcpy (xftg->bitmap, bufBitmap, size);
}
else
xftg->bitmap = 0;
xftg->bitmap = NULL;
}
}
font->glyph_memory += xftg->glyph_memory;
@ -653,7 +655,7 @@ XftFontUnloadGlyphs (Display *dpy,
}
free (xftg);
XftMemFree (XFT_MEM_GLYPH, sizeof (XftGlyph));
font->glyphs[glyphindex] = 0;
font->glyphs[glyphindex] = NULL;
}
if (font->glyphset && nused)
XRenderFreeGlyphs (dpy, font->glyphset, glyphBuf, nused);
@ -682,7 +684,7 @@ XftFontCheckGlyph (Display *dpy,
if (!xftg)
return FcFalse;
XftMemAlloc (XFT_MEM_GLYPH, sizeof (XftGlyph));
xftg->bitmap = 0;
xftg->bitmap = NULL;
xftg->glyph_memory = 0;
font->glyphs[glyph] = xftg;
}

4
lib/libXft/src/xftinit.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftinit.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -24,7 +22,7 @@
#include "xftint.h"
_X_HIDDEN Bool _XftConfigInitialized;
static Bool _XftConfigInitialized;
_X_EXPORT Bool
XftInit (_Xconst char *config)

2
lib/libXft/src/xftint.h
View File

@ -1,6 +1,4 @@
/*
* $Id: xftint.h,v 1.1.1.1 2006/11/25 17:21:38 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

8
lib/libXft/src/xftlist.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftlist.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -30,7 +28,7 @@ XftListFontsPatternObjects (Display *dpy,
FcPattern *pattern,
FcObjectSet *os)
{
return FcFontList (0, pattern, os);
return FcFontList (NULL, pattern, os);
}
_X_EXPORT FcFontSet *
@ -45,8 +43,8 @@ XftListFonts (Display *dpy,
const char *first;
va_start (va, screen);
FcPatternVapBuild (pattern, 0, va);
FcPatternVapBuild (pattern, NULL, va);
first = va_arg (va, const char *);
FcObjectSetVapBuild (os, first, va);

5
lib/libXft/src/xftname.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftname.c,v 1.1.1.2 2006/12/16 21:12:47 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -28,11 +26,12 @@ static const FcObjectType _XftObjectTypes[] = {
{ XFT_CORE, FcTypeBool, },
{ XFT_XLFD, FcTypeString, },
{ XFT_RENDER, FcTypeBool, },
{ XFT_MAX_GLYPH_MEMORY, FcTypeInteger, },
};
#define NUM_OBJECT_TYPES (sizeof _XftObjectTypes / sizeof _XftObjectTypes[0])
_X_HIDDEN FcBool _XftNameInitialized;
static FcBool _XftNameInitialized;
_X_HIDDEN void
_XftNameInit (void)

10
lib/libXft/src/xftrender.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftrender.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -397,7 +395,7 @@ XftCharSpecRender (Display *dpy,
static XRenderPictFormat *
XftPreferFormat (Display *dpy, XRenderPictFormat *a, XRenderPictFormat *b)
{
XRenderPictFormat *prefer = 0;
XRenderPictFormat *prefer = NULL;
if (a == b)
prefer = a;
@ -503,7 +501,7 @@ XftGlyphFontSpecRender (Display *dpy,
* Compute the number of glyph elts needed
*/
nelt = 1;
firstFont = 0;
firstFont = NULL;
for (i = 0; i < nglyphs; i++)
{
XftFont *pub = glyphs[i].font;
@ -524,7 +522,7 @@ XftGlyphFontSpecRender (Display *dpy,
format = firstFont->format;
x = glyphs[i].x + glyph->metrics.xOff;
y = glyphs[i].y + glyph->metrics.yOff;
prevPublic = 0;
prevPublic = NULL;
while (++i < nglyphs)
{
XftFont *pub = glyphs[i].font;
@ -568,7 +566,7 @@ XftGlyphFontSpecRender (Display *dpy,
x = y = 0;
n = 0;
j = 0;
prevPublic = 0;
prevPublic = NULL;
for (i = 0; i < nglyphs; i++)
{
XftFont *pub = glyphs[i].font;

2
lib/libXft/src/xftstr.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftstr.c,v 1.1.1.1 2006/11/25 17:21:37 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

2
lib/libXft/src/xftswap.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftswap.c,v 1.1.1.1 2006/11/25 17:21:39 matthieu Exp $
*
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

40
lib/libXft/src/xftxlfd.c
View File

@ -1,6 +1,4 @@
/*
* $Id: xftxlfd.c,v 1.1.1.1 2006/11/25 17:21:38 matthieu Exp $
*
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -102,35 +100,35 @@ XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete)
double dpixel;
if (*xlfd != '-')
return 0;
if (!(xlfd = strchr (foundry = ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (family = ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (weight_name = ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (slant = ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (/* setwidth_name = */ ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (/* add_style_name = */ ++xlfd, '-'))) return 0;
if (!(xlfd = XftGetInt (++xlfd, &pixel))) return 0;
if (!(xlfd = XftGetInt (++xlfd, &point))) return 0;
if (!(xlfd = XftGetInt (++xlfd, &resx))) return 0;
if (!(xlfd = XftGetInt (++xlfd, &resy))) return 0;
if (!(xlfd = strchr (/* spacing = */ ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (/* average_width = */ ++xlfd, '-'))) return 0;
if (!(xlfd = strchr (registry = ++xlfd, '-'))) return 0;
return NULL;
if (!(xlfd = strchr (foundry = ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (family = ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (weight_name = ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (slant = ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (/* setwidth_name = */ ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (/* add_style_name = */ ++xlfd, '-'))) return NULL;
if (!(xlfd = XftGetInt (++xlfd, &pixel))) return NULL;
if (!(xlfd = XftGetInt (++xlfd, &point))) return NULL;
if (!(xlfd = XftGetInt (++xlfd, &resx))) return NULL;
if (!(xlfd = XftGetInt (++xlfd, &resy))) return NULL;
if (!(xlfd = strchr (/* spacing = */ ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (/* average_width = */ ++xlfd, '-'))) return NULL;
if (!(xlfd = strchr (registry = ++xlfd, '-'))) return NULL;
/* make sure no fields follow this one */
if ((xlfd = strchr (encoding = ++xlfd, '-'))) return 0;
if ((xlfd = strchr (encoding = ++xlfd, '-'))) return NULL;
if (!pixel)
return 0;
return NULL;
pat = FcPatternCreate ();
if (!pat)
return 0;
return NULL;
save = (char *) malloc (strlen (foundry) + 1);
if (!save) {
FcPatternDestroy (pat);
return 0;
return NULL;
}
if (!FcPatternAddString (pat, XFT_XLFD, (FcChar8 *) xlfd_orig)) goto bail;
@ -175,5 +173,5 @@ XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete)
bail:
free (save);
FcPatternDestroy (pat);
return 0;
return NULL;
}