.gitignore | 8 ++++++++ Makefile.am | 8 +++++--- README | 25 +++++++++++++++++++++++++ configure.ac | 24 +++++++++++------------- encodings/.gitignore | 3 --- encodings/large/.gitignore | 3 --- src/.gitignore | 6 ------ src/Makefile.am | 2 ++ src/fontenc.c | 4 ++-- 9 files changed, 53 insertions(+), 30 deletions(-)
New commits: commit e609e939f8b2573ac50bdd317733a2fef194965a Author: Peter Hutterer <[email protected]> Date: Fri Aug 28 14:14:11 2009 +1000 libfontenc 1.0.5 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 6c1ce7b..fc28ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libfontenc, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libfontenc) +AC_INIT(libfontenc, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libfontenc) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 8a0bd244c5da5baae73c51e45b075b1412682e43 Author: Alan Coopersmith <[email protected]> Date: Mon Feb 2 20:34:38 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/README b/README index e69de29..8a6658d 100644 --- a/README +++ b/README @@ -0,0 +1,25 @@ +libfontenc - font encoding library + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libfontenc + + http://cgit.freedesktop.org/xorg/lib/libfontenc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + commit f160a71e9501a9d650fd99e9a080970bfd520abb Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Wed Jan 28 16:25:32 2009 -0200 Janitor: Correct make distcheck and compiler warnings. diff --git a/.gitignore b/.gitignore index 0182ff5..1093fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache config.guess @@ -18,3 +20,9 @@ missing mkinstalldirs stamp-h1 *~ +*.o +*.la +*.lo +libfontenc-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d9053b1..c59da58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,13 +24,13 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontenc.pc -EXTRA_DIST = fontenc.pc.in autogen.sh ChangeLog +EXTRA_DIST = fontenc.pc.in ChangeLog +MAINTAINERCLEANFILES = ChangeLog -CLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index dcddc57..6c1ce7b 100644 --- a/configure.ac +++ b/configure.ac @@ -27,23 +27,20 @@ AC_INIT(libfontenc, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=x AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) - # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings -AC_ARG_WITH(encodingsdir, - AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]), - [ENCODINGSDIR="$withval"], - [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"]) +encodingsdir=${libdir}/X11/fonts/encodings +AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>], + [Path to font encodings]), [encodingsdir="$withval"]) +ENCODINGSDIR="$encodingsdir" AC_SUBST(ENCODINGSDIR) # zlib @@ -52,7 +49,7 @@ AC_CHECK_LIB(z, gzclose) # Check for dependencies PKG_CHECK_MODULES(FONTENC, xproto) - +FONTENC_CFLAGS="$CWARNFLAGS $FONTENC_CFLAGS" AC_SUBST(FONTENC_CFLAGS) AC_SUBST(FONTENC_LIBS) @@ -61,6 +58,7 @@ XORG_WITH_LINT LINT_FLAGS="${LINT_FLAGS} ${FONTENC_CFLAGS}" XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/encodings/.gitignore b/encodings/.gitignore deleted file mode 100644 index 0b23b3c..0000000 --- a/encodings/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.enc.gz -Makefile -Makefile.in diff --git a/encodings/large/.gitignore b/encodings/large/.gitignore deleted file mode 100644 index 0b23b3c..0000000 --- a/encodings/large/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.enc.gz -Makefile -Makefile.in diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 05b61a7..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -*.lo -libfontenc.la -Makefile -Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 3c6c3f6..8cd0911 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,8 @@ libfontenc_la_SOURCES = \ fontenc.c \ fontencI.h +AM_CFLAGS = @FONTENC_CFLAGS@ + fontencd...@encodingsdir@ FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" diff --git a/src/fontenc.c b/src/fontenc.c index 955e481..923e35e 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -630,8 +630,8 @@ FontEncFromXLFD(const char *name, int length) } /* now p either is null or points at the '-' before the charset registry */ - - if(p == 0) + + if(p == NULL) return NULL; len = length - (p - name) - 1; commit 90f2dfbc40d6fa72213f508b0dd85f00965b6194 Author: James Cloos <[email protected]> Date: Thu Dec 6 15:51:21 2007 -0500 Add missing PHONY line for automatic ChangeLog generation diff --git a/Makefile.am b/Makefile.am index 77246ed..d9053b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,8 @@ pkgconfig_DATA = fontenc.pc EXTRA_DIST = fontenc.pc.in autogen.sh ChangeLog CLEANFILES = ChangeLog +.PHONY: ChangeLog + ChangeLog: (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
