xft: Changes to 'upstream-experimental'
.gitignore | 68 +++
INSTALL|8
Makefile.am| 16
NEWS | 61 +++
README | 59 +--
configure.ac | 49 +-
include/X11/Xft/.gitignore |2
include/X11/Xft/Xft.h | 630 -
include/X11/Xft/Xft.h.in | 617
man/.gitignore |4
man/Makefile.am| 13
man/Xft.3.in | 845 -
man/Xft.man| 845 +
man/xft-config.1.in| 120 --
src/.gitignore |6
src/Makefile.am|6
src/xftcore.c |6
src/xftdpy.c | 18
src/xftdraw.c | 30 -
src/xftextent.c|2
src/xftfont.c | 26 -
src/xftfreetype.c | 57 +--
src/xftglyphs.c| 12
src/xftinit.c |2
src/xftlist.c |6
src/xftname.c |2
src/xftrender.c|8
src/xftxlfd.c | 38 +-
xft-config.in | 100 -
xft.pc.in |2
30 files changed, 1772 insertions(+), 1886 deletions(-)
New commits:
commit b9d4a2b5be71ca883f5a876500edb0a1a9add0cf
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Fri Oct 29 16:21:18 2010 -0700
libXft 2.2.0
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/NEWS b/NEWS
index 6e4e225..01e6dbe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
Xft
X FreeType library
- Version 2.1.14
- 2009-10-09
+ Version 2.2.0
+ 2010-10-29
Xft version 2.1 is the first stand alone release of Xft, a library that
connects X applications with the FreeType font rasterization library. Xft
uses fontconfig to locate fonts so it has no configuration files.
+Version 2.2.0
+
+Dropped xft-config, now that pkg-config is well established.
+
Version 2.1.14
Added fake bold support (#1579, Novell #38202/223682).
diff --git a/configure.ac b/configure.ac
index 713edd5..f35eb91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,8 @@ dnl This is the package version number, not the shared library
dnl version. This version number will be substituted into Xft.h
dnl Please bump the minor library number at each release as well.
dnl
-AC_INIT(libXft, 2.1.14,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
+AC_INIT([libXft], [2.2.0],
+[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXft])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 8751e341bcc29952b4603e18767ab994653c6b01
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Tue Sep 21 22:00:33 2010 -0700
xft.pc.in: Requires.private entries should not be duplicated in Requires
Users of libXft don't need to link with fontconfig, freetype and
Xrender directly if they don't use them.
This may cause issues for users of pkg-config versions older than 0.22.
Please upgrade to the 2007 version of pkg-config before trying to build
the 2010 version of libXft.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Gaetan Nadon mems...@videotron.ca
diff --git a/xft.pc.in b/xft.pc.in
index 7471c2b..68d1089 100644
--- a/xft.pc.in
+++ b/xft.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: Xft
Description: X FreeType library
Version: @VERSION@
-Requires: xproto, xrender, fontconfig, freetype2
+Requires: xproto
Requires.private: xrender, fontconfig, freetype2
Cflags: -I${includedir}
Libs: -L${libdir} -lXft
commit ca575f9c9cbb11b122e676424a93da3eb0284be5
Author: Gaetan Nadon mems...@videotron.ca
Date: Sun Oct 17 20:42:41 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Use the appropriate platform version of sed
Signed-off-by: Gaetan Nadon mems...@videotron.ca
diff --git a/configure.ac b/configure.ac
index b744eb8..713edd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
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.8 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
xft: Changes to 'upstream-experimental'
.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 [EMAIL PROTECTED]
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 * 1) + (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 [EMAIL PROTECTED]
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 @@ [EMAIL PROTECTED]@
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 [EMAIL PROTECTED]
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 @@ [EMAIL PROTECTED]@
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 [EMAIL PROTECTED]
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
