xft: Changes to 'upstream-unstable'
.gitignore | 1 +
COPYING | 1 -
ChangeLog | 20 --------------------
Makefile.am | 12 ++++++++++--
configure.ac | 4 +---
include/X11/Xft/Xft.h | 4 +---
include/X11/Xft/XftCompat.h | 2 --
man/Xft.3.in | 2 --
src/Makefile.am | 2 +-
src/xftcolor.c | 2 --
src/xftcore.c | 2 --
src/xftdbg.c | 2 --
src/xftdpy.c | 2 --
src/xftdraw.c | 7 ++++---
src/xftextent.c | 2 --
src/xftfont.c | 2 --
src/xftfreetype.c | 11 +++++++----
src/xftglyphs.c | 2 --
src/xftinit.c | 2 --
src/xftint.h | 2 --
src/xftlist.c | 2 --
src/xftname.c | 3 +--
src/xftrender.c | 2 --
src/xftstr.c | 2 --
src/xftswap.c | 2 --
src/xftxlfd.c | 2 --
26 files changed, 26 insertions(+), 71 deletions(-)
New commits:
commit 1a34928cd823ef1452b973bd7c4c1d12cd976bba
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:42:37 2008 -0400
libXft 2.1.13
diff --git a/configure.ac b/configure.ac
index afe6ed3..68fb1a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xft.h
dnl Please bump the minor library number at each release as well.
dnl
-AC_INIT(libXft, 2.1.12, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
+AC_INIT(libXft, 2.1.13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h
index f628ddf..18b063b 100644
--- a/include/X11/Xft/Xft.h
+++ b/include/X11/Xft/Xft.h
@@ -31,7 +31,7 @@
#define XFT_MAJOR 2
#define XFT_MINOR 1
-#define XFT_REVISION 12
+#define XFT_REVISION 13
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 9618e16..0258e3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ libXft_la_SOURCES = xftint.h \
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
# -version-number requires libtool >= 1.5
-libXft_la_LDFLAGS = -version-number 2:1:2 -no-undefined
+libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
libXftinclude_HEADERS = \
commit 19240d3605b5f1e88ca5509afffd48acdb7e1c5f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 11 02:12:05 2008 +0200
Revert "Drop Requires, use Requires.private instead."
This reverts commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab.
Unfortunately this doesn't work on old pkg-config, which made
Requires.private completely useless. That's fixed in 0.22, but...
diff --git a/xft.pc.in b/xft.pc.in
index 91653ee..7471c2b 100644
--- a/xft.pc.in
+++ b/xft.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires.private: xproto, xrender, fontconfig, freetype2
+Requires: xproto, xrender, fontconfig, freetype2
+Requires.private: xrender, fontconfig, freetype2
Cflags: -I${includedir}
Libs: -L${libdir} -lXft
commit a1c78ce68c5f2106c38b6cb93a6b22420e1a80ab
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 17:29:27 2008 +0200
Drop Requires, use Requires.private instead.
Users of libXft don't need to link with fontconfig, freetype and
Xrender directly if they don't use them.
diff --git a/xft.pc.in b/xft.pc.in
index 7471c2b..91653ee 100644
--- a/xft.pc.in
+++ b/xft.pc.in
@@ -6,7 +6,6 @@ includedir=@includedir@
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires: xproto, xrender, fontconfig, freetype2
-Requires.private: xrender, fontconfig, freetype2
+Requires.private: xproto, xrender, fontconfig, freetype2
Cflags: -I${includedir}
Libs: -L${libdir} -lXft
commit 541c6194d986e7849ee9541a9fd60b0724647a44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 12:10:19 2008 -0400
Bug #14232: Fix XftDrawRect when Render not supported.
diff --git a/src/xftdraw.c b/src/xftdraw.c
index 775815d..46e3f43 100644
--- a/src/xftdraw.c
+++ b/src/xftdraw.c
@@ -807,7 +807,10 @@ XftDrawRect (XftDraw *draw,
}
else if (_XftDrawCorePrepare (draw, color))
{
- XftRectCore (draw, color, x, y, width, height);
+ /* note: not XftRectCore() */
+ XSetForeground (draw->dpy, draw->core.gc, color->pixel);
+ XFillRectangle (draw->dpy, draw->drawable, draw->core.gc,
+ x, y, width, height);
}
}
commit 8661a88789dce4fe06d45faec70f8e74834abdd6
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:28:43 2008 +0100
nuke RCS Ids
diff --git a/COPYING b/COPYING
index 4ee13ed..e506314 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,3 @@
-$Id$
Copyright © 2001,2003 Keith Packard
diff --git a/Makefile.am b/Makefile.am
index 418b4a9..880d3f6 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/configure.ac b/configure.ac
index 494102a..afe6ed3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h
index 150c61f..f628ddf 100644
--- a/include/X11/Xft/Xft.h
+++ b/include/X11/Xft/Xft.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h
index 944fb67..0fced03 100644
--- a/include/X11/Xft/XftCompat.h
+++ b/include/X11/Xft/XftCompat.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/Xft.3.in b/man/Xft.3.in
index fdd3d71..a5e84d5 100644
--- a/man/Xft.3.in
+++ b/man/Xft.3.in
@@ -1,6 +1,4 @@
.\"
-.\" $Id$
-.\"
.\" Copyright © 2000 Keith Packard
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftcolor.c b/src/xftcolor.c
index 5644c80..77872ef 100644
--- a/src/xftcolor.c
+++ b/src/xftcolor.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftcore.c b/src/xftcore.c
index 083a133..307d976 100644
--- a/src/xftcore.c
+++ b/src/xftcore.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftdbg.c b/src/xftdbg.c
index 5e8a745..4c4b078 100644
--- a/src/xftdbg.c
+++ b/src/xftdbg.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftdpy.c b/src/xftdpy.c
index 6ae7b04..707160f 100644
--- a/src/xftdpy.c
+++ b/src/xftdpy.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftdraw.c b/src/xftdraw.c
index 1e8b6de..775815d 100644
--- a/src/xftdraw.c
+++ b/src/xftdraw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftextent.c b/src/xftextent.c
index 138745d..c811198 100644
--- a/src/xftextent.c
+++ b/src/xftextent.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftfont.c b/src/xftfont.c
index 8c8c71c..4f3683e 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftfreetype.c b/src/xftfreetype.c
index 3f1f318..e64e0a3 100644
--- a/src/xftfreetype.c
+++ b/src/xftfreetype.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 7164b72..fc11da4 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftinit.c b/src/xftinit.c
index 8245377..ee819b3 100644
--- a/src/xftinit.c
+++ b/src/xftinit.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftint.h b/src/xftint.h
index 8668ec4..3aafecf 100644
--- a/src/xftint.h
+++ b/src/xftint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftlist.c b/src/xftlist.c
index 7fb5a2f..3c60f1f 100644
--- a/src/xftlist.c
+++ b/src/xftlist.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftname.c b/src/xftname.c
index 71ca72b..36d779c 100644
--- a/src/xftname.c
+++ b/src/xftname.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftrender.c b/src/xftrender.c
index 1562e62..cf129b3 100644
--- a/src/xftrender.c
+++ b/src/xftrender.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftstr.c b/src/xftstr.c
index 7d0cce6..a5733f4 100644
--- a/src/xftstr.c
+++ b/src/xftstr.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftswap.c b/src/xftswap.c
index 070bb11..942efdb 100644
--- a/src/xftswap.c
+++ b/src/xftswap.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xftxlfd.c b/src/xftxlfd.c
index 4137e52..60146ab 100644
--- a/src/xftxlfd.c
+++ b/src/xftxlfd.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 9e25c9019bd6788076c12cb4356c7d27d6c7d9af
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:28 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 393d955..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-2006-06-03 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- * include/X11/Xft/Xft.h:
- Bump to 2.1.9.
-
- * src/*.c:
- * include/X11/Xft/Xft.h:
- Bug #4711: Don't export unnecessary symbols. (Alan Coopersmith)
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
diff --git a/Makefile.am b/Makefile.am
index b4c24c8..418b4a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,3 +31,13 @@ pkgconfig_DATA = xft.pc
CLEANFILES = xft-config
EXTRA_DIST = xft-config.in xft.pc.in autogen.sh
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = 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)
+
+dist-hook: ChangeLog
commit 8a7f3d450c1f339f429dbce55df523d026c92375
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sun Nov 4 11:31:44 2007 -0800
Register objects used by libXft.
libXft uses XFT_MAX_GLYPH_MEMORY without first registering with fontconfig.
diff --git a/src/xftname.c b/src/xftname.c
index 6bbdd65..71ca72b 100644
--- a/src/xftname.c
+++ b/src/xftname.c
@@ -28,6 +28,7 @@ static const FcObjectType _XftObjectTypes[] = {
{ XFT_CORE, FcTypeBool, },
{ XFT_XLFD, FcTypeString, },
{ XFT_RENDER, FcTypeBool, },
+ { XFT_MAX_GLYPH_MEMORY, FcTypeInteger, },
};
#define NUM_OBJECT_TYPES (sizeof _XftObjectTypes / sizeof _XftObjectTypes[0])
commit 8ae5ea8c75a7850fa0aca0acc3962b6263f55094
Author: Karl Tomlinson <bugs.freedesktop@karlt.net>
Date: Wed Sep 12 12:00:43 2007 +0100
XftFontOpenInfo: Use of uninitialised value of size 8 (bug 11200)
This is due to XftFontInfoFill using the binary representation of the
XftFontInfo to generate fi->hash.
With 64-bit pointers there is padding between .hash and .file in struct
_XftFontInfo. This padding is not initialized, and the hash uses these
bytes.
This will interfere with finding "a matching previously opened font" in
XftFontOpenInfo, and XftFontInfoEqual, which uses memcmp, will have similar
problems.
This fix makes no assumptions about the sizes and alignment of members of
struct _XftFontInfo by using memset. (It also makes no assumptions about
what FcPatternGet* does to its output parameter when it returns
FcResultNoMatch.)
diff --git a/src/xftfreetype.c b/src/xftfreetype.c
index fc6e74a..3f1f318 100644
--- a/src/xftfreetype.c
+++ b/src/xftfreetype.c
@@ -392,6 +392,13 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
return FcFalse;
/*
+ * Initialize the whole XftFontInfo so that padding doesn't interfere with
+ * hash or XftFontInfoEqual().
+ */
+
+ memset (fi, '\0', sizeof(*fi));
+
+ /*
* Find the associated file
*/
switch (FcPatternGetString (pattern, FC_FILE, 0, &filename)) {
@@ -419,8 +426,6 @@ XftFontInfoFill (Display *dpy, _Xconst FcPattern *pattern, XftFontInfo *fi)
else if (FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &face) == FcResultMatch
&& face)
fi->file = _XftGetFaceFile (face);
- else
- fi->file = 0;
if (!fi->file)
goto bail0;
commit a782fe3fbed05344e2a12f53ede6101e120ed485
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:39 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 507a752..ae3dfca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ mkinstalldirs
stamp-h1
xft-config
xft.pc
+*~
Reply to: