libxfont: Changes to 'debian-unstable'
.gitignore | 3
ChangeLog | 156 +++++++++-------------
Makefile.am | 122 ++++++++++++++++-
configure.ac | 42 ++++-
debian/changelog | 20 ++
debian/compat | 2
debian/control | 30 ----
debian/libxfont-dev.install | 6
debian/libxfont1-udeb.install | 2
debian/libxfont1.install | 1
debian/libxfont2-udeb.install | 2
debian/libxfont2.install | 1
debian/rules | 9 -
debian/upstream/signing-key.asc | 242 ++++++++++++++++++++++++++++++++++
debian/watch | 2
include/X11/fonts/.gitignore | 2
include/X11/fonts/bufio.h | 2
include/X11/fonts/fontconf.h.in | 49 ------
include/X11/fonts/fontmisc.h | 2
include/X11/fonts/fontutil.h | 2
include/X11/fonts/libxfont2.h | 163 +++++++++++++++++++++++
include/libxfontint.h | 130 ++++++++++++++++++
m4/attributes.m4 | 283 ++++++++++++++++++++++++++++++++++++++++
src/FreeType/Makefile.am | 15 --
src/FreeType/ft.h | 2
src/FreeType/ftenc.c | 1
src/FreeType/ftfuncs.c | 3
src/FreeType/fttools.c | 1
src/FreeType/xttcap.c | 1
src/Makefile.am | 68 ---------
src/bitmap/Makefile.am | 29 ----
src/bitmap/bdfread.c | 1
src/bitmap/bdfutils.c | 1
src/bitmap/bitmap.c | 1
src/bitmap/bitmapfunc.c | 1
src/bitmap/bitmaputil.c | 1
src/bitmap/bitscale.c | 8 -
src/bitmap/fontink.c | 1
src/bitmap/pcfread.c | 1
src/bitmap/pcfwrite.c | 7
src/bitmap/snfread.c | 1
src/builtins/Makefile.am | 17 --
src/builtins/dir.c | 1
src/builtins/file.c | 1
src/builtins/fonts.c | 1
src/builtins/fpe.c | 36 ++---
src/builtins/render.c | 1
src/fc/Makefile.am | 16 --
src/fc/fsconvert.c | 1
src/fc/fserve.c | 146 +++++++++++---------
src/fc/fserve.h | 9 -
src/fc/fsio.c | 2
src/fc/fsio.h | 2
src/fc/fstrans.c | 4
src/fontfile/Makefile.am | 29 ----
src/fontfile/bitsource.c | 1
src/fontfile/bufio.c | 3
src/fontfile/bunzip2.c | 1
src/fontfile/catalogue.c | 36 ++---
src/fontfile/decompress.c | 1
src/fontfile/defaults.c | 1
src/fontfile/dirfile.c | 1
src/fontfile/fileio.c | 1
src/fontfile/filewr.c | 1
src/fontfile/fontdir.c | 7
src/fontfile/fontencc.c | 3
src/fontfile/fontfile.c | 64 ++++-----
src/fontfile/fontscale.c | 1
src/fontfile/gunzip.c | 1
src/fontfile/register.c | 1
src/fontfile/renderers.c | 3
src/stubs/Makefile.am | 25 ---
src/stubs/atom.c | 224 +++++++++++++++++++++++++++++++
src/stubs/cauthgen.c | 15 --
src/stubs/csignal.c | 15 --
src/stubs/delfntcid.c | 14 -
src/stubs/errorf.c | 14 -
src/stubs/findoldfnt.c | 15 --
src/stubs/getcres.c | 15 --
src/stubs/getdefptsize.c | 15 --
src/stubs/getnewfntcid.c | 15 --
src/stubs/gettime.c | 15 --
src/stubs/initfshdl.c | 16 --
src/stubs/libxfontstubs.c | 198 +++++++++++++++++++++++++++
src/stubs/regfpefunc.c | 32 ----
src/stubs/rmfshdl.c | 16 --
src/stubs/servclient.c | 19 --
src/stubs/setfntauth.c | 15 --
src/stubs/stfntcfnt.c | 15 --
src/stubs/stubs.h | 79 -----------
src/stubs/stubsinit.c | 82 -----------
src/util/Makefile.am | 19 --
src/util/atom.c | 250 -----------------------------------
src/util/fontaccel.c | 1
src/util/fontnames.c | 9 -
src/util/fontutil.c | 38 +----
src/util/fontxlfd.c | 1
src/util/format.c | 1
src/util/miscutil.c | 23 ---
src/util/patcache.c | 35 ++--
src/util/private.c | 5
src/util/utilbitmap.c | 1
xfont.pc.in | 13 -
xfont2.pc.in | 13 +
104 files changed, 1764 insertions(+), 1307 deletions(-)
New commits:
commit be4bb48165e310ae414763331e18bf120b0e89e3
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 22 23:50:09 2016 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4678fac..89e2467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libxfont (1:2.0.1-2) UNRELEASED; urgency=medium
+libxfont (1:2.0.1-2) unstable; urgency=medium
* Switch to -dbgsym packages.
* Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
they are enabled by default now.
+ * Upload to unstable.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 22 Nov 2016 23:31:40 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 22 Nov 2016 23:50:03 +0100
libxfont (1:2.0.1-1) experimental; urgency=medium
commit d12a1687e63608a20cde3a22f8e4f78d85c1b570
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 22 23:45:14 2016 +0100
Bump debhelper compat to 10
diff --git a/debian/changelog b/debian/changelog
index 6e81cfd..4678fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libxfont (1:2.0.1-2) UNRELEASED; urgency=medium
* Switch to -dbgsym packages.
+ * Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
+ they are enabled by default now.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 22 Nov 2016 23:31:40 +0100
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 53d6dc8..d995292 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 10),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index b696f31..9fc9ecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,4 +56,4 @@ override_dh_makeshlibs:
dh_makeshlibs -V'libxfont2 (>= 1:2.0.1)' --add-udeb=$(PACKAGE)-udeb
%:
- dh $@ --with quilt,autoreconf --parallel
+ dh $@ --with quilt
commit 25fd3f84416abfd4d7f25ec7855c187dae9ad66e
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 22 23:32:48 2016 +0100
Switch to -dbgsym packages
diff --git a/debian/changelog b/debian/changelog
index 8341e62..6e81cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfont (1:2.0.1-2) UNRELEASED; urgency=medium
+
+ * Switch to -dbgsym packages.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 22 Nov 2016 23:31:40 +0100
+
libxfont (1:2.0.1-1) experimental; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 879212b..53d6dc8 100644
--- a/debian/control
+++ b/debian/control
@@ -48,25 +48,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 font rasterisation library
This is a udeb, or a microdeb, for the debian-installer.
-Package: libxfont2-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont2 (= ${binary:Version})
-Multi-Arch: same
-Description: X11 font rasterisation library (debug package)
- libXfont provides various services for X servers, most notably font
- selection and rasterisation (through external libraries).
- .
- This package contains the debug versions of the library found in libxfont2.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXfont
-
Package: libxfont-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 3380238..b696f31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,7 @@ override_dh_install:
dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --fail-missing
override_dh_strip:
- dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
- dh_strip -N$(PACKAGE)
+ dh_strip --dbgsym-migration='libxfont2-dbg (<< 1:2.0.1-2~)'
override_dh_makeshlibs:
dh_makeshlibs -V'libxfont2 (>= 1:2.0.1)' --add-udeb=$(PACKAGE)-udeb
commit f6ff6d29845bdc86c8f724f39b292c6e2699798b
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Nov 3 22:52:28 2016 +0200
control: Add myself to uploaders.
diff --git a/debian/changelog b/debian/changelog
index 748a3ce..8341e62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxfont (1:2.0.1-1) experimental; urgency=medium
* Add Keith Packard's key to debian/upstream/signing-key.asc.
* watch: Updated to match upstream rename to libXfont2.
* control, rules, *.install: Changes to match new soname.
+ * control: Add myself to uploaders.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 15:12:22 +0300
diff --git a/debian/control b/debian/control
index 761d58a..879212b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: libxfont
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
dh-autoreconf,
commit 6e8868aa256c50699eea399ba3b9d9b76a7293a8
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 15:13:22 2016 +0300
upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 90b27e2..748a3ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
+libxfont (1:2.0.1-1) experimental; urgency=medium
* Team upload.
* New upstream release.
@@ -6,7 +6,7 @@ libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
* watch: Updated to match upstream rename to libXfont2.
* control, rules, *.install: Changes to match new soname.
- -- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 12:42:56 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 15:12:22 +0300
libxfont (1:1.5.2-1) unstable; urgency=medium
commit 1392b8fa371f560d81fc870e8d05cae4732ba4e8
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 14:44:19 2016 +0300
control, rules, *.install: Changes to match new soname.
diff --git a/debian/changelog b/debian/changelog
index 38533c2..90b27e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Add Keith Packard's key to debian/upstream/signing-key.asc.
* watch: Updated to match upstream rename to libXfont2.
+ * control, rules, *.install: Changes to match new soname.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 12:42:56 +0300
diff --git a/debian/control b/debian/control
index 815d058..761d58a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libxfont.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/lib/libxfont.git
-Package: libxfont1
+Package: libxfont2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -39,7 +39,7 @@ Description: X11 font rasterisation library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
-Package: libxfont1-udeb
+Package: libxfont2-udeb
XC-Package-Type: udeb
Section: debian-installer
Architecture: any
@@ -47,17 +47,17 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 font rasterisation library
This is a udeb, or a microdeb, for the debian-installer.
-Package: libxfont1-dbg
+Package: libxfont2-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont2 (= ${binary:Version})
Multi-Arch: same
Description: X11 font rasterisation library (debug package)
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
.
- This package contains the debug versions of the library found in libxfont1.
+ This package contains the debug versions of the library found in libxfont2.
Non-developers likely have little use for this package.
.
More information about X.Org can be found at:
@@ -69,13 +69,13 @@ Description: X11 font rasterisation library (debug package)
Package: libxfont-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont2 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
Description: X11 font rasterisation library (development headers)
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
.
This package contains the development headers for the library found in
- libxfont1. Non-developers likely have little use for this package.
+ libxfont2. Non-developers likely have little use for this package.
.
More information about X.Org can be found at:
<URL:http://www.X.org>
diff --git a/debian/libxfont-dev.install b/debian/libxfont-dev.install
index 75740c9..cd605cf 100644
--- a/debian/libxfont-dev.install
+++ b/debian/libxfont-dev.install
@@ -1,7 +1,7 @@
usr/include/X11/*
-usr/lib/*/libXfont.a
-usr/lib/*/libXfont.so
-usr/lib/*/pkgconfig/xfont.pc
+usr/lib/*/libXfont2.a
+usr/lib/*/libXfont2.so
+usr/lib/*/pkgconfig/xfont2.pc
# Extra doc, under noinst_* in doc/Makefile.am:
../../build-main/doc/*.html usr/share/doc/libxfont-dev/
diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
deleted file mode 100644
index ec85c92..0000000
--- a/debian/libxfont1-udeb.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libXfont.so.1* usr/lib
-
diff --git a/debian/libxfont1.install b/debian/libxfont1.install
deleted file mode 100644
index 1922e6f..0000000
--- a/debian/libxfont1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libXfont.so.1*
diff --git a/debian/libxfont2-udeb.install b/debian/libxfont2-udeb.install
new file mode 100644
index 0000000..fca7fda
--- /dev/null
+++ b/debian/libxfont2-udeb.install
@@ -0,0 +1,2 @@
+usr/lib/*/libXfont2.so.2* usr/lib
+
diff --git a/debian/libxfont2.install b/debian/libxfont2.install
new file mode 100644
index 0000000..225eff5
--- /dev/null
+++ b/debian/libxfont2.install
@@ -0,0 +1 @@
+usr/lib/*/libXfont2.so.2*
diff --git a/debian/rules b/debian/rules
index 3b931a6..3380238 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-PACKAGE = libxfont1
+PACKAGE = libxfont2
OOT = --builddirectory=build
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -54,7 +54,7 @@ override_dh_strip:
dh_strip -N$(PACKAGE)
override_dh_makeshlibs:
- dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)' --add-udeb=$(PACKAGE)-udeb
+ dh_makeshlibs -V'libxfont2 (>= 1:2.0.1)' --add-udeb=$(PACKAGE)-udeb
%:
dh $@ --with quilt,autoreconf --parallel
commit 1ecbb82ed37b82dd07e64ec0687d4d5e95fa995d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 14:30:37 2016 +0300
watch: Updated to match upstream rename to libXfont2.
diff --git a/debian/changelog b/debian/changelog
index 2c6988e..38533c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
* Add Keith Packard's key to debian/upstream/signing-key.asc.
+ * watch: Updated to match upstream rename to libXfont2.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 12:42:56 +0300
diff --git a/debian/watch b/debian/watch
index 41e897c..e65a141 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/lib/libXfont
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-https://xorg.freedesktop.org/releases/individual/lib/ libXfont-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/lib/ libXfont2-(.*)\.tar\.gz
commit ecb575490f63569cc51eebcaabe080ce4dd26877
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 14:27:18 2016 +0300
Add Keith Packard's key to debian/upstream/signing-key.asc.
diff --git a/debian/changelog b/debian/changelog
index 2c61b89..2c6988e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Add Keith Packard's key to debian/upstream/signing-key.asc.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 12:42:56 +0300
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index bfcba98..c82fe0f 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -99,3 +99,245 @@ UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC
GBF1
=bYOv
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=QLko
+-----END PGP PUBLIC KEY BLOCK-----
commit e3093baa198b2573e6f7616323657f3b7c5aa9e3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 14:17:56 2016 +0300
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 6f283dc..9116acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,104 +1,82 @@
-commit 8cce9834b2e74dccad94ca0adf79ae5585e37d48
-Author: Adam Jackson <ajax@redhat.com>
-Date: Wed Aug 31 16:19:11 2016 -0400
+commit 14488af0338191356c0177e3d0b5fa473ffbd59c
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 11 07:08:29 2015 -0800
- libXfont 1.5.2
+ Bump version to 2.0.1
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 42d85d1293b2753f3f200de0e960bacef0c973c7
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon May 30 00:46:21 2016 -0700
-
- fserve: Fix a buffer read overrun in _fs_client_access
-
- https://bugs.freedesktop.org/show_bug.cgi?id=83224
-
- Found by clang's Address Sanitizer
-
- crac.num_auths = set_font_authorizations(&authorizations, &authlen,
- client);
- /* Work around bug in xfs versions up through modular release 1.0.8
- which rejects CreateAC packets with num_auths = 0 & authlen < 4 */
- if (crac.num_auths == 0) {
- authorizations = padding;
- authlen = 4;
- } else {
- authlen = (authlen + 3) & ~0x3;
- }
- crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
- crac.acid = cur->acid;
- _fs_add_req_log(conn, FS_CreateAC);
- _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
- _fs_write(conn, authorizations, authlen);
-
- In the case in the report, set_font_authorizations setup authorizations as a
- 34 byte buffer (and authlen set to 34 as one would expect). The following
- block changed authlen to 36 to make it 4byte aligned and the final _fs_write()
- caused us to read 36 bytes from this 34 byte buffer.
-
- This changes the incorrect size increase to instead use _fs_write_pad which
- takes care of the padding for us.
+ This release just fixes some build issues with 2.0.0
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 2b09a7af9f19db886567e524f978ad393593f7c0
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun May 29 23:37:13 2016 -0700
+commit 95a40553b8f12cd9479dd4b3c531e2069c53b870
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 9 14:53:26 2015 -0800
- fserve: Silence a -Wformat warning
+ Remove fontconf.h
- src/fc/fserve.c:653:32: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long') [-Wformat]
- " from font server\n", rep->length);
- ^~~~~~~~~~~
- 1 warning generated.
+ This file used to advertise which font formats the library
+ supports. The X server doesn't care, so let's just remove it so that
+ it doesn't conflict with the older version of libXfont
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit e6009adbc89ec3e1f924bcb57b333c1c02f5e66d)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 3eddbca2690381bbbaf14adadb2679eea702095f
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun May 29 23:34:35 2016 -0700
+commit 903cd14547b445d7f40b52462750fc8b28441581
+Author: Matt Turner <mattst88@gmail.com>
+Date: Wed Sep 2 19:15:27 2015 -0700
+
+ Convert to non-recursive build.
- bitmap: Bail out on invalid input to FontFileMakeDir instead of calling calloc for 0 bytes
+commit 9928d71ec04cd630a8ed9c583d144decb4e98c05
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 9 09:07:30 2015 -0800
+
+ Add missing 'attributes.m4' file
- Found by clang static analysis:
- Call to 'calloc' has an allocation size of 0 bytes
+ Matt Turner noted that this file was missing; 'make distcheck' doesn't
+ appear to catch this kind of problem.
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit ac559fad20bbae45332c758abb6a790c3fd341a2)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit dfa572ea522a3019e91f2de7854b252c629342f2
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun May 29 23:29:50 2016 -0700
+commit 135fb032e940ce226c9feb13e6e903f3ecbc5eb0
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Sep 2 00:04:32 2015 -0700
- FreeType: Correct an allocation size
+ Eliminate calls back to X server or font server functions by name (v4)
- Found by clang static analysis:
- Result of 'calloc' is converted to a pointer of type 'int', which is
- incompatible with sizeof operand type 'int *'
+ This eliminates the weak symbol adventures and makes all of the calls
+ back to the X server or Font server go through a table of functions
+ instead, clarifying the required API.
- This is likely benign because the old size was larger on any platform where
- sizeof(int) <= sizeof(void *), which is everywhere.
+ As this is a rather major change to the API for the library, it now
+ installs itself as libXfont2 instead of libXfont, and the package
+ config file is now xfont2.pc.
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit d0fff111992fed9d9bfbf0c19e136bda9ba1db55)
+ All of the installed headers remain the same as the original library;
+ there's now a new include file, libxfont2.h, which defines the X
+ server and Font server interfaces.
+
+ This moves util/atom.c to stubs/atom.c and reformats that file, hence
+ the diff being larger than it would otherwise be.
+
+ v2: Rename to libXfont2 instead of libXfont_2 as suggested by Emil Velikov
+ Fix whitespace in stubs/atom.c, which was moved from util/
+
+ v3: Remove select masks from API. Expose single 'font_init' function
+ for all library initialization.
+
+ v4: Change name of distributed tarballs to libXfont2 as well
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit bee4a764ccef46101dca03c70d4ad1793a5a5d78
+commit eb67d10ae82b364a4324e96ce53baaa4e5e75f97
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 7 15:46:13 2015 -0800
- Fix warnings
+ Add compiler warning flags and fix warnings
Mostly signed vs unsigned comparisons
Signed-off-by: Keith Packard <keithp@keithp.com>
-
- Squashed commit of three cherry-picks from master:
- (cherry picked from commit eb67d10ae82b364a4324e96ce53baaa4e5e75f97)
- (cherry picked from commit eefc0b0b908eb8533e704d7156ce983ad7891cc5)
- (cherry picked from commit d967caa988eaabd9e84c82879e2f21bd33b952a7)
commit d6877a7c1c35985f6a75b6cd4e814595e781adc4
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
@@ -1375,7 +1353,7 @@ Date: Wed Apr 14 05:58:28 2010 -0500
Conflicts:
- ChangeLog
+ ChangeLog
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
@@ -2188,7 +2166,7 @@ Date: Tue Jun 19 10:38:02 2007 -0400
This patch adds a new FPE type, which will match font path elements of the
form
- catalogue:<dir>
+ catalogue:<dir>
The dir specified after the catalogue: prefix will be scanned for symlinks
and each symlink destination will be added as a local fontfile FPE.
@@ -2198,22 +2176,22 @@ Date: Tue Jun 19 10:38:02 2007 -0400
An example configuration:
- 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
- ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
- misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
- type1:pri=40 -> /usr/share/X11/fonts/Type1
- type1:pri=50 -> /usr/share/fonts/default/Type1
+ 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
+ ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
+ misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
+ type1:pri=40 -> /usr/share/X11/fonts/Type1
+ type1:pri=50 -> /usr/share/fonts/default/Type1
will add /usr/share/X11/fonts/misc as the first FPE with the attribute
'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
the attribute unscaled etc. This is functionally equivalent to setting
the following font path:
- /usr/share/X11/fonts/misc:unscaled,
- /usr/share/X11/fonts/75dpi:unscaled,
- /usr/share/X11/fonts/Type1,
- /usr/share/fonts/default/Type1,
- /usr/share/fonts/default/ghostscript
+ /usr/share/X11/fonts/misc:unscaled,
+ /usr/share/X11/fonts/75dpi:unscaled,
+ /usr/share/X11/fonts/Type1,
+ /usr/share/fonts/default/Type1,
+ /usr/share/fonts/default/ghostscript
The motivation is to let font packages add a symlink to the new font
directory they provide instead of rewriting either the Xorg config file
diff --git a/debian/changelog b/debian/changelog
index 22b2b48..2c61b89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxfont (1:2.0.1-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 12:42:56 +0300
+
libxfont (1:1.5.2-1) unstable; urgency=medium
* Team upload.
commit 14488af0338191356c0177e3d0b5fa473ffbd59c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 11 07:08:29 2015 -0800
Bump version to 2.0.1
This release just fixes some build issues with 2.0.0
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index a13e7bd..a555151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
Reply to: