[X2Go-Commits] [nx-libs] 26/45: Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x

git-admin at x2go.org git-admin at x2go.org
Mon Apr 27 04:50:53 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit b964406ba6e7e2d65b88010856ce881ee928898a
Merge: a77ca87 70b77a0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 22 08:38:21 2015 +0200

    Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x
    
    Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14

 debian/control                                  |    4 +-
 debian/rules                                    |    1 -
 nx-X11/Imakefile                                |    3 -
 nx-X11/config/cf/Imake.rules                    |   21 -
 nx-X11/config/cf/Imake.tmpl                     |    8 -
 nx-X11/config/cf/README                         |    8 -
 nx-X11/config/cf/X11.tmpl                       | 1036 +------
 nx-X11/config/cf/host.def                       |  150 -
 nx-X11/config/cf/linux.cf                       |    8 -
 nx-X11/config/cf/xf86site.def                   |  111 -
 nx-X11/config/cf/xfree86.cf                     |   52 -
 nx-X11/config/cf/xorg.cf                        |   52 -
 nx-X11/config/cf/xorgsite.def                   |  137 -
 nx-X11/include/Imakefile                        |    2 +-
 nx-X11/include/extensions/Imakefile             |    2 +-
 nx-X11/include/fonts/FS.h                       |  132 -
 nx-X11/include/fonts/FSproto.h                  |  816 ------
 nx-X11/include/fonts/Imakefile                  |   22 -
 nx-X11/include/fonts/font.h                     |  169 --
 nx-X11/include/fonts/fontproto.h                |   93 -
 nx-X11/include/fonts/fontstruct.h               |  295 --
 nx-X11/include/fonts/fsmasks.h                  |   98 -
 nx-X11/lib/Imakefile                            |   36 +-
 nx-X11/lib/Xrender/Imakefile                    |    7 -
 nx-X11/lib/font/Imakefile                       |  178 --
 nx-X11/lib/font/Speedo/Imakefile                |   46 -
 nx-X11/lib/font/Speedo/adobe-iso.h              |  200 --
 nx-X11/lib/font/Speedo/bics-iso.h               |  224 --
 nx-X11/lib/font/Speedo/bics-unicode.c           |  138 -
 nx-X11/lib/font/Speedo/bics-unicode.h           |    3 -
 nx-X11/lib/font/Speedo/do_char.c                | 1016 -------
 nx-X11/lib/font/Speedo/do_trns.c                |  512 ----
 nx-X11/lib/font/Speedo/htest.c                  |  361 ---
 nx-X11/lib/font/Speedo/iface.c                  |  650 -----
 nx-X11/lib/font/Speedo/keys.h                   |   56 -
 nx-X11/lib/font/Speedo/module/Imakefile         |   47 -
 nx-X11/lib/font/Speedo/module/speedomod.c       |   72 -
 nx-X11/lib/font/Speedo/nsample.c                |  745 -----
 nx-X11/lib/font/Speedo/out_bl2d.c               |  772 -----
 nx-X11/lib/font/Speedo/out_blk.c                |  706 -----
 nx-X11/lib/font/Speedo/out_outl.c               |  290 --
 nx-X11/lib/font/Speedo/out_scrn.c               | 1090 -------
 nx-X11/lib/font/Speedo/out_util.c               |  341 ---
 nx-X11/lib/font/Speedo/reset.c                  |  131 -
 nx-X11/lib/font/Speedo/set_spcs.c               |  773 -----
 nx-X11/lib/font/Speedo/set_trns.c               | 1324 ---------
 nx-X11/lib/font/Speedo/spdo_prv.h               |  421 ---
 nx-X11/lib/font/Speedo/speedo.h                 |  890 ------
 nx-X11/lib/font/Speedo/spencode.c               |   67 -
 nx-X11/lib/font/Speedo/sperr.c                  |  127 -
 nx-X11/lib/font/Speedo/spfile.c                 |  460 ---
 nx-X11/lib/font/Speedo/spfont.c                 |  453 ---
 nx-X11/lib/font/Speedo/spfuncs.c                |  167 --
 nx-X11/lib/font/Speedo/spglyph.c                |  399 ---
 nx-X11/lib/font/Speedo/spinfo.c                 |  462 ---
 nx-X11/lib/font/Speedo/spint.h                  |  180 --
 nx-X11/lib/font/Speedo/sptobdf.c                |  678 -----
 nx-X11/lib/font/Speedo/useropt.h                |   41 -
 nx-X11/lib/font/Type1/AFM.h                     |   62 -
 nx-X11/lib/font/Type1/Imakefile                 |   91 -
 nx-X11/lib/font/Type1/afm.c                     |  200 --
 nx-X11/lib/font/Type1/arith.c                   |  486 ----
 nx-X11/lib/font/Type1/arith.h                   |   77 -
 nx-X11/lib/font/Type1/blues.h                   |   95 -
 nx-X11/lib/font/Type1/cidchar.c                 |  621 ----
 nx-X11/lib/font/Type1/cluts.h                   |   35 -
 nx-X11/lib/font/Type1/curves.c                  |  228 --
 nx-X11/lib/font/Type1/curves.h                  |   44 -
 nx-X11/lib/font/Type1/digit.h                   |   64 -
 nx-X11/lib/font/Type1/fontfcn.c                 |  709 -----
 nx-X11/lib/font/Type1/fontfcn.h                 |  250 --
 nx-X11/lib/font/Type1/fonts.h                   |   49 -
 nx-X11/lib/font/Type1/hdigit.h                  |   94 -
 nx-X11/lib/font/Type1/hints.c                   |  890 ------
 nx-X11/lib/font/Type1/hints.h                   |   48 -
 nx-X11/lib/font/Type1/lines.c                   |  189 --
 nx-X11/lib/font/Type1/lines.h                   |   39 -
 nx-X11/lib/font/Type1/minimain.c                |   48 -
 nx-X11/lib/font/Type1/module/Imakefile          |   99 -
 nx-X11/lib/font/Type1/module/type1mod.c         |   91 -
 nx-X11/lib/font/Type1/objects.c                 | 1101 -------
 nx-X11/lib/font/Type1/objects.h                 |  354 ---
 nx-X11/lib/font/Type1/paths.c                   | 1406 ---------
 nx-X11/lib/font/Type1/paths.h                   |  239 --
 nx-X11/lib/font/Type1/pictures.h                |   50 -
 nx-X11/lib/font/Type1/range.h                   |   48 -
 nx-X11/lib/font/Type1/regions.c                 | 1651 -----------
 nx-X11/lib/font/Type1/regions.h                 |  250 --
 nx-X11/lib/font/Type1/scanfont.c                | 2370 ---------------
 nx-X11/lib/font/Type1/spaces.c                  |  998 -------
 nx-X11/lib/font/Type1/spaces.h                  |  172 --
 nx-X11/lib/font/Type1/strokes.h                 |   38 -
 nx-X11/lib/font/Type1/t1funcs.c                 | 1668 -----------
 nx-X11/lib/font/Type1/t1hdigit.h                |   40 -
 nx-X11/lib/font/Type1/t1imager.h                |   84 -
 nx-X11/lib/font/Type1/t1info.c                  | 1096 -------
 nx-X11/lib/font/Type1/t1intf.h                  |  143 -
 nx-X11/lib/font/Type1/t1io.c                    |  388 ---
 nx-X11/lib/font/Type1/t1malloc.c                |  759 -----
 nx-X11/lib/font/Type1/t1snap.c                  |   85 -
 nx-X11/lib/font/Type1/t1stdio.h                 |  101 -
 nx-X11/lib/font/Type1/t1stub.c                  |   56 -
 nx-X11/lib/font/Type1/t1test.c                  |  246 --
 nx-X11/lib/font/Type1/t1unicode.c               |  251 --
 nx-X11/lib/font/Type1/t1unicode.h               |   25 -
 nx-X11/lib/font/Type1/token.c                   | 1208 --------
 nx-X11/lib/font/Type1/token.h                   |   79 -
 nx-X11/lib/font/Type1/tokst.h                   |  510 ----
 nx-X11/lib/font/Type1/trig.h                    |   41 -
 nx-X11/lib/font/Type1/type1.c                   | 1892 ------------
 nx-X11/lib/font/Type1/util.c                    |  222 --
 nx-X11/lib/font/Type1/util.h                    |  217 --
 nx-X11/lib/font/bitmap/Imakefile                |   71 -
 nx-X11/lib/font/bitmap/bdfint.h                 |   90 -
 nx-X11/lib/font/bitmap/bdfread.c                |  967 -------
 nx-X11/lib/font/bitmap/bdfutils.c               |  340 ---
 nx-X11/lib/font/bitmap/bitmap.c                 |  160 --
 nx-X11/lib/font/bitmap/bitmapfunc.c             |  240 --
 nx-X11/lib/font/bitmap/bitmaputil.c             |  232 --
 nx-X11/lib/font/bitmap/bitscale.c               | 1978 -------------
 nx-X11/lib/font/bitmap/fontink.c                |  219 --
 nx-X11/lib/font/bitmap/module/Imakefile         |   45 -
 nx-X11/lib/font/bitmap/module/bitmapmod.c       |   76 -
 nx-X11/lib/font/bitmap/pcf.h                    |  100 -
 nx-X11/lib/font/bitmap/pcfread.c                |  997 -------
 nx-X11/lib/font/bitmap/pcfwrite.c               |  468 ---
 nx-X11/lib/font/bitmap/snfread.c                |  514 ----
 nx-X11/lib/font/bitmap/snfstr.h                 |  185 --
 nx-X11/lib/font/builtins/Imakefile              |   17 -
 nx-X11/lib/font/builtins/buildfont              |   14 -
 nx-X11/lib/font/builtins/builtin.h              |   60 -
 nx-X11/lib/font/builtins/dir.c                  |   64 -
 nx-X11/lib/font/builtins/file.c                 |  139 -
 nx-X11/lib/font/builtins/fonts.c                | 2438 ----------------
 nx-X11/lib/font/builtins/fpe.c                  |   98 -
 nx-X11/lib/font/builtins/render.c               |  114 -
 nx-X11/lib/font/fc/Imakefile                    |   31 -
 nx-X11/lib/font/fc/fsconvert.c                  |  774 -----
 nx-X11/lib/font/fc/fserve.c                     | 3480 -----------------------
 nx-X11/lib/font/fc/fserve.h                     |   96 -
 nx-X11/lib/font/fc/fservestr.h                  |  211 --
 nx-X11/lib/font/fc/fsio.c                       |  516 ----
 nx-X11/lib/font/fc/fsio.h                       |  187 --
 nx-X11/lib/font/fc/fsio.h.NX.reference          |  191 --
 nx-X11/lib/font/fc/fsio.h.XF86.reference        |  187 --
 nx-X11/lib/font/fc/fslibos.h                    |  216 --
 nx-X11/lib/font/fontcache/Imakefile             |   29 -
 nx-X11/lib/font/fontcache/fcqueue.h             |  133 -
 nx-X11/lib/font/fontcache/fontcache.c           | 1022 -------
 nx-X11/lib/font/fontcache/fontcache.h           |  121 -
 nx-X11/lib/font/fontfile/Imakefile              |   81 -
 nx-X11/lib/font/fontfile/bitsource.c            |  174 --
 nx-X11/lib/font/fontfile/bufio.c                |  212 --
 nx-X11/lib/font/fontfile/decompress.c           |  415 ---
 nx-X11/lib/font/fontfile/defaults.c             |   77 -
 nx-X11/lib/font/fontfile/dirfile.c              |  495 ----
 nx-X11/lib/font/fontfile/encparse.c             |  966 -------
 nx-X11/lib/font/fontfile/ffcheck.c              |  171 --
 nx-X11/lib/font/fontfile/fileio.c               |   90 -
 nx-X11/lib/font/fontfile/filewr.c               |   65 -
 nx-X11/lib/font/fontfile/fontdir.c              |  832 ------
 nx-X11/lib/font/fontfile/fontenc.c              |  952 -------
 nx-X11/lib/font/fontfile/fontencI.h             |   46 -
 nx-X11/lib/font/fontfile/fontencc.c             |   77 -
 nx-X11/lib/font/fontfile/fontfile.c             | 1147 --------
 nx-X11/lib/font/fontfile/fontscale.c            |  447 ---
 nx-X11/lib/font/fontfile/gunzip.c               |  227 --
 nx-X11/lib/font/fontfile/module/Imakefile       |   21 -
 nx-X11/lib/font/fontfile/printerfont.c          |  178 --
 nx-X11/lib/font/fontfile/register.c             |  107 -
 nx-X11/lib/font/fontfile/renderers.c            |  117 -
 nx-X11/lib/font/include/Imakefile               |   11 -
 nx-X11/lib/font/include/bitmap.h                |  116 -
 nx-X11/lib/font/include/bufio.h                 |   92 -
 nx-X11/lib/font/include/fntfil.h                |  178 --
 nx-X11/lib/font/include/fntfilio.h              |   56 -
 nx-X11/lib/font/include/fntfilst.h              |  198 --
 nx-X11/lib/font/include/fontencc.h              |   36 -
 nx-X11/lib/font/include/fontmisc.h              |  133 -
 nx-X11/lib/font/include/fontmod.h               |   16 -
 nx-X11/lib/font/include/fontshow.h              |   37 -
 nx-X11/lib/font/include/fontutil.h              |   26 -
 nx-X11/lib/font/include/fontxlfd.h              |  100 -
 nx-X11/lib/font/stubs/Imakefile                 |   25 -
 nx-X11/lib/font/stubs/cauthgen.c                |   14 -
 nx-X11/lib/font/stubs/csignal.c                 |   14 -
 nx-X11/lib/font/stubs/delfntcid.c               |   13 -
 nx-X11/lib/font/stubs/errorf.c                  |   13 -
 nx-X11/lib/font/stubs/fatalerror.c              |   13 -
 nx-X11/lib/font/stubs/findoldfnt.c              |   14 -
 nx-X11/lib/font/stubs/getcres.c                 |   14 -
 nx-X11/lib/font/stubs/getdefptsize.c            |   14 -
 nx-X11/lib/font/stubs/getnewfntcid.c            |   14 -
 nx-X11/lib/font/stubs/gettime.c                 |   14 -
 nx-X11/lib/font/stubs/initfshdl.c               |   15 -
 nx-X11/lib/font/stubs/regfpefunc.c              |   28 -
 nx-X11/lib/font/stubs/rmfshdl.c                 |   15 -
 nx-X11/lib/font/stubs/servclient.c              |    3 -
 nx-X11/lib/font/stubs/setfntauth.c              |   14 -
 nx-X11/lib/font/stubs/stfntcfnt.c               |   14 -
 nx-X11/lib/font/stubs/stubs.h                   |   27 -
 nx-X11/lib/font/stubs/xpstubs.c                 |   24 -
 nx-X11/lib/font/util/Imakefile                  |   43 -
 nx-X11/lib/font/util/atom.c                     |  233 --
 nx-X11/lib/font/util/fontaccel.c                |  107 -
 nx-X11/lib/font/util/fontnames.c                |  123 -
 nx-X11/lib/font/util/fontutil.c                 |  443 ---
 nx-X11/lib/font/util/fontxlfd.c                 |  637 -----
 nx-X11/lib/font/util/format.c                   |  126 -
 nx-X11/lib/font/util/miscutil.c                 |   99 -
 nx-X11/lib/font/util/patcache.c                 |  221 --
 nx-X11/lib/font/util/private.c                  |  107 -
 nx-X11/lib/font/util/utilbitmap.c               |  188 --
 nx-X11/programs/Xserver/GL/glx/Imakefile        |    2 +-
 nx-X11/programs/Xserver/Imakefile               |   26 +-
 nx-X11/programs/Xserver/Xext/Imakefile          |    4 +-
 nx-X11/programs/Xserver/Xext/extmod/Imakefile   |    2 +-
 nx-X11/programs/Xserver/composite/Imakefile     |    2 +-
 nx-X11/programs/Xserver/dix/Imakefile           |    2 +-
 nx-X11/programs/Xserver/dix/dixfonts.c          |   17 +-
 nx-X11/programs/Xserver/fb/Imakefile            |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Font.c       |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Font.h       |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/GC.c         |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile    |   13 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c       |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c |   18 +-
 nx-X11/programs/Xserver/mi/Imakefile            |    4 +-
 nx-X11/programs/Xserver/miext/damage/Imakefile  |    2 +-
 nx-X11/programs/Xserver/os/Imakefile            |    2 +-
 nx-X11/programs/Xserver/randr/Imakefile         |    4 +-
 nx-X11/programs/Xserver/render/Imakefile        |    4 +-
 nx-libs.spec                                    |   33 +-
 233 files changed, 50 insertions(+), 67022 deletions(-)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list