ChangeLog | 60 +++++++++++++++++++++
Makefile.am | 2
Makefile.in | 2
aclocal.m4 | 24 ++++++--
config.h.in | 3 +
configure | 112 ++++++++++++++++++++++++++++++++--------
configure.ac | 2
debian/changelog | 9 ++-
debian/rules | 6 +-
debian/xsfbs/xsfbs.mk | 29 +++-------
include/X11/fonts/fontconf.h.in | 2
ltmain.sh | 2
src/FreeType/ftenc.c | 4 +
src/FreeType/ftfuncs.c | 1
src/Makefile.am | 2
src/Makefile.in | 2
src/fc/fstrans.c | 2
src/fontfile/dirfile.c | 6 ++
src/fontfile/fontdir.c | 4 +
19 files changed, 210 insertions(+), 64 deletions(-)
New commits:
commit 17b2aea61cbe16146ac9480fd452c45c5110f1da
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 22:50:14 2008 +0200
Fixup the changelog
I forgot to push before preparing the release, but
didn't actually upload, so fix the merge and try again.
diff --git a/debian/changelog b/debian/changelog
index bf79ecc..c1bbd49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,6 @@
-libxfont (1:1.3.3-2) UNRELEASED; urgency=low
-
- [ Brice Goglin ]
- * Add upstream URL to debian/copyright.
- * Add a link to www.X.org and a reference to the upstream module
- in the long description.
-
- -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 11:19:28 +0200
-
libxfont (1:1.3.3-1) unstable; urgency=high
+ [ Julien Cristau ]
* Drop dependency on x11-common from libxfont1{,-dbg}.
* New upstream bugfix release.
* Disable the type1 rasterizer and support for speedo font files. The
@@ -16,7 +8,12 @@ libxfont (1:1.3.3-1) unstable; urgency=high
since before etch anyway.
* Urgency high so the above gets in lenny.
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 22:18:47 +0200
+ [ Brice Goglin ]
+ * Add upstream URL to debian/copyright.
+ * Add a link to www.X.org and a reference to the upstream module
+ in the long description.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 22:50:03 +0200
libxfont (1:1.3.2-1) unstable; urgency=low
commit 6c7b636f56ab1286574cff2d0e910cd37eaee0ab
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 22:18:55 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d374bc7..3401ebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libxfont (1:1.3.3-1) UNRELEASED; urgency=low
+libxfont (1:1.3.3-1) unstable; urgency=high
* Drop dependency on x11-common from libxfont1{,-dbg}.
* New upstream bugfix release.
* Disable the type1 rasterizer and support for speedo font files. The
former is a security hazard, and Speedo fonts are disabled in the X server
since before etch anyway.
+ * Urgency high so the above gets in lenny.
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 18 May 2008 21:05:38 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 22:18:47 +0200
libxfont (1:1.3.2-1) unstable; urgency=low
commit 5fdb8a1ad156c74f3765a8e2393fb9d9774fe01f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 22:16:38 2008 +0200
Fix rules dependencies
diff --git a/debian/rules b/debian/rules
index c2957ee..fa2e095 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ endif
confflags += --enable-fc --disable-type1 --disable-speedo
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
commit 45ab934178e41eb4f37a283c33250115e94ef069
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 22:01:48 2008 +0200
Disable the type1 rasterizer and support for speedo font files.
The former is a security hazard, and Speedo fonts are disabled
in the X server since before etch anyway.
diff --git a/debian/changelog b/debian/changelog
index b6d27d5..d374bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ libxfont (1:1.3.3-1) UNRELEASED; urgency=low
* Drop dependency on x11-common from libxfont1{,-dbg}.
* New upstream bugfix release.
+ * Disable the type1 rasterizer and support for speedo font files. The
+ former is a security hazard, and Speedo fonts are disabled in the X server
+ since before etch anyway.
-- Julien Cristau <[EMAIL PROTECTED]> Sun, 18 May 2008 21:05:38 +0200
diff --git a/debian/rules b/debian/rules
index 439bec3..c2957ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-confflags += --enable-fc
+confflags += --enable-fc --disable-type1 --disable-speedo
build: patch build-stamp
build-stamp:
commit dbd8c0dfeeb4dfa382a12601ce00013b9e4b6710
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 21:51:32 2008 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index fb2a68b..31210df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+commit 684c000e57f30344777cf763f2f1b540ef008b38
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Jul 2 15:30:03 2008 -0400
+
+ libXfont 1.3.3
+
+commit 11edbc3a818e15ea2b622b31e6f87159ee68ae4a
+Author: Maarten ter Huurne <[EMAIL PROTECTED]>
+Date: Sat Jun 28 15:34:50 2008 -0400
+
+ Do not call FT_Get_BDF_Charset_ID() if configured with --disable-bdfformat
+
+ When I configure libXfont-1.3.2 with --disable-bdfformat and link it
against
+ FreeType that is built without BDF support, I get the following link error:
+
+ libXfont.so: undefined reference to ‘FT_Get_BDF_Charset_ID’
+
+ I fixed it by checking XFONT_BDFFORMAT and if BDF support is disabled, the
call
+ to FT_Get_BDF_Charset_ID() is omitted and the result code is set as if the
call
+ had failed.
+
+ Signed-off-by: James Cloos <[EMAIL PROTECTED]>
+
+commit 1ab07ce0eec4f6c7ed66c7aba3edf8c4315dd907
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue May 13 17:26:57 2008 -0700
+
+ FontFileDirectoryChanged: check length of "fonts.alias" as well as
"fonts.dir"
+
+commit 0f9db4aa7de6e0644ac9c5811b949e5f936c9d61
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri May 9 12:36:30 2008 -0700
+
+ Don't allow a font alias to point to itself and create a loop
+
+ Part of fix for Sun bug 4258475
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
+
+commit 67311922a2e02d8a763831831b65bb4833db58b5
+Author: Colin Harrison <colin.harrison-at-virgin.net>
+Date: Mon May 5 22:17:55 2008 +0100
+
+ Fix build for WIN32
+
+commit 6ba408c956ca8e241d10d463c45b4e987b757333
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sun Mar 9 08:21:34 2008 +0100
+
+ nuke RCS Ids
+
+commit 754cabe62e91b9ad50c3027c063f4269775f7add
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Fri Mar 7 12:19:22 2008 +0100
+
+ Add missing include in src/FreeType/ftfuncs.c
+
+ Fixes compiler warning:
+ ../../../src/FreeType/ftfuncs.c: In function 'restrict_code_range_by_str':
+ ../../../src/FreeType/ftfuncs.c:2081: warning: implicit declaration of
function 'isspace'
+
commit 0fd2a1428df56d8b29e148b08dcec2dfed9302fa
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Mar 5 22:04:06 2008 -0500
diff --git a/debian/changelog b/debian/changelog
index c0a36e1..b6d27d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-libxfont (1:1.3.2-2) UNRELEASED; urgency=low
+libxfont (1:1.3.3-1) UNRELEASED; urgency=low
* Drop dependency on x11-common from libxfont1{,-dbg}.
+ * New upstream bugfix release.
-- Julien Cristau <[EMAIL PROTECTED]> Sun, 18 May 2008 21:05:38 +0200
commit ea45c196650ec24e2fb9704e8aa392d0701ba64a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 21:49:43 2008 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index b2a7913..993b498 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,8 +15,6 @@
@SET_MAKE@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/aclocal.m4 b/aclocal.m4
index 828ff59..28d9b83 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6875,14 +6875,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -6945,6 +6945,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -6954,17 +6960,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket
transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then
diff --git a/config.h.in b/config.h.in
index fe3d745..c4f7589 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,6 +24,9 @@
/* Define to 1 if you have the <poll.h> header file. */
#undef HAVE_POLL_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/configure b/configure
index 97c3e7c..538eb3d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libXfont 1.3.2.
+# Generated by GNU Autoconf 2.61 for libXfont 1.3.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libXfont'
PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='libXfont 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='libXfont 1.3.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1434,7 +1434,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libXfont 1.3.2 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.3.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1504,7 +1504,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXfont 1.3.2:";;
+ short | recursive ) echo "Configuration of libXfont 1.3.3:";;
esac
cat <<\_ACEOF
@@ -1640,7 +1640,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXfont configure 1.3.2
+libXfont configure 1.3.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXfont $as_me 1.3.2, which was
+It was created by libXfont $as_me 1.3.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2344,7 +2344,7 @@ fi
# Define the identity of the package.
PACKAGE='libXfont'
- VERSION='1.3.2'
+ VERSION='1.3.3'
cat >>confdefs.h <<_ACEOF
@@ -21083,18 +21083,15 @@ _ACEOF
+ case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
else
- UNIXCONN=yes
-fi
-
- # Check whether --enable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
- enableval=$enable_tcp_transport; TCPCONN=$enableval
-else
- TCPCONN=yes
+ UNIXCONN=$unixdef
fi
{ echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket
connections" >&5
@@ -21108,6 +21105,13 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: result: $UNIXCONN" >&5
echo "${ECHO_T}$UNIXCONN" >&6; }
+ # Check whether --enable-tcp-transport was given.
+if test "${enable_tcp_transport+set}" = set; then
+ enableval=$enable_tcp_transport; TCPCONN=$enableval
+else
+ TCPCONN=yes
+fi
+
{ echo "$as_me:$LINENO: checking if Xtrans should support TCP socket
connections" >&5
echo $ECHO_N "checking if Xtrans should support TCP socket connections...
$ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $TCPCONN" >&5
@@ -21506,6 +21510,74 @@ _ACEOF
fi
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+$ac_includes_default
+#include <sys/socket.h>
+
+typedef socklen_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_socklen_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_socklen_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+
+
+
fi
case $host_os in
solaris*|sco*|sysv4*) localdef="yes" ;;
@@ -21574,7 +21646,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -21583,7 +21655,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -22090,7 +22162,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXfont $as_me 1.3.2, which was
+This file was extended by libXfont $as_me 1.3.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22143,7 +22215,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXfont config.status 1.3.2
+libXfont config.status 1.3.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff --git a/src/Makefile.in b/src/Makefile.in
index 36785bb..1aeda3d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,8 +15,6 @@
@SET_MAKE@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed
's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat
/etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null
2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*"
>/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit 684c000e57f30344777cf763f2f1b540ef008b38
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Jul 2 15:30:03 2008 -0400
libXfont 1.3.3
diff --git a/configure.ac b/configure.ac
index 7d7ba75..fe55e41 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([libXfont],
- 1.3.2,
+ 1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit 11edbc3a818e15ea2b622b31e6f87159ee68ae4a
Author: Maarten ter Huurne <[EMAIL PROTECTED]>
Date: Sat Jun 28 15:34:50 2008 -0400
Do not call FT_Get_BDF_Charset_ID() if configured with --disable-bdfformat
When I configure libXfont-1.3.2 with --disable-bdfformat and link it against
FreeType that is built without BDF support, I get the following link error:
libXfont.so: undefined reference to ‘FT_Get_BDF_Charset_ID’
I fixed it by checking XFONT_BDFFORMAT and if BDF support is disabled, the
call
to FT_Get_BDF_Charset_ID() is omitted and the result code is set as if the
call
had failed.
Signed-off-by: James Cloos <[EMAIL PROTECTED]>
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c
index a9d6494..f6436fc 100644
--- a/src/FreeType/ftenc.c
+++ b/src/FreeType/ftenc.c
@@ -86,7 +86,11 @@ FTPickMapping(char *xlfd, int length, char *filename,
FT_Face face,
symbol = FTEncFontSpecific(encoding_name);
+#if XFONT_BDFFORMAT
ftrc = FT_Get_BDF_Charset_ID(face, &enc, ®);
+#else
+ ftrc = -1;
+#endif
if(ftrc == 0) {
/* Disable reencoding for non-Unicode fonts. This will
currently only work for BDFs. */
commit 1ab07ce0eec4f6c7ed66c7aba3edf8c4315dd907
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue May 13 17:26:57 2008 -0700
FontFileDirectoryChanged: check length of "fonts.alias" as well as
"fonts.dir"
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index a13798a..1489938 100755
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -176,6 +176,9 @@ FontFileDirectoryChanged(FontDirectoryPtr dir)
}
if (dir->dir_mtime != statb.st_mtime)
return TRUE;
+
+ if ((strlen(dir->directory) + sizeof(FontAliasFile)) > sizeof(dir_file))
+ return FALSE;
strcpy (dir_file, dir->directory);
strcat (dir_file, FontAliasFile);
if (stat (dir_file, &statb) == -1)
commit 0f9db4aa7de6e0644ac9c5811b949e5f936c9d61
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Fri May 9 12:36:30 2008 -0700
Don't allow a font alias to point to itself and create a loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index cf68a54..cd9fde1 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -811,6 +811,10 @@ FontFileAddFontAlias (FontDirectoryPtr dir, char
*aliasName, char *fontName)
{
FontEntryRec entry;
+ if (strcmp(aliasName,fontName) == 0) {
+ /* Don't allow an alias to point to itself and create a loop */
+ return FALSE;
+ }
entry.name.length = strlen (aliasName);
CopyISOLatin1Lowered (aliasName, aliasName, entry.name.length);
entry.name.name = aliasName;
commit 67311922a2e02d8a763831831b65bb4833db58b5
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Mon May 5 22:17:55 2008 +0100
Fix build for WIN32
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
old mode 100644
new mode 100755
index 3159a5e..a13798a
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -66,6 +66,9 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr
*pdir)
status;
struct stat statb;
static char format[24] = "";
+#if defined(__UNIXOS2__) || defined(WIN32)
+ int i;
+#endif
FontDirectoryPtr dir = NullFontDirectory;
commit 6ba408c956ca8e241d10d463c45b4e987b757333
Author: Matthieu Herrb <[EMAIL PROTECTED]>
Date: Sun Mar 9 08:21:34 2008 +0100
nuke RCS Ids
diff --git a/Makefile.am b/Makefile.am
index 8b354d7..f5e9c4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in
index b16df93..f12081d 100644
--- a/include/X11/fonts/fontconf.h.in
+++ b/include/X11/fonts/fontconf.h.in
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2005 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/Makefile.am b/src/Makefile.am
index 99500fc..8a9c796 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/fc/fstrans.c b/src/fc/fstrans.c
index 9f43d8f..c334c25 100644
--- a/src/fc/fstrans.c
+++ b/src/fc/fstrans.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 754cabe62e91b9ad50c3027c063f4269775f7add
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 7 12:19:22 2008 +0100
Add missing include in src/FreeType/ftfuncs.c
Fixes compiler warning:
../../../src/FreeType/ftfuncs.c: In function 'restrict_code_range_by_str':
../../../src/FreeType/ftfuncs.c:2081: warning: implicit declaration of
function 'isspace'
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index db3e4ec..fff6eec 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -42,6 +42,7 @@ THE SOFTWARE.
#include "Xdefs.h"
#include "xf86_ansic.h"
#endif
+#include <ctype.h>
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
