libxfont: Changes to 'upstream-experimental'
.gitignore | 3
COPYING | 2
Makefile.am | 128 +++++++
README | 59 +++
autogen.sh | 4
configure.ac | 190 ++++++-----
devbook.am | 55 +++
doc/.gitignore | 2
doc/Makefile.am | 62 ---
doc/fontlib.xml | 123 ++-----
include/X11/fonts/.gitignore | 2
include/X11/fonts/bdfint.h | 16
include/X11/fonts/bitmap.h | 18 -
include/X11/fonts/bufio.h | 2
include/X11/fonts/fntfil.h | 98 ++---
include/X11/fonts/fntfilst.h | 40 +-
include/X11/fonts/fontconf.h.in | 49 --
include/X11/fonts/fontmisc.h | 12
include/X11/fonts/fontutil.h | 12
include/X11/fonts/libxfont2.h | 163 +++++++++
include/X11/fonts/pcf.h | 4
include/libxfontint.h | 130 +++++++
m4/attributes.m4 | 283 ++++++++++++++++
src/FreeType/Makefile.am | 15
src/FreeType/ft.h | 2
src/FreeType/ftenc.c | 31 -
src/FreeType/ftfuncs.c | 314 +++++++++---------
src/FreeType/ftfuncs.h | 10
src/FreeType/fttools.c | 9
src/FreeType/xttcap.c | 65 +--
src/FreeType/xttcap.h | 13
src/Makefile.am | 68 ---
src/bitmap/Makefile.am | 19 -
src/bitmap/bdfread.c | 94 +++--
src/bitmap/bdfutils.c | 26 -
src/bitmap/bitmap.c | 15
src/bitmap/bitmapfunc.c | 44 +-
src/bitmap/bitmaputil.c | 1
src/bitmap/bitscale.c | 145 +++-----
src/bitmap/fontink.c | 3
src/bitmap/pcfread.c | 56 +--
src/bitmap/pcfwrite.c | 14
src/bitmap/snfread.c | 19 -
src/bitmap/snfstr.h | 2
src/builtins/Makefile.am | 17
src/builtins/buildfont | 2
src/builtins/builtin.h | 8
src/builtins/dir.c | 7
src/builtins/file.c | 7
src/builtins/fonts.c | 3
src/builtins/fpe.c | 43 +-
src/builtins/render.c | 3
src/fc/Makefile.am | 16
src/fc/fsconvert.c | 71 ++--
src/fc/fserve.c | 688 ++++++++++++++++++++++++++--------------
src/fc/fserve.h | 11
src/fc/fservestr.h | 23 -
src/fc/fsio.c | 35 +-
src/fc/fsio.h | 13
src/fc/fslibos.h | 220 ++++++------
src/fc/fstrans.c | 6
src/fontfile/Makefile.am | 29 -
src/fontfile/bitsource.c | 17
src/fontfile/bufio.c | 9
src/fontfile/bunzip2.c | 17
src/fontfile/catalogue.c | 97 ++---
src/fontfile/decompress.c | 60 +--
src/fontfile/defaults.c | 1
src/fontfile/dirfile.c | 17
src/fontfile/fileio.c | 6
src/fontfile/filewr.c | 13
src/fontfile/fontdir.c | 38 +-
src/fontfile/fontencc.c | 5
src/fontfile/fontfile.c | 148 ++++----
src/fontfile/fontscale.c | 9
src/fontfile/gunzip.c | 15
src/fontfile/register.c | 5
src/fontfile/renderers.c | 11
src/stubs/Makefile.am | 25 -
src/stubs/atom.c | 224 +++++++++++++
src/stubs/cauthgen.c | 14
src/stubs/csignal.c | 14
src/stubs/delfntcid.c | 13
src/stubs/errorf.c | 13
src/stubs/fatalerror.c | 13
src/stubs/findoldfnt.c | 14
src/stubs/getcres.c | 14
src/stubs/getdefptsize.c | 14
src/stubs/getnewfntcid.c | 14
src/stubs/gettime.c | 14
src/stubs/initfshdl.c | 15
src/stubs/libxfontstubs.c | 198 +++++++++++
src/stubs/regfpefunc.c | 28 -
src/stubs/rmfshdl.c | 15
src/stubs/servclient.c | 10
src/stubs/setfntauth.c | 14
src/stubs/stfntcfnt.c | 14
src/stubs/stubs.h | 41 --
src/util/Makefile.am | 19 -
src/util/atom.c | 242 --------------
src/util/fontaccel.c | 5
src/util/fontnames.c | 9
src/util/fontutil.c | 44 --
src/util/fontxlfd.c | 29 -
src/util/format.c | 23 -
src/util/miscutil.c | 15
src/util/patcache.c | 47 +-
src/util/private.c | 9
src/util/utilbitmap.c | 23 -
xfont.pc.in | 13
xfont2.pc.in | 13
111 files changed, 2991 insertions(+), 2313 deletions(-)
New commits:
commit 14488af0338191356c0177e3d0b5fa473ffbd59c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 11 07:08:29 2015 -0800
Bump version to 2.0.1
This release just fixes some build issues with 2.0.0
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index a13e7bd..a555151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXfont2], [2.0.0],
+AC_INIT([libXfont2], [2.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont2])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 95a40553b8f12cd9479dd4b3c531e2069c53b870
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 9 14:53:26 2015 -0800
Remove fontconf.h
This file used to advertise which font formats the library
supports. The X server doesn't care, so let's just remove it so that
it doesn't conflict with the older version of libXfont
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/.gitignore b/.gitignore
index 183f4b6..2efa153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,6 @@ core
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
+*.sig
+*.announce
+TAGS
diff --git a/Makefile.am b/Makefile.am
index 86870bb..c1a3db2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,6 @@ noinst_HEADERS = \
src/FreeType/ft.h \
src/FreeType/ftfuncs.h
-nodist_libXfontinclude_HEADERS = \
- include/X11/fonts/fontconf.h
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont2.pc
diff --git a/configure.ac b/configure.ac
index f331b93..a13e7bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.60])
AC_INIT([libXfont2], [2.0.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont2])
AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake
diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
deleted file mode 100644
index b571690..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add & Override for this directory and it's subdirectories
-fontconf.h
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in
deleted file mode 100644
index 67783d3..0000000
--- a/include/X11/fonts/fontconf.h.in
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2005 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Define as 1 if you have FreeType support in Xfont */
-#undef XFONT_FREETYPE
-
-/* Define as 1 if you have builtin font support in Xfont */
-#undef XFONT_BUILTINS
-
-/* Define as 1 if you have pcf font support in Xfont */
-#undef XFONT_PCFFORMAT
-
-/* Define as 1 if you have bdf font support in Xfont */
-#undef XFONT_BDFFORMAT
-
-/* Define as 1 if you have snf font support in Xfont */
-#undef XFONT_SNFFORMAT
-
-/* Define as 1 if you have bitmap font support in Xfont */
-#undef XFONT_BITMAP
-
-/* Define as 1 if you have fontfile support in Xfont */
-#undef XFONT_FONTFILE
-
-/* Define as 1 if you have font cache support in Xfont */
-#undef XFONT_FONTCACHE
-
-/* Define as 1 if you have X Font Services Protocol support in Xfont */
-#undef XFONT_FC
-
commit 903cd14547b445d7f40b52462750fc8b28441581
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Sep 2 19:15:27 2015 -0700
Convert to non-recursive build.
diff --git a/Makefile.am b/Makefile.am
index 43ccd34..86870bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS=doc src
+SUBDIRS=doc
libXfontincludedir = $(includedir)/X11/fonts
libXfontinclude_HEADERS = \
@@ -48,6 +48,118 @@ nodist_libXfontinclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont2.pc
+lib_LTLIBRARIES = libXfont2.la
+
+AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
+
+libXfont2_la_SOURCES = \
+ src/stubs/atom.c \
+ src/stubs/libxfontstubs.c \
+ src/util/fontaccel.c \
+ src/util/fontnames.c \
+ src/util/fontutil.c \
+ src/util/fontxlfd.c \
+ src/util/format.c \
+ src/util/miscutil.c \
+ src/util/patcache.c \
+ src/util/private.c \
+ src/util/utilbitmap.c
+
+libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+
+libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
+
+if XFONT_FONTFILE
+libXfont2_la_SOURCES += \
+ src/fontfile/bitsource.c \
+ src/fontfile/bufio.c \
+ src/fontfile/decompress.c \
+ src/fontfile/defaults.c \
+ src/fontfile/dirfile.c \
+ src/fontfile/fileio.c \
+ src/fontfile/filewr.c \
+ src/fontfile/fontdir.c \
+ src/fontfile/fontencc.c \
+ src/fontfile/fontfile.c \
+ src/fontfile/fontscale.c \
+ src/fontfile/gunzip.c \
+ src/fontfile/register.c \
+ src/fontfile/renderers.c \
+ src/fontfile/catalogue.c
+
+if X_BZIP2_FONT_COMPRESSION
+libXfont2_la_SOURCES += src/fontfile/bunzip2.c
+endif
+endif
+
+if XFONT_FREETYPE
+AM_CFLAGS += $(FREETYPE_CFLAGS)
+
+libXfont2_la_LIBADD += $(FREETYPE_LIBS)
+libXfont2_la_SOURCES += \
+ src/FreeType/ft.h \
+ src/FreeType/ftfuncs.h \
+ src/FreeType/xttcap.h \
+ src/FreeType/ftenc.c \
+ src/FreeType/ftfuncs.c \
+ src/FreeType/fttools.c \
+ src/FreeType/xttcap.c
+endif
+
+if XFONT_BITMAP
+libXfont2_la_SOURCES += \
+ src/bitmap/bitmap.c \
+ src/bitmap/bitmapfunc.c \
+ src/bitmap/bitmaputil.c \
+ src/bitmap/bitscale.c \
+ src/bitmap/fontink.c
+
+if XFONT_BDFFORMAT
+libXfont2_la_SOURCES += \
+ src/bitmap/bdfread.c \
+ src/bitmap/bdfutils.c
+endif
+
+if XFONT_PCF_OR_BUILTIN
+libXfont2_la_SOURCES += src/bitmap/pcfread.c
+endif
+
+if XFONT_PCFFORMAT
+libXfont2_la_SOURCES += src/bitmap/pcfwrite.c
+endif
+
+if XFONT_SNFFORMAT
+libXfont2_la_SOURCES += \
+ src/bitmap/snfread.c \
+ src/bitmap/snfstr.h
+endif
+endif
+
+if XFONT_BUILTINS
+libXfont2_la_SOURCES += \
+ src/builtins/builtin.h \
+ src/builtins/dir.c \
+ src/builtins/file.c \
+ src/builtins/fonts.c \
+ src/builtins/fpe.c \
+ src/builtins/render.c
+endif
+
+if XFONT_FC
+libXfont2_la_SOURCES += \
+ src/fc/fsconvert.c \
+ src/fc/fserve.c \
+ src/fc/fserve.h \
+ src/fc/fservestr.h \
+ src/fc/fsio.c \
+ src/fc/fsio.h \
+ src/fc/fslibos.h \
+ src/fc/fstrans.c
+endif
+
+EXTRA_DIST = src/builtins/buildfont
+
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 0eb4c55..f331b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
# Must be called before any macros that run the compiler (like
@@ -245,13 +245,5 @@ AC_SUBST([OS_CFLAGS])
AC_CONFIG_FILES([Makefile
doc/Makefile
- src/Makefile
- src/fontfile/Makefile
- src/FreeType/Makefile
- src/builtins/Makefile
- src/bitmap/Makefile
- src/fc/Makefile
- src/util/Makefile
- src/stubs/Makefile
xfont2.pc])
AC_OUTPUT
diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am
deleted file mode 100644
index ab60ffa..0000000
--- a/src/FreeType/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include
-
-AM_CFLAGS = $(FREETYPE_CFLAGS) $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libft.la
-
-libft_la_SOURCES = \
- ft.h \
- ftfuncs.h \
- xttcap.h \
- ftenc.c \
- ftfuncs.c \
- fttools.c \
- xttcap.c
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 03c704a..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright © 2003 Keith Packard, Noah Levitt
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Keith Packard not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Keith Packard makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-lib_LTLIBRARIES = libXfont2.la
-
-AM_CFLAGS = $(OS_CFLAGS) $(CWARNFLAGS)
-
-if XFONT_FONTFILE
-FONTFILE_DIR = fontfile
-FONTFILE_LIB = fontfile/libfontfile.la
-endif
-
-if XFONT_FREETYPE
-FREETYPE_DIR = FreeType
-FREETYPE_LIB = FreeType/libft.la
-endif
-
-if XFONT_BITMAP
-BITMAP_DIR = bitmap
-BITMAP_LIB = bitmap/libbitmap.la
-endif
-
-if XFONT_BUILTINS
-BUILTINS_DIR = builtins
-BUILTINS_LIB = builtins/libbuiltins.la
-endif
-
-if XFONT_FC
-FC_DIR = fc
-FC_LIB = fc/libfc.la
-endif
-
-UTIL_DIR = util
-UTIL_LIB = util/libutil.la
-
-STUBS_LIB = stubs/libstubs.la
-STUBS_DIR = stubs
-
-SUBDIRS=\
- $(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
- $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR)
-
-libXfont2_la_LIBADD = \
- $(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \
- $(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \
- $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
-
-libXfont2_la_SOURCES = dummy.c
-
-libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am
deleted file mode 100644
index 0f2d10a..0000000
--- a/src/bitmap/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libbitmap.la
-
-libbitmap_la_SOURCES = \
- bitmap.c \
- bitmapfunc.c \
- bitmaputil.c \
- bitscale.c \
- fontink.c
-
-if XFONT_BDFFORMAT
-libbitmap_la_SOURCES += bdfread.c bdfutils.c
-endif
-
-if XFONT_PCF_OR_BUILTIN
-libbitmap_la_SOURCES += pcfread.c
-endif
-
-if XFONT_PCFFORMAT
-libbitmap_la_SOURCES += pcfwrite.c
-endif
-
-if XFONT_SNFFORMAT
-libbitmap_la_SOURCES += snfread.c snfstr.h
-endif
diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am
deleted file mode 100644
index 6b96410..0000000
--- a/src/builtins/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include \
- -I${top_srcdir}/src/bitmap
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libbuiltins.la
-
-libbuiltins_la_SOURCES = \
- builtin.h \
- dir.c \
- file.c \
- fonts.c \
- fpe.c \
- render.c
-
-EXTRA_DIST = buildfont
diff --git a/src/dummy.c b/src/dummy.c
deleted file mode 100644
index e69de29..0000000
diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am
deleted file mode 100644
index c180cae..0000000
--- a/src/fc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libfc.la
-
-libfc_la_SOURCES = \
- fsconvert.c \
- fserve.c \
- fserve.h \
- fservestr.h \
- fsio.c \
- fsio.h \
- fslibos.h \
- fstrans.c
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
deleted file mode 100644
index ab54cfd..0000000
--- a/src/fontfile/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-AM_CPPFLAGS = -I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libfontfile.la
-
-libfontfile_la_LIBADD = \
- $(Z_LIBS)
-
-libfontfile_la_SOURCES = \
- bitsource.c \
- bufio.c \
- decompress.c \
- defaults.c \
- dirfile.c \
- fileio.c \
- filewr.c \
- fontdir.c \
- fontencc.c \
- fontfile.c \
- fontscale.c \
- gunzip.c \
- register.c \
- renderers.c \
- catalogue.c
-
-if X_BZIP2_FONT_COMPRESSION
-libfontfile_la_SOURCES += bunzip2.c
-endif
diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
deleted file mode 100644
index 65950cc..0000000
--- a/src/stubs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libstubs.la
-
-libstubs_la_SOURCES = \
- atom.c \
- libxfontstubs.c
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index d802b59..0000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CPPFLAGS = \
- -I${top_srcdir}/include \
- -I$(top_srcdir)/src/stubs
-
-AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS)
-
-noinst_LTLIBRARIES = libutil.la
-
-libutil_la_SOURCES = \
- fontaccel.c \
- fontnames.c \
- fontutil.c \
- fontxlfd.c \
- format.c \
- miscutil.c \
- patcache.c \
- private.c \
- utilbitmap.c
commit 9928d71ec04cd630a8ed9c583d144decb4e98c05
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 9 09:07:30 2015 -0800
Add missing 'attributes.m4' file
Matt Turner noted that this file was missing; 'make distcheck' doesn't
appear to catch this kind of problem.
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/m4/attributes.m4 b/m4/attributes.m4
new file mode 100644
index 0000000..5fbd43d
--- /dev/null
+++ b/m4/attributes.m4
@@ -0,0 +1,283 @@
+dnl Macros to check the presence of generic (non-typed) symbols.
+dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com>
+dnl Copyright (c) 2006-2008 xine project
+dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+dnl
+dnl As a special exception, the copyright owners of the
+dnl macro gives unlimited permission to copy, distribute and modify the
+dnl configure scripts that are the output of Autoconf when processing the
+dnl Macro. You need not follow the terms of the GNU General Public
+dnl License when using or distributing such scripts, even though portions
+dnl of the text of the Macro appear in them. The GNU General Public
+dnl License (GPL) does govern all other use of the material that
+dnl constitutes the Autoconf Macro.
+dnl
+dnl This special exception to the GPL applies to versions of the
+dnl Autoconf Macro released by this project. When you make and
+dnl distribute a modified version of the Autoconf Macro, you may extend
+dnl this special exception to the GPL to apply to your modified version as
+dnl well.
+
+dnl Check if FLAG in ENV-VAR is supported by compiler and append it
+dnl to WHERE-TO-APPEND variable
+dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
+
+AC_DEFUN([CC_CHECK_FLAG_APPEND], [
+ AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
+ AS_TR_SH([cc_cv_$2_$3]),
+ [eval "AS_TR_SH([cc_save_$2])='${$2}'"
+ eval "AS_TR_SH([$2])='-Werror $3'"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],
+ [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
+ [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
+ eval "AS_TR_SH([$2])='$cc_save_$2'"])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
+ [eval "$1='${$1} $3'"])
+])
+
+dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2])
+AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
+ for flag in $3; do
+ CC_CHECK_FLAG_APPEND($1, $2, $flag)
+ done
+])
+
+dnl Check if the flag is supported by linker (cacheable)
+dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([CC_CHECK_LDFLAGS], [
+ AC_CACHE_CHECK([if $CC supports $1 flag],
+ AS_TR_SH([cc_cv_ldflags_$1]),
+ [ac_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $1"
+ AC_LINK_IFELSE([int main() { return 1; }],
+ [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
+ [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
+ LDFLAGS="$ac_save_LDFLAGS"
+ ])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
+ [$2], [$3])
+])
+
+dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for
+dnl the current linker to avoid undefined references in a shared object.
+AC_DEFUN([CC_NOUNDEFINED], [
+ dnl We check $host for which systems to enable this for.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+
+ case $host in
+ dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
+ dnl are requested, as different implementations are present; to avoid problems
+ dnl use -Wl,-z,defs only for those platform not behaving this way.
+ *-freebsd* | *-openbsd*) ;;
+ *)
+ dnl First of all check for the --no-undefined variant of GNU ld. This allows
+ dnl for a much more readable commandline, so that people can understand what
+ dnl it does without going to look for what the heck -z defs does.
+ for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
+ CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
+ break
+ done
+ ;;
+ esac
+
+ AC_SUBST([LDFLAGS_NOUNDEFINED])
+])
+
+dnl Check for a -Werror flag or equivalent. -Werror is the GCC
+dnl and ICC flag that tells the compiler to treat all the warnings
+dnl as fatal. We usually need this option to make sure that some
+dnl constructs (like attributes) are not simply ignored.
+dnl
+dnl Other compilers don't support -Werror per se, but they support
+dnl an equivalent flag:
+dnl - Sun Studio compiler supports -errwarn=%all
+dnl we don't test for that, it gives us false positives when gcc doesn't
+dnl actually complain about it. If someone wants to compile this on sun, let
+dnl them fix it.
+AC_DEFUN([CC_CHECK_WERROR], [
+ AC_CACHE_CHECK(
+ [for $CC way to treat warnings as errors],
+ [cc_cv_werror],
+ [CC_CHECK_FLAG_APPEND([cc_cv_werror], [CFLAGS], [-Werror])])
+])
+
+AC_DEFUN([CC_CHECK_ATTRIBUTE], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
+ AS_TR_SH([cc_cv_attribute_$1]),
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
+ [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
+ [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
+ [AC_DEFINE(
+ AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
+ [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
+ )
+ $4],
+ [$5])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [
+ CC_CHECK_ATTRIBUTE(
+ [constructor],,
+ [void __attribute__((constructor)) ctor() { int a; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT], [
+ CC_CHECK_ATTRIBUTE(
+ [format], [format(printf, n, n)],
+ [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [
+ CC_CHECK_ATTRIBUTE(
+ [format_arg], [format_arg(printf)],
+ [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
+ CC_CHECK_ATTRIBUTE(
+ [visibility_$1], [visibility("$1")],
+ [void __attribute__((visibility("$1"))) $1_function() { }],
+ [$2], [$3])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_NONNULL], [
+ CC_CHECK_ATTRIBUTE(
+ [nonnull], [nonnull()],
+ [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_UNUSED], [
+ CC_CHECK_ATTRIBUTE(
+ [unused], ,
+ [void some_function(void *foo, __attribute__((unused)) void *bar);],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [
+ CC_CHECK_ATTRIBUTE(
+ [sentinel], ,
+ [void some_function(void *foo, ...) __attribute__((sentinel));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [
+ CC_CHECK_ATTRIBUTE(
+ [deprecated], ,
+ [void some_function(void *foo, ...) __attribute__((deprecated));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIAS], [
+ CC_CHECK_ATTRIBUTE(
+ [alias], [weak, alias],
+ [void other_function(void *foo) { }
+ void some_function(void *foo) __attribute__((weak, alias("other_function")));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_MALLOC], [
+ CC_CHECK_ATTRIBUTE(
+ [malloc], ,
+ [void * __attribute__((malloc)) my_alloc(int n);],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_PACKED], [
+ CC_CHECK_ATTRIBUTE(
+ [packed], ,
+ [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONST], [
+ CC_CHECK_ATTRIBUTE(
+ [const], ,
+ [int __attribute__((const)) twopow(int n) { return 1 << n; } ],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_FLAG_VISIBILITY], [
+ AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
+ [cc_cv_flag_visibility],
+ [CC_CHECK_FLAG_APPEND([cc_cv_flag_visibility], [CFLAGS], [-fvisibility=hidden])])
+
+ AS_IF([test "x$cc_cv_flag_visibility" != "x"],
+ [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
+ [Define this if the compiler supports the -fvisibility flag])
+ $1],
+ [$2])
+])
+
+AC_DEFUN([CC_FUNC_EXPECT], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([if compiler has __builtin_expect function],
+ [cc_cv_func_expect],
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [int some_function() {
+ int a = 3;
+ return (int)__builtin_expect(a, 3);
+ }])],
+ [cc_cv_func_expect=yes],
+ [cc_cv_func_expect=no])
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ AS_IF([test "x$cc_cv_func_expect" = "xyes"],
+ [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
+ [Define this if the compiler supports __builtin_expect() function])
+ $1],
+ [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
+ [cc_cv_attribute_aligned],
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ for cc_attribute_align_try in 64 32 16 8 4 2; do
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ int main() {
+ static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
+ return c;
+ }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
+ done
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ if test "x$cc_cv_attribute_aligned" != "x"; then
+ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
+ [Define the highest alignment supported])
+ fi
+])
commit 135fb032e940ce226c9feb13e6e903f3ecbc5eb0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 2 00:04:32 2015 -0700
Eliminate calls back to X server or font server functions by name (v4)
This eliminates the weak symbol adventures and makes all of the calls
back to the X server or Font server go through a table of functions
instead, clarifying the required API.
As this is a rather major change to the API for the library, it now
installs itself as libXfont2 instead of libXfont, and the package
config file is now xfont2.pc.
All of the installed headers remain the same as the original library;
there's now a new include file, libxfont2.h, which defines the X
server and Font server interfaces.
This moves util/atom.c to stubs/atom.c and reformats that file, hence
the diff being larger than it would otherwise be.
v2: Rename to libXfont2 instead of libXfont_2 as suggested by Emil Velikov
Fix whitespace in stubs/atom.c, which was moved from util/
v3: Remove select masks from API. Expose single 'font_init' function
for all library initialization.
v4: Change name of distributed tarballs to libXfont2 as well
Reply to: