libxfont: Changes to 'upstream-experimental'
.gitignore | 63 +
COPYING | 71 -
Makefile.am | 34
configure.ac | 59 -
doc/.gitignore | 6
doc/fontlib.css | 41
doc/fontlib.xml | 660 ++++++++++++++
doc/fontlib.xsl | 32
include/X11/fonts/.gitignore | 2
include/X11/fonts/bitmap.h | 5
include/X11/fonts/bufio.h | 7
include/X11/fonts/fntfilst.h | 2
include/X11/fonts/fontconf.h.in | 6
include/X11/fonts/fontmisc.h | 32
include/X11/fonts/fontmod.h | 16
include/X11/fonts/pcf.h | 2
src/.gitignore | 6
src/FreeType/.gitignore | 6
src/FreeType/ft.h | 4
src/FreeType/ftenc.c | 6
src/FreeType/ftfuncs.c | 133 +-
src/FreeType/fttools.c | 6
src/FreeType/xttcap.c | 43
src/FreeType/xttcap.h | 4
src/Makefile.am | 16
src/Speedo/.gitignore | 6
src/Speedo/Makefile.am | 34
src/Speedo/adobe-iso.h | 200 ----
src/Speedo/bics-iso.h | 224 ----
src/Speedo/bics-unicode.c | 138 ---
src/Speedo/bics-unicode.h | 3
src/Speedo/do_char.c | 809 ------------------
src/Speedo/do_trns.c | 498 -----------
src/Speedo/keys.h | 56 -
src/Speedo/out_bl2d.c | 772 -----------------
src/Speedo/out_blk.c | 706 ---------------
src/Speedo/out_outl.c | 290 ------
src/Speedo/out_scrn.c | 1090 ------------------------
src/Speedo/out_util.c | 339 -------
src/Speedo/reset.c | 129 --
src/Speedo/set_spcs.c | 763 ----------------
src/Speedo/set_trns.c | 1214 ---------------------------
src/Speedo/spdo_prv.h | 262 -----
src/Speedo/speedo.h | 874 -------------------
src/Speedo/spencode.c | 67 -
src/Speedo/sperr.c | 127 --
src/Speedo/spfile.c | 460 ----------
src/Speedo/spfont.c | 453 ----------
src/Speedo/spfuncs.c | 167 ---
src/Speedo/spglyph.c | 399 --------
src/Speedo/spinfo.c | 462 ----------
src/Speedo/spint.h | 178 ---
src/Speedo/useropt.h | 41
src/Type1/.gitignore | 6
src/Type1/Makefile.am | 52 -
src/Type1/arith.c | 212 ----
src/Type1/arith.h | 71 -
src/Type1/blues.h | 95 --
src/Type1/cluts.h | 35
src/Type1/curves.c | 228 -----
src/Type1/curves.h | 44
src/Type1/digit.h | 64 -
src/Type1/fontfcn.c | 317 -------
src/Type1/fontfcn.h | 114 --
src/Type1/fonts.h | 49 -
src/Type1/hdigit.h | 94 --
src/Type1/hints.c | 890 -------------------
src/Type1/hints.h | 48 -
src/Type1/lines.c | 188 ----
src/Type1/lines.h | 37
src/Type1/objects.c | 944 ---------------------
src/Type1/objects.h | 293 ------
src/Type1/paths.c | 748 ----------------
src/Type1/paths.h | 205 ----
src/Type1/pictures.h | 50 -
src/Type1/regions.c | 1328 -----------------------------
src/Type1/regions.h | 224 ----
src/Type1/scanfont.c | 1526 ---------------------------------
src/Type1/spaces.c | 941 --------------------
src/Type1/spaces.h | 151 ---
src/Type1/strokes.h | 38
src/Type1/t1funcs.c | 754 ----------------
src/Type1/t1hdigit.h | 40
src/Type1/t1imager.h | 84 -
src/Type1/t1info.c | 496 -----------
src/Type1/t1intf.h | 54 -
src/Type1/t1io.c | 299 ------
src/Type1/t1malloc.c | 759 ----------------
src/Type1/t1snap.c | 85 -
src/Type1/t1stdio.h | 94 --
src/Type1/t1unicode.c | 251 -----
src/Type1/t1unicode.h | 25
src/Type1/token.c | 1208 --------------------------
src/Type1/token.h | 79 -
src/Type1/tokst.h | 510 -----------
src/Type1/trig.h | 41
src/Type1/type1.c | 1797 ----------------------------------------
src/Type1/util.c | 194 ----
src/Type1/util.h | 190 ----
src/bitmap/.gitignore | 6
src/bitmap/bdfread.c | 71 -
src/bitmap/bdfutils.c | 8
src/bitmap/bitmapfunc.c | 13
src/bitmap/bitmaputil.c | 2
src/bitmap/bitscale.c | 369 --------
src/bitmap/pcfread.c | 327 -------
src/bitmap/pcfwrite.c | 6
src/bitmap/snfread.c | 62 -
src/builtins/.gitignore | 6
src/builtins/dir.c | 19
src/builtins/file.c | 6
src/builtins/render.c | 4
src/fc/.gitignore | 6
src/fc/fsconvert.c | 21
src/fc/fserve.c | 122 --
src/fc/fsio.c | 21
src/fc/fslibos.h | 2
src/fontfile/.gitignore | 6
src/fontfile/Makefile.am | 9
src/fontfile/bitsource.c | 6
src/fontfile/bufio.c | 8
src/fontfile/bunzip2.c | 47 -
src/fontfile/catalogue.c | 36
src/fontfile/decompress.c | 4
src/fontfile/dirfile.c | 8
src/fontfile/ffcheck.c | 188 ----
src/fontfile/fileio.c | 5
src/fontfile/filewr.c | 2
src/fontfile/fontdir.c | 58 -
src/fontfile/fontfile.c | 85 -
src/fontfile/fontscale.c | 11
src/fontfile/gunzip.c | 8
src/fontfile/printerfont.c | 178 ---
src/fontfile/register.c | 68 -
src/fontfile/renderers.c | 12
src/stubs/.gitignore | 6
src/stubs/Makefile.am | 4
src/stubs/fontmod.c | 14
src/stubs/xpstubs.c | 21
src/util/.gitignore | 6
src/util/atom.c | 9
src/util/fontnames.c | 32
src/util/fontutil.c | 40
src/util/fontxlfd.c | 2
src/util/miscutil.c | 61 -
src/util/patcache.c | 14
src/util/private.c | 11
src/util/utilbitmap.c | 6
xfont.pc.in | 2
149 files changed, 1312 insertions(+), 28701 deletions(-)
New commits:
commit 27270de56f7da5e047784434f3b29fa672f97ffd
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Jun 10 16:29:37 2010 +0300
libXfont 1.4.2
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/configure.ac b/configure.ac
index 35ac80b..49f1d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT([libXfont],
- 1.4.1,
+ 1.4.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
# Autoheader generates config.h.in. No new lines allowed in the list.
commit a85f4fc6142349517aaa4cf6bc8049e2d85c1006
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Jun 10 16:18:05 2010 +0300
Use one single function to register fpe functions
X server doesn't need to understand fpe internals, so let it transparent
turning all registration functions in a single one. For that, fill the already
existent register_fpe_functions().
Some X servers don't want font server support, so this patch also sets font
server support to be configured in build time.
In my machine, I see 20kB of RSS being saved in libXfont mapped in Xorg
process when I disabled font server support and other kind of fonts in the
library (--disable-pcfformat --disable-bdfformat --disable-snfformat
--disable-freetype --disable-fc).
The default library built was taking:
text data bss dec hex filename
261847 4484 1536 267867 4165b ./lib/libXfont.so
and with these flags, it jumps to:
text data bss dec hex filename
157764 2428 1188 161380 27664 ./lib/libXfont.so
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 3459275..1e76b4b 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -46,10 +46,17 @@ from The Open Group.
#pragma weak register_fpe_functions
#endif
+extern void BuiltinRegisterFpeFunctions(void);
+
/* make sure everything initializes themselves at least once */
weak long serverGeneration = 1;
weak void
register_fpe_functions (void)
{
+ BuiltinRegisterFpeFunctions();
+ FontFileRegisterFpeFunctions();
+#ifdef XFONT_FC
+ fs_register_fpe_functions();
+#endif
}
commit d137c81b83e0a6f68989c37035d0c950bb43fcc5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 1 14:12:47 2010 -0400
config: fontconf.h.in is redundant in EXTRA_DIST
Output files listed in AC_CONFIG_HEADERS or AC_OUTPUT have
their input files (typically .in) included in the tarball.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 7aee053..49102e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog INSTALL
@@ -57,7 +56,7 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
# Developer documentation - not installed on system
-EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
+EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
if ENABLE_DEVEL_DOCS
if HAVE_XMLTO
commit d8d901323776599c8392f9b973ba129c3af45a4b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Mar 30 09:26:13 2010 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
There are 2 headers to generate. The first one (config.h)
is picked up by autoheader to generate the familiar config.h.in
input file. The others in the list (or in subsequent AC_CONFIG_HEADERS
macro calls) are generated from their existing matching template,
e.g. fontconf.h.in.
When multiple headers are listed in the same macro call,
they cannot be separated by a new line like we do in AC_OUTPUT.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 852124a..35ac80b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,8 @@ AC_INIT([libXfont],
1.4.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
+# Autoheader generates config.h.in. No new lines allowed in the list.
+AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xfont.h
@@ -33,8 +35,6 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xfont.h
dnl
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit df94cb141f02f123a64b0ef7abf5f593c1b27e13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 31 20:21:47 2010 -0400
Revert "config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS"
This reverts commit 8e84687b26be6e8f5da4fce173c0a134eb07f4f3.
Until the issue is resolved on MAC O/S
http://tinderbox.x.org/builds/2010-03-31-0030/logs/libXfont/
diff --git a/Makefile.am b/Makefile.am
index 49102e8..7aee053 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog INSTALL
@@ -56,7 +57,7 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
# Developer documentation - not installed on system
-EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
+EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
if ENABLE_DEVEL_DOCS
if HAVE_XMLTO
diff --git a/configure.ac b/configure.ac
index 98dac59..852124a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xfont.h
dnl
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AC_CONFIG_HEADERS([config.h
- include/X11/fonts/fontconf.h])
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit 8e84687b26be6e8f5da4fce173c0a134eb07f4f3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Mar 30 09:26:13 2010 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Both headers end up created by the same macro.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 7aee053..49102e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog INSTALL
@@ -57,7 +56,7 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
# Developer documentation - not installed on system
-EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
+EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
if ENABLE_DEVEL_DOCS
if HAVE_XMLTO
diff --git a/configure.ac b/configure.ac
index 852124a..98dac59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xfont.h
dnl
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
+AC_CONFIG_HEADERS([config.h
+ include/X11/fonts/fontconf.h])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit a7b7bc72b9ad061ed164601d2d18dbffd6ec1f4f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index a22c157..7aee053 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xfont.pc.in include/X11/fonts/fontconf.h.in
+EXTRA_DIST = include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog INSTALL
commit f77258d0b286c2fd2a2fee36e42280016e310b10
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 27 17:06:34 2010 -0400
config: remove protection for AS_HELP_STRING for old autoconf
No longer needed as modules will not configure with 2.57.
AS_HELP_STRING was introduced in 2.58. The minimum level
is now 2.60.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c75a041..852124a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([libXfont],
1.4.1,
@@ -57,8 +57,6 @@ PKG_PROG_PKG_CONFIG
AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
AC_CHECK_FUNCS([poll])
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-
#
# select libraries to include
#
commit a79a22bfcb344c47f2659e4178fd79f8555fbcfd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 11 10:11:23 2010 -0500
doc: specify 0.0.20 as the minimum version for xmlto
Older versions do not have fop backend.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8edeba0..c75a041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.6)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_DEVEL_DOCS
-XORG_WITH_XMLTO
+XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
# Check for progs
commit a76488f75f23b8e08763e28b2fa56352e7b04e19
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jan 30 13:13:33 2010 -0500
doc: use new macros to control doc generation
Namely XORG_WITH_FOP for the fop backend (pdf) and
XORG_ENABLE_DEVEL_DOCS for the generation of all docs
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index d47a551..a22c157 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,9 +59,12 @@ dist-hook: ChangeLog INSTALL
# Developer documentation - not installed on system
EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
-if MAKE_DEVEL_DOCS
+if ENABLE_DEVEL_DOCS
if HAVE_XMLTO
noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css
+if HAVE_FOP
+noinst_DATA += doc/fontlib.pdf doc/fontlib.ps
+endif
CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps
doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
@@ -71,9 +74,9 @@ doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks $(srcdir)/doc/fontlib.xml
doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
- $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml
+ $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml
doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
- $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
+ $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
endif HAVE_XMLTO
-endif MAKE_DEVEL_DOCS
+endif ENABLE_DEVEL_DOCS
diff --git a/configure.ac b/configure.ac
index 6e39c1d..8edeba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,10 +39,12 @@ AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.5)
+ [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.6)
XORG_DEFAULT_OPTIONS
+XORG_ENABLE_DEVEL_DOCS
XORG_WITH_XMLTO
+XORG_WITH_FOP
# Check for progs
AC_PROG_CC
@@ -51,13 +53,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
dnl must first be located explicitly.
PKG_PROG_PKG_CONFIG
-# Option to enable support for building developer internals docs
-AC_ARG_ENABLE(devel-docs,
- AS_HELP_STRING([--enable-devel-docs],
- [Build internals documentation for developers (default: enabled)]),
- [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
-AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
-
# Look for headers
AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
AC_CHECK_FUNCS([poll])
commit 360f10333ac19f033ea64a8360c4886fbb657890
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jan 20 11:46:21 2010 -0500
config: replace custom code with reusable macro XORG_WITH_XMLTO
XORG_WITH_XMLTO provides additional functions like a configure
option which allow platform builders to control the usage of
the xmlto program.
This is a requirement from platforms that do not have such doc tool.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 66758a6..6e39c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,10 @@ AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.5)
XORG_DEFAULT_OPTIONS
+XORG_WITH_XMLTO
# Check for progs
AC_PROG_CC
@@ -50,12 +51,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
dnl must first be located explicitly.
PKG_PROG_PKG_CONFIG
-
-# xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-
# Option to enable support for building developer internals docs
AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs],
commit 24a257ca5b70e168564f0c6527e60bb06b61be8c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 21:39:11 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index dc48a0f..b271bf3 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,25 @@
+Copyright © 2007 Red Hat, Inc
+Copyright © 2008,2009 Sun Microsystems, 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 (including the next
+paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
Copyright (c) 1997 by Mark Leisher
Copyright (c) 1998-2003 by Juliusz Chroboczek
Copyright (c) 1998 Go Watanabe, All rights reserved.
@@ -238,52 +260,3 @@ Except as contained in this notice, the name of The XFree86 Project
Inc. 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 Inc..
-
-Copyright � 2007 Red Hat, Inc
-
-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 (including the next
-paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-Copyright 2008 Sun Microsystems, 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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
diff --git a/doc/fontlib.css b/doc/fontlib.css
index 137200f..0bc70e6 100644
--- a/doc/fontlib.css
+++ b/doc/fontlib.css
@@ -1,29 +1,24 @@
-/* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+/*
+ * Copyright 2009 Sun Microsystems, 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, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
+ * 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 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
+ * 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 AUTHORS OR COPYRIGHT HOLDERS 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.
*/
.structname, .property, .errorname, .function, .parameter, .filename {
diff --git a/doc/fontlib.xsl b/doc/fontlib.xsl
index 644f147..5de4a28 100644
--- a/doc/fontlib.xsl
+++ b/doc/fontlib.xsl
@@ -2,32 +2,26 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
<!--
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+Copyright 2009 Sun Microsystems, 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, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies of
- the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
+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 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
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
+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 AUTHORS OR COPYRIGHT HOLDERS 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.
-->
<xsl:param name="html.stylesheet" select="'fontlib.css'"/>
diff --git a/src/fontfile/bunzip2.c b/src/fontfile/bunzip2.c
index d8b9321..d927bd5 100644
--- a/src/fontfile/bunzip2.c
+++ b/src/fontfile/bunzip2.c
@@ -2,33 +2,28 @@
written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996.
intended for inclusion in X11 public releases. */
-/* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+/*
+ * Copyright © 2008 Sun Microsystems, 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, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
+ * 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 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
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
- */
+ * 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
#include "config.h"
commit d1c9028a410a10ef1b27c990f55de836eb948887
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:04 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 9d43e33..d47a551 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,7 @@ nodist_libXfontinclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xfont.pc.in include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog INSTALL
commit 72353a449e8dbf82a53a1d7958755198e989d892
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 15:28:32 2009 -0400
configure.ac: AM_MAINTAINER_MODE missing #24238
This turns off maintainer mode build rules in tarballs.
Works in conjunction with autogen.sh --enable-maintainer-mode
For all X.Org components.
diff --git a/configure.ac b/configure.ac
index 45f6f94..66758a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ dnl
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
+AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit 489e7b2cb3371042552489385902a98dc1cd976a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index f3d82f1..9d43e33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,12 +45,15 @@ pkgconfig_DATA = xfont.pc
EXTRA_DIST = xfont.pc.in include/X11/fonts/fontconf.h.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
# Developer documentation - not installed on system
EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
commit c22d67cc78c27d19bb6eaba5bf71b66444ed4a40
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index 399f7d0..45f6f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,11 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
-# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
# Check for progs
AC_PROG_CC
@@ -47,7 +49,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
dnl must first be located explicitly.
PKG_PROG_PKG_CONFIG
-XORG_DEFAULT_OPTIONS
# xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML
AC_ARG_VAR([XMLTO], [Path to xmlto command])
commit 271382b01995469eb60035d38880f9d3665d4c4c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:43 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index b90a7ad..f3d82f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ nodist_libXfontinclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
-EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in
+EXTRA_DIST = xfont.pc.in include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog
commit 9be83ae94cd82b447ed59ba0869f9e94ed9018f7
Reply to: