xft: Changes to 'debian-unstable'
.gitignore | 79 ++
ChangeLog | 199 ++++++
Makefile.am | 12
NEWS | 8
configure.ac | 25
debian/changelog | 22
debian/control | 7
debian/copyright | 2
debian/libxft-dev.install | 2
debian/patches/001_no_export_freetype.diff | 13
debian/patches/series | 1
debian/rules | 2
include/X11/Xft/.gitignore | 2
include/X11/Xft/Xft.h.in | 8
man/Makefile.am | 13
man/Xft.3.in | 845 -----------------------------
man/Xft.man | 845 +++++++++++++++++++++++++++++
man/xft-config.1.in | 120 ----
src/Makefile.am | 2
xft-config.in | 100 ---
xft.pc.in | 2
21 files changed, 1176 insertions(+), 1133 deletions(-)
New commits:
commit 9a7bc97f9c2bae8014979f10f917697721a03ebb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 20:04:16 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index a4bacea..6f95537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xft (2.2.0-2) UNRELEASED; urgency=low
+xft (2.2.0-2) unstable; urgency=low
* Remove Andres Salomon and David Nusinow from Uploaders. Thanks for your
work!
* Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
* Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
* Bump Standards-Version to 3.9.1.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 19:55:41 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 20:04:14 +0100
xft (2.2.0-1) experimental; urgency=low
commit c8ba7d9a03d0da8ac046f3baa35bd1cc475d4e20
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 20:01:43 2011 +0100
Bump Standards-Version to 3.9.1.
diff --git a/debian/changelog b/debian/changelog
index 5d344b2..a4bacea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
work!
* Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
* Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
+ * Bump Standards-Version to 3.9.1.
-- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 19:55:41 +0100
diff --git a/debian/control b/debian/control
index f9a86a1..816654a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
commit 0a95a04ec3c81c9e8c7ee42dec13bc64a69de08e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 20:01:10 2011 +0100
Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
diff --git a/debian/changelog b/debian/changelog
index 8d3e3e6..5d344b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
* Remove Andres Salomon and David Nusinow from Uploaders. Thanks for your
work!
* Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
+ * Drop obsolete Conflicts on libxft2-dev and xlibs-dev.
-- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 19:55:41 +0100
diff --git a/debian/control b/debian/control
index c42839f..f9a86a1 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,6 @@ Depends:
libxrender-dev,
zlib1g-dev | libz-dev,
${misc:Depends},
-Conflicts: libxft2-dev, xlibs-dev (<< 4.3.0)
Provides: libxft2-dev
Description: FreeType-based font drawing library for X (development files)
Xft provides a client-side font API for X applications, making the FreeType
commit 59443759e02495eec5a3a17209c8b6e99b62d4d5
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 19:56:59 2011 +0100
Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
diff --git a/debian/changelog b/debian/changelog
index 423e681..8d3e3e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xft (2.2.0-2) UNRELEASED; urgency=low
* Remove Andres Salomon and David Nusinow from Uploaders. Thanks for your
work!
+ * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..).
-- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 19:55:41 +0100
diff --git a/debian/rules b/debian/rules
index abf842f..f845b62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ PACKAGE = libxft2
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
commit 4d56e1f2ae930343674ef22867b1832a85315780
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 19:56:00 2011 +0100
Remove Andres Salomon and David Nusinow from Uploaders.
Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index 8029ebf..423e681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xft (2.2.0-2) UNRELEASED; urgency=low
+
+ * Remove Andres Salomon and David Nusinow from Uploaders. Thanks for your
+ work!
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 19:55:41 +0100
+
xft (2.2.0-1) experimental; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index fd766ef..c42839f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xft
Section: devel
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
libfontconfig1-dev,
commit a3b53dd75ff7cc44d9309339506c6485f8346570
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 05:09:34 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 639bc09..8029ebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xft (2.2.0-1) UNRELEASED; urgency=low
+xft (2.2.0-1) experimental; urgency=low
* New upstream release:
- Remove obsolete xft-config script.
@@ -7,7 +7,7 @@ xft (2.2.0-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Drop 001_no_export_freetype.diff, merged upstream.
- -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 05:09:29 +0100
xft (2.1.14-2) unstable; urgency=low
commit 43f116937cc2eed0daed34399cea5dc32f34aff4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 05:09:23 2011 +0100
Adapt libxft-dev.install to match xft-config's removal.
diff --git a/debian/changelog b/debian/changelog
index 42deea3..639bc09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xft (2.2.0-1) UNRELEASED; urgency=low
* New upstream release:
- Remove obsolete xft-config script.
+ * Adapt libxft-dev.install accordingly.
* Remove RCS tag in debian/copyright.
* Bump xutils-dev build-dep for new macros.
* Drop 001_no_export_freetype.diff, merged upstream.
diff --git a/debian/libxft-dev.install b/debian/libxft-dev.install
index 7f78622..5553ba7 100644
--- a/debian/libxft-dev.install
+++ b/debian/libxft-dev.install
@@ -2,6 +2,4 @@ usr/include/X11/Xft/*
usr/lib/libXft.a
usr/lib/libXft.so
usr/lib/pkgconfig/*.pc
-usr/bin/xft-config
-usr/share/man/man1/*
usr/share/man/man3/*
commit 8d6d7efb667b201efb9a3516d6ec1c0d349b72a4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 05:03:45 2011 +0100
Drop 001_no_export_freetype.diff, merged upstream.
diff --git a/debian/changelog b/debian/changelog
index 4f0a61c..42deea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xft (2.2.0-1) UNRELEASED; urgency=low
- Remove obsolete xft-config script.
* Remove RCS tag in debian/copyright.
* Bump xutils-dev build-dep for new macros.
+ * Drop 001_no_export_freetype.diff, merged upstream.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
diff --git a/debian/patches/001_no_export_freetype.diff b/debian/patches/001_no_export_freetype.diff
deleted file mode 100644
index 6684149..0000000
--- a/debian/patches/001_no_export_freetype.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xft/xft.pc.in
-===================================================================
---- xft.orig/xft.pc.in
-+++ xft/xft.pc.in
-@@ -6,7 +6,7 @@
- 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
diff --git a/debian/patches/series b/debian/patches/series
index f2f9479..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-001_no_export_freetype.diff
commit 41fd76548dd84be9b1b4adfce5c27f58137bc041
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 05:00:25 2011 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 567b58e..4f0a61c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xft (2.2.0-1) UNRELEASED; urgency=low
* New upstream release:
- Remove obsolete xft-config script.
* Remove RCS tag in debian/copyright.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
diff --git a/debian/control b/debian/control
index 8adfac1..fd766ef 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xft
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xft.git
commit ef60c999484d81389fedc40d78ac1d96476b6c26
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 04:59:01 2011 +0100
Document xft-config script removal.
diff --git a/debian/changelog b/debian/changelog
index 16805b3..567b58e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xft (2.2.0-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release:
+ - Remove obsolete xft-config script.
* Remove RCS tag in debian/copyright.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
commit db6815030963b41ac915a19d27a03315e40d58a0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 04:58:19 2011 +0100
Remove RCS tag in debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index eb3f361..16805b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xft (2.2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove RCS tag in debian/copyright.
-- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
diff --git a/debian/copyright b/debian/copyright
index e5ee6ce..ca4f16a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,5 +29,3 @@ 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.
-
-$Id: copyright 114 2005-03-30 07:39:46Z branden $
commit 2a4ac69e7978b6e51185abe076763429b8788c2e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 14 04:57:03 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 6658b84..6a6d960 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,202 @@
+commit b9d4a2b5be71ca883f5a876500edb0a1a9add0cf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 16:21:18 2010 -0700
+
+ libXft 2.2.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8751e341bcc29952b4603e18767ab994653c6b01
+Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ca575f9c9cbb11b122e676424a93da3eb0284be5
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit 6d220e32c1e336292cac125515f04bcbdb65322d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Mar 31 10:03:03 2010 -0400
+
+ man: build man pages the standard way
+
+ Using macro substitution.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f2bd643475a555949558ff6f889c575da33c28a4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Mar 30 14:01:31 2010 -0400
+
+ config: remove deprecated xft-config script and man page
+
+ This was put in place early 2000 when pkg-config was not used.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a33850fe1af31cf672e448a3c86ac5afb9fee06c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Mar 30 09:44:47 2010 -0400
+
+ config: remove the xft-config.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b443002c146569077394675c9e784b173d48c6e6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 16:50:34 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 26dc5b0f626615156ca8a317f428ebc7c2d50498
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 14:53:48 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 78ed756a343c37acb38cc230d03c334845553ab6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 8 11:13:11 2009 -0500
+
+ Xft.h.in: remove comments which prevents Xft.h generation #25104
+
+ With automake prior to 2.62, commnents placed beside a #undef line
+ prevent that statement to be substituted by config.status.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Tested-by: Adrian Bunk <bunk@stusta.de>
+
+commit ad762b61d79e1848ef0751d0b970f4f7660a886e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit f6bab0a9abbaf4c2381c790372c830e0c8d78df4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit cf899b63a331b908a2d4027354ce0d7c13528638
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit f0f9ad0cb2d66d35f522fa9ec19974500b3955ab
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:43 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 80e41cb93d0100a767aa8d630240440090937712
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit cf6372a5dd9dd4086ed243d3f6c7e5fe693594b0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 21 21:45:46 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 6f756640698b8f7bbada91999b4e30a0851bb6f4
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:25 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 906259ecc70dd4d0ef91f4582bd2a035d094831e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Oct 13 10:31:58 2009 -0700
+
+ Set libtool version-number automatically from package version
+
+ Since we've forgotten to manually update in most libXft releases so far,
+ might as well just automate it.
+
+ Reported by: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit fc248fb44413d11fed288793d0d8c2af76aeeb40
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 16:45:25 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index faa9344..eb3f361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 14 Jan 2011 04:56:56 +0100
+
xft (2.1.14-2) unstable; urgency=low
[ Julien Cristau ]
commit b9d4a2b5be71ca883f5a876500edb0a1a9add0cf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 16:21:18 2010 -0700
libXft 2.2.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@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.coopersmith@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.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@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 <memsize@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 <memsize@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)
diff --git a/man/Makefile.am b/man/Makefile.am
index c751b37..24e78d8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -4,21 +4,8 @@ libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
commit 6d220e32c1e336292cac125515f04bcbdb65322d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 31 10:03:03 2010 -0400
man: build man pages the standard way
Using macro substitution.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e6fd99a..b744eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AM_CONFIG_HEADER(config.h)
# checks for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+AC_PROG_SED
# Set library version for Xft.h from package version set in AC_INIT
# copied from PACKAGE_VERSION_* settings in XORG_VERSION
@@ -150,5 +151,4 @@ fi
AC_OUTPUT([Makefile
xft.pc
src/Makefile
- man/Makefile
- man/Xft.3])
+ man/Makefile])
diff --git a/man/Makefile.am b/man/Makefile.am
index 766a627..c751b37 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,2 +1,24 @@
-dist_man_MANS = Xft.3
-EXTRA_DIST = Xft.3.in
+libman_PRE = Xft.man
+libmandir = $(LIB_MAN_DIR)
+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
+
+EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+.man.$(LIB_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
diff --git a/man/Xft.3.in b/man/Xft.3.in
deleted file mode 100644
index a5e84d5..0000000
--- a/man/Xft.3.in
+++ /dev/null
@@ -1,845 +0,0 @@
-.\"
-.\" Copyright © 2000 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.
-.\"
-.TH Xft 3 "Version @VERSION@" "Xft"
-.SH NAME
- Xft \- X FreeType interface library
-.SH DESCRIPTION
-.B Xft
-is a simple library designed to interface the FreeType rasterizer with the X
-Rendering Extension.
-This manual page barely scratches the surface of this library.
-.SH "HEADER FILE"
-.B #include <X11/Xft/Xft.h>
-.SH CONSTANTS
-.TP
-.B XFT_MAJOR
-is the major version number of
-.BR Xft .
-.TP
-.B XFT_MINOR
-is the minor version number of
-.BR Xft .
-.TP
-.B XFT_REVISION
-is the revision number of
-.BR Xft .
-.TP
-.B XFT_VERSION
-is
-.B XFT_MAJOR
-times 10000 (ten thousand), plus
-.B XFT_MINOR
-times 100, plus
-.BR XFT_REVISION .
-.TP
-.B XftVersion
-is an alias for
-.BR XFT_VERSION .
-.PP
-The following example illustrates how
-.BR Xft 's
-version constants might be used:
-.nf
- #if (XFT_VERSION >= 20107)
- (void) puts("Version 2.1.7 or later of the Xft library is in"
- " use.");
- #else
- (void) printf("Insufficient version of Xft (%d.%d.%d) installed;
- " need at least version 2.1.7.\(rsn", XFT_MAJOR,
- XFT_MINOR,
- XFT_REVISION);
- #endif
-.fi
-.\" I don't understand what these are for. -- BR, 2005-04-02
-.\" XFT_CORE used in xftname.c
-.\" XFT_RENDER used in xftdpy.c, xftfreetype.c, xftname.c
-.\" XFT_XLFD used in xftname.c, xftxlfd.c
-.\" XFT_MAX_GLYPH_MEMORY used in xftdpy.c, xftfreetype.c
-.\" XFT_MAX_UNREF_FONTS used in xftdpy.c
-.\" XFT_NMISSING used in xftcore.c, xftextent.c, xftglyphs.c,
-.\" xftrender.c
-.SH "DATA TYPES"
-.TP
-.B XftFont
-.nf
-typedef struct _XftFont {
- int ascent;
- int descent;
- int height;
- int max_advance_width;
- FcCharSet *charset;
- FcPattern *pattern;
-} XftFont;
-.fi
-An
-.B XftFont
-is the primary data structure of interest to programmers using
-.BR Xft ;
-it contains general font metrics and pointers to the Fontconfig
-character set and pattern associated with the font.
-The
-.B FcCharSet
-and
-.B FcPattern
-data types are defined by the Fontconfig library.
-.TP
-.B ""
-.BR XftFont s
-are populated with any of
-.BR XftFontOpen (),
-.BR XftFontOpenName (),
-.BR XftFontOpenXlfd (),
-.BR XftFontOpenInfo (),
-or
-.BR XftFontOpenPattern ().
-.BR XftFontCopy ()
-is used to duplicate
-.BR XftFont s,
-and
-.BR XftFontClose ()
-is used to mark an
-.B XftFont
-as unused.
-.BR XftFont s
-are internally allocated, reference-counted, and freed by
-.BR Xft ;
-the programmer does not ordinarily need to allocate or free storage
-for them.
-.TP
-.B ""
-.BR XftDrawGlyphs (),
-the
-.BR XftDrawString *()
-family,
-.BR XftDrawCharSpec (),
-and
-.BR XftDrawGlyphSpec ()
-use
-.BR XftFont s
-to render text to an
-.B XftDraw
-object, which may correspond to either a core X drawable or an X
-Rendering Extension drawable.
-.TP
-.B ""
-.BR XftGlyphExtents ()
-and the
-.BR XftTextExtents *()
-family are used to determine the extents (maximum dimensions) of an
-.BR XftFont .
-.TP
-.B ""
-An
-.BR XftFont 's
-glyph or character coverage can be determined with
-.BR XftFontCheckGlyph ()
-or
-.BR XftCharExists ().
-.BR XftCharIndex ()
-returns the
-.BR XftFont -specific
-character index corresponding to a given Unicode codepoint.
-.TP
-.B ""
-.BR XftGlyphRender (),
-.BR XftGlyphSpecRender (),
-.BR XftCharSpecRender (),
-and the
-.BR XftTextRender *()
-family use
-.BR XftFont s
-to draw into X Rendering Extension
-.B Picture
-structures.
-.B Note:
-.BR XftDrawGlyphs (),
-the
-.BR XftDrawString *()
-family,
-.BR XftDrawCharSpec (),
-and
-.BR XftDrawGlyphSpec ()
-provide a means of rendering fonts that is independent of the
-availability of the X Rendering Extension on the X server.
-.\" I'm not sure what these are for; they're used internally, but why
-.\" would any external users want them? -- BR, 2005-04-02
-.\" .BR XftLockFace()
-.\" .BR XftUnlockFace()
-.TP
-.B XftFontInfo
-is an opaque object that stores information about a font.
-.B XftFontInfo
-structures are created with
-.BR XftFontInfoCreate (),
-freed with
-.BR XftFontInfoDestroy (),
-and compared with
-.BR XftFontInfoEqual ().
-.B XftFontInfo
-objects are internally allocated and freed by
-.BR Xft ;
-the programmer does not ordinarily need to allocate or free storage
-for them.
-.TP
-.B ""
-Each
-.B XftFontInfo
-structure in use is associated with a unique identifier, which can be
Reply to: