libxfont: Changes to 'debian-unstable'
.gitignore | 11
ChangeLog | 169 +++
Makefile.am | 3
configure.ac | 27
debian/changelog | 7
debian/control | 2
debian/rules | 5
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.sh | 66 -
include/X11/fonts/.gitignore | 2
include/X11/fonts/bitmap.h | 5
include/X11/fonts/bufio.h | 7
include/X11/fonts/fntfilst.h | 2
include/X11/fonts/fontconf.h.in | 6
include/X11/fonts/fontmisc.h | 32
include/X11/fonts/fontmod.h | 16
include/X11/fonts/pcf.h | 2
src/.gitignore | 6
src/FreeType/.gitignore | 6
src/FreeType/ft.h | 4
src/FreeType/ftenc.c | 6
src/FreeType/ftfuncs.c | 133 +-
src/FreeType/fttools.c | 6
src/FreeType/xttcap.c | 43
src/FreeType/xttcap.h | 4
src/Makefile.am | 16
src/Speedo/.gitignore | 6
src/Speedo/Makefile.am | 34
src/Speedo/adobe-iso.h | 200 ----
src/Speedo/bics-iso.h | 224 ----
src/Speedo/bics-unicode.c | 138 ---
src/Speedo/bics-unicode.h | 3
src/Speedo/do_char.c | 809 ------------------
src/Speedo/do_trns.c | 498 -----------
src/Speedo/keys.h | 56 -
src/Speedo/out_bl2d.c | 772 -----------------
src/Speedo/out_blk.c | 706 ---------------
src/Speedo/out_outl.c | 290 ------
src/Speedo/out_scrn.c | 1090 ------------------------
src/Speedo/out_util.c | 339 -------
src/Speedo/reset.c | 129 --
src/Speedo/set_spcs.c | 763 ----------------
src/Speedo/set_trns.c | 1214 ---------------------------
src/Speedo/spdo_prv.h | 262 -----
src/Speedo/speedo.h | 874 -------------------
src/Speedo/spencode.c | 67 -
src/Speedo/sperr.c | 127 --
src/Speedo/spfile.c | 460 ----------
src/Speedo/spfont.c | 453 ----------
src/Speedo/spfuncs.c | 167 ---
src/Speedo/spglyph.c | 399 --------
src/Speedo/spinfo.c | 462 ----------
src/Speedo/spint.h | 178 ---
src/Speedo/useropt.h | 41
src/Type1/.gitignore | 6
src/Type1/Makefile.am | 52 -
src/Type1/arith.c | 212 ----
src/Type1/arith.h | 71 -
src/Type1/blues.h | 95 --
src/Type1/cluts.h | 35
src/Type1/curves.c | 228 -----
src/Type1/curves.h | 44
src/Type1/digit.h | 64 -
src/Type1/fontfcn.c | 317 -------
src/Type1/fontfcn.h | 114 --
src/Type1/fonts.h | 49 -
src/Type1/hdigit.h | 94 --
src/Type1/hints.c | 890 -------------------
src/Type1/hints.h | 48 -
src/Type1/lines.c | 188 ----
src/Type1/lines.h | 37
src/Type1/objects.c | 944 ---------------------
src/Type1/objects.h | 293 ------
src/Type1/paths.c | 748 ----------------
src/Type1/paths.h | 205 ----
src/Type1/pictures.h | 50 -
src/Type1/regions.c | 1328 -----------------------------
src/Type1/regions.h | 224 ----
src/Type1/scanfont.c | 1526 ---------------------------------
src/Type1/spaces.c | 941 --------------------
src/Type1/spaces.h | 151 ---
src/Type1/strokes.h | 38
src/Type1/t1funcs.c | 754 ----------------
src/Type1/t1hdigit.h | 40
src/Type1/t1imager.h | 84 -
src/Type1/t1info.c | 496 -----------
src/Type1/t1intf.h | 54 -
src/Type1/t1io.c | 299 ------
src/Type1/t1malloc.c | 759 ----------------
src/Type1/t1snap.c | 85 -
src/Type1/t1stdio.h | 94 --
src/Type1/t1unicode.c | 251 -----
src/Type1/t1unicode.h | 25
src/Type1/token.c | 1208 --------------------------
src/Type1/token.h | 79 -
src/Type1/tokst.h | 510 -----------
src/Type1/trig.h | 41
src/Type1/type1.c | 1797 ----------------------------------------
src/Type1/util.c | 194 ----
src/Type1/util.h | 190 ----
src/bitmap/.gitignore | 6
src/bitmap/bdfread.c | 71 -
src/bitmap/bdfutils.c | 8
src/bitmap/bitmapfunc.c | 13
src/bitmap/bitmaputil.c | 2
src/bitmap/bitscale.c | 369 --------
src/bitmap/pcfread.c | 327 -------
src/bitmap/pcfwrite.c | 6
src/bitmap/snfread.c | 62 -
src/builtins/.gitignore | 6
src/builtins/dir.c | 19
src/builtins/file.c | 6
src/builtins/render.c | 4
src/fc/.gitignore | 6
src/fc/fsconvert.c | 21
src/fc/fserve.c | 122 --
src/fc/fsio.c | 21
src/fc/fslibos.h | 2
src/fontfile/.gitignore | 6
src/fontfile/Makefile.am | 2
src/fontfile/bitsource.c | 6
src/fontfile/bufio.c | 8
src/fontfile/bunzip2.c | 6
src/fontfile/catalogue.c | 36
src/fontfile/decompress.c | 4
src/fontfile/dirfile.c | 8
src/fontfile/ffcheck.c | 188 ----
src/fontfile/fileio.c | 5
src/fontfile/filewr.c | 2
src/fontfile/fontdir.c | 55 -
src/fontfile/fontfile.c | 85 -
src/fontfile/fontscale.c | 11
src/fontfile/gunzip.c | 8
src/fontfile/printerfont.c | 178 ---
src/fontfile/register.c | 68 -
src/fontfile/renderers.c | 12
src/stubs/.gitignore | 6
src/stubs/Makefile.am | 4
src/stubs/fontmod.c | 14
src/stubs/xpstubs.c | 21
src/util/.gitignore | 6
src/util/atom.c | 9
src/util/fontnames.c | 32
src/util/fontutil.c | 40
src/util/fontxlfd.c | 2
src/util/miscutil.c | 54 -
src/util/patcache.c | 14
src/util/private.c | 11
src/util/utilbitmap.c | 6
149 files changed, 638 insertions(+), 28671 deletions(-)
New commits:
commit cf4eeec232bc60cc12a58241d150d94c7bfdf3fd
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 13 12:11:33 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index a23f1dd..951c4c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libxfont (1:1.4.0-1) UNRELEASED; urgency=low
+libxfont (1:1.4.0-1) unstable; urgency=low
* New upstream release.
* Move libxfont1-dbg to new section 'debug'.
- -- Julien Cristau <jcristau@debian.org> Mon, 13 Apr 2009 12:02:51 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 13 Apr 2009 12:11:23 +0100
libxfont (1:1.3.4-2) unstable; urgency=low
commit 10d899619b4176dc059aa5d265103d660f458d51
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 13 12:08:07 2009 +0100
update configure flags
- type1 and speedo are gone
- explicitly enable builtins, and bdf and pcf format support
diff --git a/debian/rules b/debian/rules
index 456b686..370ae79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-confflags += --enable-fc --disable-type1 --disable-speedo
+confflags += --enable-fc --enable-builtins --enable-pcfformat --enable-bdfformat
configure: $(STAMP_DIR)/patch
autoreconf -vfi
@@ -48,8 +48,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
dh_testdir
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
+ >$@
clean: xsfclean
dh_testdir
commit db8257793d840cd54282615db459be17bb676571
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 13 12:05:14 2009 +0100
Move libxfont1-dbg to new section 'debug'.
diff --git a/debian/changelog b/debian/changelog
index 9d6fbe0..a23f1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxfont (1:1.4.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Move libxfont1-dbg to new section 'debug'.
-- Julien Cristau <jcristau@debian.org> Mon, 13 Apr 2009 12:02:51 +0100
diff --git a/debian/control b/debian/control
index 53de06a..47cb414 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X11 font rasterisation library
git://anongit.freedesktop.org/git/xorg/lib/libXfont
Package: libxfont1-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version})
commit a933ebf2739fb418f9962e9c05890e8ac54287ed
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 13 12:04:09 2009 +0100
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 578ba5e..4a82977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,166 @@
+commit 0045b2555b288099c90b65f97bd4b4a5ebc8c688
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Feb 18 13:53:14 2009 -0500
+
+ libXfont 1.4.0
+
+commit 04ced93e997b185b5d9124cacc96fa39a77b2ab7
+Author: Peter Astrand <astrand@maggie.lkpg.cendio.se>
+Date: Wed Feb 4 22:09:25 2009 +0100
+
+ Avoid sending uninitialized padding data over the network.
+
+ Besides cluttering Valgrind output, this might also be an information leak.
+
+ Signed-off-by: Peter Astrand <astrand@cendio.se>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit e15dca77fa76252dd8499f8585d8ce922ac3b869
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Thu Jan 29 18:02:34 2009 -0200
+
+ Janitor: make distcheck and .gitignore
+
+ Distribute ChangeLog but not autogen.sh.
+ Use a single toplevel .gitignore file, instead of one per subdirectory.
+
+commit 38bac54519a67ab1a276b66dbaa84a3327ccf827
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sat Sep 27 02:06:27 2008 -0400
+
+ Remove some strcasecmp silliness
+
+commit f431b4eb4dc743ccdf94b1b2ed858cc21f63c091
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 23:23:40 2009 -0500
+
+ Allow case insensitive filename matching in fontfile.
+
+ Simplify the freetype renderer list to match.
+
+commit 903d39aeea73a973fb8b05ca1ac147c2cca146cb
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 23:21:29 2009 -0500
+
+ Delete some dead ifdefs
+
+commit daa7af2bb2326de363aa5ea51c29616e3634343a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 23:20:20 2009 -0500
+
+ Move the copy of CopyISOLatin1Lowered near its user, and un-weak it.
+
+commit 6c29007756301f513c0151e2b63af073f310af66
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 23:17:55 2009 -0500
+
+ Drop OS/2 support
+
+commit 0cdc9b8f850342d50b72a57507db3413eacc6fb8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 23:16:35 2009 -0500
+
+ xalloc -> malloc, etc.
+
+commit 632a2e90a4b209facc84d7a18873f19a720ea7df
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sat Sep 27 01:30:13 2008 -0400
+
+ Remove PMF support.
+
+ .pmf files are printer font metrics; they have no glyphs, just boxes for
+ layout. They can't possibly be useful in a post-Xprint world.
+
+commit e1927f80deabe0268dc18b4a9f3ceda1325171f5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 22:57:35 2009 -0500
+
+ Remove printer font support.
+
+ Xprint is just insidious, isn't it.
+
+commit 732191d5d6ad58caab25e24df16fb89efaea2e9a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 22:42:22 2009 -0500
+
+ Remove loadable renderer support.
+
+commit 423d0a2c1dfad969f4a238618811937bc5f49776
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sat Sep 27 01:55:47 2008 -0400
+
+ Remove useless #define
+
+commit 50bca6dd881c2d787b3afa4d98a2c2667f767614
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 22:33:06 2009 -0500
+
+ Get rid of a useless array
+
+commit 6ba0565362ba9c8d1037c0e4725cb31faa141656
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 22:29:10 2009 -0500
+
+ const cleanup
+
+commit 1247f01ee36f80222e30c1678f940329aadb8335
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 01:13:08 2009 -0500
+
+ Delete Type1
+
+ Yes, these are still real fonts, but freetype can handle them just fine.
+
+commit 85b66b8a7f3095f10437c8ecb3dcbfe68c9cfced
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 20 01:03:16 2009 -0500
+
+ Delete speedo
+
+ OUT OUT OUT
+
+commit 1559d8086e8063c692aae008006578b88e1368fe
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sun Dec 28 12:35:37 2008 -0800
+
+ Added missing AM_CFLAGS for -Wl,-flat_namespace
+
+ Fixes commit f859a76b0f325b07952ad1c5c818318307c589b0
+
+commit 99bad52b592f4f11887bf9033590b61880c3c976
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sat Mar 1 16:45:55 2008 -0300
+
+ Disable some fun stdio wrapping.
+
+ The code is still there but no magic with macros is attempted anymore
+ to handle files.
+ This should really be changed to just use stdio, and properly adapt
+ functions like T1Decript, T1eexec, etc.
+
+commit 95760fbe45a700ea4cc118daa536604393721a59
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Dec 19 16:24:39 2008 -0800
+
+ Restore comment deleted by b6f793d7d5
+
+commit b6f793d7d5c7f7c55911e6524dede41b92dcbc22
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Mar 14 01:30:24 2008 -0300
+
+ libXfont ansification and removal of xf86_ansic.h dependency
+
+ Basically the code is now compiled as if FONTMODULE was never defined,
+ but also removed some "magic" defining _XOPEN_SOURCE before including
+ math.h.
+ Also removed some #if 0'ed code instead of fixing prototypes inside
+ the "dead code".
+ Changes to spdo_prv.h were due to defines like:
+ <hash>define foo() sp_foo()
+ that would not compile with the ansification in the format:
+ type foo(void)
+ due to the macro receiving "void" as an argument.
+
commit 282ac4226195d58e3818e7ac97093e396aa78086
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 19 15:07:21 2008 -0800
@@ -237,7 +400,7 @@ Date: Sat Aug 25 23:32:54 2007 +0200
Kill unused macro definition.
commit 3c3b47bf6f080ddb700886de3e5bfa42c2f0774e
-Merge: 9f86614... 32d2d33...
+Merge: 9f86614 32d2d33
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Sat Aug 11 23:09:50 2007 +0200
@@ -409,7 +572,7 @@ Date: Wed Apr 4 17:05:13 2007 -0700
Version bump: 1.2.8
commit 224fb6403a328e70b370540cc5cefd74421fafac
-Merge: e7a59cf... 0fbb37c...
+Merge: e7a59cf 0fbb37c
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 16:05:48 2007 +0200
@@ -537,7 +700,7 @@ Date: Thu Oct 5 18:12:50 2006 -0700
--disable-builtins should not force off all bitmap support
commit 264df52d24f585915e0d9823d5f087cf23e3fc75
-Merge: 0fb55cb... d896c3e...
+Merge: 0fb55cb d896c3e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 22 11:36:43 2006 -0700
diff --git a/debian/changelog b/debian/changelog
index acefb47..9d6fbe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfont (1:1.4.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 13 Apr 2009 12:02:51 +0100
+
libxfont (1:1.3.4-2) unstable; urgency=low
* Update debian/copyright from upstream COPYING.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 0045b2555b288099c90b65f97bd4b4a5ebc8c688
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 18 13:53:14 2009 -0500
libXfont 1.4.0
diff --git a/configure.ac b/configure.ac
index ab3b121..c6b6ca6 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.4,
+ 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 04ced93e997b185b5d9124cacc96fa39a77b2ab7
Author: Peter Astrand <astrand@maggie.lkpg.cendio.se>
Date: Wed Feb 4 22:09:25 2009 +0100
Avoid sending uninitialized padding data over the network.
Besides cluttering Valgrind output, this might also be an information leak.
Signed-off-by: Peter Astrand <astrand@cendio.se>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index a1b1796..2ba08e8 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1618,6 +1618,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
buf[0] = (unsigned char) namelen;
memcpy(&buf[1], name, namelen);
openreq.reqType = FS_OpenBitmapFont;
+ openreq.pad = 0;
openreq.fid = fsd->fontid;
openreq.format_hint = fsd->format;
openreq.format_mask = fsd->fmask;
@@ -1630,6 +1631,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
blockrec->sequenceNumber = conn->current_seq;
inforeq.reqType = FS_QueryXInfo;
+ inforeq.pad = 0;
inforeq.id = fsd->fontid;
inforeq.length = SIZEOF(fsQueryXInfoReq) >> 2;
@@ -1756,6 +1758,7 @@ fs_send_close_font(FontPathElementPtr fpe, Font id)
return Successful;
/* tell the font server to close the font */
req.reqType = FS_CloseFont;
+ req.pad = 0;
req.length = SIZEOF(fsCloseReq) >> 2;
req.id = id;
_fs_add_req_log(conn, FS_CloseFont);
@@ -2288,6 +2291,7 @@ fs_send_list_fonts(pointer client, FontPathElementPtr fpe, char *pattern,
/* send the request */
req.reqType = FS_ListFonts;
+ req.pad = 0;
req.maxNames = maxnames;
req.nbytes = patlen;
req.length = (SIZEOF(fsListFontsReq) + patlen + 3) >> 2;
@@ -2458,6 +2462,7 @@ fs_start_list_with_info(pointer client, FontPathElementPtr fpe,
/* send the request */
req.reqType = FS_ListFontsWithXInfo;
+ req.pad = 0;
req.maxNames = maxnames;
req.nbytes = len;
req.length = (SIZEOF(fsListFontsWithXInfoReq) + len + 3) >> 2;
@@ -2558,6 +2563,7 @@ fs_client_died(pointer client, FontPathElementPtr fpe)
{
if (cur->client == client) {
freeac.reqType = FS_FreeAC;
+ freeac.pad = 0;
freeac.id = cur->acid;
freeac.length = sizeof (fsFreeACReq) >> 2;
_fs_add_req_log(conn, FS_FreeAC);
@@ -2632,6 +2638,7 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
{
fsFreeACReq freeac;
freeac.reqType = FS_FreeAC;
+ freeac.pad = 0;
freeac.id = cur->acid;
freeac.length = sizeof (fsFreeACReq) >> 2;
_fs_add_req_log(conn, FS_FreeAC);
@@ -2660,6 +2667,7 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
if (conn->curacid != cur->acid)
{
setac.reqType = FS_SetAuthorization;
+ setac.pad = 0;
setac.length = sizeof (fsSetAuthorizationReq) >> 2;
setac.id = cur->acid;
_fs_add_req_log(conn, FS_SetAuthorization);
@@ -2962,6 +2970,7 @@ _fs_send_cat_sync (FSFpePtr conn)
lcreq.length = (SIZEOF(fsListCataloguesReq)) >> 2;
lcreq.maxNames = 0;
lcreq.nbytes = 0;
+ lcreq.pad2 = 0;
_fs_add_req_log(conn, FS_SetCatalogues);
if (_fs_write(conn, (char *) &lcreq, SIZEOF(fsListCataloguesReq)) != FSIO_READY)
return FSIO_ERROR;
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index ee93378..79dc0d6 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -394,6 +394,8 @@ _fs_do_write(FSFpePtr conn, char *data, long len, long size)
}
}
memcpy (conn->outBuf.buf + conn->outBuf.insert, data, len);
+ /* Clear pad data */
+ memset (conn->outBuf.buf + conn->outBuf.insert + len, 0, size - len);
conn->outBuf.insert += size;
_fs_mark_block (conn, FS_PENDING_WRITE);
return FSIO_READY;
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit e15dca77fa76252dd8499f8585d8ce922ac3b869
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 18:02:34 2009 -0200
Janitor: make distcheck and .gitignore
Distribute ChangeLog but not autogen.sh.
Use a single toplevel .gitignore file, instead of one per subdirectory.
diff --git a/.gitignore b/.gitignore
index 1a0f906..70042c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
@@ -9,6 +11,7 @@ config.status
config.sub
configure
depcomp
+fontconf.h
install-sh
libtool
ltmain.sh
@@ -16,6 +19,12 @@ Makefile
Makefile.in
missing
mkinstalldirs
-stamp-h1
+stamp-h?
xfont.pc
*~
+*.la
+*.lo
+*.o
+libXfont-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 7971605..1da055b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ nodist_libXfontinclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfont.pc
-EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in
+EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in
.PHONY: ChangeLog
diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
deleted file mode 100644
index d8b6626..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-fontconf.h
-stamp-h2
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9fb9857..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
diff --git a/src/FreeType/.gitignore b/src/FreeType/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/FreeType/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/bitmap/.gitignore b/src/bitmap/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/bitmap/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/builtins/.gitignore b/src/builtins/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/builtins/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fc/.gitignore b/src/fc/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fontfile/.gitignore b/src/fontfile/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fontfile/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/stubs/.gitignore b/src/stubs/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/stubs/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/util/.gitignore b/src/util/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/util/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
commit 38bac54519a67ab1a276b66dbaa84a3327ccf827
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 27 02:06:27 2008 -0400
Remove some strcasecmp silliness
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index 8df5a6a..ed5fd19 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -59,19 +57,11 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit );
extern int ValidAtom ( Atom atom );
extern char *NameForAtom (Atom atom);
-extern int f_strcasecmp(const char *s1, const char *s2);
-
#define lowbit(x) ((x) & (~(x) + 1))
#undef assert
#define assert(x) ((void)0)
-#ifndef strcasecmp
-#if defined(NEED_STRCASECMP)
-#define strcasecmp(s1,s2) f_strcasecmp(s1,s2)
-#endif
-#endif
-
extern void
BitOrderInvert(
register unsigned char *,
diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h
index 9da3c96..e91e523 100644
--- a/src/FreeType/xttcap.h
+++ b/src/FreeType/xttcap.h
@@ -121,10 +121,6 @@ SPropRecValList_dump(SRefPropRecValList *refList);
Prototypes (xttmisc)
*/
-/* compare strings with ignoring case */
- /* False == equal, True == not equal */
-Bool mystrcasecmp(char const *s1, char const *s2);
-
/* strdup clone */
char * XttXstrdup(char const *str);
#undef xstrdup
diff --git a/src/util/fontutil.c b/src/util/fontutil.c
index 181b1b2..aa89ce0 100644
--- a/src/util/fontutil.c
+++ b/src/util/fontutil.c
@@ -411,31 +411,3 @@ add_range(fsRange *newrange,
return Successful;
}
-
-/* It is difficult to find a good place for this. */
-#ifdef NEED_STRCASECMP
-int
-f_strcasecmp(const char *s1, const char *s2)
-{
- char c1, c2;
-
- if (*s1 == 0)
- if (*s2 == 0)
- return 0;
- else
- return 1;
-
- c1 = (isupper (*s1) ? tolower (*s1) : *s1);
- c2 = (isupper (*s2) ? tolower (*s2) : *s2);
- while (c1 == c2) {
- if (c1 == '\0')
- return 0;
- s1++;
- s2++;
- c1 = (isupper (*s1) ? tolower (*s1) : *s1);
- c2 = (isupper (*s2) ? tolower (*s2) : *s2);
- }
- return c1 - c2;
-}
-#endif
-
commit f431b4eb4dc743ccdf94b1b2ed858cc21f63c091
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 23:23:40 2009 -0500
Allow case insensitive filename matching in fontfile.
Simplify the freetype renderer list to match.
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 35d58d5..47ebac7 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -3898,40 +3898,24 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info,
static FontRendererRec renderers[] = {
{".ttf", 4, 0, FreeTypeOpenScalable, 0,
FreeTypeGetInfoScalable, 0, CAPABILITIES},
- {".TTF", 4, 0, FreeTypeOpenScalable, 0,
- FreeTypeGetInfoScalable, 0, CAPABILITIES},
{".ttc", 4, 0, FreeTypeOpenScalable, 0,
FreeTypeGetInfoScalable, 0, CAPABILITIES},
- {".TTC", 4, 0, FreeTypeOpenScalable, 0,
- FreeTypeGetInfoScalable, 0, CAPABILITIES},
{".otf", 4, 0, FreeTypeOpenScalable, 0,
FreeTypeGetInfoScalable, 0, CAPABILITIES},
- {".OTF", 4, 0, FreeTypeOpenScalable, 0,
- FreeTypeGetInfoScalable, 0, CAPABILITIES},
{".otc", 4, 0, FreeTypeOpenScalable, 0,
FreeTypeGetInfoScalable, 0, CAPABILITIES},
- {".OTC", 4, 0, FreeTypeOpenScalable, 0,
- FreeTypeGetInfoScalable, 0, CAPABILITIES},
Reply to: