[X2Go-Commits] [nx-libs] 02/05: Merge pull request #4 from sunweaver/feature/libxpm-cleanup

[git-admin at x2go.org]

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 897e2e2dea77603c779659b86791316ccf22cf2b
Merge: 46318a5 1d71c9e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 4 08:09:34 2015 +0100

    Merge pull request #4 from sunweaver/feature/libxpm-cleanup
    
    library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library.
    
     One release goal for version 3.6.x of nx-libs is dropping as many bundled libraries as possible that haven't
     been adapted to nx-libs.
    
     Starting with libNX_Xpm here.
    
     The libNX_Xpm library is only referenced once (nx-X11/programs/Xserver/hw/nxagent/Holder.c).
     When grepping through Xserver/hw/nxagent the suspicion comes up, that the libXpm linkage is not
     needed at all, because none of the provided functions are used inside the nxagent Xserver.

 debian/control                              |   38 +-
 debian/libnx-xpm-dev.install.in             |    2 -
 debian/libnx-xpm4.install.in                |    1 -
 debian/libnx-xpm4.symbols                   |   68 -
 nx-X11/config/cf/X11.tmpl                   |    4 +-
 nx-X11/extras/Xpm/lib/Attrib.c              |  310 ----
 nx-X11/extras/Xpm/lib/CrBufFrI.c            |  452 -----
 nx-X11/extras/Xpm/lib/CrBufFrP.c            |   78 -
 nx-X11/extras/Xpm/lib/CrDatFrI.c            |  404 -----
 nx-X11/extras/Xpm/lib/CrDatFrP.c            |   77 -
 nx-X11/extras/Xpm/lib/CrIFrBuf.c            |  118 --
 nx-X11/extras/Xpm/lib/CrIFrDat.c            |  123 --
 nx-X11/extras/Xpm/lib/CrIFrP.c              |   58 -
 nx-X11/extras/Xpm/lib/CrPFrBuf.c            |   79 -
 nx-X11/extras/Xpm/lib/CrPFrDat.c            |   82 -
 nx-X11/extras/Xpm/lib/CrPFrI.c              |   62 -
 nx-X11/extras/Xpm/lib/Image.c               |   64 -
 nx-X11/extras/Xpm/lib/Info.c                |  127 --
 nx-X11/extras/Xpm/lib/RdFToBuf.c            |  124 --
 nx-X11/extras/Xpm/lib/RdFToDat.c            |   68 -
 nx-X11/extras/Xpm/lib/RdFToI.c              |  267 ---
 nx-X11/extras/Xpm/lib/RdFToP.c              |   78 -
 nx-X11/extras/Xpm/lib/WrFFrBuf.c            |   60 -
 nx-X11/extras/Xpm/lib/WrFFrDat.c            |   62 -
 nx-X11/extras/Xpm/lib/WrFFrI.c              |  364 ----
 nx-X11/extras/Xpm/lib/WrFFrP.c              |   77 -
 nx-X11/extras/Xpm/lib/XpmI.h                |  329 ----
 nx-X11/extras/Xpm/lib/create.c              | 2532 ---------------------------
 nx-X11/extras/Xpm/lib/data.c                |  482 -----
 nx-X11/extras/Xpm/lib/hashtab.c             |  241 ---
 nx-X11/extras/Xpm/lib/misc.c                |  127 --
 nx-X11/extras/Xpm/lib/parse.c               |  803 ---------
 nx-X11/extras/Xpm/lib/rgb.c                 |  285 ---
 nx-X11/extras/Xpm/lib/scan.c                | 1027 -----------
 nx-X11/extras/Xpm/lib/xpm.h                 |  478 -----
 nx-X11/lib/Imakefile                        |    1 -
 nx-X11/lib/Xpm/Imakefile                    |  126 --
 nx-X11/lib/Xpm/Xpm-def.cpp                  |   39 -
 nx-X11/programs/Xserver/Imakefile           |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Holder.c |    2 +-
 nx-libs.spec                                |   27 +-
 41 files changed, 26 insertions(+), 9722 deletions(-)

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