From 86f96b0656dd9c4c2b3436badbf3874365d512cf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:20:12 +0100 Subject: empty CODE-REDUCTION_* files (maybe usable later for futher code reduction efforts --- debian/CODE-REDUCTION_CLEANUP-BACKUPFILES | 212 ---------- debian/CODE-REDUCTION_CLEANUP-BRUTAL | 4 - debian/CODE-REDUCTION_CLEANUP-UNUSED | 107 ----- debian/CODE-REDUCTION_PRESERVE-INCLUDED | 2 - debian/CODE-REDUCTION_PRESERVE-NEEDED | 27 -- debian/CODE-REDUCTION_PRESERVE-SYMLINKED | 652 ------------------------------ 6 files changed, 1004 deletions(-) (limited to 'debian') diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES index 0fb803e55..e69de29bb 100644 --- a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES +++ b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES @@ -1,212 +0,0 @@ -nx-X11/CHANGELOG.NX.original -nx-X11/CHANGELOG.X.original -nx-X11/include/extensions/XKBsrv.h.NX.original -nx-X11/include/extensions/XKBsrv.h.X.original -nx-X11/include/Xpoll.h.in.NX.original -nx-X11/include/Xpoll.h.in.X.original -nx-X11/lib/font/fontfile/encparse.c.NX.original -nx-X11/lib/font/fontfile/encparse.c.X.original -nx-X11/lib/X11/ChkIfEv.c.NX.original -nx-X11/lib/X11/ChkIfEv.c.X.original -nx-X11/lib/X11/cmsProp.c.X.original -nx-X11/lib/X11/ConnDis.c.NX.original -nx-X11/lib/X11/ConnDis.c.X.original -nx-X11/lib/X11/IfEvent.c.NX.original -nx-X11/lib/X11/IfEvent.c.X.original -nx-X11/lib/X11/Imakefile.NX.original -nx-X11/lib/X11/Imakefile.X.original -nx-X11/lib/X11/MaskEvent.c.NX.original -nx-X11/lib/X11/MaskEvent.c.X.original -nx-X11/lib/X11/OpenDis.c.NX.original -nx-X11/lib/X11/OpenDis.c.X.original -nx-X11/lib/X11/PeekIfEv.c.NX.original -nx-X11/lib/X11/PeekIfEv.c.X.original -nx-X11/lib/X11/Pending.c.NX.original -nx-X11/lib/X11/Pending.c.X.original -nx-X11/lib/X11/XKBMAlloc.c.NX.original -nx-X11/lib/X11/XKBMAlloc.c.X.original -nx-X11/lib/X11/XlibAsync.c.NX.original -nx-X11/lib/X11/XlibAsync.c.X.original -nx-X11/lib/X11/Xlib.h.NX.original -nx-X11/lib/X11/Xlib.h.X.original -nx-X11/lib/X11/XlibInt.c.NX.original -nx-X11/lib/X11/XlibInt.c.X.original -nx-X11/lib/X11/Xlibint.h.NX.original -nx-X11/lib/X11/Xlibint.h.X.original -nx-X11/lib/Xau/AuRead.c.NX.original -nx-X11/lib/Xau/AuRead.c.X.original -nx-X11/lib/Xpm/Imakefile.NX.original -nx-X11/lib/Xpm/Imakefile.X.original -nx-X11/lib/Xrender/Glyph.c.NX.original -nx-X11/lib/Xrender/Glyph.c.X.original -nx-X11/lib/Xrender/Xrender.h.NX.original -nx-X11/lib/Xrender/Xrender.h.X.original -nx-X11/lib/xtrans/Xtranssock.c.NX.original -nx-X11/lib/xtrans/Xtranssock.c.X.original -nx-X11/programs/Imakefile.NX.original -nx-X11/programs/Imakefile.X.original -nx-X11/programs/Xserver/dix/dixfonts.c.NX.original -nx-X11/programs/Xserver/dix/dixfonts.c.X.original -nx-X11/programs/Xserver/dix/pixmap.c.NX.original -nx-X11/programs/Xserver/dix/pixmap.c.X.original -nx-X11/programs/Xserver/fb/fbtrap.c.NX.original -nx-X11/programs/Xserver/fb/fbtrap.c.X.original -nx-X11/programs/Xserver/fb/Imakefile.NX.original -nx-X11/programs/Xserver/fb/Imakefile.X.original -nx-X11/programs/Xserver/GL/glx/render2.c.NX.original -nx-X11/programs/Xserver/GL/glx/render2.c.X.original -nx-X11/programs/Xserver/GL/glx/render2swap.c.NX.original -nx-X11/programs/Xserver/GL/glx/render2swap.c.X.original -nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original -nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original -nx-X11/programs/Xserver/GL/mesa/X/Imakefile.NX.original -nx-X11/programs/Xserver/GL/mesa/X/Imakefile.X.original -nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c.NX.original -nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c.X.original -nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXevents.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXevents.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXextension.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXextension.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXrender.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXrender.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXresource.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXresource.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXshm.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXshm.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.X.original -nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original -nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original -nx-X11/programs/Xserver/Imakefile.NX.original -nx-X11/programs/Xserver/Imakefile.X.original -nx-X11/programs/Xserver/include/dixstruct.h.NX.original -nx-X11/programs/Xserver/include/dixstruct.h.X.original -nx-X11/programs/Xserver/mi/Imakefile.NX.original -nx-X11/programs/Xserver/mi/Imakefile.X.original -nx-X11/programs/Xserver/os/auth.c.NX.original -nx-X11/programs/Xserver/os/auth.c.X.original -nx-X11/programs/Xserver/os/connection.c.NX.original -nx-X11/programs/Xserver/os/connection.c.X.original -nx-X11/programs/Xserver/os/Imakefile.NX.original -nx-X11/programs/Xserver/os/Imakefile.X.original -nx-X11/programs/Xserver/os/log.c.NX.original -nx-X11/programs/Xserver/os/log.c.X.original -nx-X11/programs/Xserver/os/oscolor.c.NX.original -nx-X11/programs/Xserver/os/oscolor.c.X.original -nx-X11/programs/Xserver/os/utils.c.NX.original -nx-X11/programs/Xserver/os/utils.c.X.original -nx-X11/programs/Xserver/os/WaitFor.c.NX.original -nx-X11/programs/Xserver/os/WaitFor.c.X.original -nx-X11/programs/Xserver/os/xdmcp.c.NX.original -nx-X11/programs/Xserver/os/xdmcp.c.X.original -nx-X11/programs/Xserver/os/xprintf.c.NX.original -nx-X11/programs/Xserver/os/xprintf.c.X.original -nx-X11/programs/Xserver/randr/Imakefile.NX.original -nx-X11/programs/Xserver/randr/Imakefile.X.original -nx-X11/programs/Xserver/randr/panoramiXproto.h.NX.original -nx-X11/programs/Xserver/randr/panoramiXproto.h.X.original -nx-X11/programs/Xserver/randr/randr.c.NX.original -nx-X11/programs/Xserver/randr/randr.c.X.original -nx-X11/programs/Xserver/randr/randr.h.NX.original -nx-X11/programs/Xserver/randr/randr.h.X.original -nx-X11/programs/Xserver/randr/randrproto.h.NX.original -nx-X11/programs/Xserver/randr/randrproto.h.X.original -nx-X11/programs/Xserver/randr/registry.h.NX.original -nx-X11/programs/Xserver/randr/registry.h.X.original -nx-X11/programs/Xserver/randr/rrcrtc.c.NX.original -nx-X11/programs/Xserver/randr/rrcrtc.c.X.original -nx-X11/programs/Xserver/randr/rrdispatch.c.X.original -nx-X11/programs/Xserver/randr/rrmode.c.NX.original -nx-X11/programs/Xserver/randr/rrmode.c.X.original -nx-X11/programs/Xserver/randr/rrscreen.c.NX.original -nx-X11/programs/Xserver/randr/rrscreen.c.X.original -nx-X11/programs/Xserver/randr/rrxinerama.c.NX.original -nx-X11/programs/Xserver/randr/rrxinerama.c.X.original -nx-X11/programs/Xserver/randr.X.original -nx-X11/programs/Xserver/render/renderedge.c.NX.original -nx-X11/programs/Xserver/render/renderedge.c.X.original -nx-X11/programs/Xserver/Xext/Imakefile.NX.original -nx-X11/programs/Xserver/Xext/Imakefile.X.original -nx-X11/programs/Xserver/Xext/security.c.NX.original -nx-X11/programs/Xserver/Xext/security.c.X.original -nx-X11/programs/Xserver/xfixes/cursor.c.NX.original -nx-X11/programs/Xserver/xfixes/cursor.c.X.original -nx-X11/programs/Xserver/xfixes/select.c.NX.original -nx-X11/programs/Xserver/xfixes/select.c.X.original -nx-X11/programs/Xserver/xkb/ddxKillSrv.c.NX.original -nx-X11/programs/Xserver/xkb/ddxKillSrv.c.X.original -nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original -nx-X11/programs/Xserver/xkb/ddxLoad.c.X.original -nx-X11/programs/Xserver/xkb/Imakefile.NX.original -nx-X11/programs/Xserver/xkb/Imakefile.X.original -nx-X11/programs/Xserver/xkb/xkbDflts.h.NX.original -nx-X11/programs/Xserver/xkb/xkbDflts.h.X.original -nx-X11/WSDrawBuffer.h.X.original diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL index 991469f96..e69de29bb 100644 --- a/debian/CODE-REDUCTION_CLEANUP-BRUTAL +++ b/debian/CODE-REDUCTION_CLEANUP-BRUTAL @@ -1,4 +0,0 @@ -nx-X11/config/cf/ -nx-X11/extras/Mesa/ -nx-X11/extras/Xpm/ -nx-X11/lib/Xcursor/ \ No newline at end of file diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED index 13354a8d0..e69de29bb 100644 --- a/debian/CODE-REDUCTION_CLEANUP-UNUSED +++ b/debian/CODE-REDUCTION_CLEANUP-UNUSED @@ -1,107 +0,0 @@ -nx-X11/config/docbook/ -nx-X11/config/pswrap/ -nx-X11/extras/drm/ -nx-X11/extras/expat/ -nx-X11/extras/fontconfig/ -nx-X11/extras/fonts/ -nx-X11/extras/freetype2/ -nx-X11/extras/ogl-sample/ -nx-X11/extras/regex/ -nx-X11/extras/rman/ -nx-X11/extras/ttf2pt1/ -nx-X11/extras/x86emu/ -nx-X11/extras/zlib/ -nx-X11/include/DPS/ -nx-X11/lib/expat/ -nx-X11/lib/fontconfig/ -nx-X11/lib/fontenc/ -nx-X11/lib/font/FreeType/ -nx-X11/lib/font/include/fontenc.h -nx-X11/lib/freetype2/ -nx-X11/lib/FS/ -nx-X11/lib/GL/apple/ -nx-X11/lib/GL/dri/ -nx-X11/lib/GL/mesa/drivers/dri/ffb -nx-X11/lib/GL/mesa/drivers/dri/gamma -nx-X11/lib/GL/mesa/drivers/dri/i810 -nx-X11/lib/GL/mesa/drivers/dri/i915 -nx-X11/lib/GL/mesa/drivers/dri/Imakefile -nx-X11/lib/GL/mesa/drivers/dri/mach64 -nx-X11/lib/GL/mesa/drivers/dri/mga -nx-X11/lib/GL/mesa/drivers/dri/r128 -nx-X11/lib/GL/mesa/drivers/dri/r200 -nx-X11/lib/GL/mesa/drivers/dri/radeon -nx-X11/lib/GL/mesa/drivers/dri/savage -nx-X11/lib/GL/mesa/drivers/dri/sis -nx-X11/lib/GL/mesa/drivers/dri/tdfx -nx-X11/lib/GL/mesa/drivers/dri/unichrome -nx-X11/lib/GL/mesa/drivers/dri/via -nx-X11/lib/GLU/ -nx-X11/lib/GLw/ -nx-X11/lib/ICE/ -nx-X11/lib/regex/ -nx-X11/lib/SM/ -nx-X11/lib/XTrap/ -nx-X11/lib/Xaw/ -nx-X11/lib/Xaw6/ -nx-X11/lib/Xaw7/ -nx-X11/lib/Xbsd/ -nx-X11/lib/Xevie/ -nx-X11/lib/Xfontcache/ -nx-X11/lib/Xft/ -nx-X11/lib/Xft1/ -nx-X11/lib/Xi/ -nx-X11/lib/Xmu/ -nx-X11/lib/Xmuu/ -nx-X11/lib/Xp/ -nx-X11/lib/XprintAppUtil/ -nx-X11/lib/XprintUtil/ -nx-X11/lib/Xss/ -nx-X11/lib/Xt/ -nx-X11/lib/Xv/ -nx-X11/lib/XvMC/ -nx-X11/lib/Xxf86*/ -nx-X11/lib/apple/ -nx-X11/lib/dmx/ -nx-X11/lib/dps/ -nx-X11/lib/dpstk/ -nx-X11/lib/lbxutil/ -nx-X11/lib/misc/ -nx-X11/lib/psres/ -nx-X11/lib/windows/ -nx-X11/lib/zlib/ -nx-X11/nls/ -nx-X11/programs/Xserver/afb/ -nx-X11/programs/Xserver/cfb/ -nx-X11/programs/Xserver/cfb16/ -nx-X11/programs/Xserver/cfb24/ -nx-X11/programs/Xserver/cfb32/ -nx-X11/programs/Xserver/hw/darwin/ -nx-X11/programs/Xserver/hw/dmx/ -nx-X11/programs/Xserver/hw/kdrive/ -nx-X11/programs/Xserver/hw/sun/ -nx-X11/programs/Xserver/hw/sunLynx/ -nx-X11/programs/Xserver/hw/vfb/ -nx-X11/programs/Xserver/hw/xfree86/ -nx-X11/programs/Xserver/hw/xnest/ -nx-X11/programs/Xserver/hw/xwin/ -nx-X11/programs/Xserver/ilbm/ -nx-X11/programs/Xserver/iplan2p2/ -nx-X11/programs/Xserver/iplan2p4/ -nx-X11/programs/Xserver/iplan2p8/ -nx-X11/programs/Xserver/lbx/ -nx-X11/programs/Xserver/mfb/ -nx-X11/programs/Xserver/miext/layer/ -nx-X11/programs/Xserver/miext/shadow/ -nx-X11/programs/Xserver/miext/rootless/ -nx-X11/programs/Xserver/GL/apple/ -nx-X11/programs/Xserver/GL/dri/ -nx-X11/programs/Xserver/GL/windows/ -nx-X11/programs/Xserver/XpConfig/ -nx-X11/programs/Xserver/Xprint/ -nx-X11/programs/Xserver/XFree86.def -nx-X11/programs/Xserver/Xnest.def -nx-X11/programs/Xserver/Xorg.def -nx-X11/programs/Xserver/Xvfb.def -nx-X11/programs/xterm/ -nx-X11/util/ diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED index 7daf5a93e..e69de29bb 100644 --- a/debian/CODE-REDUCTION_PRESERVE-INCLUDED +++ b/debian/CODE-REDUCTION_PRESERVE-INCLUDED @@ -1,2 +0,0 @@ -nx-X11/programs/Xserver/mfb/maskbits.h -nx-X11/lib/Xcursor/config-subst \ No newline at end of file diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED index 44eecd694..e69de29bb 100644 --- a/debian/CODE-REDUCTION_PRESERVE-NEEDED +++ b/debian/CODE-REDUCTION_PRESERVE-NEEDED @@ -1,27 +0,0 @@ -nx-X11/config/cf/cross.def -nx-X11/config/cf/cross.rules -nx-X11/config/cf/host.def -nx-X11/config/cf/Imake.cf -nx-X11/config/cf/Imakefile -nx-X11/config/cf/Imake.rules -nx-X11/config/cf/Imake.tmpl -nx-X11/config/cf/Library.tmpl -nx-X11/config/cf/linux.cf -nx-X11/config/cf/lnxLib.rules -nx-X11/config/cf/lnxLib.tmpl -nx-X11/config/cf/noop.rules -nx-X11/config/cf/README -nx-X11/config/cf/ServerLib.tmpl -nx-X11/config/cf/Server.tmpl -nx-X11/config/cf/site.def -nx-X11/config/cf/Threads.tmpl -nx-X11/config/cf/X11.rules -nx-X11/config/cf/X11.tmpl -nx-X11/config/cf/xf86.rules -nx-X11/config/cf/xf86site.def -nx-X11/config/cf/xf86.tmpl -nx-X11/config/cf/xfree86.cf -nx-X11/config/cf/xorg.cf -nx-X11/config/cf/xorgsite.def -nx-X11/config/cf/xorg.tmpl -nx-X11/config/cf/xorgversion.def diff --git a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED index 573ee6491..e69de29bb 100644 --- a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED +++ b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED @@ -1,652 +0,0 @@ -nx-X11/extras/Mesa/include/GL/glext.h -nx-X11/extras/Mesa/include/GL/gl.h -nx-X11/extras/Mesa/include/GL/glxext.h -nx-X11/extras/Mesa/include/GL/internal/glcore.h -nx-X11/extras/Mesa/include/GL/osmesa.h -nx-X11/extras/Mesa/include/GL/xmesa.h -nx-X11/extras/Mesa/include/GL/xmesa_xf86.h -nx-X11/extras/Mesa/src/glx/x11/compsize.c -nx-X11/extras/Mesa/src/glx/x11/indirect_size.c -nx-X11/extras/Mesa/src/glx/x11/indirect_size.h -nx-X11/extras/Mesa/src/mesa/array_cache/acache.h -nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c -nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h -nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c -nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c -nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h -nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c -nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h -nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c -nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c -nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c -nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h -nx-X11/extras/Mesa/src/mesa/glapi/glapi.c -nx-X11/extras/Mesa/src/mesa/glapi/glapi.h -nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h -nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h -nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h -nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h -nx-X11/extras/Mesa/src/mesa/glapi/glthread.c -nx-X11/extras/Mesa/src/mesa/glapi/glthread.h -nx-X11/extras/Mesa/src/mesa/main/accum.c -nx-X11/extras/Mesa/src/mesa/main/accum.h -nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c -nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h -nx-X11/extras/Mesa/src/mesa/main/api_eval.h -nx-X11/extras/Mesa/src/mesa/main/api_loopback.c -nx-X11/extras/Mesa/src/mesa/main/api_loopback.h -nx-X11/extras/Mesa/src/mesa/main/api_noop.c -nx-X11/extras/Mesa/src/mesa/main/api_noop.h -nx-X11/extras/Mesa/src/mesa/main/api_validate.c -nx-X11/extras/Mesa/src/mesa/main/api_validate.h -nx-X11/extras/Mesa/src/mesa/main/attrib.c -nx-X11/extras/Mesa/src/mesa/main/attrib.h -nx-X11/extras/Mesa/src/mesa/main/blend.c -nx-X11/extras/Mesa/src/mesa/main/blend.h -nx-X11/extras/Mesa/src/mesa/main/bufferobj.c -nx-X11/extras/Mesa/src/mesa/main/bufferobj.h -nx-X11/extras/Mesa/src/mesa/main/buffers.c -nx-X11/extras/Mesa/src/mesa/main/buffers.h -nx-X11/extras/Mesa/src/mesa/main/clip.c -nx-X11/extras/Mesa/src/mesa/main/clip.h -nx-X11/extras/Mesa/src/mesa/main/colormac.h -nx-X11/extras/Mesa/src/mesa/main/colortab.c -nx-X11/extras/Mesa/src/mesa/main/colortab.h -nx-X11/extras/Mesa/src/mesa/main/config.h -nx-X11/extras/Mesa/src/mesa/main/context.c -nx-X11/extras/Mesa/src/mesa/main/context.h -nx-X11/extras/Mesa/src/mesa/main/convolve.c -nx-X11/extras/Mesa/src/mesa/main/convolve.h -nx-X11/extras/Mesa/src/mesa/main/dd.h -nx-X11/extras/Mesa/src/mesa/main/debug.c -nx-X11/extras/Mesa/src/mesa/main/debug.h -nx-X11/extras/Mesa/src/mesa/main/depth.c -nx-X11/extras/Mesa/src/mesa/main/depth.h -nx-X11/extras/Mesa/src/mesa/main/dispatch.c -nx-X11/extras/Mesa/src/mesa/main/dlist.c -nx-X11/extras/Mesa/src/mesa/main/dlist.h -nx-X11/extras/Mesa/src/mesa/main/drawpix.c -nx-X11/extras/Mesa/src/mesa/main/drawpix.h -nx-X11/extras/Mesa/src/mesa/main/enable.c -nx-X11/extras/Mesa/src/mesa/main/enable.h -nx-X11/extras/Mesa/src/mesa/main/enums.c -nx-X11/extras/Mesa/src/mesa/main/enums.h -nx-X11/extras/Mesa/src/mesa/main/eval.c -nx-X11/extras/Mesa/src/mesa/main/eval.h -nx-X11/extras/Mesa/src/mesa/main/execmem.c -nx-X11/extras/Mesa/src/mesa/main/extensions.c -nx-X11/extras/Mesa/src/mesa/main/extensions.h -nx-X11/extras/Mesa/src/mesa/main/fbobject.c -nx-X11/extras/Mesa/src/mesa/main/fbobject.h -nx-X11/extras/Mesa/src/mesa/main/feedback.c -nx-X11/extras/Mesa/src/mesa/main/feedback.h -nx-X11/extras/Mesa/src/mesa/main/fog.c -nx-X11/extras/Mesa/src/mesa/main/fog.h -nx-X11/extras/Mesa/src/mesa/main/framebuffer.c -nx-X11/extras/Mesa/src/mesa/main/framebuffer.h -nx-X11/extras/Mesa/src/mesa/main/get.c -nx-X11/extras/Mesa/src/mesa/main/get.h -nx-X11/extras/Mesa/src/mesa/main/getstring.c -nx-X11/extras/Mesa/src/mesa/main/glheader.h -nx-X11/extras/Mesa/src/mesa/main/hash.c -nx-X11/extras/Mesa/src/mesa/main/hash.h -nx-X11/extras/Mesa/src/mesa/main/hint.c -nx-X11/extras/Mesa/src/mesa/main/hint.h -nx-X11/extras/Mesa/src/mesa/main/histogram.c -nx-X11/extras/Mesa/src/mesa/main/histogram.h -nx-X11/extras/Mesa/src/mesa/main/image.c -nx-X11/extras/Mesa/src/mesa/main/image.h -nx-X11/extras/Mesa/src/mesa/main/imports.c -nx-X11/extras/Mesa/src/mesa/main/imports.h -nx-X11/extras/Mesa/src/mesa/main/light.c -nx-X11/extras/Mesa/src/mesa/main/light.h -nx-X11/extras/Mesa/src/mesa/main/lines.c -nx-X11/extras/Mesa/src/mesa/main/lines.h -nx-X11/extras/Mesa/src/mesa/main/macros.h -nx-X11/extras/Mesa/src/mesa/main/matrix.c -nx-X11/extras/Mesa/src/mesa/main/matrix.h -nx-X11/extras/Mesa/src/mesa/main/mm.c -nx-X11/extras/Mesa/src/mesa/main/mm.h -nx-X11/extras/Mesa/src/mesa/main/mtypes.h -nx-X11/extras/Mesa/src/mesa/main/occlude.c -nx-X11/extras/Mesa/src/mesa/main/occlude.h -nx-X11/extras/Mesa/src/mesa/main/pixel.c -nx-X11/extras/Mesa/src/mesa/main/pixel.h -nx-X11/extras/Mesa/src/mesa/main/points.c -nx-X11/extras/Mesa/src/mesa/main/points.h -nx-X11/extras/Mesa/src/mesa/main/polygon.c -nx-X11/extras/Mesa/src/mesa/main/polygon.h -nx-X11/extras/Mesa/src/mesa/main/rastpos.c -nx-X11/extras/Mesa/src/mesa/main/rastpos.h -nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c -nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h -nx-X11/extras/Mesa/src/mesa/main/simple_list.h -nx-X11/extras/Mesa/src/mesa/main/state.c -nx-X11/extras/Mesa/src/mesa/main/state.h -nx-X11/extras/Mesa/src/mesa/main/stencil.c -nx-X11/extras/Mesa/src/mesa/main/stencil.h -nx-X11/extras/Mesa/src/mesa/main/texcompress.c -nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c -nx-X11/extras/Mesa/src/mesa/main/texcompress.h -nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c -nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c -nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h -nx-X11/extras/Mesa/src/mesa/main/texformat.c -nx-X11/extras/Mesa/src/mesa/main/texformat.h -nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h -nx-X11/extras/Mesa/src/mesa/main/teximage.c -nx-X11/extras/Mesa/src/mesa/main/teximage.h -nx-X11/extras/Mesa/src/mesa/main/texobj.c -nx-X11/extras/Mesa/src/mesa/main/texobj.h -nx-X11/extras/Mesa/src/mesa/main/texrender.c -nx-X11/extras/Mesa/src/mesa/main/texrender.h -nx-X11/extras/Mesa/src/mesa/main/texstate.c -nx-X11/extras/Mesa/src/mesa/main/texstate.h -nx-X11/extras/Mesa/src/mesa/main/texstore.c -nx-X11/extras/Mesa/src/mesa/main/texstore.h -nx-X11/extras/Mesa/src/mesa/main/varray.c -nx-X11/extras/Mesa/src/mesa/main/varray.h -nx-X11/extras/Mesa/src/mesa/main/version.h -nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c -nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h -nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h -nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h -nx-X11/extras/Mesa/src/mesa/math/mathmod.h -nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h -nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h -nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c -nx-X11/extras/Mesa/src/mesa/math/m_debug.h -nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c -nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h -nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c -nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h -nx-X11/extras/Mesa/src/mesa/math/m_eval.c -nx-X11/extras/Mesa/src/mesa/math/m_eval.h -nx-X11/extras/Mesa/src/mesa/math/m_matrix.c -nx-X11/extras/Mesa/src/mesa/math/m_matrix.h -nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h -nx-X11/extras/Mesa/src/mesa/math/m_translate.c -nx-X11/extras/Mesa/src/mesa/math/m_translate.h -nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h -nx-X11/extras/Mesa/src/mesa/math/m_vector.c -nx-X11/extras/Mesa/src/mesa/math/m_vector.h -nx-X11/extras/Mesa/src/mesa/math/m_xform.c -nx-X11/extras/Mesa/src/mesa/math/m_xform.h -nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h -nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c -nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h -nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c -nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h -nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c -nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h -nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h -nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c -nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h -nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c -nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h -nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c -nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h -nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c -nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h -nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h -nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c -nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h -nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h -nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c -nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h -nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c -nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h -nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c -nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h -nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h -nx-X11/extras/Mesa/src/mesa/shader/program.c -nx-X11/extras/Mesa/src/mesa/shader/program.h -nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c -nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h -nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c -nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h -nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c -nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h -nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h -nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c -nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h -nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h -nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c -nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h -nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h -nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c -nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h -nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c -nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h -nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c -nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h -nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c -nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c -nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h -nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c -nx-X11/extras/Mesa/src/mesa/swrast/s_context.c -nx-X11/extras/Mesa/src/mesa/swrast/s_context.h -nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c -nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c -nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h -nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c -nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h -nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c -nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h -nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c -nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h -nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h -nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h -nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c -nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h -nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c -nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h -nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c -nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c -nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h -nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h -nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c -nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h -nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c -nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h -nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c -nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h -nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c -nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h -nx-X11/extras/Mesa/src/mesa/swrast/s_points.c -nx-X11/extras/Mesa/src/mesa/swrast/s_points.h -nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h -nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c -nx-X11/extras/Mesa/src/mesa/swrast/s_span.c -nx-X11/extras/Mesa/src/mesa/swrast/s_span.h -nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h -nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c -nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h -nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c -nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c -nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h -nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c -nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h -nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h -nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h -nx-X11/extras/Mesa/src/mesa/swrast/swrast.h -nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c -nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h -nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c -nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h -nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c -nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h -nx-X11/extras/Mesa/src/mesa/tnl/t_context.c -nx-X11/extras/Mesa/src/mesa/tnl/t_context.h -nx-X11/extras/Mesa/src/mesa/tnl/tnl.h -nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c -nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h -nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c -nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h -nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c -nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c -nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S -nx-X11/extras/Xpm/lib/Attrib.c -nx-X11/extras/Xpm/lib/CrBufFrI.c -nx-X11/extras/Xpm/lib/CrBufFrP.c -nx-X11/extras/Xpm/lib/CrDatFrI.c -nx-X11/extras/Xpm/lib/CrDatFrP.c -nx-X11/extras/Xpm/lib/create.c -nx-X11/extras/Xpm/lib/CrIFrBuf.c -nx-X11/extras/Xpm/lib/CrIFrDat.c -nx-X11/extras/Xpm/lib/CrIFrP.c -nx-X11/extras/Xpm/lib/CrPFrBuf.c -nx-X11/extras/Xpm/lib/CrPFrDat.c -nx-X11/extras/Xpm/lib/CrPFrI.c -nx-X11/extras/Xpm/lib/data.c -nx-X11/extras/Xpm/lib/hashtab.c -nx-X11/extras/Xpm/lib/Image.c -nx-X11/extras/Xpm/lib/Info.c -nx-X11/extras/Xpm/lib/misc.c -nx-X11/extras/Xpm/lib/parse.c -nx-X11/extras/Xpm/lib/RdFToBuf.c -nx-X11/extras/Xpm/lib/RdFToDat.c -nx-X11/extras/Xpm/lib/RdFToI.c -nx-X11/extras/Xpm/lib/RdFToP.c -nx-X11/extras/Xpm/lib/rgb.c -nx-X11/extras/Xpm/lib/scan.c -nx-X11/extras/Xpm/lib/WrFFrBuf.c -nx-X11/extras/Xpm/lib/WrFFrDat.c -nx-X11/extras/Xpm/lib/WrFFrI.c -nx-X11/extras/Xpm/lib/WrFFrP.c -nx-X11/extras/Xpm/lib/xpm.h -nx-X11/extras/Xpm/lib/XpmI.h -nx-X11/include/ap_keysym.h -nx-X11/include/bitmaps/1x1 -nx-X11/include/bitmaps/2x2 -nx-X11/include/bitmaps/black -nx-X11/include/bitmaps/boxes -nx-X11/include/bitmaps/calculator -nx-X11/include/bitmaps/cntr_ptr -nx-X11/include/bitmaps/cntr_ptrmsk -nx-X11/include/bitmaps/cross_weave -nx-X11/include/bitmaps/dimple1 -nx-X11/include/bitmaps/dimple3 -nx-X11/include/bitmaps/dot -nx-X11/include/bitmaps/dropbar7 -nx-X11/include/bitmaps/dropbar8 -nx-X11/include/bitmaps/escherknot -nx-X11/include/bitmaps/flagdown -nx-X11/include/bitmaps/flagup -nx-X11/include/bitmaps/flipped_gray -nx-X11/include/bitmaps/gray -nx-X11/include/bitmaps/gray1 -nx-X11/include/bitmaps/gray3 -nx-X11/include/bitmaps/grid16 -nx-X11/include/bitmaps/grid2 -nx-X11/include/bitmaps/grid4 -nx-X11/include/bitmaps/grid8 -nx-X11/include/bitmaps/hlines2 -nx-X11/include/bitmaps/hlines3 -nx-X11/include/bitmaps/icon -nx-X11/include/bitmaps/keyboard16 -nx-X11/include/bitmaps/left_ptr -nx-X11/include/bitmaps/left_ptrmsk -nx-X11/include/bitmaps/letters -nx-X11/include/bitmaps/light_gray -nx-X11/include/bitmaps/mailempty -nx-X11/include/bitmaps/mailemptymsk -nx-X11/include/bitmaps/mailfull -nx-X11/include/bitmaps/mailfullmsk -nx-X11/include/bitmaps/mensetmanus -nx-X11/include/bitmaps/menu10 -nx-X11/include/bitmaps/menu12 -nx-X11/include/bitmaps/menu16 -nx-X11/include/bitmaps/menu6 -nx-X11/include/bitmaps/menu8 -nx-X11/include/bitmaps/noletters -nx-X11/include/bitmaps/opendot -nx-X11/include/bitmaps/opendotMask -nx-X11/include/bitmaps/plaid -nx-X11/include/bitmaps/right_ptr -nx-X11/include/bitmaps/right_ptrmsk -nx-X11/include/bitmaps/root_weave -nx-X11/include/bitmaps/scales -nx-X11/include/bitmaps/sipb -nx-X11/include/bitmaps/star -nx-X11/include/bitmaps/starMask -nx-X11/include/bitmaps/stipple -nx-X11/include/bitmaps/target -nx-X11/include/bitmaps/terminal -nx-X11/include/bitmaps/tie_fighter -nx-X11/include/bitmaps/vlines2 -nx-X11/include/bitmaps/vlines3 -nx-X11/include/bitmaps/weird_size -nx-X11/include/bitmaps/wide_weave -nx-X11/include/bitmaps/wingdogs -nx-X11/include/bitmaps/woman -nx-X11/include/bitmaps/xfd_icon -nx-X11/include/bitmaps/xlogo11 -nx-X11/include/bitmaps/xlogo16 -nx-X11/include/bitmaps/xlogo32 -nx-X11/include/bitmaps/xlogo64 -nx-X11/include/bitmaps/xsnow -nx-X11/include/DECkeysym.h -nx-X11/include/extensions/bigreqstr.h -nx-X11/include/extensions/composite.h -nx-X11/include/extensions/compositeproto.h -nx-X11/include/extensions/damageproto.h -nx-X11/include/extensions/damagewire.h -nx-X11/include/extensions/dmxext.h -nx-X11/include/extensions/dmxproto.h -nx-X11/include/extensions/dpms.h -nx-X11/include/extensions/dpmsstr.h -nx-X11/include/extensions/extutil.h -nx-X11/include/extensions/lbxbuf.h -nx-X11/include/extensions/lbxbufstr.h -nx-X11/include/extensions/lbxdeltastr.h -nx-X11/include/extensions/lbximage.h -nx-X11/include/extensions/lbxopts.h -nx-X11/include/extensions/lbxstr.h -nx-X11/include/extensions/lbxzlib.h -nx-X11/include/extensions/MITMisc.h -nx-X11/include/extensions/mitmiscstr.h -nx-X11/include/extensions/multibuf.h -nx-X11/include/extensions/multibufst.h -nx-X11/include/extensions/panoramiXext.h -nx-X11/include/extensions/panoramiXproto.h -nx-X11/include/extensions/Print.h -nx-X11/include/extensions/Printstr.h -nx-X11/include/extensions/randr.h -nx-X11/include/extensions/randrproto.h -nx-X11/include/extensions/record.h -nx-X11/include/extensions/recordstr.h -nx-X11/include/extensions/render.h -nx-X11/include/extensions/renderproto.h -nx-X11/include/extensions/security.h -nx-X11/include/extensions/securstr.h -nx-X11/include/extensions/shape.h -nx-X11/include/extensions/shapestr.h -nx-X11/include/extensions/shmstr.h -nx-X11/include/extensions/sync.h -nx-X11/include/extensions/syncstr.h -nx-X11/include/extensions/vldXvMC.h -nx-X11/include/extensions/Xag.h -nx-X11/include/extensions/Xagsrv.h -nx-X11/include/extensions/Xagstr.h -nx-X11/include/extensions/xcmiscstr.h -nx-X11/include/extensions/Xcup.h -nx-X11/include/extensions/Xcupstr.h -nx-X11/include/extensions/Xdbe.h -nx-X11/include/extensions/Xdbeproto.h -nx-X11/include/extensions/Xevie.h -nx-X11/include/extensions/Xeviestr.h -nx-X11/include/extensions/XEVI.h -nx-X11/include/extensions/XEVIstr.h -nx-X11/include/extensions/Xext.h -nx-X11/include/extensions/xf86bigfont.h -nx-X11/include/extensions/xf86bigfstr.h -nx-X11/include/extensions/xf86dga1.h -nx-X11/include/extensions/xf86dga1str.h -nx-X11/include/extensions/xf86dga.h -nx-X11/include/extensions/xf86dgastr.h -nx-X11/include/extensions/xf86misc.h -nx-X11/include/extensions/xf86mscstr.h -nx-X11/include/extensions/xf86vmode.h -nx-X11/include/extensions/xf86vmstr.h -nx-X11/include/extensions/xfixesproto.h -nx-X11/include/extensions/xfixeswire.h -nx-X11/include/extensions/XI.h -nx-X11/include/extensions/Xinerama.h -nx-X11/include/extensions/XInput.h -nx-X11/include/extensions/XIproto.h -nx-X11/include/extensions/XKBgeom.h -nx-X11/include/extensions/XKB.h -nx-X11/include/extensions/XKBproto.h -nx-X11/include/extensions/XKBsrv.h -nx-X11/include/extensions/XKBstr.h -nx-X11/include/extensions/XLbx.h -nx-X11/include/extensions/XRes.h -nx-X11/include/extensions/XResproto.h -nx-X11/include/extensions/XShm.h -nx-X11/include/extensions/xtestext1.h -nx-X11/include/extensions/XTest.h -nx-X11/include/extensions/xteststr.h -nx-X11/include/extensions/xtrapbits.h -nx-X11/include/extensions/xtrapddmi.h -nx-X11/include/extensions/xtrapdi.h -nx-X11/include/extensions/xtrapemacros.h -nx-X11/include/extensions/xtraplib.h -nx-X11/include/extensions/xtraplibp.h -nx-X11/include/extensions/xtrapproto.h -nx-X11/include/extensions/Xv.h -nx-X11/include/extensions/Xvlib.h -nx-X11/include/extensions/XvMC.h -nx-X11/include/extensions/XvMClib.h -nx-X11/include/extensions/XvMCproto.h -nx-X11/include/extensions/Xvproto.h -nx-X11/include/fonts/font.h -nx-X11/include/fonts/fontstruct.h -nx-X11/include/fonts/FS.h -nx-X11/include/fonts/fsmasks.h -nx-X11/include/fonts/FSproto.h -nx-X11/include/GL/glu.h -nx-X11/include/GL/glx.h -nx-X11/include/GL/glxint.h -nx-X11/include/GL/glxmd.h -nx-X11/include/GL/glxproto.h -nx-X11/include/GL/glxtokens.h -nx-X11/include/HPkeysym.h -nx-X11/include/keysymdef.h -nx-X11/include/keysym.h -nx-X11/include/Sunkeysym.h -nx-X11/include/Xalloca.h -nx-X11/include/Xarch.h -nx-X11/include/Xatom.h -nx-X11/include/Xdefs.h -nx-X11/include/XF86keysym.h -nx-X11/include/Xfuncproto.h -nx-X11/include/Xfuncs.h -nx-X11/include/X.h -nx-X11/include/Xmd.h -nx-X11/include/Xosdefs.h -nx-X11/include/Xos.h -nx-X11/include/Xos_r.h -nx-X11/include/Xproto.h -nx-X11/include/Xprotostr.h -nx-X11/include/Xthreads.h -nx-X11/include/XWDFile.h -nx-X11/lib/font/bitmap/bdfint.h -nx-X11/lib/font/bitmap/pcf.h -nx-X11/lib/font/include/bitmap.h -nx-X11/lib/font/include/bufio.h -nx-X11/lib/font/include/fntfil.h -nx-X11/lib/font/include/fntfilio.h -nx-X11/lib/font/include/fntfilst.h -nx-X11/lib/font/include/fontencc.h -nx-X11/lib/font/include/fontmisc.h -nx-X11/lib/font/include/fontmod.h -nx-X11/lib/font/include/fontshow.h -nx-X11/lib/font/include/fontutil.h -nx-X11/lib/font/include/fontxlfd.h -nx-X11/lib/misc/strlcat.c -nx-X11/lib/misc/strlcpy.c -nx-X11/lib/oldX/X10.h -nx-X11/lib/X11/cursorfont.h -nx-X11/lib/X11/ImUtil.h -nx-X11/lib/X11/Xcms.h -nx-X11/lib/X11/XKBAlloc.c -nx-X11/lib/X11/XKBGAlloc.c -nx-X11/lib/X11/XKBlib.h -nx-X11/lib/X11/XKBMAlloc.c -nx-X11/lib/X11/XKBMisc.c -nx-X11/lib/X11/XlibConf.h -nx-X11/lib/X11/Xlib.h -nx-X11/lib/X11/Xlibint.h -nx-X11/lib/X11/Xlocale.h -nx-X11/lib/X11/Xregion.h -nx-X11/lib/X11/Xresource.h -nx-X11/lib/X11/Xutil.h -nx-X11/lib/Xau/AuDispose.c -nx-X11/lib/Xau/AuFileName.c -nx-X11/lib/Xau/AuGetBest.c -nx-X11/lib/Xau/AuRead.c -nx-X11/lib/Xau/Xauth.h -nx-X11/lib/Xcomposite/Xcomposite.h -nx-X11/lib/Xdamage/Xdamage.h -nx-X11/lib/Xdmcp/Wrap.c -nx-X11/lib/Xdmcp/Wrap.h -nx-X11/lib/Xdmcp/Wraphelp.c -nx-X11/lib/Xdmcp/Xdmcp.h -nx-X11/lib/Xfixes/Xfixes.h -nx-X11/lib/xkbfile/maprules.c -nx-X11/lib/xkbfile/XKBbells.h -nx-X11/lib/xkbfile/xkbconfig.c -nx-X11/lib/xkbfile/XKBconfig.h -nx-X11/lib/xkbfile/xkberrs.c -nx-X11/lib/xkbfile/XKBfile.h -nx-X11/lib/xkbfile/xkbmisc.c -nx-X11/lib/xkbfile/xkbout.c -nx-X11/lib/xkbfile/XKBrules.h -nx-X11/lib/xkbfile/xkbtext.c -nx-X11/lib/xkbfile/XKMformat.h -nx-X11/lib/xkbfile/XKM.h -nx-X11/lib/xkbfile/xkmread.c -nx-X11/lib/Xrandr/Xrandr.h -nx-X11/lib/Xrender/Xrender.h -nx-X11/lib/xtrans/transport.c -nx-X11/lib/xtrans/Xtrans.c -nx-X11/lib/xtrans/Xtransdnet.c -nx-X11/lib/xtrans/Xtrans.h -nx-X11/lib/xtrans/Xtransint.h -nx-X11/lib/xtrans/Xtranslcl.c -nx-X11/lib/xtrans/Xtransos2.c -nx-X11/lib/xtrans/Xtranssock.c -nx-X11/lib/xtrans/Xtranstli.c -nx-X11/lib/xtrans/Xtransutil.c -nx-X11/programs/Xserver/hw/xfree86/common/compiler.h -nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h -nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h -nx-X11/programs/Xserver/hw/xfree86/xf86Version.h -nx-X11/programs/Xserver/include/misc.h -nx-X11/programs/Xserver/include/os.h -nx-X11/programs/Xserver/mi/miinitext.c -nx-X11/programs/Xserver/os/osdep.h -nx-X11/programs/Xserver/Xext/extmod/modinit.h -nx-X11/programs/Xserver/Xi/stubs.c -- cgit v1.2.3 From 42f3b1442a99ede7814137f1943b389fbf6653fc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:24:31 +0100 Subject: Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch, 018_nx-X11_update-libtool-ltmain-script.full.patch, 019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files that are not used at build time. --- ...nx-X11_update-autotools-helper-files.full.patch | 10531 -------------- ..._nx-X11_update-libtool-ltmain-script.full.patch | 13985 ------------------- ...expat-build-against-system-libxmltok.full.patch | 43 - debian/patches/series | 3 - 4 files changed, 24562 deletions(-) delete mode 100644 debian/patches/017_nx-X11_update-autotools-helper-files.full.patch delete mode 100644 debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch delete mode 100644 debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch (limited to 'debian') diff --git a/debian/patches/017_nx-X11_update-autotools-helper-files.full.patch b/debian/patches/017_nx-X11_update-autotools-helper-files.full.patch deleted file mode 100644 index 4d7d95abf..000000000 --- a/debian/patches/017_nx-X11_update-autotools-helper-files.full.patch +++ /dev/null @@ -1,10531 +0,0 @@ -Description: Update outdated/ancient autotools files - Replace autotools files for at these locations: - - nx-X11/extras/expat/conftools - - nx-X11/extras/fontconfig - - nx-X11/extras/freetype2/builds/unix - - nx-X11/programs/xterm - - nx-X11/lib/Xft -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/extras/expat/conftools/config.guess -+++ b/nx-X11/extras/expat/conftools/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2002-03-20' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,28 +18,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### -- --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -58,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -71,11 +70,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -93,30 +92,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -147,9 +158,11 @@ - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -158,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -172,159 +185,128 @@ - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- 2-1307) -- UNAME_MACHINE="alphaev68" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; --######################### --# Apache changes --# --# *:OS/390:*:*) --# echo i370-ibm-openedition --# exit 0 ;; -- *:OS390:*:* | *:OS/390:*:*) -- echo s390-ibm-os390 -- exit 0 ;; -- *:OS400:*:* | *:OS/400:*:*) -- echo as400-ibm-os400 -- exit 0 ;; -- *:OS/2:*:*) -- echo "i386-pc-os2_emx" -- exit 0;; --# --# end Apache changes --######################### -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -332,25 +314,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7; exit ;; -+ esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -359,10 +367,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -374,10 +382,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -388,37 +396,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -442,27 +453,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -478,29 +495,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -508,7 +525,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -523,16 +540,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -545,28 +565,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -622,17 +642,37 @@ - exit (0); - } - EOF -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -660,174 +700,248 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:3*) -- echo i386-pc-interix3 -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -- exit 0 ;; -+ echo i586-pc-interix -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips -- #undef mipsel -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- rm -f $dummy.c -- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -835,82 +949,40 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- rm -f $dummy.c -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -918,7 +990,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -926,99 +1018,113 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit 0 ;; -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) -+ exit ;; -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1026,61 +1132,94 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1088,22 +1227,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1114,36 +1256,50 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -- i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -- i*86:atheos:*:*) -- echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1175,7 +1331,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1264,12 +1420,12 @@ - } - EOF - --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1278,22 +1434,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1304,7 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- a/nx-X11/extras/expat/conftools/config.sub -+++ b/nx-X11/extras/expat/conftools/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2002-03-07' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,27 +22,26 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -75,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -88,11 +89,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +105,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -123,28 +124,13 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; --######################## --# changes for Apache --# -- tpf | os390 | vmcms) -- os=-$maybe_os -- basic_machine=s390; -- ;; -- os400) -- os=-$maybe_os -- basic_machine=as400; -- ;; -- mvs) -- os=-mvs -- basic_machine=i370; -- ;; --# --# end Apache changes --######################## - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -167,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -192,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -208,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -251,41 +248,71 @@ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ -- | d10v | d30v | dsp16xx \ -- | fr30 \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | m32r | m68000 | m68k | m88k | mcore \ -- | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ -- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ -- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ -- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ -- | mipsisa32 | mipsisa64 \ -+ | ip2k | iq2000 \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic80 | tron \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -304,40 +331,70 @@ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c54x-* \ -- | clipper-* | cydra-* \ -- | d10v-* | d30v-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ -- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ -- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64octeon-* | mips64octeonel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ -+ | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ -+ | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -355,6 +412,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -369,6 +429,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -392,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -400,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -428,12 +514,27 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -456,6 +557,14 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -606,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -617,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -634,10 +758,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -650,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -725,9 +848,12 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson -@@ -745,55 +871,75 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -+ pentium4) -+ basic_machine=i786-pc -+ ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown -- ;; -+ ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -- ;; -+ ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -@@ -804,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -824,15 +974,20 @@ - basic_machine=a29k-amd - os=-udi - ;; --######################## --# changes for Apache --# -- as400*) -- basic_machine=as400-ibm -+ sb1) -+ basic_machine=mipsisa64sb1-unknown -+ ;; -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux - ;; --# --# end Apache changes --######################## - sequent) - basic_machine=i386-sequent - ;; -@@ -840,6 +995,12 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -898,7 +1059,7 @@ - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; -- sv1) -+ sv1) - basic_machine=sv1-cray - os=-unicos - ;; -@@ -906,10 +1067,6 @@ - basic_machine=i386-sequent - os=-dynix - ;; -- t3d) -- basic_machine=alpha-cray -- os=-unicos -- ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos -@@ -922,6 +1079,23 @@ - basic_machine=tic54x-unknown - os=-coff - ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff -+ ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff -+ ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -935,6 +1109,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -956,8 +1134,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -978,11 +1156,11 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) -@@ -993,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1012,6 +1194,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1028,16 +1213,13 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh3eb | sh4eb) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -1052,10 +1234,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -1085,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1100,37 +1281,35 @@ - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; --######################## --# changes for Apache --# -- -os2_emx | -tpf* | -os390* | -vmcms* | -os400* ) -- ;; --# --# end Apache changes --######################## - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -- | -morphos* | -superux* | -rtmk* | -rtmk-nova*) -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1142,16 +1321,21 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1164,6 +1348,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1185,6 +1372,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1195,7 +1385,7 @@ - os=-rtmk-nova - ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1207,6 +1397,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1234,9 +1427,23 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint -+ ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1259,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1268,11 +1481,14 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1293,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1311,33 +1530,15 @@ - *-be) - os=-beos - ;; --######################## --# changes for Apache --# --# *-ibm) --# os=-aix --# ;; --# -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) -- case $basic_machine in -- s390*) -- os=-os390; -- ;; -- i370*) -- os=-mvs; -- ;; -- as400*) -- os=-os400; -- ;; -- *) -- os=-aix -- ;; -- esac -- ;; --# --# end Apache changes --######################## -- -+ os=-aix -+ ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1389,19 +1590,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1440,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1470,10 +1671,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -@@ -1497,7 +1704,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) ---- a/nx-X11/extras/fontconfig/config.guess -+++ b/nx-X11/extras/fontconfig/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2005-03-24' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,23 +18,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -53,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +70,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +108,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -123,7 +127,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -158,6 +162,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -166,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -196,55 +201,23 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amd64:OpenBSD:*:*) -- echo x86_64-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- cats:OpenBSD:*:*) -- echo arm-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- luna88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mips64-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) -@@ -297,40 +270,43 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe -- exit 0 ;; -+ exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 -- exit 0 ;; -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -338,32 +314,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 -- exit 0 ;; -+ exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -372,10 +367,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -387,10 +382,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -401,40 +396,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -458,32 +453,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -499,29 +495,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -529,7 +525,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -544,15 +540,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -565,28 +565,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -648,9 +648,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -658,11 +668,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -690,219 +700,248 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -- amd64:CYGWIN*:*:*) -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin -- exit 0 ;; -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -- exit 0 ;; -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu -- exit 0 ;; -+ exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu -- exit 0 ;; -+ exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -- ;; -- mips64:Linux:*:*) -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -910,87 +949,40 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -998,27 +990,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:syllable:*:*) -+ exit ;; -+ i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1026,15 +1018,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -+ exit ;; - M68*:*:R3V[5678]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1126,69 +1132,94 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -- *86) UNAME_PROCESSOR=i686 ;; -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1196,25 +1227,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -+ exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1225,41 +1256,50 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in -- A*) echo alpha-dec-vms && exit 0 ;; -- I*) echo ia64-dec-vms && exit 0 ;; -- V*) echo vax-dec-vms && exit 0 ;; -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix -- exit 0 ;; -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1291,7 +1331,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1380,11 +1420,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1393,22 +1434,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1419,9 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- a/nx-X11/extras/fontconfig/config.sub -+++ b/nx-X11/extras/fontconfig/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2005-02-10' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,22 +22,26 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -70,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +89,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +105,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,8 +124,10 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -145,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -170,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -186,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -230,22 +249,28 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -@@ -254,30 +279,40 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -297,28 +332,32 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -@@ -327,26 +366,35 @@ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ -+ | mt-* \ - | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ - | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -410,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -418,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -450,8 +518,8 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ cr16) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) -@@ -489,6 +557,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -643,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -654,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -683,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -758,9 +848,8 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; - os400) - basic_machine=powerpc-ibm -@@ -782,6 +871,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -791,6 +888,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -847,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -873,6 +980,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -884,6 +995,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -973,6 +1087,15 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -1048,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1086,13 +1213,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1139,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1159,26 +1286,30 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1196,7 +1327,7 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) -@@ -1308,6 +1439,11 @@ - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1330,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1339,9 +1481,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1367,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1385,6 +1530,9 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -@@ -1493,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1556,7 +1704,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) ---- a/nx-X11/extras/freetype2/builds/unix/config.guess -+++ b/nx-X11/extras/freetype2/builds/unix/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2004-03-12' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,23 +18,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -53,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +70,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +108,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -123,7 +127,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -158,6 +162,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -166,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -196,64 +201,23 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amd64:OpenBSD:*:*) -- echo x86_64-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- cats:OpenBSD:*:*) -- echo arm-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pegasos:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) -@@ -306,40 +270,43 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -- Alpha*:OpenVMS:*:*) -- echo alpha-hp-vms -- exit 0 ;; -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 -- exit 0 ;; -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -347,32 +314,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -381,10 +367,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -396,10 +382,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -410,40 +396,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -467,32 +453,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -508,29 +495,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -538,7 +525,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -553,15 +540,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -574,28 +565,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -657,9 +648,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -667,11 +668,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -699,224 +700,248 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using -- # FreeBSD's kernel, but not the complete OS. -- case ${LIBC} in gnu) kernel_only='k' ;; esac -- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -- exit 0 ;; -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu -- exit 0 ;; -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -- ;; -- mips64:Linux:*:*) -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -924,87 +949,40 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -1012,27 +990,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:syllable:*:*) -+ exit ;; -+ i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1040,15 +1018,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1140,68 +1132,94 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1209,22 +1227,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1235,31 +1256,50 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1291,7 +1331,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1380,11 +1420,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1393,22 +1434,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1419,7 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- a/nx-X11/extras/freetype2/builds/unix/config.sub -+++ b/nx-X11/extras/freetype2/builds/unix/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2004-03-12' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,22 +22,26 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -70,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +89,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +105,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,8 +124,10 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -145,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -170,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -186,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -230,22 +249,28 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | mcore \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -@@ -254,30 +279,40 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -297,28 +332,32 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | cydra-* \ -+ | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -@@ -326,26 +365,36 @@ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ - | msp430-* \ -- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ - | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -409,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -417,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -445,13 +514,20 @@ - basic_machine=j90-cray - os=-unicos - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -@@ -481,6 +557,14 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -631,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -642,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -659,10 +758,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -675,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -743,10 +841,6 @@ - np1) - basic_machine=np1-gould - ;; -- nv1) -- basic_machine=nv1-cray -- os=-unicosmp -- ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -754,9 +848,8 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; - os400) - basic_machine=powerpc-ibm -@@ -778,6 +871,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -787,6 +888,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -843,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -869,6 +980,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -880,6 +995,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -969,6 +1087,15 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -1029,6 +1156,10 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1040,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1059,6 +1194,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1075,13 +1213,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1128,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1148,26 +1286,30 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1185,7 +1327,7 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) -@@ -1294,6 +1436,14 @@ - -kaos*) - os=-kaos - ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1316,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1325,9 +1481,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1353,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1371,9 +1530,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1476,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1539,7 +1704,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) ---- a/nx-X11/programs/xterm/config.guess -+++ b/nx-X11/programs/xterm/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2005-05-27' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -26,16 +27,16 @@ - # the same distribution terms that you use for the rest of that program. - - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -55,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -106,7 +108,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -125,7 +127,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -160,6 +162,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -168,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -199,50 +202,18 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -- amd64:OpenBSD:*:*) -- echo x86_64-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- cats:OpenBSD:*:*) -- echo arm-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- luna88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- sgi:OpenBSD:*:*) -- echo mips64-unknown-openbsd${UNAME_RELEASE} -- exit ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -@@ -354,14 +325,33 @@ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -562,7 +552,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -658,8 +648,7 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -+ eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -@@ -671,7 +660,7 @@ - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -800,12 +789,19 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) -@@ -815,12 +811,24 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -830,7 +838,7 @@ - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; -- amd64:CYGWIN*:*:*) -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) -@@ -850,7 +858,31 @@ - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -@@ -862,6 +894,17 @@ - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -@@ -871,63 +914,33 @@ - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu - exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu - exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level -@@ -937,8 +950,11 @@ - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -@@ -952,68 +968,15 @@ - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -1042,7 +1005,7 @@ - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1086,8 +1049,11 @@ - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -@@ -1125,6 +1091,16 @@ - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1137,7 +1113,7 @@ - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1200,6 +1176,9 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1209,6 +1188,15 @@ - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -@@ -1218,7 +1206,16 @@ - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -- *86) UNAME_PROCESSOR=i686 ;; -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -@@ -1297,6 +1294,12 @@ - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1457,9 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- a/nx-X11/programs/xterm/config.sub -+++ b/nx-X11/programs/xterm/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2005-06-02' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -31,13 +32,16 @@ - - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -71,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -119,8 +124,10 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -146,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -171,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -187,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -231,23 +249,28 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -@@ -256,35 +279,40 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -- | ms1 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -- basic_machine=$basic_machine-unknown -- ;; -- m32c) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -304,28 +332,32 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -+ | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -@@ -334,30 +366,35 @@ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ -- | ms1-* \ -+ | mt-* \ - | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ - | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) - ;; -- m32c-*) -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -421,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -429,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -461,8 +518,8 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ cr16) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) -@@ -500,6 +557,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -654,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -665,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -694,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -769,9 +848,8 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; - os400) - basic_machine=powerpc-ibm -@@ -793,6 +871,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -802,6 +888,12 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -858,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -884,6 +980,10 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -895,6 +995,9 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -984,6 +1087,15 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -1059,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1097,13 +1213,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1150,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1170,26 +1286,30 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1207,7 +1327,7 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) -@@ -1319,6 +1439,11 @@ - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1341,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1350,9 +1481,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1378,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1396,6 +1530,9 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -@@ -1504,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) ---- a/nx-X11/lib/Xft/config.guess -+++ b/nx-X11/lib/Xft/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2003-02-22' -+timestamp='2009-12-30' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,23 +18,25 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -53,8 +56,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +70,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,8 +108,9 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; - dummy=$tmp/dummy ; - tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -@@ -122,7 +127,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -157,6 +162,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -165,7 +171,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -195,50 +201,32 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -276,39 +264,49 @@ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -316,29 +314,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -347,10 +367,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -362,10 +382,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -376,37 +396,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -430,32 +453,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -471,29 +495,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -501,7 +525,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -516,15 +540,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -537,28 +565,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -620,9 +648,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -630,11 +668,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -662,205 +700,248 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:3*) -- echo i586-pc-interix3 -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -- ;; -- mips64:Linux:*:*) -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; -+ ia64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m68*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -868,81 +949,40 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -950,24 +990,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -975,15 +1018,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1075,68 +1132,94 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1144,22 +1227,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1170,25 +1256,50 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1220,7 +1331,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1309,11 +1420,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1322,22 +1434,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1348,7 +1460,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- a/nx-X11/lib/Xft/config.sub -+++ b/nx-X11/lib/Xft/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+# Free Software Foundation, Inc. - --timestamp='2003-02-22' -+timestamp='2010-01-22' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,22 +22,26 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+ - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -70,8 +75,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -+Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +89,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -99,7 +105,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -118,7 +124,10 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -144,10 +153,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -169,6 +181,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -185,6 +201,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -228,53 +248,71 @@ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -- | clipper \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ -+ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | ip2k \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | ip2k | iq2000 \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic80 | tron \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ -+ | ubicom32 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -+ m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -294,54 +332,69 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | cydra-* \ -+ | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | ip2k-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ - | msp430-* \ -- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile-* | tilegx-* \ - | tron-* \ -+ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -359,6 +412,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -373,6 +429,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -396,6 +458,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -404,10 +470,26 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -432,12 +514,27 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -460,6 +557,14 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -610,6 +715,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -621,10 +734,17 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze) -+ basic_machine=microblaze-xilinx -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -638,10 +758,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -654,6 +770,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -722,10 +841,6 @@ - np1) - basic_machine=np1-gould - ;; -- nv1) -- basic_machine=nv1-cray -- os=-unicosmp -- ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -733,9 +848,12 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson -@@ -753,6 +871,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -762,24 +888,36 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -+ pentium4) -+ basic_machine=i786-pc -+ ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; -@@ -812,6 +950,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -838,6 +980,14 @@ - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -845,6 +995,12 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -919,10 +1075,6 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic4x | c4x*) -- basic_machine=tic4x-unknown -- os=-coff -- ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff -@@ -935,6 +1087,15 @@ - basic_machine=tic6x-unknown - os=-coff - ;; -+ # This must be matched before tile*. -+ tilegx*) -+ basic_machine=tilegx-unknown -+ os=-linux-gnu -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -948,6 +1109,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -991,6 +1156,10 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1002,6 +1171,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1021,6 +1194,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1037,13 +1213,10 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1090,6 +1263,9 @@ - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1110,25 +1286,30 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1146,12 +1327,15 @@ - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1164,6 +1348,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1185,6 +1372,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1207,6 +1397,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1243,6 +1436,14 @@ - -kaos*) - os=-kaos - ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1265,6 +1466,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1274,6 +1481,9 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1299,6 +1509,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1317,9 +1530,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1422,7 +1641,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1452,9 +1671,15 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -+ -tpf*) -+ vendor=ibm -+ ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; -@@ -1479,7 +1704,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch b/debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch deleted file mode 100644 index 156712266..000000000 --- a/debian/patches/018_nx-X11_update-libtool-ltmain-script.full.patch +++ /dev/null @@ -1,13985 +0,0 @@ -Description: Update outdated libtool file - Replace libtool file at this location: - - nx-X11/extras/expat/conftools/ltmain.sh -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/extras/expat/conftools/ltmain.sh -+++ b/nx-X11/extras/expat/conftools/ltmain.sh -@@ -1,4631 +1,9435 @@ --# ltmain.sh - Provide generalized library-building support services. --# NOTE: Changing this file will not affect anything until you rerun configure. --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This program is free software; you can redistribute it and/or modify -+ -+# libtool (GNU libtool) 2.4 -+# Written by Gordon Matzigkeit , 1996 -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -+# This is free software; see the source for copying conditions. There is NO -+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+# GNU Libtool is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, but -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool is distributed in the hope that it will be useful, but - # WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, -+# or obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+# Usage: $progname [OPTION]... [MODE-ARG]... - # --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# Check that we have a working $echo. --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : -+# Provide generalized library-building support services. -+# -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --no-quiet, --no-silent -+# print informational messages (default) -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print more informational messages than default -+# --no-verbose don't print the extra informational messages -+# --version print version information -+# -h, --help, --help-all print short, long, or detailed help message -+# -+# MODE must be one of the following: -+# -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory -+# -+# MODE-ARGS vary depending on the MODE. When passed as first option, -+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -+# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -+# -+# When reporting a bug, please describe a test case to reproduce it and -+# include the following information: -+# -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.4 Debian-2.4-2 -+# automake: $automake_version -+# autoconf: $autoconf_version -+# -+# Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . -+ -+PROGRAM=libtool -+PACKAGE=libtool -+VERSION="2.4 Debian-2.4-2" -+TIMESTAMP="" -+package_revision=1.3293 -+ -+# Be Bourne compatible -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST - else -- # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} -+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac - fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh - --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 --fi -+# Make sure IFS has a sensible default -+lt_nl=' -+' -+IFS=" $lt_nl" -+ -+dirname="s,/[^/]*$,," -+basename="s,^.*/,," -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation - --# Global variables. --mode=$default_mode --nonopt= --prev= --prevopt= --run= --show="$echo" --show_help= --execute_dlfiles= --lo2o="s/\\.lo\$/.${objext}/" --o2lo="s/\\.${objext}\$/.lo/" - --# Parse our command line options once, thoroughly. --while test $# -gt 0 --do -- arg="$1" -- shift -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation - -- case $arg in -- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; -- *) optarg= ;; -- esac - -- # If the previous option needs an argument, assign it. -- if test -n "$prev"; then -- case $prev in -- execute_dlfiles) -- execute_dlfiles="$execute_dlfiles $arg" -- ;; -- *) -- eval "$prev=\$arg" -- ;; -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -+} # func_stripname may be replaced by extended shell implementation - -- prev= -- prevopt= -- continue -- fi - -- # Have we seen a non-optional argument yet? -- case $arg in -- --help) -- show_help=yes -+# These SED scripts presuppose an absolute path with a trailing slash. -+pathcar='s,^/\([^/]*\).*$,\1,' -+pathcdr='s,^/[^/]*,,' -+removedotparts=':dotsl -+ s@/\./@/@g -+ t dotsl -+ s,/\.$,/,' -+collapseslashes='s@/\{1,\}@/@g' -+finalslash='s,/*$,/,' -+ -+# func_normal_abspath PATH -+# Remove doubled-up and trailing slashes, "." path components, -+# and cancel out any ".." path components in PATH after making -+# it an absolute path. -+# value returned in "$func_normal_abspath_result" -+func_normal_abspath () -+{ -+ # Start from root dir and reassemble the path. -+ func_normal_abspath_result= -+ func_normal_abspath_tpath=$1 -+ func_normal_abspath_altnamespace= -+ case $func_normal_abspath_tpath in -+ "") -+ # Empty path, that just means $cwd. -+ func_stripname '' '/' "`pwd`" -+ func_normal_abspath_result=$func_stripname_result -+ return - ;; -- -- --version) -- echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -- exit 0 -+ # The next three entries are used to spot a run of precisely -+ # two leading slashes without using negated character classes; -+ # we take advantage of case's first-match behaviour. -+ ///*) -+ # Unusual form of absolute path, do nothing. - ;; -- -- --config) -- sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -- exit 0 -+ //*) -+ # Not necessarily an ordinary path; POSIX reserves leading '//' -+ # and for example Cygwin uses it to access remote file shares -+ # over CIFS/SMB, so we conserve a leading double slash if found. -+ func_normal_abspath_altnamespace=/ - ;; -- -- --debug) -- echo "$progname: enabling shell trace mode" -- set -x -+ /*) -+ # Absolute path, do nothing. - ;; -- -- --dry-run | -n) -- run=: -+ *) -+ # Relative path, prepend $cwd. -+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; -- -- --features) -- echo "host: $host" -- if test "$build_libtool_libs" = yes; then -- echo "enable shared libraries" -- else -- echo "disable shared libraries" -- fi -- if test "$build_old_libs" = yes; then -- echo "enable static libraries" -- else -- echo "disable static libraries" -+ esac -+ # Cancel out all the simple stuff to save iterations. We also want -+ # the path to end with a slash for ease of parsing, so make sure -+ # there is one (and only one) here. -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -+ while :; do -+ # Processed it all yet? -+ if test "$func_normal_abspath_tpath" = / ; then -+ # If we ascended to the root using ".." the result may be empty now. -+ if test -z "$func_normal_abspath_result" ; then -+ func_normal_abspath_result=/ -+ fi -+ break - fi -- exit 0 -- ;; -+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcar"` -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcdr"` -+ # Figure out what to do with it -+ case $func_normal_abspath_tcomponent in -+ "") -+ # Trailing empty path component, ignore it. -+ ;; -+ ..) -+ # Parent dir; strip last assembled component from result. -+ func_dirname "$func_normal_abspath_result" -+ func_normal_abspath_result=$func_dirname_result -+ ;; -+ *) -+ # Actual path component, append it. -+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -+ ;; -+ esac -+ done -+ # Restore leading double-slash if one was found on entry. -+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -+} - -- --finish) mode="finish" ;; -+# func_relative_path SRCDIR DSTDIR -+# generates a relative path from SRCDIR to DSTDIR, with a trailing -+# slash if non-empty, suitable for immediately appending a filename -+# without needing to append a separator. -+# value returned in "$func_relative_path_result" -+func_relative_path () -+{ -+ func_relative_path_result= -+ func_normal_abspath "$1" -+ func_relative_path_tlibdir=$func_normal_abspath_result -+ func_normal_abspath "$2" -+ func_relative_path_tbindir=$func_normal_abspath_result -+ -+ # Ascend the tree starting from libdir -+ while :; do -+ # check if we have found a prefix of bindir -+ case $func_relative_path_tbindir in -+ $func_relative_path_tlibdir) -+ # found an exact match -+ func_relative_path_tcancelled= -+ break -+ ;; -+ $func_relative_path_tlibdir*) -+ # found a matching prefix -+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -+ func_relative_path_tcancelled=$func_stripname_result -+ if test -z "$func_relative_path_result"; then -+ func_relative_path_result=. -+ fi -+ break -+ ;; -+ *) -+ func_dirname $func_relative_path_tlibdir -+ func_relative_path_tlibdir=${func_dirname_result} -+ if test "x$func_relative_path_tlibdir" = x ; then -+ # Have to descend all the way to the root! -+ func_relative_path_result=../$func_relative_path_result -+ func_relative_path_tcancelled=$func_relative_path_tbindir -+ break -+ fi -+ func_relative_path_result=../$func_relative_path_result -+ ;; -+ esac -+ done - -- --mode) prevopt="--mode" prev=mode ;; -- --mode=*) mode="$optarg" ;; -+ # Now calculate path; take care to avoid doubling-up slashes. -+ func_stripname '' '/' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ func_stripname '/' '/' "$func_relative_path_tcancelled" -+ if test "x$func_stripname_result" != x ; then -+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -+ fi - -- --quiet | --silent) -- show=: -- ;; -+ # Normalisation. If bindir is libdir, return empty string, -+ # else relative path ending with a slash; either way, target -+ # file name can be directly appended. -+ if test ! -z "$func_relative_path_result"; then -+ func_stripname './' '' "$func_relative_path_result/" -+ func_relative_path_result=$func_stripname_result -+ fi -+} - -- -dlopen) -- prevopt="-dlopen" -- prev=execute_dlfiles -- ;; -+# The name of this program: -+func_dirname_and_basename "$progpath" -+progname=$func_basename_result -+ -+# Make sure we have an absolute path for reexecution: -+case $progpath in -+ [\\/]*|[A-Za-z]:\\*) ;; -+ *[\\/]*) -+ progdir=$func_dirname_result -+ progdir=`cd "$progdir" && pwd` -+ progpath="$progdir/$progname" -+ ;; -+ *) -+ save_IFS="$IFS" -+ IFS=: -+ for progdir in $PATH; do -+ IFS="$save_IFS" -+ test -x "$progdir/$progname" && break -+ done -+ IFS="$save_IFS" -+ test -n "$progdir" || progdir=`pwd` -+ progpath="$progdir/$progname" -+ ;; -+esac - -- -*) -- $echo "$modename: unrecognized option \`$arg'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- ;; -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed="${SED}"' -e 1s/^X//' -+sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -- *) -- nonopt="$arg" -- break -- ;; -- esac --done -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\(["`\\]\)/\\\1/g' - --if test -n "$prevopt"; then -- $echo "$modename: option \`$prevopt' requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit 1 --fi -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ -+# Re-`\' parameter expansions in output of double_quote_subst that were -+# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -+# in input to double_quote_subst, that '$' was protected from expansion. -+# Since each input `\' is now two `\'s, look for any number of runs of -+# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -+bs='\\' -+bs2='\\\\' -+bs4='\\\\\\\\' -+dollar='\$' -+sed_double_backslash="\ -+ s/$bs4/&\\ -+/g -+ s/^$bs2$dollar/$bs&/ -+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g -+ s/\n//g" -+ -+# Standard options: -+opt_dry_run=false -+opt_help=false -+opt_quiet=false -+opt_verbose=false -+opt_warning=: -+ -+# func_echo arg... -+# Echo program name prefixed message, along with the current mode -+# name if it has been set yet. -+func_echo () -+{ -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -+} - --# If this variable is set in any of the actions, the command in it --# will be execed at the end. This prevents here-documents from being --# left over by shells. --exec_cmd= -+# func_verbose arg... -+# Echo program name prefixed message in verbose mode only. -+func_verbose () -+{ -+ $opt_verbose && func_echo ${1+"$@"} -+ -+ # A bug in bash halts the script if the last line of a function -+ # fails when set -e is in force, so we need another command to -+ # work around that: -+ : -+} - --if test -z "$show_help"; then -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} - -- # Infer the operation mode. -- if test -z "$mode"; then -- case $nonopt in -- *cc | *++ | gcc* | *-gcc*) -- mode=link -- for arg -- do -- case $arg in -- -c) -- mode=compile -- break -- ;; -- esac -- done -- ;; -- *db | *dbx | *strace | *truss) -- mode=execute -- ;; -- *install*|cp|mv) -- mode=install -- ;; -- *rm) -- mode=uninstall -- ;; -- *) -- # If we have no mode, but dlfiles were specified, then do execute mode. -- test -n "$execute_dlfiles" && mode=execute -+# func_error arg... -+# Echo program name prefixed message to standard error. -+func_error () -+{ -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -+} - -- # Just use the default operation mode. -- if test -z "$mode"; then -- if test -n "$nonopt"; then -- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 -- else -- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 -- fi -- fi -- ;; -- esac -- fi -+# func_warning arg... -+# Echo program name prefixed warning message to standard error. -+func_warning () -+{ -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- $echo "$modename: unrecognized option \`-dlopen'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ # bash bug again: -+ : -+} - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$modename --help --mode=$mode' for more information." -- -- # These modes are in order of execution frequency so that they run quickly. -- case $mode in -- # libtool compile mode -- compile) -- modename="$modename: compile" -- # Get the compilation command and the source file. -- base_compile= -- prev= -- lastarg= -- srcfile="$nonopt" -- suppress_output= -+# func_fatal_error arg... -+# Echo program name prefixed message to standard error, and exit. -+func_fatal_error () -+{ -+ func_error ${1+"$@"} -+ exit $EXIT_FAILURE -+} - -- user_target=no -- for arg -- do -- case $prev in -- "") ;; -- xcompiler) -- # Aesthetically quote the previous argument. -- prev= -- lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+# func_fatal_help arg... -+# Echo program name prefixed message to standard error, followed by -+# a help hint, and exit. -+func_fatal_help () -+{ -+ func_error ${1+"$@"} -+ func_fatal_error "$help" -+} -+help="Try \`$progname --help' for more information." ## default - -- case $arg in -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac - -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- continue -- ;; -+# func_grep expression filename -+# Check whether EXPRESSION matches any line of FILENAME, without output. -+func_grep () -+{ -+ $GREP "$1" "$2" >/dev/null 2>&1 -+} -+ -+ -+# func_mkdir_p directory-path -+# Make sure the entire path to DIRECTORY-PATH is available. -+func_mkdir_p () -+{ -+ my_directory_path="$1" -+ my_dir_list= -+ -+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then -+ -+ # Protect directory names starting with `-' -+ case $my_directory_path in -+ -*) my_directory_path="./$my_directory_path" ;; - esac - -- # Accept any command-line options. -- case $arg in -- -o) -- if test "$user_target" != "no"; then -- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit 1 -- fi -- user_target=next -- ;; -+ # While some portion of DIR does not yet exist... -+ while test ! -d "$my_directory_path"; do -+ # ...make a list in topmost first order. Use a colon delimited -+ # list incase some portion of path contains whitespace. -+ my_dir_list="$my_directory_path:$my_dir_list" - -- -static) -- build_old_libs=yes -- continue -- ;; -+ # If the last portion added has no slash in it, the list is done -+ case $my_directory_path in */*) ;; *) break ;; esac - -- -prefer-pic) -- pic_mode=yes -- continue -- ;; -+ # ...otherwise throw away the child directory and loop -+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` -+ done -+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - -- -prefer-non-pic) -- pic_mode=no -- continue -- ;; -+ save_mkdir_p_IFS="$IFS"; IFS=':' -+ for my_dir in $my_dir_list; do -+ IFS="$save_mkdir_p_IFS" -+ # mkdir can fail with a `File exist' error if two processes -+ # try to create one of the directories concurrently. Don't -+ # stop in that case! -+ $MKDIR "$my_dir" 2>/dev/null || : -+ done -+ IFS="$save_mkdir_p_IFS" - -- -Xcompiler) -- prev=xcompiler -- continue -- ;; -+ # Bail out if we (or some other process) failed to create a directory. -+ test -d "$my_directory_path" || \ -+ func_fatal_error "Failed to create \`$1'" -+ fi -+} - -- -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -- lastarg= -- save_ifs="$IFS"; IFS=',' -- for arg in $args; do -- IFS="$save_ifs" - -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- lastarg="$lastarg $arg" -- done -- IFS="$save_ifs" -- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` -+# func_mktempdir [string] -+# Make a temporary directory that won't clash with other running -+# libtool processes, and avoids race conditions if possible. If -+# given, STRING is the basename for that directory. -+func_mktempdir () -+{ -+ my_template="${TMPDIR-/tmp}/${1-$progname}" -+ -+ if test "$opt_dry_run" = ":"; then -+ # Return a directory name, but don't create it in dry-run mode -+ my_tmpdir="${my_template}-$$" -+ else - -- # Add the arguments to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- continue -- ;; -- esac -+ # If mktemp works, use that first and foremost -+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - -- case $user_target in -- next) -- # The next one is the -o target name -- user_target=yes -- continue -- ;; -- yes) -- # We got the output file -- user_target=set -- libobj="$arg" -- continue -- ;; -- esac -+ if test ! -d "$my_tmpdir"; then -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" -+ -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $MKDIR "$my_tmpdir" -+ umask $save_mktempdir_umask -+ fi -+ -+ # If we're not in dry-run mode, bomb out on failure -+ test -d "$my_tmpdir" || \ -+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" -+ fi - -- # Accept the current argument as the source file. -- lastarg="$srcfile" -- srcfile="$arg" -+ $ECHO "$my_tmpdir" -+} - -- # Aesthetically quote the previous argument. - -- # Backslashify any backslashes, double quotes, and dollar signs. -- # These are the only characters that are still specially -- # interpreted inside of double-quoted scrings. -- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` -+# func_quote_for_eval arg -+# Aesthetically quote ARG to be evaled later. -+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -+# is double-quoted, suitable for a subsequent eval, whereas -+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -+# which are still active within double quotes backslashified. -+func_quote_for_eval () -+{ -+ case $1 in -+ *[\\\`\"\$]*) -+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; -+ *) -+ func_quote_for_eval_unquoted_result="$1" ;; -+ esac - -- # Double-quote args containing other shell metacharacters. -+ case $func_quote_for_eval_unquoted_result in -+ # Double-quote args containing shell metacharacters to delay -+ # word splitting, command substitution and and variable -+ # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. -- case $lastarg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- lastarg="\"$lastarg\"" -- ;; -- esac -+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" -+ ;; -+ *) -+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" -+ esac -+} - -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- done - -- case $user_target in -- set) -- ;; -- no) -- # Get the name of the library object. -- libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` -- ;; -- *) -- $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit 1 -- ;; -+# func_quote_for_expand arg -+# Aesthetically quote ARG to be evaled later; same as above, -+# but do not quote variable references. -+func_quote_for_expand () -+{ -+ case $1 in -+ *[\\\`\"]*) -+ my_arg=`$ECHO "$1" | $SED \ -+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; -+ *) -+ my_arg="$1" ;; - esac - -- # Recognize several different file suffixes. -- # If the user specifies -o file.o, it is replaced with file.lo -- xform='[cCFSfmso]' -- case $libobj in -- *.ada) xform=ada ;; -- *.adb) xform=adb ;; -- *.ads) xform=ads ;; -- *.asm) xform=asm ;; -- *.c++) xform=c++ ;; -- *.cc) xform=cc ;; -- *.cpp) xform=cpp ;; -- *.cxx) xform=cxx ;; -- *.f90) xform=f90 ;; -- *.for) xform=for ;; -+ case $my_arg in -+ # Double-quote args containing shell metacharacters to delay -+ # word splitting and command substitution for a subsequent eval. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ my_arg="\"$my_arg\"" -+ ;; - esac - -- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -+ func_quote_for_expand_result="$my_arg" -+} - -- case $libobj in -- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; -- *) -- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit 1 -- ;; -- esac - -- if test -z "$base_compile"; then -- $echo "$modename: you must specify a compilation command" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -+# func_show_eval cmd [fail_exp] -+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -+# is given, then evaluate it. -+func_show_eval () -+{ -+ my_cmd="$1" -+ my_fail_exp="${2-:}" -+ -+ ${opt_silent-false} || { -+ func_quote_for_expand "$my_cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ -+ if ${opt_dry_run-false}; then :; else -+ eval "$my_cmd" -+ my_status=$? -+ if test "$my_status" -eq 0; then :; else -+ eval "(exit $my_status); $my_fail_exp" -+ fi - fi -+} - -- # Delete any leftover library objects. -- if test "$build_old_libs" = yes; then -- removelist="$obj $libobj" -- else -- removelist="$libobj" -+ -+# func_show_eval_locale cmd [fail_exp] -+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -+# is given, then evaluate it. Use the saved locale for evaluation. -+func_show_eval_locale () -+{ -+ my_cmd="$1" -+ my_fail_exp="${2-:}" -+ -+ ${opt_silent-false} || { -+ func_quote_for_expand "$my_cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ -+ if ${opt_dry_run-false}; then :; else -+ eval "$lt_user_locale -+ $my_cmd" -+ my_status=$? -+ eval "$lt_safe_locale" -+ if test "$my_status" -eq 0; then :; else -+ eval "(exit $my_status); $my_fail_exp" -+ fi - fi -+} - -- $run $rm $removelist -- trap "$run $rm $removelist; exit 1" 1 2 15 -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - -- # On Cygwin there's no "real" PIC flag so we must build both object types -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- pic_mode=default -- ;; -- esac -- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then -- # non-PIC code in shared libraries is not supported -- pic_mode=default -- fi - -- # Calculate the filename of the output object if compiler does -- # not support -o with -c -- if test "$compiler_c_o" = no; then -- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -- lockfile="$output_obj.lock" -- removelist="$removelist $output_obj $lockfile" -- trap "$run $rm $removelist; exit 1" 1 2 15 -- else -- need_locks=no -- lockfile= -- fi -+# func_version -+# Echo version message to standard output and exit. -+func_version () -+{ -+ $opt_debug -+ -+ $SED -n '/(C)/!b go -+ :more -+ /\./!{ -+ N -+ s/\n# / / -+ b more -+ } -+ :go -+ /^# '$PROGRAM' (GNU /,/# warranty; / { -+ s/^# // -+ s/^# *$// -+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -+ p -+ }' < "$progpath" -+ exit $? -+} - -- # Lock this critical section if it is needed -- # We use this script file to make the link, it avoids creating a new file -- if test "$need_locks" = yes; then -- until $run ln "$0" "$lockfile" 2>/dev/null; do -- $show "Waiting for $lockfile to be removed" -- sleep 2 -- done -- elif test "$need_locks" = warn; then -- if test -f "$lockfile"; then -- echo "\ --*** ERROR, $lockfile exists and contains: --`cat $lockfile 2>/dev/null` -+# func_usage -+# Echo short help message to standard output and exit. -+func_usage () -+{ -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { -+ s/^# // -+ s/^# *$// -+ s/\$progname/'$progname'/ -+ p -+ }' < "$progpath" -+ echo -+ $ECHO "run \`$progname --help | more' for full usage" -+ exit $? -+} - --This indicates that another process is trying to use the same --temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you --repeat this compilation, it may succeed, by chance, but you had better --avoid parallel builds (make -j) in this platform, or get a better --compiler." -- -- $run $rm $removelist -- exit 1 -- fi -- echo $srcfile > "$lockfile" -+# func_help [NOEXIT] -+# Echo long help message to standard output and exit, -+# unless 'noexit' is passed as argument. -+func_help () -+{ -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print -+ s/^# // -+ s/^# *$// -+ s*\$progname*'$progname'* -+ s*\$host*'"$host"'* -+ s*\$SHELL*'"$SHELL"'* -+ s*\$LTCC*'"$LTCC"'* -+ s*\$LTCFLAGS*'"$LTCFLAGS"'* -+ s*\$LD*'"$LD"'* -+ s/\$with_gnu_ld/'"$with_gnu_ld"'/ -+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ -+ p -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" -+ ret=$? -+ if test -z "$1"; then -+ exit $ret - fi -+} - -- if test -n "$fix_srcfile_path"; then -- eval srcfile=\"$fix_srcfile_path\" -- fi -+# func_missing_arg argname -+# Echo program name prefixed message to standard error and set global -+# exit_cmd. -+func_missing_arg () -+{ -+ $opt_debug - -- # Only build a PIC object if we are building libtool libraries. -- if test "$build_libtool_libs" = yes; then -- # Without this assignment, base_compile gets emptied. -- fbsd_hideous_sh_bug=$base_compile -+ func_error "missing argument for $1." -+ exit_cmd=exit -+} - -- if test "$pic_mode" != no; then -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" -- else -- # Don't build PIC code -- command="$base_compile $srcfile" -- fi -- if test "$build_old_libs" = yes; then -- lo_libobj="$libobj" -- dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$dir" = "X$libobj"; then -- dir="$objdir" -- else -- dir="$dir/$objdir" -- fi -- libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` - -- if test -d "$dir"; then -- $show "$rm $libobj" -- $run $rm $libobj -- else -- $show "$mkdir $dir" -- $run $mkdir $dir -- status=$? -- if test $status -ne 0 && test ! -d $dir; then -- exit $status -- fi -- fi -- fi -- if test "$compiler_o_lo" = yes; then -- output_obj="$libobj" -- command="$command -o $output_obj" -- elif test "$compiler_c_o" = yes; then -- output_obj="$obj" -- command="$command -o $output_obj" -- fi -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation - -- $run $rm "$output_obj" -- $show "$command" -- if $run eval "$command"; then : -- else -- test -n "$output_obj" && $run $rm $removelist -- exit 1 -- fi -+exit_cmd=: - -- if test "$need_locks" = warn && -- test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then -- echo "\ --*** ERROR, $lockfile contains: --`cat $lockfile 2>/dev/null` - --but it should contain: --$srcfile - --This indicates that another process is trying to use the same --temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you --repeat this compilation, it may succeed, by chance, but you had better --avoid parallel builds (make -j) in this platform, or get a better --compiler." - -- $run $rm $removelist -- exit 1 -- fi - -- # Just move the object if needed, then go on to compile the next one -- if test x"$output_obj" != x"$libobj"; then -- $show "$mv $output_obj $libobj" -- if $run $mv $output_obj $libobj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi -+magic="%%%MAGIC variable%%%" -+magic_exe="%%%MAGIC EXE variable%%%" - -- # If we have no pic_flag, then copy the object into place and finish. -- if (test -z "$pic_flag" || test "$pic_mode" != default) && -- test "$build_old_libs" = yes; then -- # Rename the .lo from within objdir to obj -- if test -f $obj; then -- $show $rm $obj -- $run $rm $obj -- fi -+# Global variables. -+nonopt= -+preserve_args= -+lo2o="s/\\.lo\$/.${objext}/" -+o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 - -- $show "$mv $libobj $obj" -- if $run $mv $libobj $obj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -+# If this variable is set in any of the actions, the command in it -+# will be execed at the end. This prevents here-documents from being -+# left over by shells. -+exec_cmd= - -- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$obj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` -- libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -- # Now arrange that obj and lo_libobj become the same file -- $show "(cd $xdir && $LN_S $baseobj $libobj)" -- if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then -- # Unlock the critical section if it was locked -- if test "$need_locks" != no; then -- $run $rm "$lockfile" -- fi -- exit 0 -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ -+# func_fatal_configuration arg... -+# Echo program name prefixed message to standard error, followed by -+# a configuration failure hint, and exit. -+func_fatal_configuration () -+{ -+ func_error ${1+"$@"} -+ func_error "See the $PACKAGE documentation for more information." -+ func_fatal_error "Fatal configuration error." -+} - -- # Allow error messages only from the first compilation. -- suppress_output=' >/dev/null 2>&1' -- fi - -- # Only build a position-dependent object if we build old libraries. -+# func_config -+# Display the configuration for all the tags in this script. -+func_config () -+{ -+ re_begincf='^# ### BEGIN LIBTOOL' -+ re_endcf='^# ### END LIBTOOL' -+ -+ # Default configuration. -+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" -+ -+ # Now print the configurations for the tags. -+ for tagname in $taglist; do -+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" -+ done -+ -+ exit $? -+} -+ -+# func_features -+# Display the features supported by this script. -+func_features () -+{ -+ echo "host: $host" -+ if test "$build_libtool_libs" = yes; then -+ echo "enable shared libraries" -+ else -+ echo "disable shared libraries" -+ fi - if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -- # Don't build PIC code -- command="$base_compile $srcfile" -+ echo "enable static libraries" -+ else -+ echo "disable static libraries" -+ fi -+ -+ exit $? -+} -+ -+# func_enable_tag tagname -+# Verify that TAGNAME is valid, and either flag an error and exit, or -+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -+# variable here. -+func_enable_tag () -+{ -+ # Global variable: -+ tagname="$1" -+ -+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" -+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" -+ sed_extractcf="/$re_begincf/,/$re_endcf/p" -+ -+ # Validate tagname. -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ func_fatal_error "invalid tag name: $tagname" -+ ;; -+ esac -+ -+ # Don't test for the "default" C tag, as we know it's -+ # there but not specially marked. -+ case $tagname in -+ CC) ;; -+ *) -+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -+ taglist="$taglist $tagname" -+ -+ # Evaluate the configuration. Be careful to quote the path -+ # and the sed script, to avoid splitting on whitespace, but -+ # also don't use non-portable quotes within backquotes within -+ # quotes we have to do it in 2 steps: -+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -+ eval "$extractedcf" - else -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" -- fi -- if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -- output_obj="$obj" -+ func_error "ignoring unknown tag $tagname" - fi -+ ;; -+ esac -+} - -- # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -- $run $rm "$output_obj" -- $show "$command" -- if $run eval "$command"; then : -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () -+{ -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF - else -- $run $rm $removelist -- exit 1 -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF - fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi - -- if test "$need_locks" = warn && -- test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then -- echo "\ --*** ERROR, $lockfile contains: --`cat $lockfile 2>/dev/null` -+ exit $EXIT_MISMATCH -+ fi -+} - --but it should contain: --$srcfile - --This indicates that another process is trying to use the same --temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you --repeat this compilation, it may succeed, by chance, but you had better --avoid parallel builds (make -j) in this platform, or get a better --compiler." -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac - -- $run $rm $removelist -- exit 1 -- fi - -- # Just move the object if needed -- if test x"$output_obj" != x"$obj"; then -- $show "$mv $output_obj $obj" -- if $run $mv $output_obj $obj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi - -- # Create an invalid libtool object if no PIC, so that we do not -- # accidentally link it into a program. -- if test "$build_libtool_libs" != yes; then -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > \$libobj" || exit $? -- else -- # Move the .lo from within objdir -- $show "$mv $libobj $lo_libobj" -- if $run $mv $libobj $lo_libobj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi -- fi -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false -+ -+ -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do -+ opt="$1" -+ shift -+ case $opt in -+ --debug|-x) opt_debug='set -x' -+ func_echo "enabling shell trace mode" -+ $opt_debug -+ ;; -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: -+ ;; -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" -+ shift -+ ;; -+ --preserve-dup-deps) -+ opt_preserve_dup_deps=: -+ ;; -+ --features) -+ opt_features=: -+func_features -+ ;; -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) -+ opt_silent=false -+func_append preserve_args " $opt" -+ ;; -+ --no-verbose) -+ opt_verbose=false -+func_append preserve_args " $opt" -+ ;; -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" -+ shift -+ ;; -+ -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ -+ # Separate optargs to long options: -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; -+ esac -+ done - -- # Unlock the critical section if it was locked -- if test "$need_locks" != no; then -- $run $rm "$lockfile" -- fi -+ # Validate options: - -- exit 0 -- ;; -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi - -- # libtool link mode -- link | relink) -- modename="$modename: link" -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- # It is impossible to link a dll without this setting, and -- # we shouldn't force the makefile maintainer to figure out -- # which system we are compiling for in order to pass an extra -- # flag for every libtool invokation. -- # allow_undefined=no -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - -- # FIXME: Unfortunately, there are problems with the above when trying -- # to make a dll which has undefined symbols, in which case not -- # even a static library is built. For now, we need to specify -- # -no-undefined on the libtool link line when we can be certain -- # that all symbols are satisfied, otherwise we get a static library. -- allow_undefined=yes -+ case $host in -+ *cygwin* | *mingw* | *pw32* | *cegcc*) -+ # don't eliminate duplications in $postdeps and $predeps -+ opt_duplicate_compiler_generated_deps=: - ;; - *) -- allow_undefined=yes -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; -+ esac -+ -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match -+ -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" -+ fi -+ -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" -+ -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } -+ -+ -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} -+ -+ -+ -+ -+## ----------- ## -+## Main. ## -+## ----------- ## -+ -+# func_lalib_p file -+# True iff FILE is a libtool `.la' library or `.lo' object file. -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_lalib_p () -+{ -+ test -f "$1" && -+ $SED -e 4q "$1" 2>/dev/null \ -+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -+} -+ -+# func_lalib_unsafe_p file -+# True iff FILE is a libtool `.la' library or `.lo' object file. -+# This function implements the same check as func_lalib_p without -+# resorting to external programs. To this end, it redirects stdin and -+# closes it afterwards, without saving the original file descriptor. -+# As a safety measure, use it only where a negative result would be -+# fatal anyway. Works if `file' does not exist. -+func_lalib_unsafe_p () -+{ -+ lalib_p=no -+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then -+ for lalib_p_l in 1 2 3 4 -+ do -+ read lalib_p_line -+ case "$lalib_p_line" in -+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; -+ esac -+ done -+ exec 0<&5 5<&- -+ fi -+ test "$lalib_p" = yes -+} -+ -+# func_ltwrapper_script_p file -+# True iff FILE is a libtool wrapper script -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_script_p () -+{ -+ func_lalib_p "$1" -+} -+ -+# func_ltwrapper_executable_p file -+# True iff FILE is a libtool wrapper executable -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_executable_p () -+{ -+ func_ltwrapper_exec_suffix= -+ case $1 in -+ *.exe) ;; -+ *) func_ltwrapper_exec_suffix=.exe ;; - esac -- libtool_args="$nonopt" -- compile_command="$nonopt" -- finalize_command="$nonopt" -+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -+} - -- compile_rpath= -- finalize_rpath= -- compile_shlibpath= -- finalize_shlibpath= -- convenience= -- old_convenience= -- deplibs= -- old_deplibs= -- compiler_flags= -- linker_flags= -- dllsearchpath= -- lib_search_path=`pwd` -+# func_ltwrapper_scriptname file -+# Assumes file is an ltwrapper_executable -+# uses $file to determine the appropriate filename for a -+# temporary ltwrapper_script. -+func_ltwrapper_scriptname () -+{ -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+} - -- avoid_version=no -- dlfiles= -- dlprefiles= -- dlself=no -- export_dynamic=no -- export_symbols= -- export_symbols_regex= -- generated= -- libobjs= -- ltlibs= -- module=no -- no_install=no -- objs= -- prefer_static_libs=no -- preload=no -- prev= -- prevarg= -- release= -- rpath= -- xrpath= -- perm_rpath= -- temp_rpath= -- thread_safe=no -- vinfo= -+# func_ltwrapper_p file -+# True iff FILE is a libtool wrapper script or wrapper executable -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_p () -+{ -+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -+} - -- # We need to know -static, to get the right output filenames. -- for arg -- do -- case $arg in -- -all-static | -static) -- if test "X$arg" = "X-all-static"; then -- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 -- fi -- if test -n "$link_static_flag"; then -- dlopen_self=$dlopen_self_static -- fi -- else -- if test -z "$pic_flag" && test -n "$link_static_flag"; then -- dlopen_self=$dlopen_self_static -- fi -- fi -- build_libtool_libs=no -- build_old_libs=yes -- prefer_static_libs=yes -- break -- ;; -- esac -+ -+# func_execute_cmds commands fail_cmd -+# Execute tilde-delimited COMMANDS. -+# If FAIL_CMD is given, eval that upon failure. -+# FAIL_CMD may read-access the current command in variable CMD! -+func_execute_cmds () -+{ -+ $opt_debug -+ save_ifs=$IFS; IFS='~' -+ for cmd in $1; do -+ IFS=$save_ifs -+ eval cmd=\"$cmd\" -+ func_show_eval "$cmd" "${2-:}" - done -+ IFS=$save_ifs -+} - -- # See if our shared archives depend on static archives. -- test -n "$old_archive_from_new_cmds" && build_old_libs=yes - -- # Go through the arguments, transforming them on the way. -- while test $# -gt 0; do -- arg="$1" -- shift -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test -- ;; -- *) qarg=$arg ;; -- esac -- libtool_args="$libtool_args $qarg" -+# func_source file -+# Source FILE, adding directory component if necessary. -+# Note that it is not necessary on cygwin/mingw to append a dot to -+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -+# behavior happens only for exec(3), not for open(2)! Also, sourcing -+# `FILE.' does not work on cygwin managed mounts. -+func_source () -+{ -+ $opt_debug -+ case $1 in -+ */* | *\\*) . "$1" ;; -+ *) . "./$1" ;; -+ esac -+} - -- # If the previous option needs an argument, assign it. -- if test -n "$prev"; then -- case $prev in -- output) -- compile_command="$compile_command @OUTPUT@" -- finalize_command="$finalize_command @OUTPUT@" -- ;; -- esac - -- case $prev in -- dlfiles|dlprefiles) -- if test "$preload" = no; then -- # Add the symbol object into the linking commands. -- compile_command="$compile_command @SYMFILE@" -- finalize_command="$finalize_command @SYMFILE@" -- preload=yes -- fi -- case $arg in -- *.la | *.lo) ;; # We handle these cases below. -- force) -- if test "$dlself" = no; then -- dlself=needless -- export_dynamic=yes -- fi -- prev= -- continue -- ;; -- self) -- if test "$prev" = dlprefiles; then -- dlself=yes -- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -- dlself=yes -- else -- dlself=needless -- export_dynamic=yes -- fi -- prev= -- continue -- ;; -- *) -- if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -- else -- dlprefiles="$dlprefiles $arg" -- fi -- prev= -- continue -- ;; -- esac -- ;; -- expsyms) -- export_symbols="$arg" -- if test ! -f "$arg"; then -- $echo "$modename: symbol file \`$arg' does not exist" -- exit 1 -- fi -- prev= -- continue -- ;; -- expsyms_regex) -- export_symbols_regex="$arg" -- prev= -- continue -- ;; -- release) -- release="-$arg" -- prev= -- continue -- ;; -- rpath | xrpath) -- # We need an absolute path. -- case $arg in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -- ;; -- esac -- if test "$prev" = rpath; then -- case "$rpath " in -- *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -- esac -- else -- case "$xrpath " in -- *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -- esac -- fi -- prev= -- continue -- ;; -- xcompiler) -- compiler_flags="$compiler_flags $qarg" -- prev= -- compile_command="$compile_command $qarg" -- finalize_command="$finalize_command $qarg" -- continue -- ;; -- xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -- prev= -- compile_command="$compile_command $wl$qarg" -- finalize_command="$finalize_command $wl$qarg" -- continue -- ;; -- *) -- eval "$prev=\"\$arg\"" -- prev= -- continue -- ;; -- esac -- fi # test -n $prev -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} - -- prevarg="$arg" -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} - -- case $arg in -- -all-static) -- if test -n "$link_static_flag"; then -- compile_command="$compile_command $link_static_flag" -- finalize_command="$finalize_command $link_static_flag" -+# func_infer_tag arg -+# Infer tagged configuration to use if any are available and -+# if one wasn't chosen via the "--tag" command line option. -+# Only attempt this if the compiler in the base compile -+# command doesn't match the default compiler. -+# arg is usually of the form 'gcc ...' -+func_infer_tag () -+{ -+ $opt_debug -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ func_append_quoted CC_quoted "$arg" -+ done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` -+ case $@ in -+ # Blanks in the command may have been stripped by the calling shell, -+ # but not from the CC environment variable when configure was run. -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; -+ # Blanks at the start of $base_compile will cause this to fail -+ # if we don't check for them as well. -+ *) -+ for z in $available_tags; do -+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ func_append_quoted CC_quoted "$arg" -+ done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` -+ case "$@ " in -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) -+ # The compiler in the base compile command matches -+ # the one in the tagged configuration. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ fi -+ done -+ # If $tagname still isn't set, then no tagged configuration -+ # was found and let the user know that the "--tag" command -+ # line option must be used. -+ if test -z "$tagname"; then -+ func_echo "unable to infer tagged configuration" -+ func_fatal_error "specify a tag with \`--tag'" -+# else -+# func_verbose "using $tagname tagged configuration" - fi -- continue - ;; -+ esac -+ fi -+} - -- -allow-undefined) -- # FIXME: remove this flag sometime in the future. -- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 -- continue -- ;; - -- -avoid-version) -- avoid_version=yes -- continue -- ;; - -- -dlopen) -- prev=dlfiles -- continue -- ;; -+# func_write_libtool_object output_name pic_name nonpic_name -+# Create a libtool object file (analogous to a ".la" file), -+# but don't create it if we're doing a dry run. -+func_write_libtool_object () -+{ -+ write_libobj=${1} -+ if test "$build_libtool_libs" = yes; then -+ write_lobj=\'${2}\' -+ else -+ write_lobj=none -+ fi - -- -dlpreopen) -- prev=dlprefiles -- continue -- ;; -+ if test "$build_old_libs" = yes; then -+ write_oldobj=\'${3}\' -+ else -+ write_oldobj=none -+ fi - -- -export-dynamic) -- export_dynamic=yes -- continue -- ;; -+ $opt_dry_run || { -+ cat >${write_libobj}T <&2 -- exit 1 -- fi -- dir="$absdir" -- ;; -- esac -- case "$deplibs " in -- *" -L$dir "*) ;; -- *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -- ;; -- esac -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- case :$dllsearchpath: in -- *":$dir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$dir";; -- esac -- ;; -- esac -- continue -- ;; -+EOF -+ $MV "${write_libobj}T" "${write_libobj}" -+ } -+} - -- -l*) -- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -- case $host in -- *-*-cygwin* | *-*-pw32* | *-*-beos*) -- # These systems don't actually have a C or math library (as such) -- continue -- ;; -- *-*-mingw* | *-*-os2*) -- # These systems don't actually have a C library (as such) -- test "X$arg" = "X-lc" && continue -- ;; -- *-*-openbsd*) -- # Do not include libc due to us having libc/libc_r. -- test "X$arg" = "X-lc" && continue -- ;; -- esac -- elif test "X$arg" = "X-lc_r"; then -- case $host in -- *-*-openbsd*) -- # Do not include libc_r directly, use -pthread flag. -- continue -- ;; -- esac -- fi -- deplibs="$deplibs $arg" -- continue -- ;; - -- -module) -- module=yes -- continue -- ;; -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 - -- -no-fast-install) -- fast_install=no -- continue -- ;; - -- -no-install) -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- # The PATH hackery in wrapper scripts is required on Windows -- # in order for the loader to find any dlls it needs. -- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 -- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 -- fast_install=no -- ;; -- *) no_install=yes ;; -- esac -- continue -- ;; -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 - -- -no-undefined) -- allow_undefined=no -- continue -- ;; - -- -o) prev=output ;; -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath - -- -release) -- prev=release -- continue -- ;; - -- -rpath) -- prev=rpath -- continue -- ;; -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 - -- -R) -- prev=xrpath -- continue -- ;; - -- -R*) -- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` -- # We need an absolute path. -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -- ;; -- esac -- case "$xrpath " in -- *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -- esac -- continue -- ;; -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check - -- -static) -- # The effects of -static are defined in a previous loop. -- # We used to do the same as -all-static on platforms that -- # didn't have a PIC flag, but the assumption that the effects -- # would be equivalent was wrong. It would break on at least -- # Digital Unix and AIX. -- continue -- ;; - -- -thread-safe) -- thread_safe=yes -- continue -- ;; -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check - -- -version-info) -- prev=vinfo -- continue -- ;; - -- -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` -- arg= -- save_ifs="$IFS"; IFS=',' -- for flag in $args; do -- IFS="$save_ifs" -- case $flag in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- flag="\"$flag\"" -- ;; -- esac -- arg="$arg $wl$flag" -- compiler_flags="$compiler_flags $flag" -- done -- IFS="$save_ifs" -- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -- ;; -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep - -- -Wl,*) -- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` -- arg= -- save_ifs="$IFS"; IFS=',' -- for flag in $args; do -- IFS="$save_ifs" -- case $flag in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- flag="\"$flag\"" -- ;; -- esac -- arg="$arg $wl$flag" -- compiler_flags="$compiler_flags $wl$flag" -- linker_flags="$linker_flags $flag" -- done -- IFS="$save_ifs" -- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -- ;; - -- -Xcompiler) -- prev=xcompiler -- continue -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ -+# func_mode_compile arg... -+func_mode_compile () -+{ -+ $opt_debug -+ # Get the compilation command and the source file. -+ base_compile= -+ srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ suppress_opt=yes -+ suppress_output= -+ arg_mode=normal -+ libobj= -+ later= -+ pie_flag= -+ -+ for arg -+ do -+ case $arg_mode in -+ arg ) -+ # do not "continue". Instead, add this to base_compile -+ lastarg="$arg" -+ arg_mode=normal - ;; - -- -Xlinker) -- prev=xlinker -+ target ) -+ libobj="$arg" -+ arg_mode=normal - continue - ;; - -- # Some other compiler flag. -- -* | +*) -- # Unknown arguments in both finalize_command and compile_command need -- # to be aesthetically quoted because they are evaled later. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ normal ) -+ # Accept any command-line options. - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -+ -o) -+ test -n "$libobj" && \ -+ func_fatal_error "you cannot specify \`-o' more than once" -+ arg_mode=target -+ continue - ;; -- esac -- ;; - -- *.lo | *.$objext) -- # A library or standard object. -- if test "$prev" = dlfiles; then -- # This file was specified with -dlopen. -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $arg" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ -pie | -fpie | -fPIE) -+ func_append pie_flag " $arg" -+ continue -+ ;; - -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` -- prev= -- else -- case $arg in -- *.lo) libobjs="$libobjs $arg" ;; -- *) objs="$objs $arg" ;; -- esac -- fi -+ -shared | -static | -prefer-pic | -prefer-non-pic) -+ func_append later " $arg" -+ continue -+ ;; -+ -+ -no-suppress) -+ suppress_opt=no -+ continue -+ ;; -+ -+ -Xcompiler) -+ arg_mode=arg # the next one goes into the "base_compile" arg list -+ continue # The current "srcfile" will either be retained or -+ ;; # replaced later. I would guess that would be a bug. -+ -+ -Wc,*) -+ func_stripname '-Wc,' '' "$arg" -+ args=$func_stripname_result -+ lastarg= -+ save_ifs="$IFS"; IFS=',' -+ for arg in $args; do -+ IFS="$save_ifs" -+ func_append_quoted lastarg "$arg" -+ done -+ IFS="$save_ifs" -+ func_stripname ' ' '' "$lastarg" -+ lastarg=$func_stripname_result -+ -+ # Add the arguments to base_compile. -+ func_append base_compile " $lastarg" -+ continue -+ ;; -+ -+ *) -+ # Accept the current argument as the source file. -+ # The previous "srcfile" becomes the current argument. -+ # -+ lastarg="$srcfile" -+ srcfile="$arg" -+ ;; -+ esac # case $arg - ;; -+ esac # case $arg_mode - -- *.$libext) -- # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ # Aesthetically quote the previous argument. -+ func_append_quoted base_compile "$lastarg" -+ done # for arg -+ -+ case $arg_mode in -+ arg) -+ func_fatal_error "you must specify an argument for -Xcompile" -+ ;; -+ target) -+ func_fatal_error "you must specify a target with \`-o'" -+ ;; -+ *) -+ # Get the name of the library object. -+ test -z "$libobj" && { -+ func_basename "$srcfile" -+ libobj="$func_basename_result" -+ } -+ ;; -+ esac -+ -+ # Recognize several different file suffixes. -+ # If the user specifies -o file.o, it is replaced with file.lo -+ case $libobj in -+ *.[cCFSifmso] | \ -+ *.ada | *.adb | *.ads | *.asm | \ -+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) -+ func_xform "$libobj" -+ libobj=$func_xform_result -+ ;; -+ esac -+ -+ case $libobj in -+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; -+ *) -+ func_fatal_error "cannot determine name of library object from \`$libobj'" -+ ;; -+ esac -+ -+ func_infer_tag $base_compile -+ -+ for arg in $later; do -+ case $arg in -+ -shared) -+ test "$build_libtool_libs" != yes && \ -+ func_fatal_configuration "can not build a shared library" -+ build_old_libs=no - continue - ;; - -- *.la) -- # A libtool-controlled library. -+ -static) -+ build_libtool_libs=no -+ build_old_libs=yes -+ continue -+ ;; - -- if test "$prev" = dlfiles; then -- # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -- prev= -- elif test "$prev" = dlprefiles; then -- # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -- prev= -- else -- deplibs="$deplibs $arg" -- fi -+ -prefer-pic) -+ pic_mode=yes - continue - ;; - -- # Some other compiler argument. -- *) -- # Unknown arguments in both finalize_command and compile_command need -- # to be aesthetically quoted because they are evaled later. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -+ -prefer-non-pic) -+ pic_mode=no -+ continue - ;; -- esac # arg -+ esac -+ done - -- # Now actually substitute the argument into the commands. -- if test -n "$arg"; then -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- fi -- done # argument parsing loop -+ func_quote_for_eval "$libobj" -+ test "X$libobj" != "X$func_quote_for_eval_result" \ -+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && func_warning "libobj name \`$libobj' may not contain shell special characters." -+ func_dirname_and_basename "$obj" "/" "" -+ objname="$func_basename_result" -+ xdir="$func_dirname_result" -+ lobj=${xdir}$objdir/$objname - -- if test -n "$prev"; then -- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ test -z "$base_compile" && \ -+ func_fatal_help "you must specify a compilation command" - -- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval arg=\"$export_dynamic_flag_spec\" -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -+ # Delete any leftover library objects. -+ if test "$build_old_libs" = yes; then -+ removelist="$obj $lobj $libobj ${libobj}T" -+ else -+ removelist="$lobj $libobj ${libobj}T" - fi - -- # calculate the name of the file, without its directory -- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` -- libobjs_save="$libobjs" -+ # On Cygwin there's no "real" PIC flag so we must build both object types -+ case $host_os in -+ cygwin* | mingw* | pw32* | os2* | cegcc*) -+ pic_mode=default -+ ;; -+ esac -+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then -+ # non-PIC code in shared libraries is not supported -+ pic_mode=default -+ fi - -- if test -n "$shlibpath_var"; then -- # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ # Calculate the filename of the output object if compiler does -+ # not support -o with -c -+ if test "$compiler_c_o" = no; then -+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} -+ lockfile="$output_obj.lock" - else -- shlib_search_path= -+ output_obj= -+ need_locks=no -+ lockfile= - fi -- eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -- eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - -- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$output_objdir" = "X$output"; then -- output_objdir="$objdir" -- else -- output_objdir="$output_objdir/$objdir" -- fi -- # Create the object directory. -- if test ! -d $output_objdir; then -- $show "$mkdir $output_objdir" -- $run $mkdir $output_objdir -- status=$? -- if test $status -ne 0 && test ! -d $output_objdir; then -- exit $status -- fi -- fi -+ # Lock this critical section if it is needed -+ # We use this script file to make the link, it avoids creating a new file -+ if test "$need_locks" = yes; then -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ elif test "$need_locks" = warn; then -+ if test -f "$lockfile"; then -+ $ECHO "\ -+*** ERROR, $lockfile exists and contains: -+`cat $lockfile 2>/dev/null` - -- # Determine the type of output -- case $output in -- "") -- $echo "$modename: you must specify an output file" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- ;; -- *.$libext) linkmode=oldlib ;; -- *.lo | *.$objext) linkmode=obj ;; -- *.la) linkmode=lib ;; -- *) linkmode=prog ;; # Anything else should be a program. -- esac -+This indicates that another process is trying to use the same -+temporary object file, and libtool could not work around it because -+your compiler does not support \`-c' and \`-o' together. If you -+repeat this compilation, it may succeed, by chance, but you had better -+avoid parallel builds (make -j) in this platform, or get a better -+compiler." - -- specialdeplibs= -- libs= -- # Find all interdependent deplibs by searching for libraries -- # that are linked more than once (e.g. -la -lb -la) -- for deplib in $deplibs; do -- case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- libs="$libs $deplib" -- done -- deplibs= -- newdependency_libs= -- newlib_search_path= -- need_relink=no # whether we're linking any uninstalled libtool libraries -- notinst_deplibs= # not-installed libtool libraries -- notinst_path= # paths that contain not-installed libtool libraries -- case $linkmode in -- lib) -- passes="conv link" -- for file in $dlfiles $dlprefiles; do -- case $file in -- *.la) ;; -- *) -- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit 1 -- ;; -- esac -- done -- ;; -- prog) -- compile_deplibs= -- finalize_deplibs= -- alldeplibs=no -- newdlfiles= -- newdlprefiles= -- passes="conv scan dlopen dlpreopen link" -- ;; -- *) passes="conv" -- ;; -- esac -- for pass in $passes; do -- if test $linkmode = prog; then -- # Determine which files to process -- case $pass in -- dlopen) -- libs="$dlfiles" -- save_deplibs="$deplibs" # Collect dlpreopened libraries -- deplibs= -- ;; -- dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -- esac -+ $opt_dry_run || $RM $removelist -+ exit $EXIT_FAILURE - fi -- for deplib in $libs; do -- lib= -- found=no -- case $deplib in -- -l*) -- if test $linkmode = oldlib && test $linkmode = obj; then -- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 -- continue -- fi -- if test $pass = conv; then -- deplibs="$deplib $deplibs" -- continue -- fi -- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` -- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do -- # Search the libtool library -- lib="$searchdir/lib${name}.la" -- if test -f "$lib"; then -- found=yes -- break -- fi -- done -- if test "$found" != yes; then -- # deplib doesn't seem to be a libtool library -- if test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" -- fi -- continue -- fi -- ;; # -l -- -L*) -- case $linkmode in -- lib) -- deplibs="$deplib $deplibs" -- test $pass = conv && continue -- newdependency_libs="$deplib $newdependency_libs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -- ;; -- prog) -- if test $pass = conv; then -- deplibs="$deplib $deplibs" -- continue -- fi -- if test $pass = scan; then -- deplibs="$deplib $deplibs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -- else -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- fi -- ;; -- *) -- $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 -- ;; -- esac # linkmode -- continue -- ;; # -L -- -R*) -- if test $pass = link; then -- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` -- # Make sure the xrpath contains only unique directories. -- case "$xrpath " in -- *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -- esac -- fi -- deplibs="$deplib $deplibs" -- continue -- ;; -- *.la) lib="$deplib" ;; -- *.$libext) -- if test $pass = conv; then -- deplibs="$deplib $deplibs" -- continue -- fi -- case $linkmode in -- lib) -- if test "$deplibs_check_method" != pass_all; then -- echo -- echo "*** Warning: This library needs some functionality provided by $deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -- else -- echo -- echo "*** Warning: Linking the shared library $output against the" -- echo "*** static library $deplib is not portable!" -- deplibs="$deplib $deplibs" -- fi -- continue -- ;; -- prog) -- if test $pass != link; then -- deplibs="$deplib $deplibs" -- else -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- fi -- continue -- ;; -- esac # linkmode -- ;; # *.$libext -- *.lo | *.$objext) -- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -- # If there is no dlopen support or we're linking statically, -- # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- newdlfiles="$newdlfiles $deplib" -- fi -- continue -- ;; -- %DEPLIBS%) -- alldeplibs=yes -- continue -- ;; -- esac # case $deplib -- if test $found = yes || test -f "$lib"; then : -- else -- $echo "$modename: cannot find the library \`$lib'" 1>&2 -- exit 1 -- fi -+ func_append removelist " $output_obj" -+ $ECHO "$srcfile" > "$lockfile" -+ fi - -- # Check to see that this really is a libtool archive. -- if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -- else -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -- fi -+ $opt_dry_run || $RM $removelist -+ func_append removelist " $lockfile" -+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 -+ -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result -+ func_quote_for_eval "$srcfile" -+ qsrcfile=$func_quote_for_eval_result - -- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -- test "X$ladir" = "X$lib" && ladir="." -+ # Only build a PIC object if we are building libtool libraries. -+ if test "$build_libtool_libs" = yes; then -+ # Without this assignment, base_compile gets emptied. -+ fbsd_hideous_sh_bug=$base_compile - -- dlname= -- dlopen= -- dlpreopen= -- libdir= -- library_names= -- old_library= -- # If the library was installed with an old release of libtool, -- # it will not redefine variable installed. -- installed=yes -+ if test "$pic_mode" != no; then -+ command="$base_compile $qsrcfile $pic_flag" -+ else -+ # Don't build PIC code -+ command="$base_compile $qsrcfile" -+ fi - -- # Read the .la file -- case $lib in -- */* | *\\*) . $lib ;; -- *) . ./$lib ;; -- esac -+ func_mkdir_p "$xdir$objdir" - -- if test "$linkmode,$pass" = "lib,link" || -- test "$linkmode,$pass" = "prog,scan" || -- { test $linkmode = oldlib && test $linkmode = obj; }; then -- # Add dl[pre]opened files of deplib -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -- fi -+ if test -z "$output_obj"; then -+ # Place PIC objects in $objdir -+ func_append command " -o $lobj" -+ fi - -- if test $pass = conv; then -- # Only check for convenience libraries -- deplibs="$lib $deplibs" -- if test -z "$libdir"; then -- if test -z "$old_library"; then -- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -- fi -- # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- tmp_libs="$tmp_libs $deplib" -- done -- elif test $linkmode != prog && test $linkmode != lib; then -- $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit 1 -- fi -- continue -- fi # $pass = conv -+ func_show_eval_locale "$command" \ -+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - -- # Get the name of the library we link against. -- linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -- if test -z "$linklib"; then -- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -- fi -+ if test "$need_locks" = warn && -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $ECHO "\ -+*** ERROR, $lockfile contains: -+`cat $lockfile 2>/dev/null` - -- # This library was specified with -dlopen. -- if test $pass = dlopen; then -- if test -z "$libdir"; then -- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -- exit 1 -- fi -- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -- # If there is no dlname, no dlopen support or we're linking -- # statically, we need to preload. -- dlprefiles="$dlprefiles $lib" -- else -- newdlfiles="$newdlfiles $lib" -- fi -- continue -- fi # $pass = dlopen -+but it should contain: -+$srcfile - -- # We need an absolute path. -- case $ladir in -- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -- *) -- abs_ladir=`cd "$ladir" && pwd` -- if test -z "$abs_ladir"; then -- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 -- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 -- abs_ladir="$ladir" -- fi -- ;; -- esac -- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+This indicates that another process is trying to use the same -+temporary object file, and libtool could not work around it because -+your compiler does not support \`-c' and \`-o' together. If you -+repeat this compilation, it may succeed, by chance, but you had better -+avoid parallel builds (make -j) in this platform, or get a better -+compiler." - -- # Find the relevant object directory and library name. -- if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- $echo "$modename: warning: library \`$lib' was moved." 1>&2 -- dir="$ladir" -- absdir="$abs_ladir" -- libdir="$abs_ladir" -- else -- dir="$libdir" -- absdir="$libdir" -- fi -- else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -- fi # $installed = yes -- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ $opt_dry_run || $RM $removelist -+ exit $EXIT_FAILURE -+ fi - -- # This library was specified with -dlpreopen. -- if test $pass = dlpreopen; then -- if test -z "$libdir"; then -- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit 1 -- fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -- fi # $pass = dlpreopen -+ # Just move the object if needed, then go on to compile the next one -+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then -+ func_show_eval '$MV "$output_obj" "$lobj"' \ -+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' -+ fi - -- if test -z "$libdir"; then -- # Link the convenience library -- if test $linkmode = lib; then -- deplibs="$dir/$old_library $deplibs" -- elif test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$dir/$old_library $compile_deplibs" -- finalize_deplibs="$dir/$old_library $finalize_deplibs" -- else -- deplibs="$lib $deplibs" -- fi -- continue -- fi -+ # Allow error messages only from the first compilation. -+ if test "$suppress_opt" = yes; then -+ suppress_output=' >/dev/null 2>&1' -+ fi -+ fi - -- if test $linkmode = prog && test $pass != link; then -- newlib_search_path="$newlib_search_path $ladir" -- deplibs="$lib $deplibs" -+ # Only build a position-dependent object if we build old libraries. -+ if test "$build_old_libs" = yes; then -+ if test "$pic_mode" != yes; then -+ # Don't build PIC code -+ command="$base_compile $qsrcfile$pie_flag" -+ else -+ command="$base_compile $qsrcfile $pic_flag" -+ fi -+ if test "$compiler_c_o" = yes; then -+ func_append command " -o $obj" -+ fi - -- linkalldeplibs=no -- if test "$link_all_deplibs" != no || test -z "$library_names" || -- test "$build_libtool_libs" = no; then -- linkalldeplibs=yes -- fi -+ # Suppress compiler output if we already did a PIC compilation. -+ func_append command "$suppress_output" -+ func_show_eval_locale "$command" \ -+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -- tmp_libs= -- for deplib in $dependency_libs; do -- case $deplib in -- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test -- esac -- # Need to link against all dependency_libs? -- if test $linkalldeplibs = yes; then -- deplibs="$deplib $deplibs" -- else -- # Need to hardcode shared library paths -- # or/and link against static libraries -- newdependency_libs="$deplib $newdependency_libs" -- fi -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- tmp_libs="$tmp_libs $deplib" -- done # for deplib -- continue -- fi # $linkmode = prog... -+ if test "$need_locks" = warn && -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $ECHO "\ -+*** ERROR, $lockfile contains: -+`cat $lockfile 2>/dev/null` - -- link_static=no # Whether the deplib will be linked statically -- if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -- # Link against this shared library -+but it should contain: -+$srcfile - -- if test "$linkmode,$pass" = "prog,link" || -- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then -- # Hardcode the library path. -- # Skip directories that are in the system default run-time -- # search path. -- case " $sys_lib_dlsearch_path " in -- *" $absdir "*) ;; -- *) -- case "$compile_rpath " in -- *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -- esac -- ;; -- esac -- case " $sys_lib_dlsearch_path " in -- *" $libdir "*) ;; -- *) -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -- esac -- ;; -- esac -- if test $linkmode = prog; then -- # We need to hardcode the library path -- if test -n "$shlibpath_var"; then -- # Make sure the rpath contains only unique directories. -- case "$temp_rpath " in -- *" $dir "*) ;; -- *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $dir" ;; -- esac -- fi -- fi -- fi # $linkmode,$pass = prog,link... -+This indicates that another process is trying to use the same -+temporary object file, and libtool could not work around it because -+your compiler does not support \`-c' and \`-o' together. If you -+repeat this compilation, it may succeed, by chance, but you had better -+avoid parallel builds (make -j) in this platform, or get a better -+compiler." - -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -- test -n "$library_names"; }; }; then -- # We only need to search for static libraries -- continue -- fi -+ $opt_dry_run || $RM $removelist -+ exit $EXIT_FAILURE -+ fi - -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi -+ # Just move the object if needed -+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then -+ func_show_eval '$MV "$output_obj" "$obj"' \ -+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' -+ fi -+ fi - -- if test -n "$old_archive_from_expsyms_cmds"; then -- # figure out the soname -- set dummy $library_names -- realname="$2" -- shift; shift -- libname=`eval \\$echo \"$libname_spec\"` -- # use dlname if we got it. it's perfectly good, no? -- if test -n "$dlname"; then -- soname="$dlname" -- elif test -n "$soname_spec"; then -- # bleh windows -- case $host in -- *cygwin*) -- major=`expr $current - $age` -- versuffix="-$major" -- ;; -- esac -- eval soname=\"$soname_spec\" -- else -- soname="$realname" -- fi -+ $opt_dry_run || { -+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - -- # Make a new name for the extract_expsyms_cmds to use -- soroot="$soname" -- soname=`echo $soroot | sed -e 's/^.*\///'` -- newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" -+ # Unlock the critical section if it was locked -+ if test "$need_locks" != no; then -+ removelist=$lockfile -+ $RM "$lockfile" -+ fi -+ } - -- # If the library has no export list, then create one now -- if test -f "$output_objdir/$soname-def"; then : -- else -- $show "extracting exported symbol list from \`$soname'" -- save_ifs="$IFS"; IFS='~' -- eval cmds=\"$extract_expsyms_cmds\" -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- fi -+ exit $EXIT_SUCCESS -+} - -- # Create $newlib -- if test -f "$output_objdir/$newlib"; then :; else -- $show "generating import library for \`$soname'" -- save_ifs="$IFS"; IFS='~' -- eval cmds=\"$old_archive_from_expsyms_cmds\" -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- fi -- # make sure the library variables are pointing to the new library -- dir=$output_objdir -- linklib=$newlib -- fi # test -n $old_archive_from_expsyms_cmds -+$opt_help || { -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -+} - -- if test $linkmode = prog || test "$mode" != relink; then -- add_shlibpath= -- add_dir= -- add= -- lib_linked=yes -- case $hardcode_action in -- immediate | unsupported) -- if test "$hardcode_direct" = no; then -- add="$dir/$linklib" -- elif test "$hardcode_minus_L" = no; then -- case $host in -- *-*-sunos*) add_shlibpath="$dir" ;; -- esac -- add_dir="-L$dir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = no; then -- add_shlibpath="$dir" -- add="-l$name" -- else -- lib_linked=no -- fi -- ;; -- relink) -- if test "$hardcode_direct" = yes; then -- add="$dir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$dir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -- add_shlibpath="$dir" -- add="-l$name" -- else -- lib_linked=no -- fi -- ;; -- *) lib_linked=no ;; -- esac -+func_mode_help () -+{ -+ # We need to display help for each of the modes. -+ case $opt_mode in -+ "") -+ # Generic help is extracted from the usage comments -+ # at the start of this file. -+ func_help -+ ;; -+ -+ clean) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -- if test "$lib_linked" != yes; then -- $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -- fi -+Remove files from the build directory. - -- if test -n "$add_shlibpath"; then -- case :$compile_shlibpath: in -- *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -- esac -- fi -- if test $linkmode = prog; then -- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -- test -n "$add" && compile_deplibs="$add $compile_deplibs" -- else -- test -n "$add_dir" && deplibs="$add_dir $deplibs" -- test -n "$add" && deplibs="$add $deplibs" -- if test "$hardcode_direct" != yes && \ -- test "$hardcode_minus_L" != yes && \ -- test "$hardcode_shlibpath_var" = yes; then -- case :$finalize_shlibpath: in -- *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -- esac -- fi -- fi -- fi -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. - -- if test $linkmode = prog || test "$mode" = relink; then -- add_shlibpath= -- add_dir= -- add= -- # Finalize command for both is simple: just hardcode it. -- if test "$hardcode_direct" = yes; then -- add="$libdir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$libdir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -- case :$finalize_shlibpath: in -- *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -- esac -- add="-l$name" -- else -- # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -- add="-l$name" -- fi -+If FILE is a libtool library, object or program, all the files associated -+with it are deleted. Otherwise, only FILE itself is deleted using RM." -+ ;; - -- if test $linkmode = prog; then -- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" -- else -- test -n "$add_dir" && deplibs="$add_dir $deplibs" -- test -n "$add" && deplibs="$add $deplibs" -- fi -- fi -- elif test $linkmode = prog; then -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -- test -n "$library_names"; }; }; then -- # We only need to search for static libraries -- continue -- fi -+ compile) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -- # Try to link the static library -- # Here we assume that one of hardcode_direct or hardcode_minus_L -- # is not unsupported. This is valid on all known static and -- # shared platforms. -- if test "$hardcode_direct" != unsupported; then -- test -n "$old_library" && linklib="$old_library" -- compile_deplibs="$dir/$linklib $compile_deplibs" -- finalize_deplibs="$dir/$linklib $finalize_deplibs" -- else -- compile_deplibs="-l$name -L$dir $compile_deplibs" -- finalize_deplibs="-l$name -L$dir $finalize_deplibs" -- fi -- elif test "$build_libtool_libs" = yes; then -- # Not a shared library -- if test "$deplibs_check_method" != pass_all; then -- # We're trying link a shared library against a static one -- # but the system doesn't support it. -+Compile a source file into a libtool library object. - -- # Just print a warning and add the library to dependency_libs so -- # that the program can be linked against the static library. -- echo -- echo "*** Warning: This library needs some functionality provided by $lib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -- if test "$module" = yes; then -- echo "*** Therefore, libtool will create a static module, that should work " -- echo "*** as long as the dlopening application is linked with the -dlopen flag." -- if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -- fi -- if test "$build_old_libs" = no; then -- build_libtool_libs=module -- build_old_libs=yes -- else -- build_libtool_libs=no -- fi -- fi -- else -- convenience="$convenience $dir/$old_library" -- old_convenience="$old_convenience $dir/$old_library" -- deplibs="$dir/$old_library $deplibs" -- link_static=yes -- fi -- fi # link shared/static library? -+This mode accepts the following additional options: - -- if test $linkmode = lib; then -- if test -n "$dependency_libs" && -- { test $hardcode_into_libs != yes || test $build_old_libs = yes || -- test $link_static = yes; }; then -- # Extract -R from dependency_libs -- temp_deplibs= -- for libdir in $dependency_libs; do -- case $libdir in -- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` -- case " $xrpath " in -- *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -- esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -- esac -- done -- dependency_libs="$temp_deplibs" -- fi -+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -+ -no-suppress do not suppress compiler output for multiple passes -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only -+ -shared do not build a \`.o' file suitable for static linking -+ -static only build a \`.o' file suitable for static linking -+ -Wc,FLAG pass FLAG directly to the compiler - -- newlib_search_path="$newlib_search_path $absdir" -- # Link against this library -- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -- # ... and its dependency_libs -- tmp_libs= -- for deplib in $dependency_libs; do -- newdependency_libs="$deplib $newdependency_libs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- tmp_libs="$tmp_libs $deplib" -- done -+COMPILE-COMMAND is a command to be used in creating a \`standard' object file -+from the given SOURCEFILE. - -- if test $link_all_deplibs != no; then -- # Add the search paths of all dependency libraries -- for deplib in $dependency_libs; do -- case $deplib in -- -L*) path="$deplib" ;; -- *.la) -- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$deplib" && dir="." -- # We need an absolute path. -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -- *) -- absdir=`cd "$dir" && pwd` -- if test -z "$absdir"; then -- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 -- absdir="$dir" -- fi -- ;; -- esac -- if grep "^installed=no" $deplib > /dev/null; then -- path="-L$absdir/$objdir" -- else -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- if test -z "$libdir"; then -- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -- fi -- if test "$absdir" != "$libdir"; then -- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -- fi -- path="-L$absdir" -- fi -- ;; -- *) continue ;; -- esac -- case " $deplibs " in -- *" $path "*) ;; -- *) deplibs="$deplibs $path" ;; -- esac -- done -- fi # link_all_deplibs != no -- fi # linkmode = lib -- done # for deplib in $libs -- if test $pass = dlpreopen; then -- # Link the dlpreopened libraries before other libraries -- for deplib in $save_deplibs; do -- deplibs="$deplib $deplibs" -- done -- fi -- if test $pass != dlopen; then -- test $pass != scan && dependency_libs="$newdependency_libs" -- if test $pass != conv; then -- # Make sure lib_search_path contains only unique directories. -- lib_search_path= -- for dir in $newlib_search_path; do -- case "$lib_search_path " in -- *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -- esac -- done -- newlib_search_path= -+The output file name is determined by removing the directory component from -+SOURCEFILE, then substituting the C source code suffix \`.c' with the -+library object suffix, \`.lo'." -+ ;; -+ -+ execute) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... -+ -+Automatically set library path, then run a program. -+ -+This mode accepts the following additional options: -+ -+ -dlopen FILE add the directory containing FILE to the library path -+ -+This mode sets the library path environment variable according to \`-dlopen' -+flags. -+ -+If any of the ARGS are libtool executable wrappers, then they are translated -+into their corresponding uninstalled binary, and any of their required library -+directories are added to the library path. -+ -+Then, COMMAND is executed, with ARGS as arguments." -+ ;; -+ -+ finish) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... -+ -+Complete the installation of libtool libraries. -+ -+Each LIBDIR is a directory that contains libtool libraries. -+ -+The commands that this mode executes may require superuser privileges. Use -+the \`--dry-run' option if you just want to see what would be executed." -+ ;; -+ -+ install) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... -+ -+Install executables or libraries. -+ -+INSTALL-COMMAND is the installation command. The first component should be -+either the \`install' or \`cp' program. -+ -+The following components of INSTALL-COMMAND are treated specially: -+ -+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ -+The rest of the components are interpreted as arguments to that command (only -+BSD-compatible install options are recognized)." -+ ;; -+ -+ link) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... -+ -+Link object files or libraries together to form another library, or to -+create an executable program. -+ -+LINK-COMMAND is a command using the C compiler that you would use to create -+a program from several object files. -+ -+The following components of LINK-COMMAND are treated specially: -+ -+ -all-static do not do any dynamic linking at all -+ -avoid-version do not add a version suffix if possible -+ -bindir BINDIR specify path to binaries directory (for systems where -+ libraries must be found in the PATH setting at runtime) -+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -+ -export-symbols SYMFILE -+ try to export only the symbols listed in SYMFILE -+ -export-symbols-regex REGEX -+ try to export only the symbols matching REGEX -+ -LLIBDIR search LIBDIR for required installed libraries -+ -lNAME OUTPUT-FILE requires the installed library libNAME -+ -module build a library that can dlopened -+ -no-fast-install disable the fast-install mode -+ -no-install link a not-installable executable -+ -no-undefined declare that a library does not refer to external symbols -+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -objectlist FILE Use a list of object files found in FILE to specify objects -+ -precious-files-regex REGEX -+ don't remove output files matching REGEX -+ -release RELEASE specify package release information -+ -rpath LIBDIR the created library will eventually be installed in LIBDIR -+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -+ -shared only do dynamic linking of libtool libraries -+ -shrext SUFFIX override the standard shared library file extension -+ -static do not do any dynamic linking of uninstalled libtool libraries -+ -static-libtool-libs -+ do not do any dynamic linking of libtool libraries -+ -version-info CURRENT[:REVISION[:AGE]] -+ specify library version info [each variable defaults to 0] -+ -weak LIBNAME declare that the target provides the LIBNAME interface -+ -Wc,FLAG -+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler -+ -Wl,FLAG -+ -Xlinker FLAG pass linker-specific FLAG directly to the linker -+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -+ -+All other options (arguments beginning with \`-') are ignored. -+ -+Every other argument is treated as a filename. Files ending in \`.la' are -+treated as uninstalled libtool libraries, other files are standard or library -+object files. -+ -+If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -+only library objects (\`.lo' files) may be specified, and \`-rpath' is -+required, except when creating a convenience library. -+ -+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -+using \`ar' and \`ranlib', or on Windows using \`lib'. -+ -+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -+is created, otherwise an executable program is created." -+ ;; -+ -+ uninstall) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -+ -+Remove libraries from an installation directory. -+ -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. -+ -+If FILE is a libtool library, all the files associated with it are deleted. -+Otherwise, only FILE itself is deleted using RM." -+ ;; -+ -+ *) -+ func_fatal_help "invalid operation mode \`$opt_mode'" -+ ;; -+ esac -+ -+ echo -+ $ECHO "Try \`$progname --help' for more information about other modes." -+} -+ -+# Now that we've collected a possible --mode arg, show help if necessary -+if $opt_help; then -+ if test "$opt_help" = :; then -+ func_mode_help -+ else -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ func_mode_help -+ done -+ } | sed -n '1p; 2,$s/^Usage:/ or: /p' -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ echo -+ func_mode_help -+ done -+ } | -+ sed '1d -+ /^When reporting/,/^Report/{ -+ H -+ d -+ } -+ $x -+ /information about other modes/d -+ /more detailed .*MODE/d -+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' -+ fi -+ exit $? -+fi -+ -+ -+# func_mode_execute arg... -+func_mode_execute () -+{ -+ $opt_debug -+ # The first argument is the command name. -+ cmd="$nonopt" -+ test -z "$cmd" && \ -+ func_fatal_help "you must specify a COMMAND" -+ -+ # Handle -dlopen flags immediately. -+ for file in $opt_dlopen; do -+ test -f "$file" \ -+ || func_fatal_help "\`$file' is not a file" -+ -+ dir= -+ case $file in -+ *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$file" \ -+ || func_fatal_help "\`$lib' is not a valid libtool archive" -+ -+ # Read the libtool library. -+ dlname= -+ library_names= -+ func_source "$file" -+ -+ # Skip this library if it cannot be dlopened. -+ if test -z "$dlname"; then -+ # Warn if it was a shared library. -+ test -n "$library_names" && \ -+ func_warning "\`$file' was not linked with \`-export-dynamic'" -+ continue - fi - -- if test "$linkmode,$pass" != "prog,link"; then -- vars="deplibs" -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" -+ -+ if test -f "$dir/$objdir/$dlname"; then -+ func_append dir "/$objdir" - else -- vars="compile_deplibs finalize_deplibs" -+ if test ! -f "$dir/$dlname"; then -+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -+ fi - fi -- for var in $vars dependency_libs; do -- # Add libraries to $var in reverse order -- eval tmp_libs=\"\$$var\" -- new_libs= -- for deplib in $tmp_libs; do -- case $deplib in -- -L*) new_libs="$deplib $new_libs" ;; -- *) -- case " $specialdeplibs " in -- *" $deplib "*) new_libs="$deplib $new_libs" ;; -- *) -- case " $new_libs " in -- *" $deplib "*) ;; -- *) new_libs="$deplib $new_libs" ;; -- esac -- ;; -- esac -- ;; -- esac -- done -- tmp_libs= -- for deplib in $new_libs; do -- case $deplib in -- -L*) -- case " $tmp_libs " in -- *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -- esac -- ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -- esac -- done -- eval $var=\"$tmp_libs\" -- done # for var -- fi -- if test "$pass" = "conv" && -- { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then -- libs="$deplibs" # reset libs -- deplibs= -- fi -- done # for pass -- if test $linkmode = prog; then -- dlfiles="$newdlfiles" -- dlprefiles="$newdlprefiles" -- fi -+ ;; - -- case $linkmode in -- oldlib) -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -- fi -+ *.lo) -+ # Just add the directory containing the .lo file. -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" -+ ;; -+ -+ *) -+ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" -+ continue -+ ;; -+ esac -+ -+ # Get the absolute pathname. -+ absdir=`cd "$dir" && pwd` -+ test -n "$absdir" && dir="$absdir" -+ -+ # Now add the directory to shlibpath_var. -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" -+ else -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -+ fi -+ done -+ -+ # This variable tells wrapper scripts just to set shlibpath_var -+ # rather than running their programs. -+ libtool_execute_magic="$magic" -+ -+ # Check if any of the arguments is a wrapper script. -+ args= -+ for file -+ do -+ case $file in -+ -* | *.la | *.lo ) ;; -+ *) -+ # Do a test to see if this is really a libtool program. -+ if func_ltwrapper_script_p "$file"; then -+ func_source "$file" -+ # Transform arg to wrapped name. -+ file="$progdir/$program" -+ elif func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ func_source "$func_ltwrapper_scriptname_result" -+ # Transform arg to wrapped name. -+ file="$progdir/$program" -+ fi -+ ;; -+ esac -+ # Quote arguments (to preserve shell metacharacters). -+ func_append_quoted args "$file" -+ done -+ -+ if test "X$opt_dry_run" = Xfalse; then -+ if test -n "$shlibpath_var"; then -+ # Export the shlibpath_var. -+ eval "export $shlibpath_var" -+ fi -+ -+ # Restore saved environment variables -+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+ do -+ eval "if test \"\${save_$lt_var+set}\" = set; then -+ $lt_var=\$save_$lt_var; export $lt_var -+ else -+ $lt_unset $lt_var -+ fi" -+ done -+ -+ # Now prepare to actually exec the command. -+ exec_cmd="\$cmd$args" -+ else -+ # Display what would be done. -+ if test -n "$shlibpath_var"; then -+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -+ echo "export $shlibpath_var" -+ fi -+ $ECHO "$cmd$args" -+ exit $EXIT_SUCCESS -+ fi -+} -+ -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} -+ -+ -+# func_mode_finish arg... -+func_mode_finish () -+{ -+ $opt_debug -+ libs= -+ libdirs= -+ admincmds= -+ -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi -+ -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for libdir in $libdirs; do -+ if test -n "$finish_cmds"; then -+ # Do each command in the finish commands. -+ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -+'"$cmd"'"' -+ fi -+ if test -n "$finish_eval"; then -+ # Do the single finish_eval. -+ eval cmds=\"$finish_eval\" -+ $opt_dry_run || eval "$cmds" || func_append admincmds " -+ $cmds" -+ fi -+ done -+ fi -+ -+ # Exit here if they wanted silent mode. -+ $opt_silent && exit $EXIT_SUCCESS -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo -+ -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi -+ exit $EXIT_SUCCESS -+} -+ -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} -+ -+ -+# func_mode_install arg... -+func_mode_install () -+{ -+ $opt_debug -+ # There may be an optional sh(1) argument at the beginning of -+ # install_prog (especially on Windows NT). -+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -+ # Allow the use of GNU shtool's install command. -+ case $nonopt in *shtool*) :;; *) false;; esac; then -+ # Aesthetically quote it. -+ func_quote_for_eval "$nonopt" -+ install_prog="$func_quote_for_eval_result " -+ arg=$1 -+ shift -+ else -+ install_prog= -+ arg=$nonopt -+ fi -+ -+ # The real first argument should be the name of the installation program. -+ # Aesthetically quote it. -+ func_quote_for_eval "$arg" -+ func_append install_prog "$func_quote_for_eval_result" -+ install_shared_prog=$install_prog -+ case " $install_prog " in -+ *[\\\ /]cp\ *) install_cp=: ;; -+ *) install_cp=false ;; -+ esac -+ -+ # We need to accept at least all the BSD install flags. -+ dest= -+ files= -+ opts= -+ prev= -+ install_type= -+ isdir=no -+ stripme= -+ no_mode=: -+ for arg -+ do -+ arg2= -+ if test -n "$dest"; then -+ func_append files " $dest" -+ dest=$arg -+ continue -+ fi -+ -+ case $arg in -+ -d) isdir=yes ;; -+ -f) -+ if $install_cp; then :; else -+ prev=$arg -+ fi -+ ;; -+ -g | -m | -o) -+ prev=$arg -+ ;; -+ -s) -+ stripme=" -s" -+ continue -+ ;; -+ -*) -+ ;; -+ *) -+ # If the previous option needed an argument, then skip it. -+ if test -n "$prev"; then -+ if test "x$prev" = x-m && test -n "$install_override_mode"; then -+ arg2=$install_override_mode -+ no_mode=false -+ fi -+ prev= -+ else -+ dest=$arg -+ continue -+ fi -+ ;; -+ esac -+ -+ # Aesthetically quote the argument. -+ func_quote_for_eval "$arg" -+ func_append install_prog " $func_quote_for_eval_result" -+ if test -n "$arg2"; then -+ func_quote_for_eval "$arg2" -+ fi -+ func_append install_shared_prog " $func_quote_for_eval_result" -+ done -+ -+ test -z "$install_prog" && \ -+ func_fatal_help "you must specify an install program" -+ -+ test -n "$prev" && \ -+ func_fatal_help "the \`$prev' option requires an argument" -+ -+ if test -n "$install_override_mode" && $no_mode; then -+ if $install_cp; then :; else -+ func_quote_for_eval "$install_override_mode" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" -+ fi -+ fi -+ -+ if test -z "$files"; then -+ if test -z "$dest"; then -+ func_fatal_help "no file or destination specified" -+ else -+ func_fatal_help "you must specify a destination" -+ fi -+ fi -+ -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$dest" -+ dest=$func_stripname_result -+ -+ # Check to see that the destination is a directory. -+ test -d "$dest" && isdir=yes -+ if test "$isdir" = yes; then -+ destdir="$dest" -+ destname= -+ else -+ func_dirname_and_basename "$dest" "" "." -+ destdir="$func_dirname_result" -+ destname="$func_basename_result" -+ -+ # Not a directory, so check to see that there is only one file specified. -+ set dummy $files; shift -+ test "$#" -gt 1 && \ -+ func_fatal_help "\`$dest' is not a directory" -+ fi -+ case $destdir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ for file in $files; do -+ case $file in -+ *.lo) ;; -+ *) -+ func_fatal_help "\`$destdir' must be an absolute directory name" -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ # This variable tells wrapper scripts just to set variables rather -+ # than running their programs. -+ libtool_install_magic="$magic" -+ -+ staticlibs= -+ future_libdirs= -+ current_libdirs= -+ for file in $files; do -+ -+ # Do each installation. -+ case $file in -+ *.$libext) -+ # Do the static libraries later. -+ func_append staticlibs " $file" -+ ;; -+ -+ *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$file" \ -+ || func_fatal_help "\`$file' is not a valid libtool archive" -+ -+ library_names= -+ old_library= -+ relink_command= -+ func_source "$file" -+ -+ # Add the libdir to current_libdirs if it is the destination. -+ if test "X$destdir" = "X$libdir"; then -+ case "$current_libdirs " in -+ *" $libdir "*) ;; -+ *) func_append current_libdirs " $libdir" ;; -+ esac -+ else -+ # Note the libdir as a future libdir. -+ case "$future_libdirs " in -+ *" $libdir "*) ;; -+ *) func_append future_libdirs " $libdir" ;; -+ esac -+ fi -+ -+ func_dirname "$file" "/" "" -+ dir="$func_dirname_result" -+ func_append dir "$objdir" -+ -+ if test -n "$relink_command"; then -+ # Determine the prefix the user has applied to our future dir. -+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ -+ # Don't allow the user to place us outside of our expected -+ # location b/c this prevents finding dependent libraries that -+ # are installed to the same prefix. -+ # At present, this check doesn't affect windows .dll's that -+ # are installed into $libdir/../bin (currently, that works fine) -+ # but it's something to keep an eye on. -+ test "$inst_prefix_dir" = "$destdir" && \ -+ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ -+ if test -n "$inst_prefix_dir"; then -+ # Stick the inst_prefix_dir data into the link command. -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ else -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` -+ fi -+ -+ func_warning "relinking \`$file'" -+ func_show_eval "$relink_command" \ -+ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' -+ fi -+ -+ # See the names of the shared library. -+ set dummy $library_names; shift -+ if test -n "$1"; then -+ realname="$1" -+ shift -+ -+ srcname="$realname" -+ test -n "$relink_command" && srcname="$realname"T -+ -+ # Install the shared library and build the symlinks. -+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ -+ 'exit $?' -+ tstripme="$stripme" -+ case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ case $realname in -+ *.dll.a) -+ tstripme="" -+ ;; -+ esac -+ ;; -+ esac -+ if test -n "$tstripme" && test -n "$striplib"; then -+ func_show_eval "$striplib $destdir/$realname" 'exit $?' -+ fi -+ -+ if test "$#" -gt 0; then -+ # Delete the old symlinks, and create new ones. -+ # Try `ln -sf' first, because the `ln' binary might depend on -+ # the symlink we replace! Solaris /bin/ln does not understand -f, -+ # so we also need to try rm && ln -s. -+ for linkname -+ do -+ test "$linkname" != "$realname" \ -+ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" -+ done -+ fi -+ -+ # Do each command in the postinstall commands. -+ lib="$destdir/$realname" -+ func_execute_cmds "$postinstall_cmds" 'exit $?' -+ fi -+ -+ # Install the pseudo-library for information purposes. -+ func_basename "$file" -+ name="$func_basename_result" -+ instname="$dir/$name"i -+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' -+ -+ # Maybe install the static library, too. -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" -+ ;; -+ -+ *.lo) -+ # Install (i.e. copy) a libtool object. -+ -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ func_basename "$file" -+ destfile="$func_basename_result" -+ destfile="$destdir/$destfile" -+ fi -+ -+ # Deduce the name of the destination old-style object file. -+ case $destfile in -+ *.lo) -+ func_lo2o "$destfile" -+ staticdest=$func_lo2o_result -+ ;; -+ *.$objext) -+ staticdest="$destfile" -+ destfile= -+ ;; -+ *) -+ func_fatal_help "cannot copy a libtool object to \`$destfile'" -+ ;; -+ esac -+ -+ # Install the libtool object if requested. -+ test -n "$destfile" && \ -+ func_show_eval "$install_prog $file $destfile" 'exit $?' -+ -+ # Install the old object if enabled. -+ if test "$build_old_libs" = yes; then -+ # Deduce the name of the old-style object file. -+ func_lo2o "$file" -+ staticobj=$func_lo2o_result -+ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' -+ fi -+ exit $EXIT_SUCCESS -+ ;; -+ -+ *) -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ func_basename "$file" -+ destfile="$func_basename_result" -+ destfile="$destdir/$destfile" -+ fi -+ -+ # If the file is missing, and there is a .exe on the end, strip it -+ # because it is most likely a libtool script we actually want to -+ # install -+ stripped_ext="" -+ case $file in -+ *.exe) -+ if test ! -f "$file"; then -+ func_stripname '' '.exe' "$file" -+ file=$func_stripname_result -+ stripped_ext=".exe" -+ fi -+ ;; -+ esac -+ -+ # Do a test to see if this is really a libtool program. -+ case $host in -+ *cygwin* | *mingw*) -+ if func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ wrapper=$func_ltwrapper_scriptname_result -+ else -+ func_stripname '' '.exe' "$file" -+ wrapper=$func_stripname_result -+ fi -+ ;; -+ *) -+ wrapper=$file -+ ;; -+ esac -+ if func_ltwrapper_script_p "$wrapper"; then -+ notinst_deplibs= -+ relink_command= -+ -+ func_source "$wrapper" -+ -+ # Check the variables that should have been set. -+ test -z "$generated_by_libtool_version" && \ -+ func_fatal_error "invalid libtool wrapper script \`$wrapper'" -+ -+ finalize=yes -+ for lib in $notinst_deplibs; do -+ # Check to see that each library is installed. -+ libdir= -+ if test -f "$lib"; then -+ func_source "$lib" -+ fi -+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ if test -n "$libdir" && test ! -f "$libfile"; then -+ func_warning "\`$lib' has not been installed in \`$libdir'" -+ finalize=no -+ fi -+ done -+ -+ relink_command= -+ func_source "$wrapper" -+ -+ outputname= -+ if test "$fast_install" = no && test -n "$relink_command"; then -+ $opt_dry_run || { -+ if test "$finalize" = yes; then -+ tmpdir=`func_mktempdir` -+ func_basename "$file$stripped_ext" -+ file="$func_basename_result" -+ outputname="$tmpdir/$file" -+ # Replace the output file specification. -+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` -+ -+ $opt_silent || { -+ func_quote_for_expand "$relink_command" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ if eval "$relink_command"; then : -+ else -+ func_error "error: relink \`$file' with the above command before installing it" -+ $opt_dry_run || ${RM}r "$tmpdir" -+ continue -+ fi -+ file="$outputname" -+ else -+ func_warning "cannot relink \`$file'" -+ fi -+ } -+ else -+ # Install the binary that we compiled earlier. -+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` -+ fi -+ fi -+ -+ # remove .exe since cygwin /usr/bin/install will append another -+ # one anyway -+ case $install_prog,$host in -+ */usr/bin/install*,*cygwin*) -+ case $file:$destfile in -+ *.exe:*.exe) -+ # this is ok -+ ;; -+ *.exe:*) -+ destfile=$destfile.exe -+ ;; -+ *:*.exe) -+ func_stripname '' '.exe' "$destfile" -+ destfile=$func_stripname_result -+ ;; -+ esac -+ ;; -+ esac -+ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' -+ $opt_dry_run || if test -n "$outputname"; then -+ ${RM}r "$tmpdir" -+ fi -+ ;; -+ esac -+ done -+ -+ for file in $staticlibs; do -+ func_basename "$file" -+ name="$func_basename_result" -+ -+ # Set up the ranlib parameters. -+ oldlib="$destdir/$name" -+ -+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?' -+ -+ if test -n "$stripme" && test -n "$old_striplib"; then -+ func_show_eval "$old_striplib $oldlib" 'exit $?' -+ fi -+ -+ # Do each command in the postinstall commands. -+ func_execute_cmds "$old_postinstall_cmds" 'exit $?' -+ done -+ -+ test -n "$future_libdirs" && \ -+ func_warning "remember to run \`$progname --finish$future_libdirs'" -+ -+ if test -n "$current_libdirs"; then -+ # Maybe just do a dry run. -+ $opt_dry_run && current_libdirs=" -n$current_libdirs" -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ else -+ exit $EXIT_SUCCESS -+ fi -+} -+ -+test "$opt_mode" = install && func_mode_install ${1+"$@"} -+ -+ -+# func_generate_dlsyms outputname originator pic_p -+# Extract symbols from dlprefiles and create ${outputname}S.o with -+# a dlpreopen symbol table. -+func_generate_dlsyms () -+{ -+ $opt_debug -+ my_outputname="$1" -+ my_originator="$2" -+ my_pic_p="${3-no}" -+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` -+ my_dlsyms= -+ -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ if test -n "$NM" && test -n "$global_symbol_pipe"; then -+ my_dlsyms="${my_outputname}S.c" -+ else -+ func_error "not configured to extract global symbols from dlpreopened files" -+ fi -+ fi -+ -+ if test -n "$my_dlsyms"; then -+ case $my_dlsyms in -+ "") ;; -+ *.c) -+ # Discover the nlist of each of the dlfiles. -+ nlist="$output_objdir/${my_outputname}.nm" -+ -+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T" -+ -+ # Parse the name list into a source file. -+ func_verbose "creating $output_objdir/$my_dlsyms" -+ -+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ -+ -+#ifdef __cplusplus -+extern \"C\" { -+#endif -+ -+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -+#endif -+ -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ -+/* External symbol declarations for the compiler. */\ -+" -+ -+ if test "$dlself" = yes; then -+ func_verbose "generating symbol list for \`$output'" -+ -+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" -+ -+ # Add our own program objects to the symbol list. -+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ for progfile in $progfiles; do -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" -+ done -+ -+ if test -n "$exclude_expsyms"; then -+ $opt_dry_run || { -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ } -+ fi -+ -+ if test -n "$export_symbols_regex"; then -+ $opt_dry_run || { -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ } -+ fi -+ -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ export_symbols="$output_objdir/$outputname.exp" -+ $opt_dry_run || { -+ $RM $export_symbols -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ } -+ else -+ $opt_dry_run || { -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ } -+ fi -+ fi -+ -+ for dlprefile in $dlprefiles; do -+ func_verbose "extracting global C symbols from \`$dlprefile'" -+ func_basename "$dlprefile" -+ name="$func_basename_result" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac -+ done -+ -+ $opt_dry_run || { -+ # Make sure we have at least an empty file. -+ test -f "$nlist" || : > "$nlist" -+ -+ if test -n "$exclude_expsyms"; then -+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $MV "$nlist"T "$nlist" -+ fi -+ -+ # Try sorting and uniquifying the output. -+ if $GREP -v "^: " < "$nlist" | -+ if sort -k 3 /dev/null 2>&1; then -+ sort -k 3 -+ else -+ sort +2 -+ fi | -+ uniq > "$nlist"S; then -+ : -+ else -+ $GREP -v "^: " < "$nlist" > "$nlist"S -+ fi -+ -+ if test -f "$nlist"S; then -+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' -+ else -+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" -+ fi -+ -+ echo >> "$output_objdir/$my_dlsyms" "\ -+ -+/* The mapping between symbol names and symbols. */ -+typedef struct { -+ const char *name; -+ void *address; -+} lt_dlsymlist; -+extern LT_DLSYM_CONST lt_dlsymlist -+lt_${my_prefix}_LTX_preloaded_symbols[]; -+LT_DLSYM_CONST lt_dlsymlist -+lt_${my_prefix}_LTX_preloaded_symbols[] = -+{\ -+ { \"$my_originator\", (void *) 0 }," -+ -+ case $need_lib_prefix in -+ no) -+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" -+ ;; -+ *) -+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" -+ ;; -+ esac -+ echo >> "$output_objdir/$my_dlsyms" "\ -+ {0, (void *) 0} -+}; -+ -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt_${my_prefix}_LTX_preloaded_symbols; -+} -+#endif -+ -+#ifdef __cplusplus -+} -+#endif\ -+" -+ } # !$opt_dry_run -+ -+ pic_flag_for_symtable= -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) -+ case $host in -+ # compiling the symbol table file with pic_flag works around -+ # a FreeBSD bug that causes programs to crash when -lm is -+ # linked before any other PIC object. But we must not use -+ # pic_flag when linking with -static. The problem exists in -+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; -+ *-*-hpux*) -+ pic_flag_for_symtable=" $pic_flag" ;; -+ *) -+ if test "X$my_pic_p" != Xno; then -+ pic_flag_for_symtable=" $pic_flag" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ symtab_cflags= -+ for arg in $LTCFLAGS; do -+ case $arg in -+ -pie | -fpie | -fPIE) ;; -+ *) func_append symtab_cflags " $arg" ;; -+ esac -+ done -+ -+ # Now compile the dynamic symbol file. -+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' -+ -+ # Clean up the generated files. -+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' -+ -+ # Transform the symbol file into the correct name. -+ symfileobj="$output_objdir/${my_outputname}S.$objext" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ if test -f "$output_objdir/$my_outputname.def"; then -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ else -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ fi -+ ;; -+ *) -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ ;; -+ esac -+ ;; -+ *) -+ func_fatal_error "unknown suffix for \`$my_dlsyms'" -+ ;; -+ esac -+ else -+ # We keep going just in case the user didn't refer to -+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -+ # really was required. -+ -+ # Nullify the symbol file. -+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` -+ fi -+} -+ -+# func_win32_libid arg -+# return the library type of file 'arg' -+# -+# Need a lot of goo to handle *both* DLLs and import libs -+# Has to be a shell function in order to 'eat' the argument -+# that is supplied when $file_magic_command is called. -+# Despite the name, also deal with 64 bit binaries. -+func_win32_libid () -+{ -+ $opt_debug -+ win32_libid_type="unknown" -+ win32_fileres=`file -L $1 2>/dev/null` -+ case $win32_fileres in -+ *ar\ archive\ import\ library*) # definitely import -+ win32_libid_type="x86 archive import" -+ ;; -+ *ar\ archive*) # could be an import, or static -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | -+ $SED -n -e ' -+ 1,100{ -+ / I /{ -+ s,.*,import, -+ p -+ q -+ } -+ }'` -+ case $win32_nmres in -+ import*) win32_libid_type="x86 archive import";; -+ *) win32_libid_type="x86 archive static";; -+ esac -+ fi -+ ;; -+ *DLL*) -+ win32_libid_type="x86 DLL" -+ ;; -+ *executable*) # but shell scripts are "executable" too... -+ case $win32_fileres in -+ *MS\ Windows\ PE\ Intel*) -+ win32_libid_type="x86 DLL" -+ ;; -+ esac -+ ;; -+ esac -+ $ECHO "$win32_libid_type" -+} -+ -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} -+ -+ -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () -+{ -+ $opt_debug -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" -+ if test "$lock_old_archive_extraction" = yes; then -+ lockfile=$f_ex_an_ar_oldlib.lock -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ fi -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ -+ 'stat=$?; rm -f "$lockfile"; exit $stat' -+ if test "$lock_old_archive_extraction" = yes; then -+ $opt_dry_run || rm -f "$lockfile" -+ fi -+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" -+ fi -+} -+ -+ -+# func_extract_archives gentop oldlib ... -+func_extract_archives () -+{ -+ $opt_debug -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ func_basename "$my_xlib" -+ my_xlib="$func_basename_result" -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ func_arith $extracted_serial + 1 -+ extracted_serial=$func_arith_result -+ my_xlib_u=lt$extracted_serial-$my_xlib ;; -+ *) break ;; -+ esac -+ done -+ extracted_archives="$extracted_archives $my_xlib_u" -+ my_xdir="$my_gentop/$my_xlib_u" -+ -+ func_mkdir_p "$my_xdir" -+ -+ case $host in -+ *-darwin*) -+ func_verbose "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ $opt_dry_run || { -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`basename "$darwin_archive"` -+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ done # $darwin_arches -+ ## Okay now we've a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` -+ $LIPO -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ $RM -rf unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd $darwin_orig_dir -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ } # !$opt_dry_run -+ ;; -+ *) -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` -+ done -+ -+ func_extract_archives_result="$my_oldobjs" -+} -+ -+ -+# func_emit_wrapper [arg=no] -+# -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. -+# -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () -+{ -+ func_emit_wrapper_arg1=${1-no} -+ -+ $ECHO "\ -+#! $SHELL -+ -+# $output - temporary wrapper script for $objdir/$outputname -+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# -+# The $output program cannot be directly executed until all the libtool -+# libraries that it depends on are installed. -+# -+# This wrapper script should never be moved out of the build directory. -+# If it is, it will not operate correctly. -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='$sed_quote_subst' -+ -+# Be Bourne compatible -+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+relink_command=\"$relink_command\" -+ -+# This environment variable determines our operation mode. -+if test \"\$libtool_install_magic\" = \"$magic\"; then -+ # install mode needs the following variables: -+ generated_by_libtool_version='$macro_version' -+ notinst_deplibs='$notinst_deplibs' -+else -+ # When we are sourced in execute mode, \$file and \$ECHO are already set. -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ file=\"\$0\"" -+ -+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` -+ $ECHO "\ -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ ECHO=\"$qECHO\" -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} -+ -+ # Find the directory that this script lives in. -+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -+ test \"x\$thisdir\" = \"x\$file\" && thisdir=. -+ -+ # Follow symbolic links until we get to the real thisdir. -+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` -+ while test -n \"\$file\"; do -+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` -+ -+ # If there was a directory component, then change thisdir. -+ if test \"x\$destdir\" != \"x\$file\"; then -+ case \"\$destdir\" in -+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -+ *) thisdir=\"\$thisdir/\$destdir\" ;; -+ esac -+ fi -+ -+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` -+ done -+ -+ # Usually 'no', except on cygwin/mingw when embedded into -+ # the cwrapper. -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 -+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then -+ # special case for '.' -+ if test \"\$thisdir\" = \".\"; then -+ thisdir=\`pwd\` -+ fi -+ # remove .libs from thisdir -+ case \"\$thisdir\" in -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ $objdir ) thisdir=. ;; -+ esac -+ fi -+ -+ # Try to get the absolute directory name. -+ absdir=\`cd \"\$thisdir\" && pwd\` -+ test -n \"\$absdir\" && thisdir=\"\$absdir\" -+" -+ -+ if test "$fast_install" = yes; then -+ $ECHO "\ -+ program=lt-'$outputname'$exeext -+ progdir=\"\$thisdir/$objdir\" -+ -+ if test ! -f \"\$progdir/\$program\" || -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then -+ -+ file=\"\$\$-\$program\" -+ -+ if test ! -d \"\$progdir\"; then -+ $MKDIR \"\$progdir\" -+ else -+ $RM \"\$progdir/\$file\" -+ fi" -+ -+ $ECHO "\ -+ -+ # relink executable if necessary -+ if test -n \"\$relink_command\"; then -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : -+ else -+ $ECHO \"\$relink_command_output\" >&2 -+ $RM \"\$progdir/\$file\" -+ exit 1 -+ fi -+ fi -+ -+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -+ { $RM \"\$progdir/\$program\"; -+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } -+ $RM \"\$progdir/\$file\" -+ fi" -+ else -+ $ECHO "\ -+ program='$outputname' -+ progdir=\"\$thisdir/$objdir\" -+" -+ fi -+ -+ $ECHO "\ -+ -+ if test -f \"\$progdir/\$program\"; then" -+ -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ -+ # Export our shlibpath_var if we have one. -+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ $ECHO "\ -+ # Add our own library path to $shlibpath_var -+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ -+ # Some systems cannot cope with colon-terminated $shlibpath_var -+ # The second colon is a workaround for a bug in BeOS R4 sed -+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` -+ -+ export $shlibpath_var -+" -+ fi -+ -+ $ECHO "\ -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ # Run the actual program with our arguments. -+ func_exec_program \${1+\"\$@\"} -+ fi -+ else -+ # The program doesn't exist. -+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit 1 -+ fi -+fi\ -+" -+} -+ -+ -+# func_emit_cwrapperexe_src -+# emit the source code for a wrapper executable on stdout -+# Must ONLY be called from within func_mode_link because -+# it depends on a number of variable set therein. -+func_emit_cwrapperexe_src () -+{ -+ cat < -+#include -+#ifdef _MSC_VER -+# include -+# include -+# include -+#else -+# include -+# include -+# ifdef __CYGWIN__ -+# include -+# endif -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* declarations of non-ANSI functions */ -+#if defined(__MINGW32__) -+# ifdef __STRICT_ANSI__ -+int _putenv (const char *); -+# endif -+#elif defined(__CYGWIN__) -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif -+/* #elif defined (other platforms) ... */ -+#endif -+ -+/* portability defines, excluding path handling macros */ -+#if defined(_MSC_VER) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+# define S_IXUSR _S_IEXEC -+# ifndef _INTPTR_T_DEFINED -+# define _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#elif defined(__MINGW32__) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+#elif defined(__CYGWIN__) -+# define HAVE_SETENV -+# define FOPEN_WB "wb" -+/* #elif defined (other platforms) ... */ -+#endif -+ -+#if defined(PATH_MAX) -+# define LT_PATHMAX PATH_MAX -+#elif defined(MAXPATHLEN) -+# define LT_PATHMAX MAXPATHLEN -+#else -+# define LT_PATHMAX 1024 -+#endif -+ -+#ifndef S_IXOTH -+# define S_IXOTH 0 -+#endif -+#ifndef S_IXGRP -+# define S_IXGRP 0 -+#endif -+ -+/* path handling portability macros */ -+#ifndef DIR_SEPARATOR -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' -+#endif -+ -+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -+ defined (__OS2__) -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# define FOPEN_WB "wb" -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif -+#endif -+ -+#ifndef DIR_SEPARATOR_2 -+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -+#else /* DIR_SEPARATOR_2 */ -+# define IS_DIR_SEPARATOR(ch) \ -+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -+#endif /* DIR_SEPARATOR_2 */ -+ -+#ifndef PATH_SEPARATOR_2 -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -+#else /* PATH_SEPARATOR_2 */ -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -+#endif /* PATH_SEPARATOR_2 */ -+ -+#ifndef FOPEN_WB -+# define FOPEN_WB "w" -+#endif -+#ifndef _O_BINARY -+# define _O_BINARY 0 -+#endif -+ -+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -+#define XFREE(stale) do { \ -+ if (stale) { free ((void *) stale); stale = 0; } \ -+} while (0) -+ -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; -+#else -+static int lt_debug = 0; -+#endif -+ -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ -+ -+void *xmalloc (size_t num); -+char *xstrdup (const char *string); -+const char *base_name (const char *name); -+char *find_executable (const char *wrapper); -+char *chase_symlinks (const char *pathspec); -+int make_executable (const char *path); -+int check_executable (const char *path); -+char *strendzap (char *str, const char *pat); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); -+void lt_setenv (const char *name, const char *value); -+char *lt_extend_str (const char *orig_value, const char *add, int to_end); -+void lt_update_exe_path (const char *name, const char *value); -+void lt_update_lib_path (const char *name, const char *value); -+char **prepare_spawn (char **argv); -+void lt_dump_script (FILE *f); -+EOF -+ -+ cat <= 0) -+ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) -+ return 1; -+ else -+ return 0; -+} -+ -+int -+make_executable (const char *path) -+{ -+ int rval = 0; -+ struct stat st; -+ -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); -+ if ((!path) || (!*path)) -+ return 0; -+ -+ if (stat (path, &st) >= 0) -+ { -+ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); -+ } -+ return rval; -+} -+ -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise -+ Does not chase symlinks, even on platforms that support them. -+*/ -+char * -+find_executable (const char *wrapper) -+{ -+ int has_slash = 0; -+ const char *p; -+ const char *p_next; -+ /* static buffer for getcwd */ -+ char tmp[LT_PATHMAX + 1]; -+ int tmp_len; -+ char *concat_name; -+ -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); -+ -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; -+ -+ /* Absolute path? */ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+ else -+ { -+#endif -+ if (IS_DIR_SEPARATOR (wrapper[0])) -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ } -+#endif -+ -+ for (p = wrapper; *p; p++) -+ if (*p == '/') -+ { -+ has_slash = 1; -+ break; -+ } -+ if (!has_slash) -+ { -+ /* no slashes; search PATH */ -+ const char *path = getenv ("PATH"); -+ if (path != NULL) -+ { -+ for (p = path; *p; p = p_next) -+ { -+ const char *q; -+ size_t p_len; -+ for (q = p; *q; q++) -+ if (IS_PATH_SEPARATOR (*q)) -+ break; -+ p_len = q - p; -+ p_next = (*q == '\0' ? q : q + 1); -+ if (p_len == 0) -+ { -+ /* empty path: current directory */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); -+ tmp_len = strlen (tmp); -+ concat_name = -+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ } -+ else -+ { -+ concat_name = -+ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, p, p_len); -+ concat_name[p_len] = '/'; -+ strcpy (concat_name + p_len + 1, wrapper); -+ } -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+ } -+ /* not found in PATH; assume curdir */ -+ } -+ /* Relative path | not found in path: prepend cwd */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); -+ tmp_len = strlen (tmp); -+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ return NULL; -+} -+ -+char * -+chase_symlinks (const char *pathspec) -+{ -+#ifndef S_ISLNK -+ return xstrdup (pathspec); -+#else -+ char buf[LT_PATHMAX]; -+ struct stat s; -+ char *tmp_pathspec = xstrdup (pathspec); -+ char *p; -+ int has_symlinks = 0; -+ while (strlen (tmp_pathspec) && !has_symlinks) -+ { -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); -+ if (lstat (tmp_pathspec, &s) == 0) -+ { -+ if (S_ISLNK (s.st_mode) != 0) -+ { -+ has_symlinks = 1; -+ break; -+ } -+ -+ /* search backwards for last DIR_SEPARATOR */ -+ p = tmp_pathspec + strlen (tmp_pathspec) - 1; -+ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -+ p--; -+ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -+ { -+ /* no more DIR_SEPARATORS left */ -+ break; -+ } -+ *p = '\0'; -+ } -+ else -+ { -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); -+ } -+ } -+ XFREE (tmp_pathspec); -+ -+ if (!has_symlinks) -+ { -+ return xstrdup (pathspec); -+ } -+ -+ tmp_pathspec = realpath (pathspec, buf); -+ if (tmp_pathspec == 0) -+ { -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); -+ } -+ return xstrdup (tmp_pathspec); -+#endif -+} -+ -+char * -+strendzap (char *str, const char *pat) -+{ -+ size_t len, patlen; -+ -+ assert (str != NULL); -+ assert (pat != NULL); -+ -+ len = strlen (str); -+ patlen = strlen (pat); -+ -+ if (patlen <= len) -+ { -+ str += len - patlen; -+ if (strcmp (str, pat) == 0) -+ *str = '\0'; -+ } -+ return str; -+} -+ -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ -+static void -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, -+ const char *message, va_list ap) -+{ -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); -+ vfprintf (stderr, message, ap); -+ fprintf (stderr, ".\n"); -+ -+ if (exit_status >= 0) -+ exit (exit_status); -+} -+ -+void -+lt_fatal (const char *file, int line, const char *message, ...) -+{ -+ va_list ap; -+ va_start (ap, message); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); -+ va_end (ap); -+} -+ -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ -+void -+lt_setenv (const char *name, const char *value) -+{ -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); -+ { -+#ifdef HAVE_SETENV -+ /* always make a copy, for consistency with !HAVE_SETENV */ -+ char *str = xstrdup (value); -+ setenv (name, str, 1); -+#else -+ int len = strlen (name) + 1 + strlen (value) + 1; -+ char *str = XMALLOC (char, len); -+ sprintf (str, "%s=%s", name, value); -+ if (putenv (str) != EXIT_SUCCESS) -+ { -+ XFREE (str); -+ } -+#endif -+ } -+} -+ -+char * -+lt_extend_str (const char *orig_value, const char *add, int to_end) -+{ -+ char *new_value; -+ if (orig_value && *orig_value) -+ { -+ int orig_value_len = strlen (orig_value); -+ int add_len = strlen (add); -+ new_value = XMALLOC (char, add_len + orig_value_len + 1); -+ if (to_end) -+ { -+ strcpy (new_value, orig_value); -+ strcpy (new_value + orig_value_len, add); -+ } -+ else -+ { -+ strcpy (new_value, add); -+ strcpy (new_value + add_len, orig_value); -+ } -+ } -+ else -+ { -+ new_value = xstrdup (add); -+ } -+ return new_value; -+} -+ -+void -+lt_update_exe_path (const char *name, const char *value) -+{ -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); -+ -+ if (name && *name && value && *value) -+ { -+ char *new_value = lt_extend_str (getenv (name), value, 0); -+ /* some systems can't cope with a ':'-terminated path #' */ -+ int len = strlen (new_value); -+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) -+ { -+ new_value[len-1] = '\0'; -+ } -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ } -+} -+ -+void -+lt_update_lib_path (const char *name, const char *value) -+{ -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); -+ -+ if (name && *name && value && *value) -+ { -+ char *new_value = lt_extend_str (getenv (name), value, 0); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ } -+} -+ -+EOF -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ -+/* Prepares an argument vector before calling spawn(). -+ Note that spawn() does not by itself call the command interpreter -+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : -+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -+ GetVersionEx(&v); -+ v.dwPlatformId == VER_PLATFORM_WIN32_NT; -+ }) ? "cmd.exe" : "command.com"). -+ Instead it simply concatenates the arguments, separated by ' ', and calls -+ CreateProcess(). We must quote the arguments since Win32 CreateProcess() -+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a -+ special way: -+ - Space and tab are interpreted as delimiters. They are not treated as -+ delimiters if they are surrounded by double quotes: "...". -+ - Unescaped double quotes are removed from the input. Their only effect is -+ that within double quotes, space and tab are treated like normal -+ characters. -+ - Backslashes not followed by double quotes are not special. -+ - But 2*n+1 backslashes followed by a double quote become -+ n backslashes followed by a double quote (n >= 0): -+ \" -> " -+ \\\" -> \" -+ \\\\\" -> \\" -+ */ -+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+char ** -+prepare_spawn (char **argv) -+{ -+ size_t argc; -+ char **new_argv; -+ size_t i; -+ -+ /* Count number of arguments. */ -+ for (argc = 0; argv[argc] != NULL; argc++) -+ ; -+ -+ /* Allocate new argument vector. */ -+ new_argv = XMALLOC (char *, argc + 1); -+ -+ /* Put quoted arguments into the new argument vector. */ -+ for (i = 0; i < argc; i++) -+ { -+ const char *string = argv[i]; -+ -+ if (string[0] == '\0') -+ new_argv[i] = xstrdup ("\"\""); -+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) -+ { -+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); -+ size_t length; -+ unsigned int backslashes; -+ const char *s; -+ char *quoted_string; -+ char *p; -+ -+ length = 0; -+ backslashes = 0; -+ if (quote_around) -+ length++; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ length += backslashes + 1; -+ length++; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ length += backslashes + 1; -+ -+ quoted_string = XMALLOC (char, length + 1); -+ -+ p = quoted_string; -+ backslashes = 0; -+ if (quote_around) -+ *p++ = '"'; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ { -+ unsigned int j; -+ for (j = backslashes + 1; j > 0; j--) -+ *p++ = '\\'; -+ } -+ *p++ = c; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ { -+ unsigned int j; -+ for (j = backslashes; j > 0; j--) -+ *p++ = '\\'; -+ *p++ = '"'; -+ } -+ *p = '\0'; -+ -+ new_argv[i] = quoted_string; -+ } -+ else -+ new_argv[i] = (char *) string; -+ } -+ new_argv[argc] = NULL; -+ -+ return new_argv; -+} -+EOF -+ ;; -+ esac -+ -+ cat <<"EOF" -+void lt_dump_script (FILE* f) -+{ -+EOF -+ func_emit_wrapper yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' -+ -+ cat <<"EOF" -+} -+EOF -+} -+# end: func_emit_cwrapperexe_src -+ -+# func_win32_import_lib_p ARG -+# True if ARG is an import lib, as indicated by $file_magic_cmd -+func_win32_import_lib_p () -+{ -+ $opt_debug -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in -+ *import*) : ;; -+ *) false ;; -+ esac -+} -+ -+# func_mode_link arg... -+func_mode_link () -+{ -+ $opt_debug -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ # It is impossible to link a dll without this setting, and -+ # we shouldn't force the makefile maintainer to figure out -+ # which system we are compiling for in order to pass an extra -+ # flag for every libtool invocation. -+ # allow_undefined=no -+ -+ # FIXME: Unfortunately, there are problems with the above when trying -+ # to make a dll which has undefined symbols, in which case not -+ # even a static library is built. For now, we need to specify -+ # -no-undefined on the libtool link line when we can be certain -+ # that all symbols are satisfied, otherwise we get a static library. -+ allow_undefined=yes -+ ;; -+ *) -+ allow_undefined=yes -+ ;; -+ esac -+ libtool_args=$nonopt -+ base_compile="$nonopt $@" -+ compile_command=$nonopt -+ finalize_command=$nonopt -+ -+ compile_rpath= -+ finalize_rpath= -+ compile_shlibpath= -+ finalize_shlibpath= -+ convenience= -+ old_convenience= -+ deplibs= -+ old_deplibs= -+ compiler_flags= -+ linker_flags= -+ dllsearchpath= -+ lib_search_path=`pwd` -+ inst_prefix_dir= -+ new_inherited_linker_flags= -+ -+ avoid_version=no -+ bindir= -+ dlfiles= -+ dlprefiles= -+ dlself=no -+ export_dynamic=no -+ export_symbols= -+ export_symbols_regex= -+ generated= -+ libobjs= -+ ltlibs= -+ module=no -+ no_install=no -+ objs= -+ non_pic_objects= -+ precious_files_regex= -+ prefer_static_libs=no -+ preload=no -+ prev= -+ prevarg= -+ release= -+ rpath= -+ xrpath= -+ perm_rpath= -+ temp_rpath= -+ thread_safe=no -+ vinfo= -+ vinfo_number=no -+ weak_libs= -+ single_module="${wl}-single_module" -+ func_infer_tag $base_compile -+ -+ # We need to know -static, to get the right output filenames. -+ for arg -+ do -+ case $arg in -+ -shared) -+ test "$build_libtool_libs" != yes && \ -+ func_fatal_configuration "can not build a shared library" -+ build_old_libs=no -+ break -+ ;; -+ -all-static | -static | -static-libtool-libs) -+ case $arg in -+ -all-static) -+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -+ func_warning "complete static linking is impossible in this configuration" -+ fi -+ if test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ -static) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=built -+ ;; -+ -static-libtool-libs) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ esac -+ build_libtool_libs=no -+ build_old_libs=yes -+ break -+ ;; -+ esac -+ done -+ -+ # See if our shared archives depend on static archives. -+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes -+ -+ # Go through the arguments, transforming them on the way. -+ while test "$#" -gt 0; do -+ arg="$1" -+ shift -+ func_quote_for_eval "$arg" -+ qarg=$func_quote_for_eval_unquoted_result -+ func_append libtool_args " $func_quote_for_eval_result" -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ output) -+ func_append compile_command " @OUTPUT@" -+ func_append finalize_command " @OUTPUT@" -+ ;; -+ esac -+ -+ case $prev in -+ bindir) -+ bindir="$arg" -+ prev= -+ continue -+ ;; -+ dlfiles|dlprefiles) -+ if test "$preload" = no; then -+ # Add the symbol object into the linking commands. -+ func_append compile_command " @SYMFILE@" -+ func_append finalize_command " @SYMFILE@" -+ preload=yes -+ fi -+ case $arg in -+ *.la | *.lo) ;; # We handle these cases below. -+ force) -+ if test "$dlself" = no; then -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ self) -+ if test "$prev" = dlprefiles; then -+ dlself=yes -+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -+ dlself=yes -+ else -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ *) -+ if test "$prev" = dlfiles; then -+ func_append dlfiles " $arg" -+ else -+ func_append dlprefiles " $arg" -+ fi -+ prev= -+ continue -+ ;; -+ esac -+ ;; -+ expsyms) -+ export_symbols="$arg" -+ test -f "$arg" \ -+ || func_fatal_error "symbol file \`$arg' does not exist" -+ prev= -+ continue -+ ;; -+ expsyms_regex) -+ export_symbols_regex="$arg" -+ prev= -+ continue -+ ;; -+ framework) -+ case $host in -+ *-*-darwin*) -+ case "$deplibs " in -+ *" $qarg.ltframework "*) ;; -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later -+ ;; -+ esac -+ ;; -+ esac -+ prev= -+ continue -+ ;; -+ inst_prefix) -+ inst_prefix_dir="$arg" -+ prev= -+ continue -+ ;; -+ objectlist) -+ if test -f "$arg"; then -+ save_arg=$arg -+ moreargs= -+ for fil in `cat "$save_arg"` -+ do -+# func_append moreargs " $fil" -+ arg=$fil -+ # A libtool-controlled object. -+ -+ # Check to see that this really is a libtool object. -+ if func_lalib_unsafe_p "$arg"; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ func_source "$arg" -+ -+ if test -z "$pic_object" || -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && -+ test "$non_pic_object" = none; then -+ func_fatal_error "cannot find name of object for \`$arg'" -+ fi -+ -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" -+ -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ func_append dlfiles " $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ func_append dlprefiles " $pic_object" -+ prev= -+ fi -+ -+ # A PIC object. -+ func_append libobjs " $pic_object" -+ arg="$pic_object" -+ fi -+ -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ func_append non_pic_objects " $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if $opt_dry_run; then -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" -+ -+ func_lo2o "$arg" -+ pic_object=$xdir$objdir/$func_lo2o_result -+ non_pic_object=$xdir$func_lo2o_result -+ func_append libobjs " $pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ else -+ func_fatal_error "\`$arg' is not a valid libtool object" -+ fi -+ fi -+ done -+ else -+ func_fatal_error "link input file \`$arg' does not exist" -+ fi -+ arg=$save_arg -+ prev= -+ continue -+ ;; -+ precious_regex) -+ precious_files_regex="$arg" -+ prev= -+ continue -+ ;; -+ release) -+ release="-$arg" -+ prev= -+ continue -+ ;; -+ rpath | xrpath) -+ # We need an absolute path. -+ case $arg in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ func_fatal_error "only absolute run-paths are allowed" -+ ;; -+ esac -+ if test "$prev" = rpath; then -+ case "$rpath " in -+ *" $arg "*) ;; -+ *) func_append rpath " $arg" ;; -+ esac -+ else -+ case "$xrpath " in -+ *" $arg "*) ;; -+ *) func_append xrpath " $arg" ;; -+ esac -+ fi -+ prev= -+ continue -+ ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ weak) -+ func_append weak_libs " $arg" -+ prev= -+ continue -+ ;; -+ xcclinker) -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" -+ prev= -+ func_append compile_command " $qarg" -+ func_append finalize_command " $qarg" -+ continue -+ ;; -+ xcompiler) -+ func_append compiler_flags " $qarg" -+ prev= -+ func_append compile_command " $qarg" -+ func_append finalize_command " $qarg" -+ continue -+ ;; -+ xlinker) -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" -+ prev= -+ func_append compile_command " $wl$qarg" -+ func_append finalize_command " $wl$qarg" -+ continue -+ ;; -+ *) -+ eval "$prev=\"\$arg\"" -+ prev= -+ continue -+ ;; -+ esac -+ fi # test -n "$prev" -+ -+ prevarg="$arg" -+ -+ case $arg in -+ -all-static) -+ if test -n "$link_static_flag"; then -+ # See comment for -static flag below, for more details. -+ func_append compile_command " $link_static_flag" -+ func_append finalize_command " $link_static_flag" -+ fi -+ continue -+ ;; -+ -+ -allow-undefined) -+ # FIXME: remove this flag sometime in the future. -+ func_fatal_error "\`-allow-undefined' must not be used because it is the default" -+ ;; -+ -+ -avoid-version) -+ avoid_version=yes -+ continue -+ ;; -+ -+ -bindir) -+ prev=bindir -+ continue -+ ;; -+ -+ -dlopen) -+ prev=dlfiles -+ continue -+ ;; -+ -+ -dlpreopen) -+ prev=dlprefiles -+ continue -+ ;; -+ -+ -export-dynamic) -+ export_dynamic=yes -+ continue -+ ;; -+ -+ -export-symbols | -export-symbols-regex) -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ func_fatal_error "more than one -exported-symbols argument is not allowed" -+ fi -+ if test "X$arg" = "X-export-symbols"; then -+ prev=expsyms -+ else -+ prev=expsyms_regex -+ fi -+ continue -+ ;; -+ -+ -framework) -+ prev=framework -+ continue -+ ;; -+ -+ -inst-prefix-dir) -+ prev=inst_prefix -+ continue -+ ;; -+ -+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* -+ # so, if we see these flags be careful not to treat them like -L -+ -L[A-Z][A-Z]*:*) -+ case $with_gcc/$host in -+ no/*-*-irix* | /*-*-irix*) -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ ;; -+ esac -+ continue -+ ;; -+ -+ -L*) -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then -+ if test "$#" -gt 0; then -+ func_fatal_error "require no space between \`-L' and \`$1'" -+ else -+ func_fatal_error "need path for \`-L' option" -+ fi -+ fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ test -z "$absdir" && \ -+ func_fatal_error "cannot determine absolute directory name of \`$dir'" -+ dir="$absdir" -+ ;; -+ esac -+ case "$deplibs " in -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; -+ *) -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" -+ ;; -+ esac -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` -+ case :$dllsearchpath: in -+ *":$dir:"*) ;; -+ ::) dllsearchpath=$dir;; -+ *) func_append dllsearchpath ":$dir";; -+ esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ ::) dllsearchpath=$testbindir;; -+ *) func_append dllsearchpath ":$testbindir";; -+ esac -+ ;; -+ esac -+ continue -+ ;; -+ -+ -l*) -+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ # These systems don't actually have a C or math library (as such) -+ continue -+ ;; -+ *-*-os2*) -+ # These systems don't actually have a C library (as such) -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C and math libraries are in the System framework -+ func_append deplibs " System.ltframework" -+ continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ test "X$arg" = "X-lc" && continue -+ ;; -+ esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac -+ fi -+ func_append deplibs " $arg" -+ continue -+ ;; -+ -+ -module) -+ module=yes -+ continue -+ ;; -+ -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ # Darwin uses the -arch flag to determine output architecture. -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ prev=xcompiler -+ continue -+ ;; -+ -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ func_append compiler_flags " $arg" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ case "$new_inherited_linker_flags " in -+ *" $arg "*) ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; -+ esac -+ continue -+ ;; -+ -+ -multi_module) -+ single_module="${wl}-multi_module" -+ continue -+ ;; -+ -+ -no-fast-install) -+ fast_install=no -+ continue -+ ;; -+ -+ -no-install) -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) -+ # The PATH hackery in wrapper scripts is required on Windows -+ # and Darwin in order for the loader to find any dlls it needs. -+ func_warning "\`-no-install' is ignored for $host" -+ func_warning "assuming \`-no-fast-install' instead" -+ fast_install=no -+ ;; -+ *) no_install=yes ;; -+ esac -+ continue -+ ;; -+ -+ -no-undefined) -+ allow_undefined=no -+ continue -+ ;; -+ -+ -objectlist) -+ prev=objectlist -+ continue -+ ;; -+ -+ -o) prev=output ;; -+ -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; -+ -+ -release) -+ prev=release -+ continue -+ ;; -+ -+ -rpath) -+ prev=rpath -+ continue -+ ;; -+ -+ -R) -+ prev=xrpath -+ continue -+ ;; -+ -+ -R*) -+ func_stripname '-R' '' "$arg" -+ dir=$func_stripname_result -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; -+ *) -+ func_fatal_error "only absolute run-paths are allowed" -+ ;; -+ esac -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) func_append xrpath " $dir" ;; -+ esac -+ continue -+ ;; -+ -+ -shared) -+ # The effects of -shared are defined in a previous loop. -+ continue -+ ;; -+ -+ -shrext) -+ prev=shrext -+ continue -+ ;; -+ -+ -static | -static-libtool-libs) -+ # The effects of -static are defined in a previous loop. -+ # We used to do the same as -all-static on platforms that -+ # didn't have a PIC flag, but the assumption that the effects -+ # would be equivalent was wrong. It would break on at least -+ # Digital Unix and AIX. -+ continue -+ ;; -+ -+ -thread-safe) -+ thread_safe=yes -+ continue -+ ;; -+ -+ -version-info) -+ prev=vinfo -+ continue -+ ;; -+ -+ -version-number) -+ prev=vinfo -+ vinfo_number=yes -+ continue -+ ;; -+ -+ -weak) -+ prev=weak -+ continue -+ ;; -+ -+ -Wc,*) -+ func_stripname '-Wc,' '' "$arg" -+ args=$func_stripname_result -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ func_quote_for_eval "$flag" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" -+ done -+ IFS="$save_ifs" -+ func_stripname ' ' '' "$arg" -+ arg=$func_stripname_result -+ ;; -+ -+ -Wl,*) -+ func_stripname '-Wl,' '' "$arg" -+ args=$func_stripname_result -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ func_quote_for_eval "$flag" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" -+ done -+ IFS="$save_ifs" -+ func_stripname ' ' '' "$arg" -+ arg=$func_stripname_result -+ ;; -+ -+ -Xcompiler) -+ prev=xcompiler -+ continue -+ ;; -+ -+ -Xlinker) -+ prev=xlinker -+ continue -+ ;; -+ -+ -XCClinker) -+ prev=xcclinker -+ continue -+ ;; -+ -+ # -msg_* for osf cc -+ -msg_*) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; -+ -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ func_append compiler_flags " $arg" -+ continue -+ ;; -+ -+ # Some other compiler flag. -+ -* | +*) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; - -- if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 -- fi -+ *.$objext) -+ # A standard object. -+ func_append objs " $arg" -+ ;; - -- if test -n "$xrpath"; then -- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 -- fi -+ *.lo) -+ # A libtool-controlled object. - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 -- fi -+ # Check to see that this really is a libtool object. -+ if func_lalib_unsafe_p "$arg"; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ func_source "$arg" -+ -+ if test -z "$pic_object" || -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && -+ test "$non_pic_object" = none; then -+ func_fatal_error "cannot find name of object for \`$arg'" -+ fi -+ -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 -- fi -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ func_append dlfiles " $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi - -- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 -- fi -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ func_append dlprefiles " $pic_object" -+ prev= -+ fi - -- # Now set the variables for building old libraries. -- build_libtool_libs=no -- oldlibs="$output" -- objs="$objs$old_deplibs" -- ;; -+ # A PIC object. -+ func_append libobjs " $pic_object" -+ arg="$pic_object" -+ fi - -- lib) -- # Make sure we only generate libraries of the form `libNAME.la'. -- case $outputname in -- lib*) -- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -- eval libname=\"$libname_spec\" -- ;; -- *) -- if test "$module" = no; then -- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -- if test "$need_lib_prefix" != no; then -- # Add the "lib" prefix for modules if required -- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -- eval libname=\"$libname_spec\" -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ func_append non_pic_objects " $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ fi - else -- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ # Only an error if not doing a dry-run. -+ if $opt_dry_run; then -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" -+ -+ func_lo2o "$arg" -+ pic_object=$xdir$objdir/$func_lo2o_result -+ non_pic_object=$xdir$func_lo2o_result -+ func_append libobjs " $pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ else -+ func_fatal_error "\`$arg' is not a valid libtool object" -+ fi - fi - ;; -- esac - -- if test -n "$objs"; then -- if test "$deplibs_check_method" != pass_all; then -- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -- exit 1 -+ *.$libext) -+ # An archive. -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" -+ continue -+ ;; -+ -+ *.la) -+ # A libtool-controlled library. -+ -+ func_resolve_sysroot "$arg" -+ if test "$prev" = dlfiles; then -+ # This library was specified with -dlopen. -+ func_append dlfiles " $func_resolve_sysroot_result" -+ prev= -+ elif test "$prev" = dlprefiles; then -+ # The library was specified with -dlpreopen. -+ func_append dlprefiles " $func_resolve_sysroot_result" -+ prev= - else -- echo -- echo "*** Warning: Linking the shared library $output against the non-libtool" -- echo "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append deplibs " $func_resolve_sysroot_result" - fi -- fi -+ continue -+ ;; - -- if test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 -- fi -+ # Some other compiler argument. -+ *) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; -+ esac # arg - -- set dummy $rpath -- if test $# -gt 2; then -- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 -+ # Now actually substitute the argument into the commands. -+ if test -n "$arg"; then -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" - fi -- install_libdir="$2" -+ done # argument parsing loop - -- oldlibs= -- if test -z "$rpath"; then -- if test "$build_libtool_libs" = yes; then -- # Building a libtool convenience library. -- libext=al -- oldlibs="$output_objdir/$libname.$libext $oldlibs" -- build_libtool_libs=convenience -- build_old_libs=yes -- fi -+ test -n "$prev" && \ -+ func_fatal_help "the \`$prevarg' option requires an argument" - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 -- fi -+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -+ eval arg=\"$export_dynamic_flag_spec\" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ fi - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 -- fi -- else -+ oldlibs= -+ # calculate the name of the file, without its directory -+ func_basename "$output" -+ outputname="$func_basename_result" -+ libobjs_save="$libobjs" - -- # Parse the version information argument. -- save_ifs="$IFS"; IFS=':' -- set dummy $vinfo 0 0 0 -- IFS="$save_ifs" -+ if test -n "$shlibpath_var"; then -+ # get the directories listed in $shlibpath_var -+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` -+ else -+ shlib_search_path= -+ fi -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - -- if test -n "$8"; then -- $echo "$modename: too many parameters to \`-version-info'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ func_dirname "$output" "/" "" -+ output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result -+ # Create the object directory. -+ func_mkdir_p "$output_objdir" -+ -+ # Determine the type of output -+ case $output in -+ "") -+ func_fatal_help "you must specify an output file" -+ ;; -+ *.$libext) linkmode=oldlib ;; -+ *.lo | *.$objext) linkmode=obj ;; -+ *.la) linkmode=lib ;; -+ *) linkmode=prog ;; # Anything else should be a program. -+ esac - -- current="$2" -- revision="$3" -- age="$4" -+ specialdeplibs= - -- # Check that each of the things are valid numbers. -- case $current in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -- *) -- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ libs= -+ # Find all interdependent deplibs by searching for libraries -+ # that are linked more than once (e.g. -la -lb -la) -+ for deplib in $deplibs; do -+ if $opt_preserve_dup_deps ; then -+ case "$libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append libs " $deplib" -+ done -+ -+ if test "$linkmode" = lib; then -+ libs="$predeps $libs $compiler_lib_search_path $postdeps" -+ -+ # Compute libraries that are listed more than once in $predeps -+ # $postdeps and mark them as special (i.e., whose duplicates are -+ # not to be eliminated). -+ pre_post_deps= -+ if $opt_duplicate_compiler_generated_deps; then -+ for pre_post_dep in $predeps $postdeps; do -+ case "$pre_post_deps " in -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; -+ esac -+ func_append pre_post_deps " $pre_post_dep" -+ done -+ fi -+ pre_post_deps= -+ fi -+ -+ deplibs= -+ newdependency_libs= -+ newlib_search_path= -+ need_relink=no # whether we're linking any uninstalled libtool libraries -+ notinst_deplibs= # not-installed libtool libraries -+ notinst_path= # paths that contain not-installed libtool libraries -+ -+ case $linkmode in -+ lib) -+ passes="conv dlpreopen link" -+ for file in $dlfiles $dlprefiles; do -+ case $file in -+ *.la) ;; -+ *) -+ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" -+ ;; -+ esac -+ done -+ ;; -+ prog) -+ compile_deplibs= -+ finalize_deplibs= -+ alldeplibs=no -+ newdlfiles= -+ newdlprefiles= -+ passes="conv scan dlopen dlpreopen link" -+ ;; -+ *) passes="conv" -+ ;; -+ esac -+ -+ for pass in $passes; do -+ # The preopen pass in lib mode reverses $deplibs; put it back here -+ # so that -L comes before libs that need it for instance... -+ if test "$linkmode,$pass" = "lib,link"; then -+ ## FIXME: Find the place where the list is rebuilt in the wrong -+ ## order, and fix it there properly -+ tmp_deplibs= -+ for deplib in $deplibs; do -+ tmp_deplibs="$deplib $tmp_deplibs" -+ done -+ deplibs="$tmp_deplibs" -+ fi -+ -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan"; then -+ libs="$deplibs" -+ deplibs= -+ fi -+ if test "$linkmode" = prog; then -+ case $pass in -+ dlopen) libs="$dlfiles" ;; -+ dlpreopen) libs="$dlprefiles" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac -+ fi -+ if test "$linkmode,$pass" = "lib,dlpreopen"; then -+ # Collect and forward deplibs of preopened libtool libs -+ for lib in $dlprefiles; do -+ # Ignore non-libtool-libs -+ dependency_libs= -+ func_resolve_sysroot "$lib" -+ case $lib in -+ *.la) func_source "$func_resolve_sysroot_result" ;; -+ esac - -- case $revision in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -- *) -- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ # Collect preopened libtool deplibs, except any this library -+ # has declared as weak libs -+ for deplib in $dependency_libs; do -+ func_basename "$deplib" -+ deplib_base=$func_basename_result -+ case " $weak_libs " in -+ *" $deplib_base "*) ;; -+ *) func_append deplibs " $deplib" ;; -+ esac -+ done -+ done -+ libs="$dlprefiles" -+ fi -+ if test "$pass" = dlopen; then -+ # Collect dlpreopened libraries -+ save_deplibs="$deplibs" -+ deplibs= -+ fi -+ -+ for deplib in $libs; do -+ lib= -+ found=no -+ case $deplib in -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ func_append compiler_flags " $deplib" -+ if test "$linkmode" = lib ; then -+ case "$new_inherited_linker_flags " in -+ *" $deplib "*) ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; -+ esac -+ fi -+ fi -+ continue -+ ;; -+ -l*) -+ if test "$linkmode" != lib && test "$linkmode" != prog; then -+ func_warning "\`-l' is ignored for archives/objects" -+ continue -+ fi -+ func_stripname '-l' '' "$deplib" -+ name=$func_stripname_result -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done -+ done -+ if test "$found" != yes; then -+ # deplib doesn't seem to be a libtool library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ else # deplib is a libtool library -+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -+ # We need to do some special things here, and not later. -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $deplib "*) -+ if func_lalib_p "$lib"; then -+ library_names= -+ old_library= -+ func_source "$lib" -+ for l in $old_library $library_names; do -+ ll="$l" -+ done -+ if test "X$ll" = "X$old_library" ; then # only static version available -+ found=no -+ func_dirname "$lib" "" "." -+ ladir="$func_dirname_result" -+ lib=$ladir/$old_library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ fi -+ ;; -+ *) ;; -+ esac -+ fi -+ fi -+ ;; # -l -+ *.ltframework) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ if test "$linkmode" = lib ; then -+ case "$new_inherited_linker_flags " in -+ *" $deplib "*) ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; -+ esac -+ fi -+ fi -+ continue -+ ;; -+ -L*) -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" -+ ;; -+ *) -+ func_warning "\`-L' is ignored for archives/objects" -+ ;; -+ esac # linkmode -+ continue -+ ;; # -L -+ -R*) -+ if test "$pass" = link; then -+ func_stripname '-R' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result -+ # Make sure the xrpath contains only unique directories. -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) func_append xrpath " $dir" ;; -+ esac -+ fi -+ deplibs="$deplib $deplibs" -+ continue -+ ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; -+ *.$libext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ case $linkmode in -+ lib) -+ # Linking convenience modules into shared libraries is allowed, -+ # but linking other static libraries is non-portable. -+ case " $dlpreconveniencelibs " in -+ *" $deplib "*) ;; -+ *) -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method; shift -+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then -+ echo -+ $ECHO "*** Warning: Trying to link with static lib archive $deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because the file extensions .$libext of this argument makes me believe" -+ echo "*** that it is just a static archive that I should not use here." -+ else -+ echo -+ $ECHO "*** Warning: Linking the shared library $output against the" -+ $ECHO "*** static library $deplib is not portable!" -+ deplibs="$deplib $deplibs" -+ fi -+ ;; -+ esac -+ continue -+ ;; -+ prog) -+ if test "$pass" != link; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ continue -+ ;; -+ esac # linkmode -+ ;; # *.$libext -+ *.lo | *.$objext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ elif test "$linkmode" = prog; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ func_append newdlprefiles " $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ func_append newdlfiles " $deplib" -+ fi -+ fi -+ continue - ;; -- esac -- -- case $age in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -- *) -- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ %DEPLIBS%) -+ alldeplibs=yes -+ continue - ;; -- esac -+ esac # case $deplib - -- if test $age -gt $current; then -- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ if test "$found" = yes || test -f "$lib"; then : -+ else -+ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - -- # Calculate the version variables. -- major= -- versuffix= -- verstring= -- case $version_type in -- none) ;; -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$lib" \ -+ || func_fatal_error "\`$lib' is not a valid libtool archive" - -- darwin) -- # Like Linux, but with the current version available in -- # verstring for coding it into the library header -- major=.`expr $current - $age` -- versuffix="$major.$age.$revision" -- # Darwin ld doesn't like 0 for these options... -- minor_current=`expr $current + 1` -- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -- ;; -+ func_dirname "$lib" "" "." -+ ladir="$func_dirname_result" - -- freebsd-aout) -- major=".$current" -- versuffix=".$current.$revision"; -- ;; -+ dlname= -+ dlopen= -+ dlpreopen= -+ libdir= -+ library_names= -+ old_library= -+ inherited_linker_flags= -+ # If the library was installed with an old release of libtool, -+ # it will not redefine variables installed, or shouldnotlink -+ installed=yes -+ shouldnotlink=no -+ avoidtemprpath= - -- freebsd-elf) -- major=".$current" -- versuffix=".$current"; -- ;; - -- irix) -- major=`expr $current - $age + 1` -- verstring="sgi$major.$revision" -+ # Read the .la file -+ func_source "$lib" - -- # Add in all the interfaces that we are compatible with. -- loop=$revision -- while test $loop != 0; do -- iface=`expr $revision - $loop` -- loop=`expr $loop - 1` -- verstring="sgi$major.$iface:$verstring" -+ # Convert "-framework foo" to "foo.ltframework" -+ if test -n "$inherited_linker_flags"; then -+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do -+ case " $new_inherited_linker_flags " in -+ *" $tmp_inherited_linker_flag "*) ;; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; -+ esac - done -+ fi -+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan" || -+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" -+ fi - -- # Before this point, $major must not contain `.'. -- major=.$major -- versuffix="$major.$revision" -- ;; -- -- linux) -- major=.`expr $current - $age` -- versuffix="$major.$age.$revision" -- ;; -+ if test "$pass" = conv; then -+ # Only check for convenience libraries -+ deplibs="$lib $deplibs" -+ if test -z "$libdir"; then -+ if test -z "$old_library"; then -+ func_fatal_error "cannot find name of link library for \`$lib'" -+ fi -+ # It is a libtool convenience library, so add in its objects. -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_preserve_dup_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then -+ func_fatal_error "\`$lib' is not a convenience library" -+ fi -+ continue -+ fi # $pass = conv - -- osf) -- major=`expr $current - $age` -- versuffix=".$current.$age.$revision" -- verstring="$current.$age.$revision" - -- # Add in all the interfaces that we are compatible with. -- loop=$age -- while test $loop != 0; do -- iface=`expr $current - $loop` -- loop=`expr $loop - 1` -- verstring="$verstring:${iface}.0" -+ # Get the name of the library we link against. -+ linklib= -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" - done -+ fi -+ if test -z "$linklib"; then -+ func_fatal_error "cannot find name of link library for \`$lib'" -+ fi - -- # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -- ;; -- -- sunos) -- major=".$current" -- versuffix=".$current.$revision" -- ;; -- -- windows) -- # Use '-' rather than '.', since we only want one -- # extension on DOS 8.3 filesystems. -- major=`expr $current - $age` -- versuffix="-$major" -- ;; -+ # This library was specified with -dlopen. -+ if test "$pass" = dlopen; then -+ if test -z "$libdir"; then -+ func_fatal_error "cannot -dlopen a convenience library: \`$lib'" -+ fi -+ if test -z "$dlname" || -+ test "$dlopen_support" != yes || -+ test "$build_libtool_libs" = no; then -+ # If there is no dlname, no dlopen support or we're linking -+ # statically, we need to preload. We also need to preload any -+ # dependent libraries so libltdl's deplib preloader doesn't -+ # bomb out in the load deplibs phase. -+ func_append dlprefiles " $lib $dependency_libs" -+ else -+ func_append newdlfiles " $lib" -+ fi -+ continue -+ fi # $pass = dlopen - -+ # We need an absolute path. -+ case $ladir in -+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) -- $echo "$modename: unknown library version type \`$version_type'" 1>&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ abs_ladir=`cd "$ladir" && pwd` -+ if test -z "$abs_ladir"; then -+ func_warning "cannot determine absolute directory name of \`$ladir'" -+ func_warning "passing it literally to the linker, although it might fail" -+ abs_ladir="$ladir" -+ fi - ;; - esac -+ func_basename "$lib" -+ laname="$func_basename_result" - -- # Clear the version info if we defaulted, and they specified a release. -- if test -z "$vinfo" && test -n "$release"; then -- major= -- verstring="0.0" -- case $version_type in -- darwin) -- # we can't check for "0.0" in archive_cmds due to quoting -- # problems, so we reset it completely -- verstring="" -+ # Find the relevant object directory and library name. -+ if test "X$installed" = Xyes; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ func_warning "library \`$lib' was moved." -+ dir="$ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ else -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" -+ fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes -+ else -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ func_append notinst_path " $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ func_append notinst_path " $abs_ladir" -+ fi -+ fi # $installed = yes -+ func_stripname 'lib' '.la' "$laname" -+ name=$func_stripname_result -+ -+ # This library was specified with -dlpreopen. -+ if test "$pass" = dlpreopen; then -+ if test -z "$libdir" && test "$linkmode" = prog; then -+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" -+ fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi - ;; -- *) -- verstring="0.0" -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi - ;; - esac -- if test "$need_version" = no; then -- versuffix= -+ fi # $pass = dlpreopen -+ -+ if test -z "$libdir"; then -+ # Link the convenience library -+ if test "$linkmode" = lib; then -+ deplibs="$dir/$old_library $deplibs" -+ elif test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$dir/$old_library $compile_deplibs" -+ finalize_deplibs="$dir/$old_library $finalize_deplibs" - else -- versuffix=".0.0" -+ deplibs="$lib $deplibs" # used for prog,scan pass - fi -+ continue - fi - -- # Remove version info from name if versioning should be avoided -- if test "$avoid_version" = yes && test "$need_version" = no; then -- major= -- versuffix= -- verstring="" -- fi - -- # Check to see if the archive will have undefined symbols. -- if test "$allow_undefined" = yes; then -- if test "$allow_undefined_flag" = unsupported; then -- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -- build_libtool_libs=no -- build_old_libs=yes -- fi -- else -- # Don't allow undefined symbols. -- allow_undefined_flag="$no_undefined_flag" -- fi -- fi -+ if test "$linkmode" = prog && test "$pass" != link; then -+ func_append newlib_search_path " $ladir" -+ deplibs="$lib $deplibs" - -- if test "$mode" != relink; then -- # Remove our outputs. -- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -- $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* -- fi -+ linkalldeplibs=no -+ if test "$link_all_deplibs" != no || test -z "$library_names" || -+ test "$build_libtool_libs" = no; then -+ linkalldeplibs=yes -+ fi - -- # Now set the variables for building old libraries. -- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" -+ ;; -+ esac -+ # Need to link against all dependency_libs? -+ if test "$linkalldeplibs" = yes; then -+ deplibs="$deplib $deplibs" -+ else -+ # Need to hardcode shared library paths -+ # or/and link against static libraries -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ if $opt_preserve_dup_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done # for deplib -+ continue -+ fi # $linkmode = prog... - -- # Transform .lo files to .o files. -- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -- fi -+ if test "$linkmode,$pass" = "prog,link"; then -+ if test -n "$library_names" && -+ { { test "$prefer_static_libs" = no || -+ test "$prefer_static_libs,$installed" = "built,yes"; } || -+ test -z "$old_library"; }; then -+ # We need to hardcode the library path -+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then -+ # Make sure the rpath contains only unique directories. -+ case "$temp_rpath:" in -+ *"$absdir:"*) ;; -+ *) func_append temp_rpath "$absdir:" ;; -+ esac -+ fi - -- # Eliminate all temporary directories. -- for path in $notinst_path; do -- lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` -- deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` -- dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` -- done -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) func_append compile_rpath " $absdir" ;; -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) func_append finalize_rpath " $libdir" ;; -+ esac -+ ;; -+ esac -+ fi # $linkmode,$pass = prog,link... - -- if test -n "$xrpath"; then -- # If the user specified any rpath flags, then add them. -- temp_xrpath= -- for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -- esac -- done -- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then -- dependency_libs="$temp_xrpath $dependency_libs" -+ if test "$alldeplibs" = yes && -+ { test "$deplibs_check_method" = pass_all || -+ { test "$build_libtool_libs" = yes && -+ test -n "$library_names"; }; }; then -+ # We only need to search for static libraries -+ continue -+ fi - fi -- fi -- -- # Make sure dlfiles contains only unique files that won't be dlpreopened -- old_dlfiles="$dlfiles" -- dlfiles= -- for lib in $old_dlfiles; do -- case " $dlprefiles $dlfiles " in -- *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -- esac -- done -- -- # Make sure dlprefiles contains only unique files -- old_dlprefiles="$dlprefiles" -- dlprefiles= -- for lib in $old_dlprefiles; do -- case "$dlprefiles " in -- *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -- esac -- done - -- if test "$build_libtool_libs" = yes; then -- if test -n "$rpath"; then -+ link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes; then -+ use_static_libs=no -+ fi -+ if test -n "$library_names" && -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -- # these systems don't actually have a c library (as such)! -- ;; -- *-*-rhapsody* | *-*-darwin1.[012]) -- # Rhapsody C library is in the System framework -- deplibs="$deplibs -framework System" -- ;; -- *-*-netbsd*) -- # Don't link with libc until the a.out ld.so is fixed. -- ;; -- *-*-openbsd*) -- # Do not include libc due to us having libc/libc_r. -+ *cygwin* | *mingw* | *cegcc*) -+ # No point in relinking DLLs because paths are not encoded -+ func_append notinst_deplibs " $lib" -+ need_relink=no - ;; - *) -- # Add libc to deplibs on all other systems if necessary. -- if test $build_libtool_need_lc = "yes"; then -- deplibs="$deplibs -lc" -+ if test "$installed" = no; then -+ func_append notinst_deplibs " $lib" -+ need_relink=yes - fi - ;; - esac -- fi -+ # This is a shared library - -- # Transform deplibs into only deplibs that can be linked in shared. -- name_save=$name -- libname_save=$libname -- release_save=$release -- versuffix_save=$versuffix -- major_save=$major -- # I'm not sure if I'm treating the release correctly. I think -- # release should show up in the -l (ie -lgmp5) so we don't want to -- # add it in twice. Is that correct? -- release="" -- versuffix="" -- major="" -- newdeplibs= -- droppeddeps=no -- case $deplibs_check_method in -- pass_all) -- # Don't check for shared/static. Everything works. -- # This might be a little naive. We might want to check -- # whether the library exists or not. But this is on -- # osf3 & osf4 and I'm not really sure... Just -- # implementing what was already the behaviour. -- newdeplibs=$deplibs -- ;; -- test_compile) -- # This code stresses the "libraries are programs" paradigm to its -- # limits. Maybe even breaks it. We compile a program, linking it -- # against the deplibs as a proxy for the library. Then we can check -- # whether they linked in statically or dynamically with ldd. -- $rm conftest.c -- cat > conftest.c < /dev/null | -+ $GREP ": [^:]* bundle" >/dev/null ; then -+ if test "X$dlopenmodule" != "X$lib"; then -+ $ECHO "*** Warning: lib $linklib is a module, not a shared library" -+ if test -z "$old_library" ; then -+ echo -+ echo "*** And there doesn't seem to be a static archive available" -+ echo "*** The link will probably fail, sorry" -+ else -+ add="$dir/$old_library" -+ fi -+ elif test -n "$old_library"; then -+ add="$dir/$old_library" -+ fi -+ fi -+ esac -+ elif test "$hardcode_minus_L" = no; then -+ case $host in -+ *-*-sunos*) add_shlibpath="$dir" ;; -+ esac -+ add_dir="-L$dir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = no; then -+ add_shlibpath="$dir" -+ add="-l$name" - else -- newdeplibs="$newdeplibs $i" -+ lib_linked=no - fi -- done -- else -- # Error occured in the first compile. Let's try to salvage the situation: -- # Compile a seperate program for each library. -- for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- $rm conftest -- $CC -o conftest conftest.c $i -- # Did it work? -- if test $? -eq 0 ; then -- ldd_output=`ldd conftest` -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -- fi -- else -- droppeddeps=yes -- echo -- echo "*** Warning! Library $i is needed by this library but I was not able to" -- echo "*** make it link in! You will probably need to install it or some" -- echo "*** library that it depends on before this library will be fully" -- echo "*** functional. Installing it before continuing would be even better." -+ ;; -+ relink) -+ if test "$hardcode_direct" = yes && -+ test "$hardcode_direct_absolute" = no; then -+ add="$dir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$dir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ func_append add_dir " -L$inst_prefix_dir$libdir" -+ ;; -+ esac - fi -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ add_shlibpath="$dir" -+ add="-l$name" - else -- newdeplibs="$newdeplibs $i" -- fi -- done -- fi -- ;; -- file_magic*) -- set dummy $deplibs_check_method -- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -- for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- # Follow soft links. -- if ls -lLd "$potent_lib" 2>/dev/null \ -- | grep " -> " >/dev/null; then -- continue -- fi -- # The statement above tries to avoid entering an -- # endless loop below, in case of cyclic links. -- # We might still enter an endless loop, since a link -- # loop can be closed while we follow links, -- # but so what? -- potlib="$potent_lib" -- while test -h "$potlib" 2>/dev/null; do -- potliblink=`ls -ld $potlib | sed 's/.* -> //'` -- case $potliblink in -- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -- esac -- done -- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -- done -- done -- if test -n "$a_deplib" ; then -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -- fi -- else -- # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -- fi -- done # Gone through all deplibs. -- ;; -- match_pattern*) -- set dummy $deplibs_check_method -- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -- for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- if eval echo \"$potent_lib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -- done -- done -- if test -n "$a_deplib" ; then -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ lib_linked=no - fi -- else -- # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ ;; -+ *) lib_linked=no ;; -+ esac -+ -+ if test "$lib_linked" != yes; then -+ func_fatal_configuration "unsupported hardcode properties" - fi -- done # Gone through all deplibs. -- ;; -- none | unknown | *) -- newdeplibs="" -- if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -- -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | -- grep . >/dev/null; then -- echo -- if test "X$deplibs_check_method" = "Xnone"; then -- echo "*** Warning: inter-library dependencies are not supported in this platform." -+ -+ if test -n "$add_shlibpath"; then -+ case :$compile_shlibpath: in -+ *":$add_shlibpath:"*) ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; -+ esac -+ fi -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -+ test -n "$add" && compile_deplibs="$add $compile_deplibs" - else -- echo "*** Warning: inter-library dependencies are not known to be supported." -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ if test "$hardcode_direct" != yes && -+ test "$hardcode_minus_L" != yes && -+ test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; -+ esac -+ fi - fi -- echo "*** All declared inter-library dependencies are being dropped." -- droppeddeps=yes - fi -- ;; -- esac -- versuffix=$versuffix_save -- major=$major_save -- release=$release_save -- libname=$libname_save -- name=$name_save -- -- case $host in -- *-*-rhapsody* | *-*-darwin1.[012]) -- # On Rhapsody replace the C library is the System framework -- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` -- ;; -- esac - -- if test "$droppeddeps" = yes; then -- if test "$module" = yes; then -- echo -- echo "*** Warning: libtool could not satisfy all declared inter-library" -- echo "*** dependencies of module $libname. Therefore, libtool will create" -- echo "*** a static module, that should work as long as the dlopening" -- echo "*** application is linked with the -dlopen flag." -- if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ # Finalize command for both is simple: just hardcode it. -+ if test "$hardcode_direct" = yes && -+ test "$hardcode_direct_absolute" = no; then -+ add="$libdir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$libdir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; -+ esac -+ add="-l$name" -+ elif test "$hardcode_automatic" = yes; then -+ if test -n "$inst_prefix_dir" && -+ test -f "$inst_prefix_dir$libdir/$linklib" ; then -+ add="$inst_prefix_dir$libdir/$linklib" -+ else -+ add="$libdir/$linklib" -+ fi -+ else -+ # We cannot seem to hardcode it, guess we'll fake it. -+ add_dir="-L$libdir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ func_append add_dir " -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi -+ add="-l$name" - fi -- if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -- build_libtool_libs=module -- build_old_libs=yes -+ -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else -- build_libtool_libs=no -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" - fi -+ fi -+ elif test "$linkmode" = prog; then -+ # Here we assume that one of hardcode_direct or hardcode_minus_L -+ # is not unsupported. This is valid on all known static and -+ # shared platforms. -+ if test "$hardcode_direct" != unsupported; then -+ test -n "$old_library" && linklib="$old_library" -+ compile_deplibs="$dir/$linklib $compile_deplibs" -+ finalize_deplibs="$dir/$linklib $finalize_deplibs" - else -- echo "*** The inter-library dependencies that have been dropped here will be" -- echo "*** automatically added whenever a program is linked with this library" -- echo "*** or is declared to -dlopen it." -+ compile_deplibs="-l$name -L$dir $compile_deplibs" -+ finalize_deplibs="-l$name -L$dir $finalize_deplibs" -+ fi -+ elif test "$build_libtool_libs" = yes; then -+ # Not a shared library -+ if test "$deplibs_check_method" != pass_all; then -+ # We're trying link a shared library against a static one -+ # but the system doesn't support it. - -- if test $allow_undefined = no; then -- echo -- echo "*** Since this library must not contain undefined symbols," -- echo "*** because either the platform does not support them or" -- echo "*** it was explicitly requested with -no-undefined," -- echo "*** libtool will only create a static version of it." -+ # Just print a warning and add the library to dependency_libs so -+ # that the program can be linked against the static library. -+ echo -+ $ECHO "*** Warning: This system can not link to static lib archive $lib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have." -+ if test "$module" = yes; then -+ echo "*** But as you try to build a module library, libtool will still create " -+ echo "*** a static module, that should work as long as the dlopening application" -+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ if test -z "$global_symbol_pipe"; then -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi - if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi -+ else -+ deplibs="$dir/$old_library $deplibs" -+ link_static=yes - fi -- fi -- # Done checking deplibs! -- deplibs=$newdeplibs -- fi -+ fi # link shared/static library? - -- # All the library-specific variables (install_libdir is set above). -- library_names= -- old_library= -- dlname= -+ if test "$linkmode" = lib; then -+ if test -n "$dependency_libs" && -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || -+ test "$link_static" = yes; }; then -+ # Extract -R from dependency_libs -+ temp_deplibs= -+ for libdir in $dependency_libs; do -+ case $libdir in -+ -R*) func_stripname '-R' '' "$libdir" -+ temp_xrpath=$func_stripname_result -+ case " $xrpath " in -+ *" $temp_xrpath "*) ;; -+ *) func_append xrpath " $temp_xrpath";; -+ esac;; -+ *) func_append temp_deplibs " $libdir";; -+ esac -+ done -+ dependency_libs="$temp_deplibs" -+ fi - -- # Test again, we may have decided not to build it any more -- if test "$build_libtool_libs" = yes; then -- if test $hardcode_into_libs = yes; then -- # Hardcode the library paths -- hardcode_libdirs= -- dep_rpath= -- rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -- for libdir in $rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ func_append newlib_search_path " $absdir" -+ # Link against this library -+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -+ # ... and its dependency_libs -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ newdependency_libs="$deplib $newdependency_libs" -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then -+ case "$tmp_libs " in -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; -+ esac -+ fi -+ func_append tmp_libs " $func_resolve_sysroot_result" -+ done -+ -+ if test "$link_all_deplibs" != no; then -+ # Add the search paths of all dependency libraries -+ for deplib in $dependency_libs; do -+ path= -+ case $deplib in -+ -L*) path="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result -+ func_dirname "$deplib" "" "." -+ dir=$func_dirname_result -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ func_warning "cannot determine absolute directory name of \`$dir'" -+ absdir="$dir" -+ fi -+ ;; -+ esac -+ if $GREP "^installed=no" $deplib > /dev/null; then -+ case $host in -+ *-*-darwin*) -+ depdepl= -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names" ; then -+ for tmp in $deplibrary_names ; do -+ depdepl=$tmp -+ done -+ if test -f "$absdir/$objdir/$depdepl" ; then -+ depdepl="$absdir/$objdir/$depdepl" -+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ if test -z "$darwin_install_name"; then -+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ fi -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" -+ path= -+ fi -+ fi -+ ;; -+ *) -+ path="-L$absdir/$objdir" -+ ;; -+ esac - else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -- esac -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$deplib' is not a valid libtool archive" -+ test "$absdir" != "$libdir" && \ -+ func_warning "\`$deplib' seems to be moved" -+ -+ path="-L$absdir" - fi -- else -- eval flag=\"$hardcode_libdir_flag_spec\" -- dep_rpath="$dep_rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$perm_rpath " in -- *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ ;; -+ esac -+ case " $deplibs " in -+ *" $path "*) ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ done -+ fi # link_all_deplibs != no -+ fi # linkmode = lib -+ done # for deplib in $libs -+ if test "$pass" = link; then -+ if test "$linkmode" = "prog"; then -+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" -+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" -+ else -+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ fi -+ fi -+ dependency_libs="$newdependency_libs" -+ if test "$pass" = dlpreopen; then -+ # Link the dlpreopened libraries before other libraries -+ for deplib in $save_deplibs; do -+ deplibs="$deplib $deplibs" -+ done -+ fi -+ if test "$pass" != dlopen; then -+ if test "$pass" != conv; then -+ # Make sure lib_search_path contains only unique directories. -+ lib_search_path= -+ for dir in $newlib_search_path; do -+ case "$lib_search_path " in -+ *" $dir "*) ;; -+ *) func_append lib_search_path " $dir" ;; -+ esac -+ done -+ newlib_search_path= -+ fi -+ -+ if test "$linkmode,$pass" != "prog,link"; then -+ vars="deplibs" -+ else -+ vars="compile_deplibs finalize_deplibs" -+ fi -+ for var in $vars dependency_libs; do -+ # Add libraries to $var in reverse order -+ eval tmp_libs=\"\$$var\" -+ new_libs= -+ for deplib in $tmp_libs; do -+ # FIXME: Pedantically, this is the right thing to do, so -+ # that some nasty dependency loop isn't accidentally -+ # broken: -+ #new_libs="$deplib $new_libs" -+ # Pragmatically, this seems to cause very few problems in -+ # practice: -+ case $deplib in -+ -L*) new_libs="$deplib $new_libs" ;; -+ -R*) ;; -+ *) -+ # And here is the reason: when a library appears more -+ # than once as an explicit dependence of a library, or -+ # is implicitly linked in more than once by the -+ # compiler, it is considered special, and multiple -+ # occurrences thereof are not removed. Compare this -+ # with having the same library being listed as a -+ # dependency of multiple other libraries: in this case, -+ # we know (pedantically, we assume) the library does not -+ # need to be listed more than once, so we keep only the -+ # last copy. This is not always right, but it is rare -+ # enough that we require users that really mean to play -+ # such unportable linking tricks to link the library -+ # using -Wl,-lname, so that libtool does not consider it -+ # for duplicate removal. -+ case " $specialdeplibs " in -+ *" $deplib "*) new_libs="$deplib $new_libs" ;; -+ *) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$deplib $new_libs" ;; -+ esac -+ ;; -+ esac -+ ;; -+ esac -+ done -+ tmp_libs= -+ for deplib in $new_libs; do -+ case $deplib in -+ -L*) -+ case " $tmp_libs " in -+ *" $deplib "*) ;; -+ *) func_append tmp_libs " $deplib" ;; - esac -- fi -+ ;; -+ *) func_append tmp_libs " $deplib" ;; -+ esac - done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- eval dep_rpath=\"$hardcode_libdir_flag_spec\" -- fi -- if test -n "$runpath_var" && test -n "$perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $perm_rpath; do -- rpath="$rpath$dir:" -- done -- eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -- fi -- test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -+ eval $var=\"$tmp_libs\" -+ done # for var -+ fi -+ # Last step: remove runtime libs from dependency_libs -+ # (they stay in deplibs) -+ tmp_libs= -+ for i in $dependency_libs ; do -+ case " $predeps $postdeps $compiler_lib_search_path " in -+ *" $i "*) -+ i="" -+ ;; -+ esac -+ if test -n "$i" ; then -+ func_append tmp_libs " $i" - fi -+ done -+ dependency_libs=$tmp_libs -+ done # for pass -+ if test "$linkmode" = prog; then -+ dlfiles="$newdlfiles" -+ fi -+ if test "$linkmode" = prog || test "$linkmode" = lib; then -+ dlprefiles="$newdlprefiles" -+ fi - -- shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -- if test -n "$shlibpath"; then -- eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -- fi -+ case $linkmode in -+ oldlib) -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ func_warning "\`-dlopen' is ignored for archives" -+ fi - -- # Get the real and link names of the library. -- eval library_names=\"$library_names_spec\" -- set dummy $library_names -- realname="$2" -- shift; shift -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ func_warning "\`-l' and \`-L' are ignored for archives" ;; -+ esac - -- if test -n "$soname_spec"; then -- eval soname=\"$soname_spec\" -- else -- soname="$realname" -- fi -- test -z "$dlname" && dlname=$soname -+ test -n "$rpath" && \ -+ func_warning "\`-rpath' is ignored for archives" - -- lib="$output_objdir/$realname" -- for link -- do -- linknames="$linknames $link" -- done -+ test -n "$xrpath" && \ -+ func_warning "\`-R' is ignored for archives" - -- # Ensure that we have .o objects for linkers which dislike .lo -- # (e.g. aix) in case we are running --disable-static -- for obj in $libobjs; do -- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$obj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- if test ! -f $xdir/$oldobj; then -- $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" -- $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? -- fi -- done -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info/-version-number' is ignored for archives" - -- # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for archives" - -- # Prepare the list of exported symbols -- if test -z "$export_symbols"; then -- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -- $show "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -- $run $rm $export_symbols -- eval cmds=\"$export_symbols_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- if test -n "$export_symbols_regex"; then -- $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -- $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -- $show "$mv \"${export_symbols}T\" \"$export_symbols\"" -- $run eval '$mv "${export_symbols}T" "$export_symbols"' -- fi -- fi -+ test -n "$export_symbols$export_symbols_regex" && \ -+ func_warning "\`-export-symbols' is ignored for archives" -+ -+ # Now set the variables for building old libraries. -+ build_libtool_libs=no -+ oldlibs="$output" -+ func_append objs "$old_deplibs" -+ ;; -+ -+ lib) -+ # Make sure we only generate libraries of the form `libNAME.la'. -+ case $outputname in -+ lib*) -+ func_stripname 'lib' '.la' "$outputname" -+ name=$func_stripname_result -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ ;; -+ *) -+ test "$module" = no && \ -+ func_fatal_help "libtool library \`$output' must begin with \`lib'" -+ -+ if test "$need_lib_prefix" != no; then -+ # Add the "lib" prefix for modules if required -+ func_stripname '' '.la' "$outputname" -+ name=$func_stripname_result -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ else -+ func_stripname '' '.la' "$outputname" -+ libname=$func_stripname_result - fi -+ ;; -+ esac - -- if test -n "$export_symbols" && test -n "$include_expsyms"; then -- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' -+ if test -n "$objs"; then -+ if test "$deplibs_check_method" != pass_all; then -+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" -+ else -+ echo -+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool" -+ $ECHO "*** objects $objs is not portable!" -+ func_append libobjs " $objs" - fi -+ fi - -- if test -n "$convenience"; then -- if test -n "$whole_archive_flag_spec"; then -- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- else -- gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi -- generated="$generated $gentop" -- -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -+ test "$dlself" != no && \ -+ func_warning "\`-dlopen self' is ignored for libtool libraries" - -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ set dummy $rpath -+ shift -+ test "$#" -gt 1 && \ -+ func_warning "ignoring multiple \`-rpath's for a libtool library" - -- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -- done -- fi -- fi -+ install_libdir="$1" - -- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -+ oldlibs= -+ if test -z "$rpath"; then -+ if test "$build_libtool_libs" = yes; then -+ # Building a libtool convenience library. -+ # Some compilers have problems with a `.al' extension so -+ # convenience libraries should have the same extension an -+ # archive normally would. -+ oldlibs="$output_objdir/$libname.$libext $oldlibs" -+ build_libtool_libs=convenience -+ build_old_libs=yes - fi - -- # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -- fi -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - -- # Do each of the archive commands. -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval cmds=\"$archive_expsym_cmds\" -- else -- eval cmds=\"$archive_cmds\" -- fi -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for convenience libraries" -+ else -+ -+ # Parse the version information argument. -+ save_ifs="$IFS"; IFS=':' -+ set dummy $vinfo 0 0 0 -+ shift - IFS="$save_ifs" - -- # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -- exit 0 -- fi -+ test -n "$7" && \ -+ func_fatal_help "too many parameters to \`-version-info'" - -- # Create links to the real library. -- for linkname in $linknames; do -- if test "$realname" != "$linkname"; then -- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? -- fi -- done -+ # convert absolute version numbers to libtool ages -+ # this retains compatibility with .la files and attempts -+ # to make the code below a bit more comprehensible -+ -+ case $vinfo_number in -+ yes) -+ number_major="$1" -+ number_minor="$2" -+ number_revision="$3" -+ # -+ # There are really only two kinds -- those that -+ # use the current revision as the major version -+ # and those that subtract age and use age as -+ # a minor version. But, then there is irix -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+ darwin|linux|osf|windows|none) -+ func_arith $number_major + $number_minor -+ current=$func_arith_result -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+ freebsd-aout|freebsd-elf|qnx|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+ ;; -+ irix|nonstopux) -+ func_arith $number_major + $number_minor -+ current=$func_arith_result -+ age="$number_minor" -+ revision="$number_minor" -+ lt_irix_increment=no -+ ;; -+ *) -+ func_fatal_configuration "$modename: unknown library version type \`$version_type'" -+ ;; -+ esac -+ ;; -+ no) -+ current="$1" -+ revision="$2" -+ age="$3" -+ ;; -+ esac - -- # If -module or -export-dynamic was specified, set the dlname. -- if test "$module" = yes || test "$export_dynamic" = yes; then -- # On all known operating systems, these are identical. -- dlname="$soname" -- fi -- fi -- ;; -+ # Check that each of the things are valid numbers. -+ case $current in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "CURRENT \`$current' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac - -- obj) -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -- fi -+ case $revision in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "REVISION \`$revision' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac - -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -- fi -+ case $age in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "AGE \`$age' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac - -- if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 -- fi -+ if test "$age" -gt "$current"; then -+ func_error "AGE \`$age' is greater than the current interface number \`$current'" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ fi - -- if test -n "$xrpath"; then -- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 -- fi -+ # Calculate the version variables. -+ major= -+ versuffix= -+ verstring= -+ case $version_type in -+ none) ;; - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 -- fi -+ darwin) -+ # Like Linux, but with the current version available in -+ # verstring for coding it into the library header -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix="$major.$age.$revision" -+ # Darwin ld doesn't like 0 for these options... -+ func_arith $current + 1 -+ minor_current=$func_arith_result -+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" -+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ ;; - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 -- fi -+ freebsd-aout) -+ major=".$current" -+ versuffix=".$current.$revision"; -+ ;; - -- case $output in -- *.lo) -- if test -n "$objs$old_deplibs"; then -- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit 1 -- fi -- libobj="$output" -- obj=`$echo "X$output" | $Xsed -e "$lo2o"` -- ;; -- *) -- libobj= -- obj="$output" -- ;; -- esac -+ freebsd-elf) -+ major=".$current" -+ versuffix=".$current" -+ ;; - -- # Delete the old objects. -- $run $rm $obj $libobj -+ irix | nonstopux) -+ if test "X$lt_irix_increment" = "Xno"; then -+ func_arith $current - $age -+ else -+ func_arith $current - $age + 1 -+ fi -+ major=$func_arith_result - -- # Objects from convenience libraries. This assumes -- # single-version convenience libraries. Whenever we create -- # different ones for PIC/non-PIC, this we'll have to duplicate -- # the extraction. -- reload_conv_objs= -- gentop= -- # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec -- wl= -+ case $version_type in -+ nonstopux) verstring_prefix=nonstopux ;; -+ *) verstring_prefix=sgi ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" - -- if test -n "$convenience"; then -- if test -n "$whole_archive_flag_spec"; then -- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -- else -- gentop="$output_objdir/${obj}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi -- generated="$generated $gentop" -- -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -+ # Add in all the interfaces that we are compatible with. -+ loop=$revision -+ while test "$loop" -ne 0; do -+ func_arith $revision - $loop -+ iface=$func_arith_result -+ func_arith $loop - 1 -+ loop=$func_arith_result -+ verstring="$verstring_prefix$major.$iface:$verstring" -+ done - -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ # Before this point, $major must not contain `.'. -+ major=.$major -+ versuffix="$major.$revision" -+ ;; -+ -+ linux) -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix="$major.$age.$revision" -+ ;; -+ -+ osf) -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix=".$current.$age.$revision" -+ verstring="$current.$age.$revision" - -- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -+ # Add in all the interfaces that we are compatible with. -+ loop=$age -+ while test "$loop" -ne 0; do -+ func_arith $current - $loop -+ iface=$func_arith_result -+ func_arith $loop - 1 -+ loop=$func_arith_result -+ verstring="$verstring:${iface}.0" - done -- fi -- fi - -- # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ # Make executables depend on our current version. -+ func_append verstring ":${current}.0" -+ ;; - -- output="$obj" -- eval cmds=\"$reload_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -+ qnx) -+ major=".$current" -+ versuffix=".$current" -+ ;; - -- # Exit if we aren't doing a library object file. -- if test -z "$libobj"; then -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop -- fi -+ sunos) -+ major=".$current" -+ versuffix=".$current.$revision" -+ ;; -+ -+ windows) -+ # Use '-' rather than '.', since we only want one -+ # extension on DOS 8.3 filesystems. -+ func_arith $current - $age -+ major=$func_arith_result -+ versuffix="-$major" -+ ;; - -- exit 0 -- fi -+ *) -+ func_fatal_configuration "unknown library version type \`$version_type'" -+ ;; -+ esac - -- if test "$build_libtool_libs" != yes; then -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop -+ # Clear the version info if we defaulted, and they specified a release. -+ if test -z "$vinfo" && test -n "$release"; then -+ major= -+ case $version_type in -+ darwin) -+ # we can't check for "0.0" in archive_cmds due to quoting -+ # problems, so we reset it completely -+ verstring= -+ ;; -+ *) -+ verstring="0.0" -+ ;; -+ esac -+ if test "$need_version" = no; then -+ versuffix= -+ else -+ versuffix=".0.0" -+ fi - fi - -- # Create an invalid libtool object if no PIC, so that we don't -- # accidentally link it into a program. -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > $libobj" || exit $? -- exit 0 -- fi -+ # Remove version info from name if versioning should be avoided -+ if test "$avoid_version" = yes && test "$need_version" = no; then -+ major= -+ versuffix= -+ verstring="" -+ fi - -- if test -n "$pic_flag" || test "$pic_mode" != default; then -- # Only do commands if we really have different PIC objects. -- reload_objs="$libobjs $reload_conv_objs" -- output="$libobj" -- eval cmds=\"$reload_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- else -- # Just create a symlink. -- $show $rm $libobj -- $run $rm $libobj -- xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$libobj"; then -- xdir="." -+ # Check to see if the archive will have undefined symbols. -+ if test "$allow_undefined" = yes; then -+ if test "$allow_undefined_flag" = unsupported; then -+ func_warning "undefined symbols not allowed in $host shared libraries" -+ build_libtool_libs=no -+ build_old_libs=yes -+ fi - else -- xdir="$xdir" -+ # Don't allow undefined symbols. -+ allow_undefined_flag="$no_undefined_flag" - fi -- baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- $show "(cd $xdir && $LN_S $oldobj $baseobj)" -- $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? -- fi - -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop - fi - -- exit 0 -- ;; -- -- prog) -- case $host in -- *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; -- esac -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -+ func_generate_dlsyms "$libname" "$libname" "yes" -+ func_append libobjs " $symfileobj" -+ test "X$libobjs" = "X " && libobjs= -+ -+ if test "$opt_mode" != relink; then -+ # Remove our outputs, but don't remove object files since they -+ # may have been created when compiling PIC objects. -+ removelist= -+ tempremovelist=`$ECHO "$output_objdir/*"` -+ for p in $tempremovelist; do -+ case $p in -+ *.$objext | *.gcno) -+ ;; -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -+ if test "X$precious_files_regex" != "X"; then -+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -+ then -+ continue -+ fi -+ fi -+ func_append removelist " $p" -+ ;; -+ *) ;; -+ esac -+ done -+ test -n "$removelist" && \ -+ func_show_eval "${RM}r \$removelist" - fi - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 -- fi -+ # Now set the variables for building old libraries. -+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -+ func_append oldlibs " $output_objdir/$libname.$libext" - -- if test "$preload" = yes; then -- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && -- test "$dlopen_self_static" = unknown; then -- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." -- fi -+ # Transform .lo files to .o files. -+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - -- case $host in -- *-*-rhapsody* | *-*-darwin1.[012]) -- # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -- ;; -- esac -- -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ # Eliminate all temporary directories. -+ #for path in $notinst_path; do -+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` -+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` -+ #done - -- if test -n "$rpath$xrpath"; then -+ if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. -- for libdir in $rpath $xrpath; do -- # This is the magic to use -rpath. -+ temp_xrpath= -+ for libdir in $xrpath; do -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done -+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -+ dependency_libs="$temp_xrpath $dependency_libs" -+ fi - fi - -- # Now hardcode the library paths -- rpath= -- hardcode_libdirs= -- for libdir in $compile_rpath $finalize_rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ # Make sure dlfiles contains only unique files that won't be dlpreopened -+ old_dlfiles="$dlfiles" -+ dlfiles= -+ for lib in $old_dlfiles; do -+ case " $dlprefiles $dlfiles " in -+ *" $lib "*) ;; -+ *) func_append dlfiles " $lib" ;; -+ esac -+ done -+ -+ # Make sure dlprefiles contains only unique files -+ old_dlprefiles="$dlprefiles" -+ dlprefiles= -+ for lib in $old_dlprefiles; do -+ case "$dlprefiles " in -+ *" $lib "*) ;; -+ *) func_append dlprefiles " $lib" ;; -+ esac -+ done -+ -+ if test "$build_libtool_libs" = yes; then -+ if test -n "$rpath"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ # these systems don't actually have a c library (as such)! -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ func_append deplibs " System.ltframework" -+ ;; -+ *-*-netbsd*) -+ # Don't link with libc until the a.out ld.so is fixed. -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ ;; -+ *) -+ # Add libc to deplibs on all other systems if necessary. -+ if test "$build_libtool_need_lc" = "yes"; then -+ func_append deplibs " -lc" -+ fi -+ ;; -+ esac -+ fi -+ -+ # Transform deplibs into only deplibs that can be linked in shared. -+ name_save=$name -+ libname_save=$libname -+ release_save=$release -+ versuffix_save=$versuffix -+ major_save=$major -+ # I'm not sure if I'm treating the release correctly. I think -+ # release should show up in the -l (ie -lgmp5) so we don't want to -+ # add it in twice. Is that correct? -+ release="" -+ versuffix="" -+ major="" -+ newdeplibs= -+ droppeddeps=no -+ case $deplibs_check_method in -+ pass_all) -+ # Don't check for shared/static. Everything works. -+ # This might be a little naive. We might want to check -+ # whether the library exists or not. But this is on -+ # osf3 & osf4 and I'm not really sure... Just -+ # implementing what was already the behavior. -+ newdeplibs=$deplibs -+ ;; -+ test_compile) -+ # This code stresses the "libraries are programs" paradigm to its -+ # limits. Maybe even breaks it. We compile a program, linking it -+ # against the deplibs as a proxy for the library. Then we can check -+ # whether they linked in statically or dynamically with ldd. -+ $opt_dry_run || $RM conftest.c -+ cat > conftest.c </dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi -+ for potent_lib in $potential_libs; do -+ # Follow soft links. -+ if ls -lLd "$potent_lib" 2>/dev/null | -+ $GREP " -> " >/dev/null; then -+ continue -+ fi -+ # The statement above tries to avoid entering an -+ # endless loop below, in case of cyclic links. -+ # We might still enter an endless loop, since a link -+ # loop can be closed while we follow links, -+ # but so what? -+ potlib="$potent_lib" -+ while test -h "$potlib" 2>/dev/null; do -+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` -+ case $potliblink in -+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; -+ esac -+ done -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | -+ $SED -e 10q | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ func_append newdeplibs " $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ echo -+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ $ECHO "*** with $libname and none of the candidates passed a file format test" -+ $ECHO "*** using a file magic. Last file checked: $potlib" -+ fi -+ fi -+ ;; -+ *) -+ # Add a -L argument. -+ func_append newdeplibs " $a_deplib" -+ ;; -+ esac -+ done # Gone through all deplibs. -+ ;; -+ match_pattern*) -+ set dummy $deplibs_check_method; shift -+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -+ for a_deplib in $deplibs; do -+ case $a_deplib in -+ -l*) -+ func_stripname -l '' "$a_deplib" -+ name=$func_stripname_result -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ func_append newdeplibs " $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ potlib="$potent_lib" # see symlink-check above in file_magic test -+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ -+ $EGREP "$match_pattern_regex" > /dev/null; then -+ func_append newdeplibs " $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ echo -+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ $ECHO "*** with $libname and none of the candidates passed a file format test" -+ $ECHO "*** using a regex pattern. Last file checked: $potlib" -+ fi -+ fi -+ ;; -+ *) -+ # Add a -L argument. -+ func_append newdeplibs " $a_deplib" -+ ;; -+ esac -+ done # Gone through all deplibs. -+ ;; -+ none | unknown | *) -+ newdeplibs="" -+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ for i in $predeps $postdeps ; do -+ # can't use Xsed below, because $i might contain '/' -+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` -+ done -+ fi -+ case $tmp_deplibs in -+ *[!\ \ ]*) -+ echo -+ if test "X$deplibs_check_method" = "Xnone"; then -+ echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -- esac -+ echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- else -- eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$perm_rpath " in -- *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ echo "*** All declared inter-library dependencies are being dropped." -+ droppeddeps=yes -+ ;; - esac -- fi -+ ;; -+ esac -+ versuffix=$versuffix_save -+ major=$major_save -+ release=$release_save -+ libname=$libname_save -+ name=$name_save -+ - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- case :$dllsearchpath: in -- *":$libdir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -- esac -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library with the System framework -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac -- done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- eval rpath=\" $hardcode_libdir_flag_spec\" -- fi -- compile_rpath="$rpath" - -- rpath= -- hardcode_libdirs= -- for libdir in $finalize_rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ if test "$droppeddeps" = yes; then -+ if test "$module" = yes; then -+ echo -+ echo "*** Warning: libtool could not satisfy all declared inter-library" -+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -+ echo "*** a static module, that should work as long as the dlopening" -+ echo "*** application is linked with the -dlopen flag." -+ if test -z "$global_symbol_pipe"; then -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes - else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -- esac -+ build_libtool_libs=no - fi - else -- eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$finalize_perm_rpath " in -- *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -- esac -- fi -- done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- eval rpath=\" $hardcode_libdir_flag_spec\" -- fi -- finalize_rpath="$rpath" -- -- if test -n "$libobjs" && test "$build_old_libs" = yes; then -- # Transform all the library objects into standard objects. -- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- fi -+ echo "*** The inter-library dependencies that have been dropped here will be" -+ echo "*** automatically added whenever a program is linked with this library" -+ echo "*** or is declared to -dlopen it." - -- dlsyms= -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- if test -n "$NM" && test -n "$global_symbol_pipe"; then -- dlsyms="${outputname}S.c" -- else -- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 -+ if test "$allow_undefined" = no; then -+ echo -+ echo "*** Since this library must not contain undefined symbols," -+ echo "*** because either the platform does not support them or" -+ echo "*** it was explicitly requested with -no-undefined," -+ echo "*** libtool will only create a static version of it." -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ fi - fi -+ # Done checking deplibs! -+ deplibs=$newdeplibs - fi -+ # Time to change all our "foo.ltframework" stuff back to "-framework foo" -+ case $host in -+ *-*-darwin*) -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ ;; -+ esac - -- if test -n "$dlsyms"; then -- case $dlsyms in -- "") ;; -- *.c) -- # Discover the nlist of each of the dlfiles. -- nlist="$output_objdir/${outputname}.nm" -- -- $show "$rm $nlist ${nlist}S ${nlist}T" -- $run $rm "$nlist" "${nlist}S" "${nlist}T" -- -- # Parse the name list into a source file. -- $show "creating $output_objdir/$dlsyms" -- -- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ --/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ --/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ -- --#ifdef __cplusplus --extern \"C\" { --#endif -- --/* Prevent the only kind of declaration conflicts we can make. */ --#define lt_preloaded_symbols some_other_symbol -- --/* External symbol declarations for the compiler. */\ --" -- -- if test "$dlself" = yes; then -- $show "generating symbol list for \`$output'" -- -- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" -- -- # Add our own program objects to the symbol list. -- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- for arg in $progfiles; do -- $show "extracting global C symbols from \`$arg'" -- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -- done -- -- if test -n "$exclude_expsyms"; then -- $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -- $run eval '$mv "$nlist"T "$nlist"' -- fi -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $deplibs " in -+ *" -L$path/$objdir "*) -+ func_append new_libs " -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) func_append new_libs " $deplib" ;; -+ esac -+ ;; -+ *) func_append new_libs " $deplib" ;; -+ esac -+ done -+ deplibs="$new_libs" - -- if test -n "$export_symbols_regex"; then -- $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' -- $run eval '$mv "$nlist"T "$nlist"' -- fi -+ # All the library-specific variables (install_libdir is set above). -+ library_names= -+ old_library= -+ dlname= - -- # Prepare the list of exported symbols -- if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$output.exp" -- $run $rm $export_symbols -- $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -- else -- $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' -- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' -- $run eval 'mv "$nlist"T "$nlist"' -+ # Test again, we may have decided not to build it any more -+ if test "$build_libtool_libs" = yes; then -+ if test "$hardcode_into_libs" = yes; then -+ # Hardcode the library paths -+ hardcode_libdirs= -+ dep_rpath= -+ rpath="$finalize_rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" -+ for libdir in $rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) func_apped perm_rpath " $libdir" ;; -+ esac - fi -- fi -- -- for arg in $dlprefiles; do -- $show "extracting global C symbols from \`$arg'" -- name=`echo "$arg" | sed -e 's%^.*/%%'` -- $run eval 'echo ": $name " >> "$nlist"' -- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done -- -- if test -z "$run"; then -- # Make sure we have at least an empty file. -- test -f "$nlist" || : > "$nlist" -- -- if test -n "$exclude_expsyms"; then -- egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $mv "$nlist"T "$nlist" -- fi -- -- # Try sorting and uniquifying the output. -- if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then -- : -- else -- grep -v "^: " < "$nlist" > "$nlist"S -- fi -- -- if test -f "$nlist"S; then -- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ if test -n "$hardcode_libdir_flag_spec_ld"; then -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- echo '/* NONE */' >> "$output_objdir/$dlsyms" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi -- -- $echo >> "$output_objdir/$dlsyms" "\ -- --#undef lt_preloaded_symbols -- --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[] = --{\ --" -- -- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" -- -- $echo >> "$output_objdir/$dlsyms" "\ -- {0, (lt_ptr) 0} --}; -- --/* This works around a problem in FreeBSD linker */ --#ifdef FREEBSD_WORKAROUND --static const void *lt_preloaded_setup() { -- return lt_preloaded_symbols; --} --#endif -- --#ifdef __cplusplus --} --#endif\ --" - fi -+ if test -n "$runpath_var" && test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ func_append rpath "$dir:" -+ done -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -+ fi -+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -+ fi - -- pic_flag_for_symtable= -- case $host in -- # compiling the symbol table file with pic_flag works around -- # a FreeBSD bug that causes programs to crash when -lm is -- # linked before any other PIC object. But we must not use -- # pic_flag when linking with -static. The problem exists in -- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -- case "$compile_command " in -- *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -- esac;; -- *-*-hpux*) -- case "$compile_command " in -- *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC";; -- esac -- esac -+ shlibpath="$finalize_shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ if test -n "$shlibpath"; then -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -+ fi -+ -+ # Get the real and link names of the library. -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" -+ set dummy $library_names -+ shift -+ realname="$1" -+ shift - -- # Now compile the dynamic symbol file. -- $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -- $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -- -- # Clean up the generated files. -- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" -- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" -- -- # Transform the symbol file into the correct name. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- ;; -- *) -- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit 1 -- ;; -- esac -- else -- # We keep going just in case the user didn't refer to -- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -- # really was required. -+ if test -n "$soname_spec"; then -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ if test -z "$dlname"; then -+ dlname=$soname -+ fi - -- # Nullify the symbol file. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -- fi -+ lib="$output_objdir/$realname" -+ linknames= -+ for link -+ do -+ func_append linknames " $link" -+ done - -- if test $need_relink = no || test "$build_libtool_libs" != yes; then -- # Replace the output file specification. -- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -- link_command="$compile_command$compile_rpath" -+ # Use standard objects if they are pic -+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ test "X$libobjs" = "X " && libobjs= - -- # We have no uninstalled library dependencies, so finalize right now. -- $show "$link_command" -- $run eval "$link_command" -- status=$? -+ delfiles= -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" -+ export_symbols="$output_objdir/$libname.uexp" -+ func_append delfiles " $export_symbols" -+ fi -+ -+ orig_export_symbols= -+ case $host_os in -+ cygwin* | mingw* | cegcc*) -+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then -+ # exporting using user supplied symfile -+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -+ # and it's NOT already a .def file. Must figure out -+ # which of the given symbols are data symbols and tag -+ # them as such. So, trigger use of export_symbols_cmds. -+ # export_symbols gets reassigned inside the "prepare -+ # the list of exported symbols" if statement, so the -+ # include_expsyms logic still works. -+ orig_export_symbols="$export_symbols" -+ export_symbols= -+ always_export_symbols=yes -+ fi -+ fi -+ ;; -+ esac - -- # Delete the generated files. -- if test -n "$dlsyms"; then -- $show "$rm $output_objdir/${outputname}S.${objext}" -- $run $rm "$output_objdir/${outputname}S.${objext}" -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -+ func_verbose "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $opt_dry_run || $RM $export_symbols -+ cmds=$export_symbols_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd1 in $cmds; do -+ IFS="$save_ifs" -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" -+ func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs -+ skipped_export=false -+ else -+ # The command line is too long to execute in one step. -+ func_verbose "using reloadable object file for export list..." -+ skipped_export=: -+ # Break out early, otherwise skipped_export may be -+ # set to false by a later but shorter cmd. -+ break -+ fi -+ done -+ IFS="$save_ifs" -+ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then -+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' -+ fi -+ fi - fi - -- exit $status -- fi -- -- if test -n "$shlibpath_var"; then -- # We should set the shlibpath_var -- rpath= -- for dir in $temp_rpath; do -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) -- # Absolute path. -- rpath="$rpath$dir:" -- ;; -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ tmp_export_symbols="$export_symbols" -+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' -+ fi -+ -+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -+ # The given exports_symbols file has to be filtered, so filter it. -+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ # FIXME: $output_objdir/$libname.filter potentially contains lots of -+ # 's' commands which not all seds can handle. GNU sed should be fine -+ # though. Also, the filter scales superlinearly with the number of -+ # global variables. join(1) would be nice here, but unfortunately -+ # isn't a blessed tool. -+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" -+ export_symbols=$output_objdir/$libname.def -+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -+ fi -+ -+ tmp_deplibs= -+ for test_deplib in $deplibs; do -+ case " $convenience " in -+ *" $test_deplib "*) ;; - *) -- # Relative path: add a thisdir entry. -- rpath="$rpath\$thisdir/$dir:" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -- temp_rpath="$rpath" -- fi -+ deplibs="$tmp_deplibs" - -- if test -n "$compile_shlibpath$finalize_shlibpath"; then -- compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -- fi -- if test -n "$finalize_shlibpath"; then -- finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -- fi -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec" && -+ test "$compiler_needs_object" = yes && -+ test -z "$libobjs"; then -+ # extract the archives, so we have objects to list. -+ # TODO: could optimize this to just extract one archive. -+ whole_archive_flag_spec= -+ fi -+ if test -n "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ test "X$libobjs" = "X " && libobjs= -+ else -+ gentop="$output_objdir/${outputname}x" -+ func_append generated " $gentop" - -- compile_var= -- finalize_var= -- if test -n "$runpath_var"; then -- if test -n "$perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $perm_rpath; do -- rpath="$rpath$dir:" -- done -- compile_var="$runpath_var=\"$rpath\$$runpath_var\" " -- fi -- if test -n "$finalize_perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -- done -- finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ func_extract_archives $gentop $convenience -+ func_append libobjs " $func_extract_archives_result" -+ test "X$libobjs" = "X " && libobjs= -+ fi - fi -- fi - -- if test "$no_install" = yes; then -- # We don't need to create a wrapper script. -- link_command="$compile_var$compile_command$compile_rpath" -- # Replace the output file specification. -- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -- # Delete the old output file. -- $run $rm $output -- # Link the executable and exit -- $show "$link_command" -- $run eval "$link_command" || exit $? -- exit 0 -- fi -+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" -+ fi - -- if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -+ # Make a backup of the uninstalled library when relinking -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? -+ fi - -- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 -- $echo "$modename: \`$output' will be relinked during installation" 1>&2 -- else -- if test "$fast_install" != no; then -- link_command="$finalize_var$compile_command$finalize_rpath" -- if test "$fast_install" = yes; then -- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds - else -- # fast_install is set to needless -- relink_command= -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds - fi - else -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -- fi -- fi -- -- # Replace the output file specification. -- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -- -- # Delete the old output files. -- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname -- -- $show "$link_command" -- $run eval "$link_command" || exit $? -- -- # Now create the wrapper script. -- $show "creating $output" -- -- # Quote the relink command for shipping. -- if test -n "$relink_command"; then -- # Preserve any variables that may affect compiler behavior -- for var in $variables_saved_for_relink; do -- if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -- elif eval var_value=\$$var; test -z "$var_value"; then -- relink_command="$var=; export $var; $relink_command" -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds - else -- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -- relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds - fi -- done -- relink_command="cd `pwd`; $relink_command" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Quote $echo for shipping. -- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then -- case $0 in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; -- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; -- esac -- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` -- else -- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Only actually do things if our run command is non-null. -- if test -z "$run"; then -- # win32 will think the script is a binary if it has -- # a .exe suffix, so we strip it off here. -- case $output in -- *.exe) output=`echo $output|sed 's,.exe$,,'` ;; -- esac -- # test for cygwin because mv fails w/o .exe extensions -- case $host in -- *cygwin*) exeext=.exe ;; -- *) exeext= ;; -- esac -- $rm $output -- trap "$rm $output; exit 1" 1 2 15 -- -- $echo > $output "\ --#! $SHELL -- --# $output - temporary wrapper script for $objdir/$outputname --# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP --# --# The $output program cannot be directly executed until all the libtool --# libraries that it depends on are installed. --# --# This wrapper script should never be moved out of the build directory. --# If it is, it will not operate correctly. -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' --sed_quote_subst='$sed_quote_subst' -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -- --relink_command=\"$relink_command\" -- --# This environment variable determines our operation mode. --if test \"\$libtool_install_magic\" = \"$magic\"; then -- # install mode needs the following variable: -- notinst_deplibs='$notinst_deplibs' --else -- # When we are sourced in execute mode, \$file and \$echo are already set. -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- echo=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$echo works! -- : -- else -- # Restart under the correct shell, and then maybe \$echo will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi -- fi\ --" -- $echo >> $output "\ -- -- # Find the directory that this script lives in. -- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -- test \"x\$thisdir\" = \"x\$file\" && thisdir=. -- -- # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` -- while test -n \"\$file\"; do -- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -- -- # If there was a directory component, then change thisdir. -- if test \"x\$destdir\" != \"x\$file\"; then -- case \"\$destdir\" in -- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -- *) thisdir=\"\$thisdir/\$destdir\" ;; -- esac -- fi -- -- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` -- done -- -- # Try to get the absolute directory name. -- absdir=\`cd \"\$thisdir\" && pwd\` -- test -n \"\$absdir\" && thisdir=\"\$absdir\" --" -- -- if test "$fast_install" = yes; then -- echo >> $output "\ -- program=lt-'$outputname'$exeext -- progdir=\"\$thisdir/$objdir\" -- -- if test ! -f \"\$progdir/\$program\" || \\ -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ -- test \"X\$file\" != \"X\$progdir/\$program\"; }; then -- -- file=\"\$\$-\$program\" -- -- if test ! -d \"\$progdir\"; then -- $mkdir \"\$progdir\" -- else -- $rm \"\$progdir/\$file\" -- fi" -- -- echo >> $output "\ -- -- # relink executable if necessary -- if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \$relink_command 2>&1\`; then : -- else -- $echo \"\$relink_command_output\" >&2 -- $rm \"\$progdir/\$file\" -- exit 1 -- fi -- fi -- -- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -- { $rm \"\$progdir/\$program\"; -- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } -- $rm \"\$progdir/\$file\" -- fi" -- else -- echo >> $output "\ -- program='$outputname' -- progdir=\"\$thisdir/$objdir\" --" -- fi -- -- echo >> $output "\ -- -- if test -f \"\$progdir/\$program\"; then" -- -- # Export our shlibpath_var if we have one. -- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- $echo >> $output "\ -- # Add our own library path to $shlibpath_var -- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -- -- # Some systems cannot cope with colon-terminated $shlibpath_var -- # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -- -- export $shlibpath_var --" - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $echo >> $output "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -+ if test "X$skipped_export" != "X:" && -+ func_len " $test_cmds" && -+ len=$func_len_result && -+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ : -+ else -+ # The command line is too long to link in one step, link piecewise -+ # or, if using GNU ld and skipped_export is not :, use a linker -+ # script. -+ -+ # Save the value of $output and $libobjs because we want to -+ # use them later. If we have whole_archive_flag_spec, we -+ # want to use save_libobjs as it was before -+ # whole_archive_flag_spec was expanded, because we can't -+ # assume the linker understands whole_archive_flag_spec. -+ # This may have to be revisited, in case too many -+ # convenience libraries get linked in and end up exceeding -+ # the spec. -+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ fi -+ save_output=$output -+ func_basename "$output" -+ output_la=$func_basename_result -+ -+ # Clear the reloadable object creation command queue and -+ # initialize k to one. -+ test_cmds= -+ concat_cmds= -+ objlist= -+ last_robj= -+ k=1 -+ -+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then -+ output=${output_objdir}/${output_la}.lnkscript -+ func_verbose "creating GNU ld script: $output" -+ echo 'INPUT (' > $output -+ for obj in $save_libobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output -+ done -+ echo ')' >> $output -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result -+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then -+ output=${output_objdir}/${output_la}.lnk -+ func_verbose "creating linker input file list: $output" -+ : > $output -+ set x $save_libobjs -+ shift -+ firstobj= -+ if test "$compiler_needs_object" = yes; then -+ firstobj="$1 " -+ shift -+ fi -+ for obj -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output -+ done -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" -+ else -+ if test -n "$save_libobjs"; then -+ func_verbose "creating reloadable object files..." -+ output=$output_objdir/$output_la-${k}.$objext -+ eval test_cmds=\"$reload_cmds\" -+ func_len " $test_cmds" -+ len0=$func_len_result -+ len=$len0 -+ -+ # Loop over the list of objects to be linked. -+ for obj in $save_libobjs -+ do -+ func_len " $obj" -+ func_arith $len + $func_len_result -+ len=$func_arith_result -+ if test "X$objlist" = X || -+ test "$len" -lt "$max_cmd_len"; then -+ func_append objlist " $obj" -+ else -+ # The command $test_cmds is almost too long, add a -+ # command to the queue. -+ if test "$k" -eq 1 ; then -+ # The first file doesn't have a previous command to add. -+ reload_objs=$objlist -+ eval concat_cmds=\"$reload_cmds\" -+ else -+ # All subsequent reloadable object files will link in -+ # the last one created. -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" -+ fi -+ last_robj=$output_objdir/$output_la-${k}.$objext -+ func_arith $k + 1 -+ k=$func_arith_result -+ output=$output_objdir/$output_la-${k}.$objext -+ objlist=" $obj" -+ func_len " $last_robj" -+ func_arith $len0 + $func_len_result -+ len=$func_arith_result -+ fi -+ done -+ # Handle the remaining objects by creating one last -+ # reloadable object file. All subsequent reloadable object -+ # files will link in the last one created. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" -+ if test -n "$last_robj"; then -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" -+ fi -+ func_append delfiles " $output" - -- $echo >> $output "\ -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- # Run the actual program with our arguments. --" -- case $host in -- # win32 systems need to use the prog path for dll -- # lookup to work -- *-*-cygwin* | *-*-pw32*) -- $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} --" -- ;; -+ else -+ output= -+ fi - -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2*) -- $echo >> $output "\ -- exec \$progdir\\\\\$program \${1+\"\$@\"} --" -- ;; -+ if ${skipped_export-false}; then -+ func_verbose "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $opt_dry_run || $RM $export_symbols -+ libobjs=$output -+ # Append the command to create the export file. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" -+ if test -n "$last_robj"; then -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" -+ fi -+ fi - -- *) -- $echo >> $output "\ -- # Export the path to the program. -- PATH=\"\$progdir:\$PATH\" -- export PATH -+ test -n "$save_libobjs" && -+ func_verbose "creating a temporary reloadable object file: $output" - -- exec \$program \${1+\"\$@\"} --" -- ;; -- esac -- $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -- exit 1 -- fi -- else -- # The program doesn't exist. -- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 -- \$echo \"This script is just a wrapper for \$program.\" 1>&2 -- echo \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -- fi --fi\ --" -- chmod +x $output -- fi -- exit 0 -- ;; -- esac -+ # Loop through the commands generated above and execute them. -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $concat_cmds; do -+ IFS="$save_ifs" -+ $opt_silent || { -+ func_quote_for_expand "$cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ $opt_dry_run || eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$opt_mode" = relink; then -+ ( cd "$output_objdir" && \ -+ $RM "${realname}T" && \ -+ $MV "${realname}U" "$realname" ) -+ fi - -- # See if we need to build an old-fashioned archive. -- for oldlib in $oldlibs; do -+ exit $lt_exit -+ } -+ done -+ IFS="$save_ifs" - -- if test "$build_libtool_libs" = convenience; then -- oldobjs="$libobjs_save" -- addlibs="$convenience" -- build_libtool_libs=no -- else -- if test "$build_libtool_libs" = module; then -- oldobjs="$libobjs_save" -- build_libtool_libs=no -- else -- oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` -- fi -- addlibs="$old_convenience" -- fi -+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then -+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' -+ fi -+ fi - -- if test -n "$addlibs"; then -- gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi -- generated="$generated $gentop" -- -- # Add in members from convenience archives. -- for xlib in $addlibs; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -+ if ${skipped_export-false}; then -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ tmp_export_symbols="$export_symbols" -+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' -+ fi - -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -+ if test -n "$orig_export_symbols"; then -+ # The given exports_symbols file has to be filtered, so filter it. -+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ # FIXME: $output_objdir/$libname.filter potentially contains lots of -+ # 's' commands which not all seds can handle. GNU sed should be fine -+ # though. Also, the filter scales superlinearly with the number of -+ # global variables. join(1) would be nice here, but unfortunately -+ # isn't a blessed tool. -+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" -+ export_symbols=$output_objdir/$libname.def -+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -+ fi - fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - -- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -- done -- fi -+ libobjs=$output -+ # Restore the value of output. -+ output=$save_output - -- # Do each command in the archive commands. -- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- eval cmds=\"$old_archive_from_new_cmds\" -- else -- # Ensure that we have .o objects in place in case we decided -- # not to build a shared library, and have fallen back to building -- # static libs even though --disable-static was passed! -- for oldobj in $oldobjs; do -- if test ! -f $oldobj; then -- xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$oldobj"; then -- xdir="." -+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ test "X$libobjs" = "X " && libobjs= -+ fi -+ # Expand the library linking commands again to reset the -+ # value of $libobjs for piecewise linking. -+ -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ cmds=$module_expsym_cmds - else -- xdir="$xdir" -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ cmds=$archive_expsym_cmds -+ else -+ cmds=$archive_cmds - fi -- baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` -- obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -- $show "(cd $xdir && ${LN_S} $obj $baseobj)" -- $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? - fi -- done -- -- eval cmds=\"$old_archive_cmds\" -- fi -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- done -+ fi - -- if test -n "$generated"; then -- $show "${rm}r$generated" -- $run ${rm}r$generated -- fi -+ if test -n "$delfiles"; then -+ # Append the command to remove temporary files to $cmds. -+ eval cmds=\"\$cmds~\$RM $delfiles\" -+ fi - -- # Now create the libtool archive. -- case $output in -- *.la) -- old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -- $show "creating $output" -+ # Add any objects from preloaded convenience libraries -+ if test -n "$dlprefiles"; then -+ gentop="$output_objdir/${outputname}x" -+ func_append generated " $gentop" - -- # Preserve any variables that may affect compiler behavior -- for var in $variables_saved_for_relink; do -- if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -- elif eval var_value=\$$var; test -z "$var_value"; then -- relink_command="$var=; export $var; $relink_command" -- else -- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -- relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ func_extract_archives $gentop $dlprefiles -+ func_append libobjs " $func_extract_archives_result" -+ test "X$libobjs" = "X " && libobjs= - fi -- done -- # Quote the link command for shipping. -- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - -- # Only create the output if not a dry run. -- if test -z "$run"; then -- for installed in no yes; do -- if test "$installed" = yes; then -- if test -z "$install_libdir"; then -- break -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $opt_silent || { -+ func_quote_for_expand "$cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ $opt_dry_run || eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$opt_mode" = relink; then -+ ( cd "$output_objdir" && \ -+ $RM "${realname}T" && \ -+ $MV "${realname}U" "$realname" ) -+ fi -+ -+ exit $lt_exit -+ } -+ done -+ IFS="$save_ifs" -+ -+ # Restore the uninstalled library and exit -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -+ -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ func_show_eval '${RM}r "$gentop"' - fi -- output="$output_objdir/$outputname"i -- # Replace all uninstalled libtool libraries with the installed ones -- newdependency_libs= -- for deplib in $dependency_libs; do -- case $deplib in -- *.la) -- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- if test -z "$libdir"; then -- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -- fi -- newdependency_libs="$newdependency_libs $libdir/$name" -- ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -- esac -- done -- dependency_libs="$newdependency_libs" -- newdlfiles= -- for lib in $dlfiles; do -- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- if test -z "$libdir"; then -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -- fi -- newdlfiles="$newdlfiles $libdir/$name" -- done -- dlfiles="$newdlfiles" -- newdlprefiles= -- for lib in $dlprefiles; do -- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- if test -z "$libdir"; then -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -- fi -- newdlprefiles="$newdlprefiles $libdir/$name" -- done -- dlprefiles="$newdlprefiles" - fi -- $rm $output -- # place dlname in correct position for cygwin -- tdlname=$dlname -- case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -- esac -- $echo > $output "\ --# $outputname - a libtool library file --# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP --# --# Please DO NOT delete this file! --# It is necessary for linking the library. - --# The name that we can dlopen(3). --dlname='$tdlname' -+ exit $EXIT_SUCCESS -+ fi - --# Names of this library. --library_names='$library_names' -+ # Create links to the real library. -+ for linkname in $linknames; do -+ if test "$realname" != "$linkname"; then -+ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' -+ fi -+ done - --# The name of the static archive. --old_library='$old_library' -+ # If -module or -export-dynamic was specified, set the dlname. -+ if test "$module" = yes || test "$export_dynamic" = yes; then -+ # On all known operating systems, these are identical. -+ dlname="$soname" -+ fi -+ fi -+ ;; - --# Libraries that this one depends upon. --dependency_libs='$dependency_libs' -+ obj) -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ func_warning "\`-dlopen' is ignored for objects" -+ fi - --# Version information for $libname. --current=$current --age=$age --revision=$revision -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ func_warning "\`-l' and \`-L' are ignored for objects" ;; -+ esac - --# Is this an already installed library? --installed=$installed -+ test -n "$rpath" && \ -+ func_warning "\`-rpath' is ignored for objects" - --# Files to dlopen/dlpreopen --dlopen='$dlfiles' --dlpreopen='$dlprefiles' -+ test -n "$xrpath" && \ -+ func_warning "\`-R' is ignored for objects" - --# Directory that this library needs to be installed in: --libdir='$install_libdir'" -- if test "$installed" = no && test $need_relink = yes; then -- $echo >> $output "\ --relink_command=\"$relink_command\"" -- fi -- done -- fi -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info' is ignored for objects" - -- # Do a symbolic link so that the libtool archive can be found in -- # LD_LIBRARY_PATH before the program is installed. -- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" -- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? -- ;; -- esac -- exit 0 -- ;; -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for objects" - -- # libtool install mode -- install) -- modename="$modename: install" -+ case $output in -+ *.lo) -+ test -n "$objs$old_deplibs" && \ -+ func_fatal_error "cannot build library object \`$output' from non-libtool objects" - -- # There may be an optional sh(1) argument at the beginning of -- # install_prog (especially on Windows NT). -- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -- # Allow the use of GNU shtool's install command. -- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then -- # Aesthetically quote it. -- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -- arg="\"$arg\"" -+ libobj=$output -+ func_lo2o "$libobj" -+ obj=$func_lo2o_result -+ ;; -+ *) -+ libobj= -+ obj="$output" - ;; - esac -- install_prog="$arg " -- arg="$1" -- shift -- else -- install_prog= -- arg="$nonopt" -- fi - -- # The real first argument should be the name of the installation program. -- # Aesthetically quote it. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -- arg="\"$arg\"" -- ;; -- esac -- install_prog="$install_prog$arg" -+ # Delete the old objects. -+ $opt_dry_run || $RM $obj $libobj - -- # We need to accept at least all the BSD install flags. -- dest= -- files= -- opts= -- prev= -- install_type= -- isdir=no -- stripme= -- for arg -- do -- if test -n "$dest"; then -- files="$files $dest" -- dest="$arg" -- continue -+ # Objects from convenience libraries. This assumes -+ # single-version convenience libraries. Whenever we create -+ # different ones for PIC/non-PIC, this we'll have to duplicate -+ # the extraction. -+ reload_conv_objs= -+ gentop= -+ # reload_cmds runs $LD directly, so let us get rid of -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. -+ wl= -+ -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` -+ else -+ gentop="$output_objdir/${obj}x" -+ func_append generated " $gentop" -+ -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" -+ fi - fi - -- case $arg in -- -d) isdir=yes ;; -- -f) prev="-f" ;; -- -g) prev="-g" ;; -- -m) prev="-m" ;; -- -o) prev="-o" ;; -- -s) -- stripme=" -s" -- continue -- ;; -- -*) ;; -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - -- *) -- # If the previous option needed an argument, then skip it. -- if test -n "$prev"; then -- prev= -- else -- dest="$arg" -- continue -+ # Create the old-style object. -+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ -+ output="$obj" -+ func_execute_cmds "$reload_cmds" 'exit $?' -+ -+ # Exit if we aren't doing a library object file. -+ if test -z "$libobj"; then -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' - fi -- ;; -- esac - -- # Aesthetically quote the argument. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -- arg="\"$arg\"" -- ;; -+ exit $EXIT_SUCCESS -+ fi -+ -+ if test "$build_libtool_libs" != yes; then -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi -+ -+ # Create an invalid libtool object if no PIC, so that we don't -+ # accidentally link it into a program. -+ # $show "echo timestamp > $libobj" -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? -+ exit $EXIT_SUCCESS -+ fi -+ -+ if test -n "$pic_flag" || test "$pic_mode" != default; then -+ # Only do commands if we really have different PIC objects. -+ reload_objs="$libobjs $reload_conv_objs" -+ output="$libobj" -+ func_execute_cmds "$reload_cmds" 'exit $?' -+ fi -+ -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi -+ -+ exit $EXIT_SUCCESS -+ ;; -+ -+ prog) -+ case $host in -+ *cygwin*) func_stripname '' '.exe' "$output" -+ output=$func_stripname_result.exe;; - esac -- install_prog="$install_prog $arg" -- done -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info' is ignored for programs" - -- if test -z "$install_prog"; then -- $echo "$modename: you must specify an install program" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for programs" - -- if test -n "$prev"; then -- $echo "$modename: the \`$prev' option requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ test "$preload" = yes \ -+ && test "$dlopen_support" = unknown \ -+ && test "$dlopen_self" = unknown \ -+ && test "$dlopen_self_static" = unknown && \ -+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - -- if test -z "$files"; then -- if test -z "$dest"; then -- $echo "$modename: no file or destination specified" 1>&2 -- else -- $echo "$modename: you must specify a destination" 1>&2 -- fi -- $echo "$help" 1>&2 -- exit 1 -- fi -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ ;; -+ esac - -- # Strip any trailing slash from the destination. -- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` -+ case $host in -+ *-*-darwin*) -+ # Don't allow lazy linking, it breaks C++ global constructors -+ # But is supposedly fixed on 10.4 or later (yay!). -+ if test "$tagname" = CXX ; then -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in -+ 10.[0123]) -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" -+ ;; -+ esac -+ fi -+ # Time to change all our "foo.ltframework" stuff back to "-framework foo" -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ ;; -+ esac - -- # Check to see that the destination is a directory. -- test -d "$dest" && isdir=yes -- if test "$isdir" = yes; then -- destdir="$dest" -- destname= -- else -- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` -- test "X$destdir" = "X$dest" && destdir=. -- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - -- # Not a directory, so check to see that there is only one file specified. -- set dummy $files -- if test $# -gt 2; then -- $echo "$modename: \`$dest' is not a directory" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -- fi -- case $destdir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- for file in $files; do -- case $file in -- *.lo) ;; -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; - *) -- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ func_append new_libs " -L$path/$objdir" ;; -+ esac - ;; - esac - done -- ;; -- esac -- -- # This variable tells wrapper scripts just to set variables rather -- # than running their programs. -- libtool_install_magic="$magic" -- -- staticlibs= -- future_libdirs= -- current_libdirs= -- for file in $files; do -- -- # Do each installation. -- case $file in -- *.$libext) -- # Do the static libraries later. -- staticlibs="$staticlibs $file" -- ;; -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) func_append new_libs " $deplib" ;; -+ esac -+ ;; -+ *) func_append new_libs " $deplib" ;; -+ esac -+ done -+ compile_deplibs="$new_libs" - -- *.la) -- # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -- else -- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi - -- library_names= -- old_library= -- relink_command= -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - -- # Add the libdir to current_libdirs if it is the destination. -- if test "X$destdir" = "X$libdir"; then -- case "$current_libdirs " in -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$finalize_rpath " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac -- else -- # Note the libdir as a future libdir. -- case "$future_libdirs " in -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` -+ case :$dllsearchpath: in -+ *":$libdir:"*) ;; -+ ::) dllsearchpath=$libdir;; -+ *) func_append dllsearchpath ":$libdir";; -+ esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ ::) dllsearchpath=$testbindir;; -+ *) func_append dllsearchpath ":$testbindir";; -+ esac -+ ;; -+ esac -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" - -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ -- test "X$dir" = "X$file/" && dir= -- dir="$dir$objdir" -- -- if test -n "$relink_command"; then -- $echo "$modename: warning: relinking \`$file'" 1>&2 -- $show "$relink_command" -- if $run eval "$relink_command"; then : -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi - else -- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- continue -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; -+ esac - fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" - -- # See the names of the shared library. -- set dummy $library_names -- if test -n "$2"; then -- realname="$2" -- shift -- shift -+ if test -n "$libobjs" && test "$build_old_libs" = yes; then -+ # Transform all the library objects into standard objects. -+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ fi - -- srcname="$realname" -- test -n "$relink_command" && srcname="$realname"T -+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - -- # Install the shared library and build the symlinks. -- $show "$install_prog $dir/$srcname $destdir/$realname" -- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? -- if test -n "$stripme" && test -n "$striplib"; then -- $show "$striplib $destdir/$realname" -- $run eval "$striplib $destdir/$realname" || exit $? -- fi -+ # template prelinking step -+ if test -n "$prelink_cmds"; then -+ func_execute_cmds "$prelink_cmds" 'exit $?' -+ fi - -- if test $# -gt 0; then -- # Delete the old symlinks, and create new ones. -- for linkname -- do -- if test "$linkname" != "$realname"; then -- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- fi -- done -- fi -+ wrappers_required=yes -+ case $host in -+ *cegcc* | *mingw32ce*) -+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -+ wrappers_required=no -+ ;; -+ *cygwin* | *mingw* ) -+ if test "$build_libtool_libs" != yes; then -+ wrappers_required=no -+ fi -+ ;; -+ *) -+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then -+ wrappers_required=no -+ fi -+ ;; -+ esac -+ if test "$wrappers_required" = no; then -+ # Replace the output file specification. -+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` -+ link_command="$compile_command$compile_rpath" - -- # Do each command in the postinstall commands. -- lib="$destdir/$realname" -- eval cmds=\"$postinstall_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -+ # We have no uninstalled library dependencies, so finalize right now. -+ exit_status=0 -+ func_show_eval "$link_command" 'exit_status=$?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' - fi - -- # Install the pseudo-library for information purposes. -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- instname="$dir/$name"i -- $show "$install_prog $instname $destdir/$name" -- $run eval "$install_prog $instname $destdir/$name" || exit $? -+ # Delete the generated files. -+ if test -f "$output_objdir/${outputname}S.${objext}"; then -+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -+ fi - -- # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -- ;; -+ exit $exit_status -+ fi - -- *.lo) -- # Install (i.e. copy) a libtool object. -+ if test -n "$compile_shlibpath$finalize_shlibpath"; then -+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -+ fi -+ if test -n "$finalize_shlibpath"; then -+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -+ fi - -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -- else -- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- destfile="$destdir/$destfile" -+ compile_var= -+ finalize_var= -+ if test -n "$runpath_var"; then -+ if test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ func_append rpath "$dir:" -+ done -+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -- -- # Deduce the name of the destination old-style object file. -- case $destfile in -- *.lo) -- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` -- ;; -- *.$objext) -- staticdest="$destfile" -- destfile= -- ;; -- *) -- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- ;; -- esac -- -- # Install the libtool object if requested. -- if test -n "$destfile"; then -- $show "$install_prog $file $destfile" -- $run eval "$install_prog $file $destfile" || exit $? -+ if test -n "$finalize_perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $finalize_perm_rpath; do -+ func_append rpath "$dir:" -+ done -+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -+ fi - -- # Install the old object if enabled. -- if test "$build_old_libs" = yes; then -- # Deduce the name of the old-style object file. -- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` -+ if test "$no_install" = yes; then -+ # We don't need to create a wrapper script. -+ link_command="$compile_var$compile_command$compile_rpath" -+ # Replace the output file specification. -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` -+ # Delete the old output file. -+ $opt_dry_run || $RM $output -+ # Link the executable and exit -+ func_show_eval "$link_command" 'exit $?' - -- $show "$install_prog $staticobj $staticdest" -- $run eval "$install_prog \$staticobj \$staticdest" || exit $? -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' - fi -- exit 0 -- ;; - -- *) -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -+ exit $EXIT_SUCCESS -+ fi -+ -+ if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" -+ -+ func_warning "this platform does not like uninstalled shared libraries" -+ func_warning "\`$output' will be relinked during installation" -+ else -+ if test "$fast_install" != no; then -+ link_command="$finalize_var$compile_command$finalize_rpath" -+ if test "$fast_install" = yes; then -+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` -+ else -+ # fast_install is set to needless -+ relink_command= -+ fi - else -- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- destfile="$destdir/$destfile" -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" - fi -+ fi - -- # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- notinst_deplibs= -- relink_command= -+ # Replace the output file specification. -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+ # Delete the old output files. -+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - -- # Check the variables that should have been set. -- if test -z "$notinst_deplibs"; then -- $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 -- exit 1 -- fi -+ func_show_eval "$link_command" 'exit $?' - -- finalize=yes -- for lib in $notinst_deplibs; do -- # Check to see that each library is installed. -- libdir= -- if test -f "$lib"; then -- # If there is no directory component, then add one. -- case $lib in -- */* | *\\*) . $lib ;; -- *) . ./$lib ;; -- esac -- fi -- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -- if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 -- finalize=no -- fi -- done -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi - -- relink_command= -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+ # Now create the wrapper script. -+ func_verbose "creating $output" - -- outputname= -- if test "$fast_install" = no && test -n "$relink_command"; then -- if test "$finalize" = yes && test -z "$run"; then -- tmpdir="/tmp" -- test -n "$TMPDIR" && tmpdir="$TMPDIR" -- tmpdir="$tmpdir/libtool-$$" -- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : -- else -- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 -- continue -- fi -- file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- outputname="$tmpdir/$file" -- # Replace the output file specification. -- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ # Quote the relink command for shipping. -+ if test -n "$relink_command"; then -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" -+ else -+ func_quote_for_eval "$var_value" -+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" -+ fi -+ done -+ relink_command="(cd `pwd`; $relink_command)" -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` -+ fi - -- $show "$relink_command" -- if $run eval "$relink_command"; then : -+ # Only actually do things if not in dry run mode. -+ $opt_dry_run || { -+ # win32 will think the script is a binary if it has -+ # a .exe suffix, so we strip it off here. -+ case $output in -+ *.exe) func_stripname '' '.exe' "$output" -+ output=$func_stripname_result ;; -+ esac -+ # test for cygwin because mv fails w/o .exe extensions -+ case $host in -+ *cygwin*) -+ exeext=.exe -+ func_stripname '' '.exe' "$outputname" -+ outputname=$func_stripname_result ;; -+ *) exeext= ;; -+ esac -+ case $host in -+ *cygwin* | *mingw* ) -+ func_dirname_and_basename "$output" "" "." -+ output_name=$func_basename_result -+ output_path=$func_dirname_result -+ cwrappersource="$output_path/$objdir/lt-$output_name.c" -+ cwrapper="$output_path/$output_name.exe" -+ $RM $cwrappersource $cwrapper -+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 -+ -+ func_emit_cwrapperexe_src > $cwrappersource -+ -+ # The wrapper executable is built using the $host compiler, -+ # because it contains $host paths and files. If cross- -+ # compiling, it, like the target executable, must be -+ # executed on the $host or under an emulation environment. -+ $opt_dry_run || { -+ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource -+ $STRIP $cwrapper -+ } -+ -+ # Now, create the wrapper script for func_source use: -+ func_ltwrapper_scriptname $cwrapper -+ $RM $func_ltwrapper_scriptname_result -+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 -+ $opt_dry_run || { -+ # note: this script will not be executed, so do not chmod. -+ if test "x$build" = "x$host" ; then -+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else -- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- ${rm}r "$tmpdir" -- continue -+ func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi -- file="$outputname" -- else -- $echo "$modename: warning: cannot relink \`$file'" 1>&2 -- fi -- else -- # Install the binary that we compiled earlier. -- file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -- fi -- fi -+ } -+ ;; -+ * ) -+ $RM $output -+ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - -- # remove .exe since cygwin /usr/bin/install will append another -- # one anyways -- case $install_prog,$host in -- /usr/bin/install*,*cygwin*) -- case $file:$destfile in -- *.exe:*.exe) -- # this is ok -- ;; -- *.exe:*) -- destfile=$destfile.exe -- ;; -- *:*.exe) -- destfile=`echo $destfile | sed -e 's,.exe$,,'` -- ;; -- esac -+ func_emit_wrapper no > $output -+ chmod +x $output - ;; - esac -- $show "$install_prog$stripme $file $destfile" -- $run eval "$install_prog\$stripme \$file \$destfile" || exit $? -- test -n "$outputname" && ${rm}r "$tmpdir" -- ;; -- esac -- done -- -- for file in $staticlibs; do -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- -- # Set up the ranlib parameters. -- oldlib="$destdir/$name" -+ } -+ exit $EXIT_SUCCESS -+ ;; -+ esac - -- $show "$install_prog $file $oldlib" -- $run eval "$install_prog \$file \$oldlib" || exit $? -+ # See if we need to build an old-fashioned archive. -+ for oldlib in $oldlibs; do - -- if test -n "$stripme" && test -n "$striplib"; then -- $show "$old_striplib $oldlib" -- $run eval "$old_striplib $oldlib" || exit $? -+ if test "$build_libtool_libs" = convenience; then -+ oldobjs="$libobjs_save $symfileobj" -+ addlibs="$convenience" -+ build_libtool_libs=no -+ else -+ if test "$build_libtool_libs" = module; then -+ oldobjs="$libobjs_save" -+ build_libtool_libs=no -+ else -+ oldobjs="$old_deplibs $non_pic_objects" -+ if test "$preload" = yes && test -f "$symfileobj"; then -+ func_append oldobjs " $symfileobj" -+ fi -+ fi -+ addlibs="$old_convenience" - fi - -- # Do each command in the postinstall commands. -- eval cmds=\"$old_postinstall_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- done -- -- if test -n "$future_libdirs"; then -- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 -- fi -- -- if test -n "$current_libdirs"; then -- # Maybe just do a dry run. -- test -n "$run" && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $0 --finish$current_libdirs' -- else -- exit 0 -- fi -- ;; -+ if test -n "$addlibs"; then -+ gentop="$output_objdir/${outputname}x" -+ func_append generated " $gentop" - -- # libtool finish mode -- finish) -- modename="$modename: finish" -- libdirs="$nonopt" -- admincmds= -+ func_extract_archives $gentop $addlibs -+ func_append oldobjs " $func_extract_archives_result" -+ fi - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ # Do each command in the archive commands. -+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -+ cmds=$old_archive_from_new_cmds -+ else - -- for libdir in $libdirs; do -- if test -n "$finish_cmds"; then -- # Do each command in the finish commands. -- eval cmds=\"$finish_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || admincmds="$admincmds -- $cmd" -+ # Add any objects from preloaded convenience libraries -+ if test -n "$dlprefiles"; then -+ gentop="$output_objdir/${outputname}x" -+ func_append generated " $gentop" -+ -+ func_extract_archives $gentop $dlprefiles -+ func_append oldobjs " $func_extract_archives_result" -+ fi -+ -+ # POSIX demands no paths to be encoded in archives. We have -+ # to avoid creating archives with duplicate basenames if we -+ # might have to extract them afterwards, e.g., when creating a -+ # static archive out of a convenience library, or when linking -+ # the entirety of a libtool archive into another (currently -+ # not supported by libtool). -+ if (for obj in $oldobjs -+ do -+ func_basename "$obj" -+ $ECHO "$func_basename_result" -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ echo "copying selected object files to avoid basename conflicts..." -+ gentop="$output_objdir/${outputname}x" -+ func_append generated " $gentop" -+ func_mkdir_p "$gentop" -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ func_basename "$obj" -+ objbase="$func_basename_result" -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ func_arith $counter + 1 -+ counter=$func_arith_result -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" -+ ;; -+ *) func_append oldobjs " $obj" ;; -+ esac - done -- IFS="$save_ifs" -- fi -- if test -n "$finish_eval"; then -- # Do the single finish_eval. -- eval cmds=\"$finish_eval\" -- $run eval "$cmds" || admincmds="$admincmds -- $cmds" - fi -- done -- fi -- -- # Exit here if they wanted silent mode. -- test "$show" = ":" && exit 0 -+ eval cmds=\"$old_archive_cmds\" - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -+ func_len " $cmds" -+ len=$func_len_result -+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds -+ else -+ # the command line is too long to link in one step, link in parts -+ func_verbose "using piecewise archive linking..." -+ save_RANLIB=$RANLIB -+ RANLIB=: -+ objlist= -+ concat_cmds= -+ save_oldobjs=$oldobjs -+ oldobjs= -+ # Is there a better way of finding the last object in the list? -+ for obj in $save_oldobjs -+ do -+ last_oldobj=$obj -+ done -+ eval test_cmds=\"$old_archive_cmds\" -+ func_len " $test_cmds" -+ len0=$func_len_result -+ len=$len0 -+ for obj in $save_oldobjs -+ do -+ func_len " $obj" -+ func_arith $len + $func_len_result -+ len=$func_arith_result -+ func_append objlist " $obj" -+ if test "$len" -lt "$max_cmd_len"; then -+ : -+ else -+ # the above command should be used before it gets too long -+ oldobjs=$objlist -+ if test "$obj" = "$last_oldobj" ; then -+ RANLIB=$save_RANLIB -+ fi -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ objlist= -+ len=$len0 -+ fi -+ done -+ RANLIB=$save_RANLIB -+ oldobjs=$objlist -+ if test "X$oldobjs" = "X" ; then -+ eval cmds=\"\$concat_cmds\" -+ else -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -+ fi -+ fi -+ fi -+ func_execute_cmds "$cmds" 'exit $?' - done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" -- exit 0 -- ;; -- -- # libtool execute mode -- execute) -- modename="$modename: execute" - -- # The first argument is the command name. -- cmd="$nonopt" -- if test -z "$cmd"; then -- $echo "$modename: you must specify a COMMAND" 1>&2 -- $echo "$help" -- exit 1 -- fi -+ test -n "$generated" && \ -+ func_show_eval "${RM}r$generated" - -- # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -- if test ! -f "$file"; then -- $echo "$modename: \`$file' is not a file" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ # Now create the libtool archive. -+ case $output in -+ *.la) -+ old_library= -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ func_verbose "creating $output" - -- dir= -- case $file in -- *.la) -- # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" - else -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -+ func_quote_for_eval "$var_value" -+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi -+ done -+ # Quote the link command for shipping. -+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= -+ fi - -- # Read the libtool library. -- dlname= -- library_names= -+ # Only create the output if not a dry run. -+ $opt_dry_run || { -+ for installed in no yes; do -+ if test "$installed" = yes; then -+ if test -z "$install_libdir"; then -+ break -+ fi -+ output="$output_objdir/$outputname"i -+ # Replace all uninstalled libtool libraries with the installed ones -+ newdependency_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ *.la) -+ func_basename "$deplib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$deplib' is not a valid libtool archive" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" -+ ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; -+ esac -+ done -+ dependency_libs="$newdependency_libs" -+ newdlfiles= -+ -+ for lib in $dlfiles; do -+ case $lib in -+ *.la) -+ func_basename "$lib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$lib' is not a valid libtool archive" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ *) func_append newdlfiles " $lib" ;; -+ esac -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ *.la) -+ # Only pass preopened files to the pseudo-archive (for -+ # eventual linking with the app. that links it) if we -+ # didn't already link the preopened objects directly into -+ # the library: -+ func_basename "$lib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$lib' is not a valid libtool archive" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ esac -+ done -+ dlprefiles="$newdlprefiles" -+ else -+ newdlfiles= -+ for lib in $dlfiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ func_append newdlfiles " $abs" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ func_append newdlprefiles " $abs" -+ done -+ dlprefiles="$newdlprefiles" -+ fi -+ $RM $output -+ # place dlname in correct position for cygwin -+ # In fact, it would be nice if we could use this code for all target -+ # systems that can't hard-code library paths into their executables -+ # and that have no shared library path variable independent of PATH, -+ # but it turns out we can't easily determine that from inspecting -+ # libtool variables, so we have to hard-code the OSs to which it -+ # applies here; at the moment, that means platforms that use the PE -+ # object format with DLL files. See the long comment at the top of -+ # tests/bindir.at for full details. -+ tdlname=$dlname -+ case $host,$output,$installed,$module,$dlname in -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ # If a -bindir argument was supplied, place the dll there. -+ if test "x$bindir" != x ; -+ then -+ func_relative_path "$install_libdir" "$bindir" -+ tdlname=$func_relative_path_result$dlname -+ else -+ # Otherwise fall back on heuristic. -+ tdlname=../bin/$dlname -+ fi -+ ;; -+ esac -+ $ECHO > $output "\ -+# $outputname - a libtool library file -+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# -+# Please DO NOT delete this file! -+# It is necessary for linking the library. - -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+# The name that we can dlopen(3). -+dlname='$tdlname' - -- # Skip this library if it cannot be dlopened. -- if test -z "$dlname"; then -- # Warn if it was a shared library. -- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" -- continue -- fi -+# Names of this library. -+library_names='$library_names' - -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$file" && dir=. -+# The name of the static archive. -+old_library='$old_library' - -- if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -- else -- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -- exit 1 -- fi -- ;; -+# Linker flags that can not go in dependency_libs. -+inherited_linker_flags='$new_inherited_linker_flags' - -- *.lo) -- # Just add the directory containing the .lo file. -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$file" && dir=. -- ;; -+# Libraries that this one depends upon. -+dependency_libs='$dependency_libs' - -- *) -- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 -- continue -- ;; -- esac -+# Names of additional weak libraries provided by this library -+weak_library_names='$weak_libs' - -- # Get the absolute pathname. -- absdir=`cd "$dir" && pwd` -- test -n "$absdir" && dir="$absdir" -+# Version information for $libname. -+current=$current -+age=$age -+revision=$revision - -- # Now add the directory to shlibpath_var. -- if eval "test -z \"\$$shlibpath_var\""; then -- eval "$shlibpath_var=\"\$dir\"" -- else -- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -- fi -- done -+# Is this an already installed library? -+installed=$installed - -- # This variable tells wrapper scripts just to set shlibpath_var -- # rather than running their programs. -- libtool_execute_magic="$magic" -+# Should we warn about portability when linking against -modules? -+shouldnotlink=$module - -- # Check if any of the arguments is a wrapper script. -- args= -- for file -- do -- case $file in -- -*) ;; -- *) -- # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+# Files to dlopen/dlpreopen -+dlopen='$dlfiles' -+dlpreopen='$dlprefiles' - -- # Transform arg to wrapped name. -- file="$progdir/$program" -- fi -- ;; -- esac -- # Quote arguments (to preserve shell metacharacters). -- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` -- args="$args \"$file\"" -- done -+# Directory that this library needs to be installed in: -+libdir='$install_libdir'" -+ if test "$installed" = no && test "$need_relink" = yes; then -+ $ECHO >> $output "\ -+relink_command=\"$relink_command\"" -+ fi -+ done -+ } - -- if test -z "$run"; then -- if test -n "$shlibpath_var"; then -- # Export the shlibpath_var. -- eval "export $shlibpath_var" -- fi -+ # Do a symbolic link so that the libtool archive can be found in -+ # LD_LIBRARY_PATH before the program is installed. -+ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' -+ ;; -+ esac -+ exit $EXIT_SUCCESS -+} - -- # Restore saved enviroment variables -- if test "${save_LC_ALL+set}" = set; then -- LC_ALL="$save_LC_ALL"; export LC_ALL -- fi -- if test "${save_LANG+set}" = set; then -- LANG="$save_LANG"; export LANG -- fi -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && -+ func_mode_link ${1+"$@"} - -- # Now prepare to actually exec the command. -- exec_cmd='"$cmd"$args' -- else -- # Display what would be done. -- if test -n "$shlibpath_var"; then -- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" -- $echo "export $shlibpath_var" -- fi -- $echo "$cmd$args" -- exit 0 -- fi -- ;; - -- # libtool clean and uninstall mode -- clean | uninstall) -- modename="$modename: $mode" -- rm="$nonopt" -+# func_mode_uninstall arg... -+func_mode_uninstall () -+{ -+ $opt_debug -+ RM="$nonopt" - files= - rmforce= - exit_status=0 -@@ -4637,43 +9441,41 @@ - for arg - do - case $arg in -- -f) rm="$rm $arg"; rmforce=yes ;; -- -*) rm="$rm $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -- if test -z "$rm"; then -- $echo "$modename: you must specify an RM program" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -+ test -z "$RM" && \ -+ func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$dir" = "X$file"; then -- dir=. -- objdir="$objdir" -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" -+ if test "X$dir" = X.; then -+ odir="$objdir" - else -- objdir="$dir/$objdir" -+ odir="$dir/$objdir" - fi -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- test $mode = uninstall && objdir="$dir" -+ func_basename "$file" -+ name="$func_basename_result" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test $mode = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. -- if (test -L "$file") >/dev/null 2>&1 \ -- || (test -h "$file") >/dev/null 2>&1 \ -- || test -f "$file"; then -+ if { test -L "$file"; } >/dev/null 2>&1 || -+ { test -h "$file"; } >/dev/null 2>&1 || -+ test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 -@@ -4687,298 +9489,154 @@ - case $name in - *.la) - # Possibly a libtool archive, so verify it. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- . $dir/$name -+ if func_lalib_p "$file"; then -+ func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- if test $mode = uninstall; then -+ case "$opt_mode" in -+ clean) -+ case " $library_names " in -+ *" $dlname "*) ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; -+ esac -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" -+ ;; -+ uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. -- eval cmds=\"$postuninstall_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" -- if test $? != 0 && test "$rmforce" != yes; then -- exit_status=1 -- fi -- done -- IFS="$save_ifs" -+ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- eval cmds=\"$old_postuninstall_cmds\" -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" -- if test $? != 0 && test "$rmforce" != yes; then -- exit_status=1 -- fi -- done -- IFS="$save_ifs" -+ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. -- fi -+ ;; -+ esac - fi - ;; - - *.lo) -- if test "$build_old_libs" = yes; then -- oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` -- rmfiles="$rmfiles $dir/$oldobj" -+ # Possibly a libtool object, so verify it. -+ if func_lalib_p "$file"; then -+ -+ # Read the .lo file -+ func_source $dir/$name -+ -+ # Add PIC object to the list of files to remove. -+ if test -n "$pic_object" && -+ test "$pic_object" != none; then -+ func_append rmfiles " $dir/$pic_object" -+ fi -+ -+ # Add non-PIC object to the list of files to remove. -+ if test -n "$non_pic_object" && -+ test "$non_pic_object" != none; then -+ func_append rmfiles " $dir/$non_pic_object" -+ fi - fi - ;; - - *) -- # Do a test to see if this is a libtool program. -- if test $mode = clean && -- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- relink_command= -- . $dir/$file -+ if test "$opt_mode" = clean ; then -+ noexename=$name -+ case $file in -+ *.exe) -+ func_stripname '' '.exe' "$file" -+ file=$func_stripname_result -+ func_stripname '' '.exe' "$name" -+ noexename=$func_stripname_result -+ # $file with .exe has already been added to rmfiles, -+ # add $file without .exe -+ func_append rmfiles " $file" -+ ;; -+ esac -+ # Do a test to see if this is a libtool program. -+ if func_ltwrapper_p "$file"; then -+ if func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ relink_command= -+ func_source $func_ltwrapper_scriptname_result -+ func_append rmfiles " $func_ltwrapper_scriptname_result" -+ else -+ relink_command= -+ func_source $dir/$noexename -+ fi - -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -- if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ # note $name still contains .exe if it was in $file originally -+ # as does the version of $file that was added into $rmfiles -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" -+ if test "$fast_install" = yes && test -n "$relink_command"; then -+ func_append rmfiles " $odir/lt-$name" -+ fi -+ if test "X$noexename" != "X$name" ; then -+ func_append rmfiles " $odir/lt-${noexename}.c" -+ fi - fi - fi - ;; - esac -- $show "$rm $rmfiles" -- $run $rm $rmfiles || exit_status=1 -+ func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then -- $show "rmdir $dir" -- $run rmdir $dir >/dev/null 2>&1 -+ func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -- ;; -+} - -- "") -- $echo "$modename: you must specify a MODE" 1>&2 -- $echo "$generic_help" 1>&2 -- exit 1 -- ;; -- esac -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && -+ func_mode_uninstall ${1+"$@"} - -- if test -z "$exec_cmd"; then -- $echo "$modename: invalid operation mode \`$mode'" 1>&2 -- $echo "$generic_help" 1>&2 -- exit 1 -- fi --fi # test -z "$show_help" -+test -z "$opt_mode" && { -+ help="$generic_help" -+ func_fatal_help "you must specify a MODE" -+} -+ -+test -z "$exec_cmd" && \ -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then -- eval exec $exec_cmd -- exit 1 -+ eval exec "$exec_cmd" -+ exit $EXIT_FAILURE - fi - --# We need to display help for each of the modes. --case $mode in --"") $echo \ --"Usage: $modename [OPTION]... [MODE-ARG]... -- --Provide generalized library-building support services. -- -- --config show all configuration variables -- --debug enable verbose shell tracing ---n, --dry-run display commands without modifying any files -- --features display basic configuration information and exit -- --finish same as \`--mode=finish' -- --help display this help message and exit -- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] -- --quiet same as \`--silent' -- --silent don't print informational messages -- --version print version information -- --MODE must be one of the following: -- -- clean remove files from the build directory -- compile compile a source file into a libtool object -- execute automatically set library path, then run a program -- finish complete the installation of libtool libraries -- install install libraries or executables -- link create a library or an executable -- uninstall remove libraries from an installed directory -- --MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for --a more detailed description of MODE." -- exit 0 -- ;; -- --clean) -- $echo \ --"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... -- --Remove files from the build directory. -- --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -- --If FILE is a libtool library, object or program, all the files associated --with it are deleted. Otherwise, only FILE itself is deleted using RM." -- ;; -- --compile) -- $echo \ --"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE -- --Compile a source file into a libtool library object. -- --This mode accepts the following additional options: -- -- -o OUTPUT-FILE set the output file name to OUTPUT-FILE -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -- -static always build a \`.o' file suitable for static linking -- --COMPILE-COMMAND is a command to be used in creating a \`standard' object file --from the given SOURCEFILE. -- --The output file name is determined by removing the directory component from --SOURCEFILE, then substituting the C source code suffix \`.c' with the --library object suffix, \`.lo'." -- ;; -- --execute) -- $echo \ --"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... -- --Automatically set library path, then run a program. -- --This mode accepts the following additional options: -- -- -dlopen FILE add the directory containing FILE to the library path -- --This mode sets the library path environment variable according to \`-dlopen' --flags. -- --If any of the ARGS are libtool executable wrappers, then they are translated --into their corresponding uninstalled binary, and any of their required library --directories are added to the library path. -- --Then, COMMAND is executed, with ARGS as arguments." -- ;; -- --finish) -- $echo \ --"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... -- --Complete the installation of libtool libraries. -- --Each LIBDIR is a directory that contains libtool libraries. -- --The commands that this mode executes may require superuser privileges. Use --the \`--dry-run' option if you just want to see what would be executed." -- ;; -- --install) -- $echo \ --"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... -- --Install executables or libraries. -- --INSTALL-COMMAND is the installation command. The first component should be --either the \`install' or \`cp' program. -- --The rest of the components are interpreted as arguments to that command (only --BSD-compatible install options are recognized)." -- ;; -- --link) -- $echo \ --"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... -- --Link object files or libraries together to form another library, or to --create an executable program. -- --LINK-COMMAND is a command using the C compiler that you would use to create --a program from several object files. -- --The following components of LINK-COMMAND are treated specially: -- -- -all-static do not do any dynamic linking at all -- -avoid-version do not add a version suffix if possible -- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -- -export-symbols SYMFILE -- try to export only the symbols listed in SYMFILE -- -export-symbols-regex REGEX -- try to export only the symbols matching REGEX -- -LLIBDIR search LIBDIR for required installed libraries -- -lNAME OUTPUT-FILE requires the installed library libNAME -- -module build a library that can dlopened -- -no-fast-install disable the fast-install mode -- -no-install link a not-installable executable -- -no-undefined declare that a library does not refer to external symbols -- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -- -release RELEASE specify package release information -- -rpath LIBDIR the created library will eventually be installed in LIBDIR -- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -- -static do not do any dynamic linking of libtool libraries -- -version-info CURRENT[:REVISION[:AGE]] -- specify library version info [each variable defaults to 0] -- --All other options (arguments beginning with \`-') are ignored. -- --Every other argument is treated as a filename. Files ending in \`.la' are --treated as uninstalled libtool libraries, other files are standard or library --object files. -- --If the OUTPUT-FILE ends in \`.la', then a libtool library is created, --only library objects (\`.lo' files) may be specified, and \`-rpath' is --required, except when creating a convenience library. -- --If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created --using \`ar' and \`ranlib', or on Windows using \`lib'. -- --If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file --is created, otherwise an executable program is created." -- ;; -- --uninstall) -- $echo \ --"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -- --Remove libraries from an installation directory. -- --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -- --If FILE is a libtool library, all the files associated with it are deleted. --Otherwise, only FILE itself is deleted using RM." -- ;; -- --*) -- $echo "$modename: invalid operation mode \`$mode'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- ;; --esac -+exit $exit_status - --echo --$echo "Try \`$modename --help' for more information about other modes." - --exit 0 -+# The TAGs below are defined such that we never get into a situation -+# in which we disable both kinds of libraries. Given conflicting -+# choices, we go for a static library, that is the most portable, -+# since we can't tell whether shared libraries were disabled because -+# the user asked for that or because the platform doesn't support -+# them. This is particularly important on AIX, because we don't -+# support having both static and shared libraries enabled at the same -+# time on that platform, so we default to a shared-only configuration. -+# If a disable-shared tag is given, we'll fallback to a static-only -+# configuration. But we'll never go from static-only to shared-only. -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -+build_libtool_libs=no -+build_old_libs=yes -+# ### END LIBTOOL TAG CONFIG: disable-shared -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-static -+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+# ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: - # mode:shell-script - # sh-indentation:2 - # End: -+# vi:sw=2 -+ diff --git a/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch b/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch deleted file mode 100644 index d32e570a3..000000000 --- a/debian/patches/019_nx-X11_expat-build-against-system-libxmltok.full.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Building expat against system's libxmltok library - Provide support for building expat against the system's libxmltok library. - . - Not reported to upstream as this patch is mainly imported for being compliant - with Debian policy (lintian error: embedded-library). -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/lib/expat/Imakefile -+++ b/nx-X11/lib/expat/Imakefile -@@ -19,7 +19,7 @@ - EXPATSRC = $(EXPATTOP)/lib - EXPATINC = $(EXPATTOP)/lib - --INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I. -+INCLUDES = -I/usr/include/xmltok -I/usr/local/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. - - /* - * Endianness (for short's) -@@ -31,8 +31,8 @@ - DEFINES = -DXML_BYTE_ORDER=0 -DX_BYTE_ORDER=$(X_BYTE_ORDER) - REQUIREDLIBS=$(LDPRELIBS) - --SRCS = xmlparse.c xmltok.c xmlrole.c --OBJS = xmlparse.o xmltok.o xmlrole.o -+#SRCS = xmlparse.c xmltok.c xmlrole.c -+#OBJS = xmlparse.o xmltok.o xmlrole.o - - HEADERS = expat.h - -@@ -45,9 +45,9 @@ - - DependTarget() - --LinkSourceFile(xmlparse.c,$(EXPATSRC)) --LinkSourceFile(xmltok.c,$(EXPATSRC)) --LinkSourceFile(xmlrole.c,$(EXPATSRC)) -+#LinkSourceFile(xmlparse.c,$(EXPATSRC)) -+#LinkSourceFile(xmltok.c,$(EXPATSRC)) -+#LinkSourceFile(xmlrole.c,$(EXPATSRC)) - LinkSourceFile(expat.h,$(EXPATINC)) - - diff --git a/debian/patches/series b/debian/patches/series index 0e6ec06e9..82c949ccd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,9 +14,6 @@ 014_nxcompshad_makefile-uninstall+autoconf.full.patch 015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-X11_install-location.full.patch -017_nx-X11_update-autotools-helper-files.full.patch -018_nx-X11_update-libtool-ltmain-script.full.patch -019_nx-X11_expat-build-against-system-libxmltok.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch -- cgit v1.2.3 From 0c42e33b4268ea405afab4c8a512716fa5c5e31c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:25:43 +0100 Subject: Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree. --- debian/patches/031_nx-X11_parallel-make.full.patch | 28 ---------------------- 1 file changed, 28 deletions(-) (limited to 'debian') diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch index e87918a71..496020545 100644 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ b/debian/patches/031_nx-X11_parallel-make.full.patch @@ -198,31 +198,3 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ ---- a/nx-X11/lib/X11/Imakefile.NX.original -+++ b/nx-X11/lib/X11/Imakefile.NX.original -@@ -1159,21 +1159,17 @@ - - #ifdef SunArchitecture - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- gmake -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- gmake -+ ${MAKE} -C ../../../nxcompext - - #else - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- make -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- make -+ ${MAKE} -C ../../../nxcompext - - #endif - -- cgit v1.2.3 From 237d7487fc39a25108a2b690ec4c104edbd4b1c0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:26:51 +0100 Subject: Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files matter to the NX code reduction efforts. --- ...nxcompext+nxcompshad_unique-libnames.full.patch | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'debian') diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch index 1f3fd11bd..7c21c6fe5 100644 --- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch +++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch @@ -26,7 +26,6 @@ Last-Update: 2012-02-15 nx-X11/config/cf/lnxLib.tmpl | 4 nx-X11/lib/X11/Imakefile | 2 nx-X11/lib/XRes/Imakefile | 2 - nx-X11/lib/XTrap/Imakefile | 2 nx-X11/lib/Xau/Imakefile | 2 nx-X11/lib/Xcomposite/Imakefile | 2 nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 @@ -38,7 +37,6 @@ Last-Update: 2012-02-15 nx-X11/lib/Xext/Imakefile | 2 nx-X11/lib/Xfixes/Imakefile | 2 nx-X11/lib/Xfixes/xfixes.pc.in | 2 - nx-X11/lib/Xfontcache/Imakefile | 2 nx-X11/lib/Xinerama/Imakefile | 2 nx-X11/lib/Xpm/Imakefile | 2 nx-X11/lib/Xrandr/Imakefile | 2 @@ -876,17 +874,6 @@ Last-Update: 2012-02-15 #define SoRev SOXRESREV #define LibHeaders NO ---- a/nx-X11/lib/XTrap/Imakefile -+++ b/nx-X11/lib/XTrap/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXTrap - #define DoDebugLib DebugLibXTrap - #define DoProfileLib ProfileLibXTrap --#define LibName XTrap -+#define LibName NX_XTrap - #define SoRev SOXTRAPREV - #define LibHeaders NO - --- a/nx-X11/lib/Xau/Imakefile +++ b/nx-X11/lib/Xau/Imakefile @@ -10,7 +10,7 @@ @@ -996,17 +983,6 @@ Last-Update: 2012-02-15 Cflags: -I${includedir} @X_CFLAGS@ -Libs: -L${libdir} -lXfixes @X_LIBS@ +Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ ---- a/nx-X11/lib/Xfontcache/Imakefile -+++ b/nx-X11/lib/Xfontcache/Imakefile -@@ -9,7 +9,7 @@ - #define DoExtraLib SharedLibXfontcache - #define DoDebugLib DebugLibXfontcache - #define DoProfileLib ProfileLibXfontcache --#define LibName Xfontcache -+#define LibName NX_Xfontcache - #define SoRev SOXFONTCACHEREV - #define LibHeaders NO - --- a/nx-X11/lib/Xinerama/Imakefile +++ b/nx-X11/lib/Xinerama/Imakefile @@ -4,7 +4,7 @@ -- cgit v1.2.3 From 91dc4b5099128d024e98dce760c12f995ca4d8fc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:29:45 +0100 Subject: Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build process. --- debian/patches/604_nx-X11_recent-freetype-API.full.patch | 15 --------------- debian/patches/series | 1 - 2 files changed, 16 deletions(-) delete mode 100644 debian/patches/604_nx-X11_recent-freetype-API.full.patch (limited to 'debian') diff --git a/debian/patches/604_nx-X11_recent-freetype-API.full.patch b/debian/patches/604_nx-X11_recent-freetype-API.full.patch deleted file mode 100644 index e751fb82d..000000000 --- a/debian/patches/604_nx-X11_recent-freetype-API.full.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix FTBFS against libfreetype6 (>= 2.5.0) -Author: Mike Gabriel ---- a/nx-X11/lib/Xft/xftglyphs.c -+++ b/nx-X11/lib/Xft/xftglyphs.c -@@ -23,7 +23,9 @@ - */ - - #include "xftint.h" --#include -+ -+#include -+#include FT_FREETYPE_H - - static const int filters[3][3] = { - /* red */ diff --git a/debian/patches/series b/debian/patches/series index 82c949ccd..e6398bc19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -65,7 +65,6 @@ 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch -604_nx-X11_recent-freetype-API.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch -- cgit v1.2.3 From 231ffa85e3383acb1537231de6d0ed0ef60e39e3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:31:35 +0100 Subject: Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort. --- debian/patches/991_fix-hr-typos.full.patch | 40 ------------------------------ 1 file changed, 40 deletions(-) (limited to 'debian') diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch index cc862a8b4..3836adf55 100644 --- a/debian/patches/991_fix-hr-typos.full.patch +++ b/debian/patches/991_fix-hr-typos.full.patch @@ -1,35 +1,6 @@ Description: Fix several typos in nx-X11 Author: Mike Gabriel ---- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c -+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c -@@ -729,7 +729,7 @@ - for (i = 0; attr[i]; i += 2) { - if (!strcmp (attr[i], "driver")) driver = attr[i+1]; - else if (!strcmp (attr[i], "screen")) screen = attr[i+1]; -- else XML_WARNING("unkown device attribute: %s.", attr[i]); -+ else XML_WARNING("unknown device attribute: %s.", attr[i]); - } - if (driver && strcmp (driver, data->driverName)) - data->ignoringDevice = data->inDevice; -@@ -749,7 +749,7 @@ - for (i = 0; attr[i]; i += 2) { - if (!strcmp (attr[i], "name")) name = attr[i+1]; - else if (!strcmp (attr[i], "executable")) exec = attr[i+1]; -- else XML_WARNING("unkown application attribute: %s.", attr[i]); -+ else XML_WARNING("unknown application attribute: %s.", attr[i]); - } - if (exec && strcmp (exec, data->execName)) - data->ignoringApp = data->inApp; -@@ -762,7 +762,7 @@ - for (i = 0; attr[i]; i += 2) { - if (!strcmp (attr[i], "name")) name = attr[i+1]; - else if (!strcmp (attr[i], "value")) value = attr[i+1]; -- else XML_WARNING("unkown option attribute: %s.", attr[i]); -+ else XML_WARNING("unknown option attribute: %s.", attr[i]); - } - if (!name) XML_WARNING1 ("name attribute missing in option."); - if (!value) XML_WARNING1 ("value attribute missing in option."); --- a/nx-X11/extras/Mesa/src/mesa/main/debug.c +++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c @@ -43,7 +43,7 @@ @@ -52,17 +23,6 @@ Author: Mike Gabriel err = GL_TRUE; } else { ---- a/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h -+++ b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h -@@ -88,7 +88,7 @@ - case EPrefixError: append("ERROR: "); break; - case EPrefixInternalError: append("INTERNAL ERROR: "); break; - case EPrefixUnimplemented: append("UNIMPLEMENTED: "); break; -- default: append("UNKOWN ERROR: "); break; -+ default: append("UNKNOWN ERROR: "); break; - } - } - void location(TSourceLoc loc) { --- a/nx-X11/ChangeLog.X.org +++ b/nx-X11/ChangeLog.X.org @@ -12733,7 +12733,7 @@ -- cgit v1.2.3 From 4db6f0fdba904d00c1cfc3909b9b2c09655abf87 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Feb 2015 04:59:13 +0100 Subject: Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. Initialize server_support array with correct size. Fix Mesa upstream bugzilla bug #7353. (Fixes: #776). --- debian/changelog | 5 +++ ...-initialize-server-support-correctly.full.patch | 49 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 55 insertions(+) create mode 100644 debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bebcf51e8..a5e08c030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,11 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). + [ Heinrich Schuchardt ] + + Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. + Initialize server_support array with correct size. Fix Mesa upstream + bugzilla bug #7353. (Fixes: #776). + [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. diff --git a/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch b/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch new file mode 100644 index 000000000..3fe8c5745 --- /dev/null +++ b/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch @@ -0,0 +1,49 @@ +From 7ef4a07165d49e671f6f569ee87bfe893b1e7fcf Mon Sep 17 00:00:00 2001 +From: Ian Romanick +Date: Thu, 13 Jul 2006 15:27:37 +0000 +Subject: [PATCH] Move initialization of server_support from + __glXProcessServerString to __glXCalcualteUsableExtensions. By having both + callers of __glXProcessServerString initialize the bit-fields passed in, we + guarantee that the correct amount of data is initialized: + +This fixes bugzilla #7353. +--- + nx-X11/extras/Mesa/src/glx/x11/glxextensions.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c b/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c +index c3bc930..d00bdbb 100644 +--- a/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c ++++ b/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c +@@ -319,6 +319,11 @@ set_glx_extension( const struct extension_info * ext, + * + * \param server_string GLX extension string from the server. + * \param server_support Bit-field of supported extensions. ++ * ++ * \note ++ * This function is used to process both GLX and GL extension strings. The ++ * bit-fields used to track each of these have different sizes. Therefore, ++ * the data pointed by \c server_support must be preinitialized to zero. + */ + static void + __glXProcessServerString( const struct extension_info * ext, +@@ -328,8 +333,6 @@ __glXProcessServerString( const struct extension_info * ext, + unsigned base; + unsigned len; + +- (void) memset( server_support, 0, sizeof( server_support ) ); +- + for ( base = 0 ; server_string[ base ] != NUL ; /* empty */ ) { + /* Determine the length of the next extension name. + */ +@@ -580,6 +583,8 @@ __glXCalculateUsableExtensions( __GLXscreenConfigs *psc, + + __glXExtensionsCtr(); + __glXExtensionsCtrScreen( psc ); ++ ++ (void) memset( server_support, 0, sizeof( server_support ) ); + __glXProcessServerString( known_glx_extensions, + psc->serverGLXexts, server_support ); + +-- +2.1.4 diff --git a/debian/patches/series b/debian/patches/series index e6398bc19..1b0e2b545 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -68,6 +68,7 @@ 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch +700_nx-X11_mesa-initialize-server-support-correctly.full.patch 990_fix-DEBUG-and-TEST-builds.full.patch 991_fix-hr-typos.full+lite.patch 991_fix-hr-typos.full.patch -- cgit v1.2.3 From 939492d83d5be30d139519367e6c8451cef95608 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 10:32:49 +0100 Subject: Revert "Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. Initialize server_support array with correct size. Fix Mesa upstream bugzilla bug #7353. (Fixes: #776)." This reverts commit 4db6f0fdba904d00c1cfc3909b9b2c09655abf87. Reason: the file nx-X11/extras/Mesa/src/glx/x11/glxextensions.c is not used at build time and has been removed from the code base in NX 3.6. --- debian/changelog | 5 --- ...-initialize-server-support-correctly.full.patch | 49 ---------------------- debian/patches/series | 1 - 3 files changed, 55 deletions(-) delete mode 100644 debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a5e08c030..bebcf51e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,11 +100,6 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). - [ Heinrich Schuchardt ] - + Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. - Initialize server_support array with correct size. Fix Mesa upstream - bugzilla bug #7353. (Fixes: #776). - [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. diff --git a/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch b/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch deleted file mode 100644 index 3fe8c5745..000000000 --- a/debian/patches/700_nx-X11_mesa-initialize-server-support-correctly.full.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7ef4a07165d49e671f6f569ee87bfe893b1e7fcf Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Thu, 13 Jul 2006 15:27:37 +0000 -Subject: [PATCH] Move initialization of server_support from - __glXProcessServerString to __glXCalcualteUsableExtensions. By having both - callers of __glXProcessServerString initialize the bit-fields passed in, we - guarantee that the correct amount of data is initialized: - -This fixes bugzilla #7353. ---- - nx-X11/extras/Mesa/src/glx/x11/glxextensions.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c b/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c -index c3bc930..d00bdbb 100644 ---- a/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c -+++ b/nx-X11/extras/Mesa/src/glx/x11/glxextensions.c -@@ -319,6 +319,11 @@ set_glx_extension( const struct extension_info * ext, - * - * \param server_string GLX extension string from the server. - * \param server_support Bit-field of supported extensions. -+ * -+ * \note -+ * This function is used to process both GLX and GL extension strings. The -+ * bit-fields used to track each of these have different sizes. Therefore, -+ * the data pointed by \c server_support must be preinitialized to zero. - */ - static void - __glXProcessServerString( const struct extension_info * ext, -@@ -328,8 +333,6 @@ __glXProcessServerString( const struct extension_info * ext, - unsigned base; - unsigned len; - -- (void) memset( server_support, 0, sizeof( server_support ) ); -- - for ( base = 0 ; server_string[ base ] != NUL ; /* empty */ ) { - /* Determine the length of the next extension name. - */ -@@ -580,6 +583,8 @@ __glXCalculateUsableExtensions( __GLXscreenConfigs *psc, - - __glXExtensionsCtr(); - __glXExtensionsCtrScreen( psc ); -+ -+ (void) memset( server_support, 0, sizeof( server_support ) ); - __glXProcessServerString( known_glx_extensions, - psc->serverGLXexts, server_support ); - --- -2.1.4 diff --git a/debian/patches/series b/debian/patches/series index 1b0e2b545..e6398bc19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -68,7 +68,6 @@ 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch -700_nx-X11_mesa-initialize-server-support-correctly.full.patch 990_fix-DEBUG-and-TEST-builds.full.patch 991_fix-hr-typos.full+lite.patch 991_fix-hr-typos.full.patch -- cgit v1.2.3 From eb55dc8fd6974ca6f3325d2d30e56c96f28d2876 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 10:37:17 +0100 Subject: Drop not-used-anymore NX source tree clean-up code. Source tree has been cleaned up natively. --- debian/roll-tarballs.sh | 29 ----------------------------- debian/rules | 26 -------------------------- 2 files changed, 55 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 9b63529f7..a8d3cf63f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -139,39 +139,10 @@ mv -v debian/changelog doc/changelog test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh - - -#### stuff we do not needed -UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` -CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` -UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` -PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` -PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` -PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" -mkdir -p .preserve/ -for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do - if [ ! -d $path ]; then - path_dirname=$(dirname "$path") - else - path_dirname="$path" - fi - mkdir -vp ".preserve/$path_dirname" - cp -av "$path" ".preserve/$path" -done - -for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do - rm -R "$path" -done - -# re-create the to-be-preserved files -cp -a .preserve/* ./ -rm -Rf .preserve/ - # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* diff --git a/debian/rules b/debian/rules index 099050b7d..b8e4ad4e1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,14 +13,6 @@ export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARC %: CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --with quilt -# before build, we will remove unused code / bundled libraries (keep this in sync with roll-tarball.sh) -UNUSED_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-UNUSED" -CLEANUP_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-BRUTAL" -UNNEEDED_BACKUPS = "debian/CODE-REDUCTION_CLEANUP-BACKUPFILES" -PRESERVE_SYMLINKED_FILES = "debian/CODE-REDUCTION_PRESERVE-SYMLINKED" -PRESERVE_NEEDED_FILES = "debian/CODE-REDUCTION_PRESERVE-NEEDED" -PRESERVE_INCLUDED_FILES = "debian/CODE-REDUCTION_PRESERVE-INCLUDED" - override_dh_auto_clean: rm -Rf nx-X11/.build-exports dh_auto_clean @@ -121,24 +113,6 @@ override_dh_auto_build: # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst - # make a copy of code to be preserved for build - mkdir -p .preserve - for path in `cat $(PRESERVE_SYMLINKED_FILES)` `cat $(PRESERVE_NEEDED_FILES)` `cat $(PRESERVE_INCLUDED_FILES)`; do \ - if echo $$path | grep -E "^#.*"; then continue; fi; \ - test -d $$path && mkdir -p .preserve/$$path || mkdir -p .preserve/$$(dirname $$path); \ - cp -av $$path .preserve/$$path; \ - done - - # remove unused code / bundled libraries (see at the top of the debian/rules file) - # for the exact list of files and folders - rm -Rf `cat $(UNUSED_FOLDERS)` - rm -Rf `cat $(CLEANUP_FOLDERS)` - rm -Rf `cat $(UNNEEDED_BACKUPS)` - - # copy to-be-preserved files back into code tree - cp -av .preserve/* . - rm -Rf .preserve/ - LOCAL_LDFLAGS=$(LDFLAGS) SHLIBGLOBALSFLAGS=$(LDFLAGS) SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel override_dh_strip: -- cgit v1.2.3 From abbe9386166a062755b190c1ee8755b430201c64 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 10:46:10 +0100 Subject: fix long-line in changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bebcf51e8..bbd4372d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,7 +84,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium library package (names) as obsolete. + Don't depend on nx-libs base package with fixed version. + Don't fail if removing *.a files fails due to the files being non-present. - + Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time. + + Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build + time. + Assure that BuildRoot: is set. + On SLE 11.x: libX* packages are prefixed with "xorg-x11-". -- cgit v1.2.3 From 7a1bd6b29b1b780569a09b0c534000a9841a70b6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 11:44:17 +0100 Subject: Provide README.NX-development file. Drop README.NX-redistribution file. --- ...00_add-NX-redistribution-README.full+lite.patch | 48 ---------------------- debian/patches/series | 1 - 2 files changed, 49 deletions(-) delete mode 100644 debian/patches/000_add-NX-redistribution-README.full+lite.patch (limited to 'debian') diff --git a/debian/patches/000_add-NX-redistribution-README.full+lite.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch deleted file mode 100644 index 3e1f2e878..000000000 --- a/debian/patches/000_add-NX-redistribution-README.full+lite.patch +++ /dev/null @@ -1,48 +0,0 @@ -Description: Add README.NX-redistributed -Author: Mike Gabriel - ---- /dev/null -+++ b/README.NX-redistributed -@@ -0,0 +1,42 @@ -+NX redistribution by X2Go -+------------------------- -+This source tree is a re-distribution of those NX packages needed to -+setup FreeNX and/or X2Go on a Linux server. -+ -+The NX re-distribution currently is maintained by the X2Go Project: -+http://wiki.x2go.org -+ -+Our goal is: -+ - provide _one_ tarball that builds NX projects via a common Makefile -+ - provide _one_ tarball for distribution packagers -+ -+This re-distribution contains the following tarballs derived from -+NoMachine (http://www.nomachine.com/sources.php): -+ -+ nxcomp -+ nxcompext -+ nxcompshad -+ nxproxy -+ nx-X11 -+ nxagent -+ nxauth -+ -+The patches we apply are shipped with this tarball, for further introspection -+please refer to this folder: -+ -+ doc/applied-patches -+ -+This source tree is maintained on the X2Go Git server: -+Browsing... http://code.x2go.org/gitweb?p=nx-libs.git;a=summary -+Git-Cloning... git clone git://code.x2go.org/nx-libs.git -+ -+If you have any questions about this NX redistribution or want to file -+a bug, then please contact the X2Go developers on -+ -+ x2go-dev@lists.berlios.de -+ -+The X2Go-Dev mailing list requires subscription before you can post to it: -+http://lists.berlios.de/mailman/listinfo/x2go-dev -+ -+thanks+light+love -+Mike Gabriel diff --git a/debian/patches/series b/debian/patches/series index e6398bc19..4eb064ea0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -000_add-NX-redistribution-README.full+lite.patch 002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch -- cgit v1.2.3 From 3b4a915984b3136f6fddb0cdfdec01cf64715c46 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 11:46:07 +0100 Subject: Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch). Make sure nxcompshad get built against nx-X11. . Furthermore /usr/X11R6/lib is an outdated path on current Debian systems. --- ...nxcompshad_build-against-nx-x11-only.full.patch | 39 ---------------------- debian/patches/series | 1 - 2 files changed, 40 deletions(-) delete mode 100644 debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch (limited to 'debian') diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch deleted file mode 100644 index 4e92c3b04..000000000 --- a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Build nxcompshad against nx-X11. - Make sure nxcompshad get built against nx-X11. - . - Furthermore /usr/X11R6/lib is an outdated path on - current Debian systems. -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -+LIBS = @LIBS@ -lX11 - - # - # Only if THREADS is defined. -@@ -162,7 +162,7 @@ - -Wl,--enable-auto-import \ - -Wl,--whole-archive ${LIBARCHIVE} \ - -Wl,--no-whole-archive \ -- ${LIBS} -L/usr/X11R6/lib -+ ${LIBS} - - $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) - # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) ---- a/nxcompshad/configure.in -+++ b/nxcompshad/configure.in -@@ -19,7 +19,7 @@ - - if test -d "../nx-X11/exports/include" ; then - CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" -- LIBS="$LIBS -L../nx-X11/exports/lib" -+ LIBS="-L../nx-X11/exports/lib" - fi - - dnl Check whether --with-ipaq was given. diff --git a/debian/patches/series b/debian/patches/series index 4eb064ea0..e410e2024 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch -- cgit v1.2.3 From b3496d0a7a76cb0808bbe0f7c84355e4e88878d0 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 9 Feb 2015 11:53:47 +0100 Subject: gcc43 fix (003_nxcompshad_gcc43.full.patch) Use builtin includes to build with gcc43. --- debian/patches/003_nxcompshad_gcc43.full.patch | 33 -------------------------- debian/patches/series | 1 - 2 files changed, 34 deletions(-) delete mode 100644 debian/patches/003_nxcompshad_gcc43.full.patch (limited to 'debian') diff --git a/debian/patches/003_nxcompshad_gcc43.full.patch b/debian/patches/003_nxcompshad_gcc43.full.patch deleted file mode 100644 index 165c30035..000000000 --- a/debian/patches/003_nxcompshad_gcc43.full.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: gcc43 fix - Use builtin includes to build with gcc43. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxcompshad/Logger.h -+++ b/nxcompshad/Logger.h -@@ -18,8 +18,8 @@ - #ifndef Logger_H - #define Logger_H - --#include --#include -+#include -+#include - - // - // Error handling macros. ---- a/nxcompshad/Misc.h -+++ b/nxcompshad/Misc.h -@@ -20,8 +20,8 @@ - - #include - --#include --#include -+#include -+#include - - using namespace std; - diff --git a/debian/patches/series b/debian/patches/series index e410e2024..3dfca5e33 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch -- cgit v1.2.3 From dd20ab5e6222bb415245829af8915259da4eae3f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 11:56:14 +0100 Subject: Description: Fix build on Debian (004_nx-X11_fix-nxcompshad-build.full.patch) By an unknown reason this patch currently is needed to build nx-X11, nxcomp, nxcompshad and nxcompext with dpkg-buildpackage and debuild. --- .../patches/004_nx-X11_fix-nxcompshad-build.full.patch | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) delete mode 100644 debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch (limited to 'debian') diff --git a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch b/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch deleted file mode 100644 index f65fb7877..000000000 --- a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix build on Debian - By an unknown reason this patch currently is needed to - build nx-X11, nxcomp, nxcompshad and nxcompext with - dpkg-buildpackage and debuild. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1047,7 +1047,7 @@ - #else - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- make -+ rm -f *.o && make - #endif - - ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/series b/debian/patches/series index 3dfca5e33..fef54678f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch -- cgit v1.2.3 From 48c82810715011513dc38dc1fd39d67134d899c5 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 9 Feb 2015 11:57:55 +0100 Subject: Description: gcc43 fix (005_nxcomp_gcc43.full+lite.patch) Use builtin includes to build with gcc43. --- debian/patches/005_nxcomp_gcc43.full+lite.patch | 77 ------------------------- debian/patches/series | 1 - 2 files changed, 78 deletions(-) delete mode 100644 debian/patches/005_nxcomp_gcc43.full+lite.patch (limited to 'debian') diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch deleted file mode 100644 index bb758c2bd..000000000 --- a/debian/patches/005_nxcomp_gcc43.full+lite.patch +++ /dev/null @@ -1,77 +0,0 @@ -Description: gcc43 fix - Use builtin includes to build with gcc43. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: not-yet -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxcomp/Message.cpp 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Message.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,9 +15,9 @@ - /* */ - /**************************************************************************/ - --#include -+#include - #include --#include -+#include - - #include - ---- a/nxcomp/Misc.cpp 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Misc.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,11 +15,11 @@ - /* */ - /**************************************************************************/ - --#include --#include --#include -+#include -+#include -+#include - #include --#include -+#include - - #include - #include ---- a/nxcomp/Misc.h 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Misc.h 2012-03-01 03:47:27.605712530 +0100 -@@ -21,8 +21,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #ifdef __sun - ---- a/nxcomp/Proxy.cpp 2012-03-01 03:46:39.224943897 +0100 -+++ b/nxcomp/Proxy.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,9 +15,9 @@ - /* */ - /**************************************************************************/ - --#include -+#include - #include --#include -+#include - #include - #include - ---- a/nxcomp/Split.cpp 2012-03-01 03:46:39.224943897 +0100 -+++ b/nxcomp/Split.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -16,7 +16,7 @@ - /**************************************************************************/ - - #include --#include -+#include - #include - #include - #include diff --git a/debian/patches/series b/debian/patches/series index fef54678f..9779715e4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch 008_nxcomp_sa-restorer.full+lite.patch -- cgit v1.2.3 From f27e7424fc314e50f826036fd078ca64fe3f31ba Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:16:10 +0100 Subject: Fix building against libpng 1.5 (006_nxcomp_libpng15.full+lite.patch). From the libpng homepage... The libpng 1.5.x series continues the evolution of the libpng API, finally hiding the contents of the venerable and hoary png_struct and png_info data structures inside private (i.e., non-installed) header files. Instead of direct struct-access, applications should be using the various png_get_xxx() and png_set_xxx() accessor functions, which have existed for almost as long as libpng itself. (Apps that compiled against libpng 1.4 without warnings about deprecated features should happily compile against 1.5, too. Patch origin: Fedora packagers of libXcomp3. --- debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 ---------------------- debian/patches/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch (limited to 'debian') diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch deleted file mode 100644 index a75c59bac..000000000 --- a/debian/patches/006_nxcomp_libpng15.full+lite.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Fix building against libpng 1.5. - From the libpng homepage... - - The libpng 1.5.x series continues the evolution of the libpng API, - finally hiding the contents of the venerable and hoary png_struct and - png_info data structures inside private (i.e., non-installed) header - files. Instead of direct struct-access, applications should be using - the various png_get_xxx() and png_set_xxx() accessor functions, which - have existed for almost as long as libpng itself. (Apps that compiled - against libpng 1.4 without warnings about deprecated features should - happily compile against 1.5, too. -Forwarded: pending... -Author: Fedora packagers of NX -Last-Update: 2012-02-06 ---- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/debian/patches/series b/debian/patches/series index 9779715e4..f82c87bf0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch 008_nxcomp_sa-restorer.full+lite.patch 009_nxproxy_add-man-page.full+lite.patch -- cgit v1.2.3 From a720908a60a2bc8da177582f80537ecf3eee45d8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:18:50 +0100 Subject: Remove .gch files during cleanup (007_nxcompshad_clean-gch-files.full.patch). When building nxcompshad .gch files get created. On cleanup these should be removed. --- .../patches/007_nxcompshad_clean-gch-files.full.patch | 17 ----------------- debian/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 debian/patches/007_nxcompshad_clean-gch-files.full.patch (limited to 'debian') diff --git a/debian/patches/007_nxcompshad_clean-gch-files.full.patch b/debian/patches/007_nxcompshad_clean-gch-files.full.patch deleted file mode 100644 index 897e27890..000000000 --- a/debian/patches/007_nxcompshad_clean-gch-files.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove .gch files during cleanup. - When building nxcompshad .gch files get created. On - cleanup these should be removed. -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -185,7 +185,7 @@ - install.man: - - clean: -- -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ -+ -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe - - distclean: clean diff --git a/debian/patches/series b/debian/patches/series index f82c87bf0..81a71d3a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -007_nxcompshad_clean-gch-files.full.patch 008_nxcomp_sa-restorer.full+lite.patch 009_nxproxy_add-man-page.full+lite.patch 009_nxagent_add-man-page.full.patch -- cgit v1.2.3 From a0b2fd836883e8ec429d5f31779c61f31b1a204d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:20:22 +0100 Subject: sa_restorer vs. memset (008_nxcomp_sa-restorer.full+lite.patch). Use memset instead of setting sa_restorer to NULL. Original-Author: Alexander Morozov --- .../patches/008_nxcomp_sa-restorer.full+lite.patch | 46 ---------------------- debian/patches/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 debian/patches/008_nxcomp_sa-restorer.full+lite.patch (limited to 'debian') diff --git a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch b/debian/patches/008_nxcomp_sa-restorer.full+lite.patch deleted file mode 100644 index f1447ccb0..000000000 --- a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: sa_restorer vs. memset - Use memset instead of setting sa_restorer to NULL. -Forwarded: pending -Author: Alexander Morozov -Last-Update: 2012-02-07 ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -5884,20 +5884,9 @@ - - struct sigaction newAction; - -- newAction.sa_handler = HandleSignal; -- -- // -- // This field doesn't exist on most OSes except -- // Linux. We keep setting the field to NULL to -- // avoid side-effects in the case the field is -- // a value return. -- // -+ memset(&newAction, 0, sizeof(newAction)); - -- #if defined(__linux__) -- -- newAction.sa_restorer = NULL; -- -- #endif -+ newAction.sa_handler = HandleSignal; - - sigemptyset(&(newAction.sa_mask)); - -@@ -6509,13 +6498,9 @@ - - struct sigaction action; - -- action.sa_handler = HandleTimer; -- -- #if defined(__linux__) -+ memset(&action, 0, sizeof(action)); - -- action.sa_restorer = NULL; -- -- #endif -+ action.sa_handler = HandleTimer; - - sigemptyset(&action.sa_mask); - diff --git a/debian/patches/series b/debian/patches/series index 81a71d3a1..9f56169bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -008_nxcomp_sa-restorer.full+lite.patch 009_nxproxy_add-man-page.full+lite.patch 009_nxagent_add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch -- cgit v1.2.3 From 27ddd1695541ff333104d5a3e441a0c37308750e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:23:12 +0100 Subject: Work on man pages. 009_nxproxy_add-man-page.full+lite.patch 009_nxagent_add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch --- debian/patches/009_nxagent_add-man-page.full.patch | 43 -------- .../009_nxproxy_add-man-page.full+lite.patch | 33 ------ ...0_nxauth_fix-binary-name-in-man-page.full.patch | 119 --------------------- debian/patches/series | 3 - 4 files changed, 198 deletions(-) delete mode 100644 debian/patches/009_nxagent_add-man-page.full.patch delete mode 100644 debian/patches/009_nxproxy_add-man-page.full+lite.patch delete mode 100644 debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch (limited to 'debian') diff --git a/debian/patches/009_nxagent_add-man-page.full.patch b/debian/patches/009_nxagent_add-man-page.full.patch deleted file mode 100644 index cec8c7527..000000000 --- a/debian/patches/009_nxagent_add-man-page.full.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: man page for nxagent -Author: Mike Gabriel - ---- /dev/null -+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 -@@ -0,0 +1,37 @@ -+.TH NXAGENT 1 -+.SH NAME -+nxagent \- NoMachine's NX Agent. -+.SH SYNOPSIS -+.B nxagent -+.I "[options]" -+ -+.SH DESCRIPTION -+\fBnxagent\fR is an Xnest-like X server for remote application/desktop access. -+.PP -+\fBnxagent\fR implements a very efficient compression of the X11 protocol. -+.PP -+This increases performance when using X applications over high latency and -+low bandwidth networks, while providing a local (LAN-like) usage experience -+even if connecting from off-site locations (via cable modem or GSM). -+.PP -+\fBnxagent\fR is not designed to be used as a standalone application. -+It has to be launched on the server side by remote desktop frameworks like FreeNX. -+.PP -+Available clients are -+NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\fR -+(with NX plugin). -+ -+.SH OPTIONS -+.TP -+.B \--help -+Lists all others options that are not listed here. -+ -+.SH FURTHER READINGS -+Information on NX: http://www.nomachine.com -+.PP -+Information on FreeNX: http://freenx.berlios.de -+ -+.SH AUTHOR -+This manual page was written by Per Hansen , -+and modified by Marcelo Boveto Shima and -+Mike Gabriel . diff --git a/debian/patches/009_nxproxy_add-man-page.full+lite.patch b/debian/patches/009_nxproxy_add-man-page.full+lite.patch deleted file mode 100644 index b60e218ee..000000000 --- a/debian/patches/009_nxproxy_add-man-page.full+lite.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: man page for nxproxy -Author: Mike Gabriel - ---- /dev/null -+++ b/nxproxy/man/nxproxy.1 -@@ -0,0 +1,27 @@ -+'\" -*- coding: utf-8 -*- -+.if \n(.g .ds T< \\FC -+.if \n(.g .ds T> \\F[\n[.fam]] -+.de URL -+\\$2 \(la\\$1\(ra\\$3 -+.. -+.if \n(.g .mso www.tmac -+.TH nxproxy 1 "Nov 2011" "Version 3.5.0" "NX Proxy" -+.SH NAME -+nxproxy \- NX Proxy Tool -+.SH SYNOPSIS -+'nh -+.fi -+.ad l -+\fBnxproxy\fR -+ -+.SH DESCRIPTION -+\fBnxproxy\fR is a tool that allows one to tunnel X sessions through -+the NX compression libraries. \fBnxproxy\fR is a backend application -+utilized by the X2GoClient GUI and some other NX/X2Go clients. -+.PP -+.SH OPTIONS -+For an insight in \fBnxproxy\fR options use \fBnxproxy \-\-help\fR on the command line. -+.PP -+.SH AUTHOR -+This manual has been written by Mike Gabriel for the X2Go project -+(http://www.x2go.org). diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch deleted file mode 100644 index c8f76b51a..000000000 --- a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch +++ /dev/null @@ -1,119 +0,0 @@ -Description: Fix binary name in man page for nxauth. - The NX auth man page in upstream still uses xauth as - binary name. -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nx-X11/programs/nxauth/nxauth.man -+++ b/nx-X11/programs/nxauth/nxauth.man -@@ -27,51 +27,51 @@ - .\" - .TH XAUTH 1 __xorgversion__ - .SH NAME --xauth \- X authority file utility -+nxauth \- NoMachine X authority file utility - .SH SYNOPSIS --.B xauth -+.B nxauth - [ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqib\fP ] [ \fIcommand arg ...\fP ] - .SH DESCRIPTION - .PP --The \fIxauth\fP program is used to edit and display the authorization -+The \fInxauth\fP program is used to edit and display the authorization - information used in connecting to the X server. This program is usually - used to extract authorization records from one machine and merge them in on - another (as is the case when using remote logins or granting access to - other users). Commands (described below) may be entered interactively, --on the \fIxauth\fP command line, or in scripts. Note that this program -+on the \fInxauth\fP command line, or in scripts. Note that this program - does \fBnot\fP contact the X server except when the generate command is used. --Normally \fIxauth\fP is not used to create the authority file entry in -+Normally \fInxauth\fP is not used to create the authority file entry in - the first place; \fIxdm\fP does that. - .SH OPTIONS --The following options may be used with \fIxauth\fP. They may be given -+The following options may be used with \fInxauth\fP. They may be given - individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP). - .TP 8 - .B "\-f \fIauthfile\fP" - This option specifies the name of the authority file to use. By default, --\fIxauth\fP will use the file specified by the XAUTHORITY environment variable -+\fInxauth\fP will use the file specified by the nxauthORITY environment variable - or \fI\.Xauthority\fP in the user's home directory. - .TP 8 - .B \-q --This option indicates that \fIxauth\fP should operate quietly and not print --unsolicited status messages. This is the default if an \fIxauth\fP command is -+This option indicates that \fInxauth\fP should operate quietly and not print -+unsolicited status messages. This is the default if an \fInxauth\fP command is - is given on the command line or if the standard output is not directed to a - terminal. - .TP 8 - .B \-v --This option indicates that \fIxauth\fP should operate verbosely and print -+This option indicates that \fInxauth\fP should operate verbosely and print - status messages indicating the results of various operations (e.g., how many --records have been read in or written out). This is the default if \fIxauth\fP -+records have been read in or written out). This is the default if \fInxauth\fP - is reading commands from its standard input and its standard output is - directed to a terminal. - .TP 8 - .B \-i --This option indicates that \fIxauth\fP should ignore any authority file --locks. Normally, \fIxauth\fP will refuse to read or edit any authority files -+This option indicates that \fInxauth\fP should ignore any authority file -+locks. Normally, \fInxauth\fP will refuse to read or edit any authority files - that have been locked by other programs (usually \fIxdm\fP or another --\fIxauth\fP). -+\fInxauth\fP). - .TP 8 - .B \-b --This option indicates that \fIxauth\fP should attempt to break any authority -+This option indicates that \fInxauth\fP should attempt to break any authority - file locks before proceeding. Use this option only to clean up stale locks. - .SH COMMANDS - The following commands may be used to manipulate authority files: -@@ -157,14 +157,14 @@ - authority file. - .TP 8 - .B "source \fIfilename" --The specified file is treated as a script containing \fIxauth\fP commands -+The specified file is treated as a script containing \fInxauth\fP commands - to execute. Blank lines and lines beginning with a sharp sign (#) are - ignored. A single dash may be used to indicate the standard input, if it - hasn't already been read. - .TP 8 - .B "info" - Information describing the authorization file, whether or not any changes --have been made, and from where \fIxauth\fP commands are being read -+have been made, and from where \fInxauth\fP commands are being read - is printed on the standard output. - .TP 8 - .B "exit" -@@ -194,12 +194,12 @@ - local entries for different machines may be stored in one authority file. - .SH EXAMPLE - .PP --The most common use for \fIxauth\fP is to extract the entry for the -+The most common use for \fInxauth\fP is to extract the entry for the - current display, copy it to another machine, and merge it into the - user's authority file on the remote machine: - .sp - .nf -- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \- -+ % nxauth extract \- $DISPLAY | rsh otherhost nxauth merge \- - .fi - .PP - .sp -@@ -207,10 +207,10 @@ - authorization using the MIT-MAGIC-COOKIE-1 protocol. Clients that - connect with this authorization will be untrusted. - .nf -- % xauth generate :0 . -+ % nxauth generate :0 . - .fi - .SH ENVIRONMENT --This \fIxauth\fP program uses the following environment variables: -+This \fInxauth\fP program uses the following environment variables: - .TP 8 - .B XAUTHORITY - to get the name of the authority file to use if the \fI\-f\fP option isn't diff --git a/debian/patches/series b/debian/patches/series index 9f56169bf..8bbb69182 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -009_nxproxy_add-man-page.full+lite.patch -009_nxagent_add-man-page.full.patch -010_nxauth_fix-binary-name-in-man-page.full.patch 012_nxcomp_makefile-uninstall+autoconf.full+lite.patch 013_nxcompext_makefile-uninstall+autoconf.full.patch 014_nxcompshad_makefile-uninstall+autoconf.full.patch -- cgit v1.2.3 From 4bc550e867f6168c1090aa4e1959a22238be84f1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:26:02 +0100 Subject: nxcomp*,nxproxy: Add clean rules to Makefile.in templates. --- ...omp_makefile-uninstall+autoconf.full+lite.patch | 74 ---------------------- ...xcompext_makefile-uninstall+autoconf.full.patch | 66 ------------------- ...compshad_makefile-uninstall+autoconf.full.patch | 70 -------------------- .../015_nxproxy_makefile-uninstall.full+lite.patch | 40 ------------ debian/patches/series | 4 -- 5 files changed, 254 deletions(-) delete mode 100644 debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch (limited to 'debian') diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch deleted file mode 100644 index af778fefc..000000000 --- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs - Provide install and uninstall functionality in nxcomp/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -64,10 +64,15 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -264,12 +269,44 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)${libdir} -+ ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir} -+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch deleted file mode 100644 index 300c0a39e..000000000 --- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs. - Provide install and uninstall functionality in nxcompext/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -56,11 +56,15 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -- -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - # - # This should be autodetected. - # -@@ -147,12 +151,35 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)${libdir} -+ ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch deleted file mode 100644 index 921eccc4f..000000000 --- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch +++ /dev/null @@ -1,70 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs - Provide install and uninstall functionality in nxcompshad/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -74,10 +74,17 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ -+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f -+RM_DIR = rmdir -p --ignore-fail-on-non-empty - - # - # This should be autodetected. -@@ -178,12 +185,38 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ $(INSTALL_DIR) $(DESTDIR)${libdir} -+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir} -+ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a -+ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done -+ $(RM_DIR) $(DESTDIR)${libdir}/nx/ -+ $(RM_DIR) $(DESTDIR)${includedir}/nx/ -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch deleted file mode 100644 index 554c86aa4..000000000 --- a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile - Provide install and uninstall functionality in nxcomp/Makefile. -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -41,6 +41,8 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -87,11 +89,20 @@ - install: install.bin install.man - - install.bin: $(PROGRAM) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - - install.man: -- $(srcdir)/mkinstalldirs $(man1dir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) -+ $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 -+ -+uninstall: uninstall.bin uninstall.man -+ -+uninstall.bin: -+ $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) -+ -+uninstall.man: -+ $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 - - clean: - -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ diff --git a/debian/patches/series b/debian/patches/series index 8bbb69182..f3678f428 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,3 @@ -012_nxcomp_makefile-uninstall+autoconf.full+lite.patch -013_nxcompext_makefile-uninstall+autoconf.full.patch -014_nxcompshad_makefile-uninstall+autoconf.full.patch -015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-X11_install-location.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch -- cgit v1.2.3 From 9b72eeaa21ada21b117433b05c745b656b42963a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 15:12:11 +0100 Subject: FHS adaptation for Debian packaging (016_nx-X11_install-location.full.patch). From tarball, NX libraries and binaries are installed to /usr/local/lib/nx. . FIXME: The paths in this patch get superceded by current build logic in nx-libs.spec and debian/rules. This should be merged into the NX build logic finally. --- .../patches/016_nx-X11_install-location.full.patch | 154 --------------------- debian/patches/series | 1 - 2 files changed, 155 deletions(-) delete mode 100644 debian/patches/016_nx-X11_install-location.full.patch (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.full.patch b/debian/patches/016_nx-X11_install-location.full.patch deleted file mode 100644 index 6571aea9e..000000000 --- a/debian/patches/016_nx-X11_install-location.full.patch +++ /dev/null @@ -1,154 +0,0 @@ -Description: FHS adaptation for Debian packaging - From tarball, NX libraries and binaries are installed to - /usr/local/lib/nx. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -820,12 +820,12 @@ - - #ifndef UsrLibDir - #ifdef ProjectRoot --#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) -+#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat3(/usr,/,LibDirName) -+#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -863,7 +863,7 @@ - #endif - #ifndef IncRoot - #ifdef ProjectRoot --#define IncRoot Concat(ProjectRoot,/include) -+#define IncRoot Concat(ProjectRoot,/include/nx) - #ifndef AlternateIncRoot - #define AlternateIncRoot YES - #endif ---- a/nx-X11/config/cf/X11.rules -+++ b/nx-X11/config/cf/X11.rules -@@ -36,17 +36,17 @@ - #endif - - #if defined(X11ProjectRoot) --# define XBinDir $(XPROJECTROOT)/bin -+# define XBinDir $(XPROJECTROOT)/lib/nx/bin - #elif defined(ProjectRoot) --# define XBinDir $(PROJECTROOT)/bin -+# define XBinDir $(PROJECTROOT)/lib/nx/bin - #else - # define XBinDir $(BINDIR) - #endif - - #ifdef X11ProjectRoot --# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib -+# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT) - #else --# define XUsrLibDirPath $(USRLIBDIR) -+# define XUsrLibDirPath $(USRLIBDIR)/nx - #endif - #ifdef UsrLibDirPath - # undef UsrLibDirPath -@@ -60,7 +60,7 @@ - #if ImportX11 - # define XLdPreLibs -L$(LIBSRC) - #elif defined(UseInstalledX11) && defined(X11ProjectRoot) --# define XLdPreLibs -L$(XPROJECTROOT)/lib -+# define XLdPreLibs -L$(XPROJECTROOT) - #else - # define XLdPreLibs /**/ - #endif -@@ -70,7 +70,7 @@ - #define LdPreLibs LdPreLib XLdPreLibs - - #ifdef X11ProjectRoot --# define XLdPostLibs -L$(XPROJECTROOT)/lib -+# define XLdPostLibs -L$(XPROJECTROOT) - #else - # define XLdPostLibs /**/ - #endif -@@ -86,7 +86,7 @@ - # define TopXInclude -I$(TOP)/exports/include - #else - # ifdef X11ProjectRoot --# define TopXInclude -I$(XPROJECTROOT)/include -+# define TopXInclude -I$(XPROJECTROOT)/../../include/nx - # else - # define TopXInclude /**/ - # endif -@@ -98,7 +98,7 @@ - #define TopIncludes TopInclude $(TOP_X_INCLUDES) - - #if UseInstalledX11 && defined(X11ProjectRoot) --# define X11BuildLibPath $(XPROJECTROOT)/lib -+# define X11BuildLibPath $(XPROJECTROOT) - #elif UseInstalledX11 - # define X11BuildLibPath $(USRLIBDIR) - #elif ImportX11 ---- a/nx-X11/config/cf/X11.tmpl -+++ b/nx-X11/config/cf/X11.tmpl -@@ -1401,7 +1401,7 @@ - - #ifndef BinDir - #ifdef ProjectRoot --#define BinDir Concat(ProjectRoot,/bin) -+#define BinDir Concat(ProjectRoot,/lib/nx/bin) - #else - #define BinDir /usr/bin/X11 - #endif -@@ -1461,7 +1461,7 @@ - #endif - #ifndef LibDir - # ifdef ProjectRoot --# define LibDir Concat(ProjectRoot,/lib/X11) -+# define LibDir Concat(ProjectRoot,/lib/nx/X11) - # else - # define LibDir /usr/lib/X11 - # endif ---- a/nx-X11/config/cf/linux.cf -+++ b/nx-X11/config/cf/linux.cf -@@ -1054,7 +1054,7 @@ - - #if HaveLib64 - # ifndef LibDirName --# define LibDirName lib64 -+# define LibDirName lib - # endif - # ifndef SystemUsrLibDir - # define SystemUsrLibDir /usr/lib64 ---- a/nx-X11/config/cf/site.def -+++ b/nx-X11/config/cf/site.def -@@ -72,7 +72,7 @@ - #ifdef AfterVendorCF - - #ifndef ProjectRoot --#define ProjectRoot /usr/local/lib/nx -+#define ProjectRoot /usr/local - #endif - - /* -@@ -87,7 +87,7 @@ - * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, - * UseEtcX11 and UseSeparateConfDir. - * --#define EtcX11Directory ProjectRoot/etc -+#define EtcX11Directory /etc/nx - */ - - ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -33,7 +33,7 @@ - - srcdir = @srcdir@ - prefix = @prefix@ --exec_prefix = @exec_prefix@ -+exec_prefix = @exec_prefix@/lib/nx - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ diff --git a/debian/patches/series b/debian/patches/series index f3678f428..70c573c38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -016_nx-X11_install-location.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch -- cgit v1.2.3 From 236ee4ffa8e4fa92bb748301986307841ef060ab Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 15:16:30 +0100 Subject: nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in templates. 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch --- debian/patches/024_fix-make-clean.full+lite.patch | 19 --------- debian/patches/024_fix-make-clean.full.patch | 51 ----------------------- debian/patches/series | 2 - 3 files changed, 72 deletions(-) delete mode 100644 debian/patches/024_fix-make-clean.full+lite.patch delete mode 100644 debian/patches/024_fix-make-clean.full.patch (limited to 'debian') diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch deleted file mode 100644 index 7f0b327cf..000000000 --- a/debian/patches/024_fix-make-clean.full+lite.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix clean rule in nxcomp's Makefile.in -Author: Mike Gabriel - ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -313,4 +313,4 @@ - - distclean: clean - -rm -rf autom4te.cache config.status config.log \ -- config.cache depend.status Makefile tags -+ config.cache depend.status Makefile tags configure ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -109,4 +109,4 @@ - $(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) - - distclean: clean -- -rm -f config.status config.log config.cache depend.status Makefile tags -+ -rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure diff --git a/debian/patches/024_fix-make-clean.full.patch b/debian/patches/024_fix-make-clean.full.patch deleted file mode 100644 index 356ce47d8..000000000 --- a/debian/patches/024_fix-make-clean.full.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Provide main Makefile for whole source tree - By design this patch is not needed to be sent upstream. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-10-19 ---- a/nx-X11/Makefile -+++ b/nx-X11/Makefile -@@ -138,6 +138,7 @@ - - xmakefile: Imakefile - $(RM) xmakefile -+ @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; - $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - - World.Win32: -@@ -197,11 +198,16 @@ - # a copy of every rule that might be invoked at top level - - clean: -- $(MAKE_CMD) $@ -+ -$(MAKE_CMD) $@ -+ find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ rm -f config/cf/{version.def,date.def} - dangerous_strip_clean: - $(MAKE_CMD) $@ - distclean: -- $(MAKE_CMD) $@ -+ -$(MAKE_CMD) $@ - $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def - depend: - $(MAKE_CMD) $@ ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -185,5 +185,5 @@ - @ALL@ - - distclean: clean -- -rm -rf autom4te.cache config.status config.log \ -+ -rm -rf autom4te.cache config.status config.log configure \ - config.cache depend.status Makefile tags ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -222,4 +222,4 @@ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe - - distclean: clean -- -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache -+ -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure diff --git a/debian/patches/series b/debian/patches/series index 70c573c38..63bc3dc43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -024_fix-make-clean.full.patch -024_fix-make-clean.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch -- cgit v1.2.3 From 78efa8bf9889a006cd5c0a34a22d458de59ee60a Mon Sep 17 00:00:00 2001 From: Gabriel Marcano Date: Mon, 9 Feb 2015 15:19:12 +0100 Subject: Fix FTBFS against libjpeg9a (025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch). --- ...nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch | 40 ---------------------- debian/patches/series | 1 - 2 files changed, 41 deletions(-) delete mode 100644 debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch (limited to 'debian') diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch deleted file mode 100644 index 66ca8c33e..000000000 --- a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix FTBFS when built against libjpeg9a -Author: Gabriel Marcano ---- a/nxcomp/Jpeg.cpp 2014-08-19 22:23:36.139072400 -0400 -+++ b/nxcomp/Jpeg.cpp 2014-08-19 22:25:24.323182800 -0400 -@@ -440,7 +440,7 @@ - - JpegSetSrcManager(&cinfo, compressedData, compressedLen); - -- jpeg_read_header(&cinfo, 1); -+ jpeg_read_header(&cinfo, TRUE); - - if (jpegError) goto AbortDecompressJpeg16; - -@@ -581,7 +581,7 @@ - - JpegSetSrcManager(&cinfo, compressedData, compressedLen); - -- jpeg_read_header(&cinfo, 1); -+ jpeg_read_header(&cinfo, TRUE); - - if (jpegError) goto AbortDecompressJpeg24; - -@@ -718,7 +718,7 @@ - - JpegSetSrcManager(&cinfo, compressedData, compressedLen); - -- jpeg_read_header(&cinfo, 1); -+ jpeg_read_header(&cinfo, TRUE); - - if (jpegError) goto AbortDecompressJpeg32; - -@@ -833,7 +833,7 @@ - jpegSrcManager.bytes_in_buffer = jpegBufferLen; - jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr; - -- return 1; -+ return TRUE; - } - - static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes) diff --git a/debian/patches/series b/debian/patches/series index 63bc3dc43..6eadd7bd9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch 026_nxcompshad_honour-optflags.full.patch -- cgit v1.2.3 From 3384aba386c44ec26d3f131b897f77da440324d7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:22:07 +0100 Subject: Honour compiler/linker option flags. 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch 026_nxcompshad_honour-optflags.full.patch --- .../026_nxcomp_honour-optflags.full+lite.patch | 31 ---------------------- .../026_nxcompext_honour-optflags.full.patch | 17 ------------ .../026_nxcompshad_honour-optflags.full.patch | 17 ------------ debian/patches/series | 3 --- 4 files changed, 68 deletions(-) delete mode 100644 debian/patches/026_nxcomp_honour-optflags.full+lite.patch delete mode 100644 debian/patches/026_nxcompext_honour-optflags.full.patch delete mode 100644 debian/patches/026_nxcompshad_honour-optflags.full.patch (limited to 'debian') diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch deleted file mode 100644 index a2713a1bc..000000000 --- a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcomp/configure.in b/nxcomp/configure.in ---- a/nxcomp/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxcomp/configure.in 2012-12-11 13:13:19.390229196 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" -+CFLAGS="$CFLAGS -O3" - - dnl Reset default linking directives. - -diff -up a/nxproxy/configure.in b/nxproxy/configure.in ---- a/nxproxy/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxproxy/configure.in 2012-12-11 13:16:19.955301045 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CPPFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CPPFLAGS="$CPPFLAGS -O3" - - dnl Prefer headers and libraries from nx-X11 if present. - diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/026_nxcompext_honour-optflags.full.patch deleted file mode 100644 index 4d5df3e6b..000000000 --- a/debian/patches/026_nxcompext_honour-optflags.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcompext/configure.in b/nxcompext/configure.in ---- a/nxcompext/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxcompext/configure.in 2012-12-11 13:15:26.712576302 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CFLAGS="$CFLAGS -O3" - - dnl Reset default linking directives. - diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/026_nxcompshad_honour-optflags.full.patch deleted file mode 100644 index ea1d2ad80..000000000 --- a/debian/patches/026_nxcompshad_honour-optflags.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in ---- a/nxcompshad/configure.in 2012-11-10 06:40:56.000000000 -0700 -+++ b/nxcompshad/configure.in 2012-12-11 13:13:25.915196300 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CPPFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CPPFLAGS="$CPPFLAGS -O3" - - dnl Reset default linking directives. - diff --git a/debian/patches/series b/debian/patches/series index 6eadd7bd9..ca6b6dcdc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -026_nxcompext_honour-optflags.full.patch -026_nxcomp_honour-optflags.full+lite.patch -026_nxcompshad_honour-optflags.full.patch 027_nxcomp_abstract-X11-socket.full+lite.patch 028_nx-X11_abstract-kernel-sockets.full.patch 029_nxcomp_ppc64.full+lite.patch -- cgit v1.2.3 From aaf4a59e4c4ec54a26283bce6bf25281e12f0424 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 15:27:46 +0100 Subject: Add X11 abstract socket support to nxcomp/nxproxy (027_nxcomp_abstract-X11-socket.full+lite.patch). --- .../027_nxcomp_abstract-X11-socket.full+lite.patch | 59 ---------------------- debian/patches/series | 1 - 2 files changed, 60 deletions(-) delete mode 100644 debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch (limited to 'debian') diff --git a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch b/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch deleted file mode 100644 index 4c457c5d5..000000000 --- a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch +++ /dev/null @@ -1,59 +0,0 @@ -Description: Add X11 abstract socket support to nxcomp/nxproxy -Author: Mike Gabriel - -diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp -index 92b6fc2..d86809d 100644 ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -4250,6 +4250,39 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr, - // where the socket will be created. - // - -+ // Try abstract X11 socket first (via a test connect), if that fails -+ // fall back to Unix domain socket file. -+ -+ #ifdef __linux__ -+ int testSocketFD; -+ testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC); -+ -+ int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort); -+ unixSocketName[0] = '\0'; -+ -+ sockaddr_un *xServerAddrABSTRACT = new sockaddr_un; -+ memset(xServerAddrABSTRACT, 0, xServerAddrLength); -+ xServerAddrABSTRACT -> sun_family = AF_UNIX; -+ memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1); -+ xServerAddrLength = len +3; -+ -+ int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength); -+ if (ret == 0) { -+ -+ cerr << "Info" << ": Using abstract X11 socket in kernel namespace " -+ << "for accessing DISPLAY=:" << xPort << ".\n"; -+ -+ close(testSocketFD); -+ xServerAddr = (sockaddr *) xServerAddrABSTRACT; -+ return 1; -+ -+ } else { -+ -+ cerr << "Info" << ": Falling back to file system X11 socket " -+ << "for accessing DISPLAY=:" << xPort << ".\n"; -+ -+ #endif -+ - struct stat statInfo; - - char unixSocketDir[DEFAULT_STRING_LENGTH]; -@@ -4322,6 +4355,11 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr, - - xServerAddr = (sockaddr *) xServerAddrUNIX; - xServerAddrLength = sizeof(sockaddr_un); -+ -+ #ifdef __linux__ -+ -+ } -+ #endif - } - else - { diff --git a/debian/patches/series b/debian/patches/series index ca6b6dcdc..8da3bdbf9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -027_nxcomp_abstract-X11-socket.full+lite.patch 028_nx-X11_abstract-kernel-sockets.full.patch 029_nxcomp_ppc64.full+lite.patch 030_nx-X11_configure-args.full.patch -- cgit v1.2.3 From f6619070bad8c20f8467ceb3c161d7699cc00aff Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 15:29:53 +0100 Subject: Support abstract local sockets for Linux systems (028_nx-X11_abstract-kernel-sockets.full.patch). Relevant code taken from xtrans 1.2.7 on 2014-06-11. --- .../028_nx-X11_abstract-kernel-sockets.full.patch | 321 --------------------- debian/patches/series | 1 - 2 files changed, 322 deletions(-) delete mode 100644 debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch (limited to 'debian') diff --git a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch b/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch deleted file mode 100644 index 279f9a9af..000000000 --- a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch +++ /dev/null @@ -1,321 +0,0 @@ -Author: Mike Gabriel -Description: Support abstract local sockets for Linux systems -Abstract: - Relevant code taken from xtrans 1.2.7 on 2014-06-11. - ---- a/nx-X11/lib/xtrans/Xtranssock.c -+++ b/nx-X11/lib/xtrans/Xtranssock.c -@@ -172,6 +172,8 @@ - sock_init();\ - IBMsockInit = 1;\ - } -+ -+ - #undef EINTR - #define EINTR SOCEINTR - #undef EINVAL -@@ -192,6 +194,10 @@ - #define SocketInitOnce() /**/ - #endif - -+#if defined(linux) -+#define HAVE_ABSTRACT_SOCKETS -+#endif -+ - #define MIN_BACKLOG 128 - #ifdef SOMAXCONN - #if SOMAXCONN > MIN_BACKLOG -@@ -532,7 +538,7 @@ - - void TRANS(SocketRejectConnection) (XtransConnInfo ciptr) - { -- size_t sa_l = sizeof(struct sockaddr); -+ socklen_t sa_l = sizeof(struct sockaddr); - struct sockaddr sa; - fd_set fs; - struct timeval t; -@@ -914,9 +920,11 @@ - struct sockaddr_in socknamev4; - void *socknamePtr; - #if defined(SVR4) || defined(__SCO__) -+# define SOCKLEN_T_PTR void* - size_t namelen; - #else -- int namelen; -+# define SOCKLEN_T_PTR socklen_t* -+ socklen_t namelen; - #endif - - PRMSG (3,"SocketINETGetAddr(%p)\n", ciptr, 0, 0); -@@ -935,7 +943,7 @@ - } - - if (getsockname (ciptr->fd,(struct sockaddr *) socknamePtr, -- (void *)&namelen) < 0) -+ (SOCKLEN_T_PTR)&namelen) < 0) - { - #ifdef WIN32 - errno = WSAGetLastError(); -@@ -1477,23 +1485,28 @@ - - #ifdef UNIXCONN - static int --set_sun_path(const char *port, const char *upath, char *path) -+set_sun_path(const char *port, const char *upath, char *path, int abstract) - { - struct sockaddr_un s; - int maxlen = sizeof(s.sun_path) - 1; -+ const char *at = ""; - - if (!port || !*port || !path) - return -1; - -- if (*port == '/') { /* a full pathname */ -- if (strlen(port) > maxlen) -- return -1; -- sprintf(path, "%s", port); -- } else { -- if (strlen(port) + strlen(upath) > maxlen) -- return -1; -- sprintf(path, "%s%s", upath, port); -- } -+#ifdef HAVE_ABSTRACT_SOCKETS -+ if (port[0] == '@') -+ upath = ""; -+ else if (abstract) -+ at = "@"; -+#endif -+ -+ if (*port == '/') /* a full pathname */ -+ upath = ""; -+ -+ if (strlen(port) + strlen(upath) > maxlen) -+ return -1; -+ snprintf(path, sizeof(s.sun_path), "%s%s%s", at, upath, port); - return 0; - } - #endif -@@ -1726,6 +1739,12 @@ - int oldUmask; - int status; - unsigned int mode; -+ char tmpport[108]; -+ -+ int abstract = 0; -+#ifdef HAVE_ABSTRACT_SOCKETS -+ abstract = ciptr->transptr->flags & TRANS_ABSTRACT; -+#endif - - PRMSG (2, "SocketUNIXCreateListener(%s)\n", - port ? port : "NULL", 0, 0); -@@ -1741,11 +1760,11 @@ - mode = 0777; - #endif - #ifdef NX_TRANS_SOCKET -- if (trans_mkdir(_NXGetUnixDir(UNIX_DIR), mode) == -1) { -+ if (!abstract && trans_mkdir(_NXGetUnixDir(UNIX_DIR), mode) == -1) { - PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n", - _NXGetUnixDir(UNIX_DIR), errno, 0); - #else -- if (trans_mkdir(UNIX_DIR, mode) == -1) { -+ if (!abstract && trans_mkdir(UNIX_DIR, mode) == -1) { - PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n", - UNIX_DIR, errno, 0); - #endif -@@ -1754,13 +1773,18 @@ - } - #endif - -+ memset(&sockname, 0, sizeof(sockname)); - sockname.sun_family = AF_UNIX; - -+ if (!(port && *port)) { -+ snprintf (tmpport, sizeof(tmpport), "%s%ld", UNIX_PATH, (long)getpid()); -+ port = tmpport; -+ } - if (port && *port) { - #ifdef NX_TRANS_SOCKET -- if (set_sun_path(port, _NXGetUnixPath(UNIX_PATH), sockname.sun_path) != 0) { -+ if (set_sun_path(port, _NXGetUnixPath(UNIX_PATH), sockname.sun_path, abstract) != 0) { - #else -- if (set_sun_path(port, UNIX_PATH, sockname.sun_path) != 0) { -+ if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) { - #endif - PRMSG (1, "SocketUNIXCreateListener: path too long\n", 0, 0, 0); - return TRANS_CREATE_LISTENER_FAILED; -@@ -1784,7 +1808,12 @@ - fprintf(stderr, "SocketUNIXCreateListener: Unlinking path [%s] for ciptr at [%p].\n", - sockname.sun_path, (void *) ciptr); - #endif -- unlink (sockname.sun_path); -+ if (abstract) { -+ sockname.sun_path[0] = '\0'; -+ namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&sockname.sun_path[1]); -+ } -+ else -+ unlink (sockname.sun_path); - - if ((status = TRANS(SocketCreateListener) (ciptr, - (struct sockaddr *) &sockname, namelen, flags)) < 0) -@@ -1814,6 +1843,9 @@ - return TRANS_CREATE_LISTENER_FAILED; - } - -+ if (abstract) -+ sockname.sun_path[0] = '@'; -+ - ciptr->family = sockname.sun_family; - ciptr->addrlen = namelen; - memcpy (ciptr->addr, &sockname, ciptr->addrlen); -@@ -1823,7 +1855,6 @@ - return 0; - } - -- - static int - TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) - -@@ -1836,15 +1867,20 @@ - struct stat statb; - int status = TRANS_RESET_NOOP; - unsigned int mode; -+ int abstract = 0; -+#ifdef HAVE_ABSTRACT_SOCKETS -+ abstract = ciptr->transptr->flags & TRANS_ABSTRACT; -+#endif - - PRMSG (3, "SocketUNIXResetListener(%p,%d)\n", ciptr, ciptr->fd, 0); - -- if (stat (unsock->sun_path, &statb) == -1 || -+ if (!abstract && ( -+ stat (unsock->sun_path, &statb) == -1 || - ((statb.st_mode & S_IFMT) != - #if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) - S_IFIFO)) - #else -- S_IFSOCK)) -+ S_IFSOCK))) - #endif - { - int oldUmask = umask (0); -@@ -2034,6 +2070,11 @@ - } - - -+ /* -+ * if the socket is abstract, we already modified the address to have a -+ * @ instead of the initial NUL, so no need to do that again here. -+ */ -+ - newciptr->addrlen = ciptr->addrlen; - memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen); - -@@ -2626,6 +2667,12 @@ - struct sockaddr_un sockname; - int namelen; - -+ -+ int abstract = 0; -+#ifdef HAVE_ABSTRACT_SOCKETS -+ abstract = ciptr->transptr->flags & TRANS_ABSTRACT; -+#endif -+ - #if defined(hpux) && defined(X11_t) - struct sockaddr_un old_sockname; - int old_namelen; -@@ -2674,9 +2721,9 @@ - sockname.sun_family = AF_UNIX; - - #ifdef NX_TRANS_SOCKET -- if (set_sun_path(port, _NXGetUnixPath(UNIX_PATH), sockname.sun_path) != 0) { -+ if (set_sun_path(port, _NXGetUnixPath(UNIX_PATH), sockname.sun_path, abstract) != 0) { - #else -- if (set_sun_path(port, UNIX_PATH, sockname.sun_path) != 0) { -+ if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) { - #endif - PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0); - return TRANS_CONNECT_FAILED; -@@ -2722,6 +2769,14 @@ - #endif - - /* -+ * Adjust the socket path if using abstract sockets. -+ * Done here because otherwise all the strlen() calls above would fail. -+ */ -+ -+ if (abstract) -+ sockname.sun_path[0] = '\0'; -+ -+ /* - * Do the connect() - */ - -@@ -2757,12 +2812,18 @@ - * should try again. - */ - -- if (olderrno == ENOENT || olderrno == EINTR) -- return TRANS_TRY_CONNECT_AGAIN; -- else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS) -+ if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS) - return TRANS_IN_PROGRESS; -- else -- { -+ else if (olderrno == EINTR) -+ return TRANS_TRY_CONNECT_AGAIN; -+ else if (olderrno == ENOENT || olderrno == ECONNREFUSED) -+ /* If opening as abstract failed, try again normally */ -+ if (abstract) { -+ ciptr->transptr->flags &= ~(TRANS_ABSTRACT); -+ return TRANS_TRY_CONNECT_AGAIN; -+ } else { -+ return TRANS_CONNECT_FAILED; -+ } else { - PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n", - EGET(),0, 0); - -@@ -2791,6 +2852,9 @@ - return TRANS_CONNECT_FAILED; - } - -+ if (abstract) -+ sockname.sun_path[0] = '@'; -+ - ciptr->family = AF_UNIX; - ciptr->addrlen = namelen; - ciptr->peeraddrlen = namelen; -@@ -3323,7 +3387,11 @@ - Xtransport TRANS(SocketLocalFuncs) = { - /* Socket Interface */ - "local", -+#ifdef HAVE_ABSTRACT_SOCKETS -+ TRANS_ABSTRACT, -+#else - 0, -+#endif - #ifdef TRANS_CLIENT - TRANS(SocketOpenCOTSClient), - #endif /* TRANS_CLIENT */ -@@ -3369,7 +3437,7 @@ - Xtransport TRANS(SocketUNIXFuncs) = { - /* Socket Interface */ - "unix", --#if !defined(LOCALCONN) -+#if !defined(LOCALCONN) && !defined(HAVE_ABSTRACT_SOCKETS) - TRANS_ALIAS, - #else - 0, ---- a/nx-X11/lib/xtrans/Xtransint.h -+++ b/nx-X11/lib/xtrans/Xtransint.h -@@ -374,9 +374,10 @@ - #define TRANS_DISABLED (1<<2) /* Don't open this one */ - #define TRANS_NOLISTEN (1<<3) /* Don't listen on this one */ - #define TRANS_NOUNLINK (1<<4) /* Dont unlink transport endpoints */ -+#define TRANS_ABSTRACT (1<<5) /* Use abstract sockets if available */ - - /* Flags to preserve when setting others */ --#define TRANS_KEEPFLAGS (TRANS_NOUNLINK) -+#define TRANS_KEEPFLAGS (TRANS_NOUNLINK|TRANS_ABSTRACT) - - /* - * readv() and writev() don't exist or don't work correctly on some diff --git a/debian/patches/series b/debian/patches/series index 8da3bdbf9..b184a1fb0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -028_nx-X11_abstract-kernel-sockets.full.patch 029_nxcomp_ppc64.full+lite.patch 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch -- cgit v1.2.3 From bd10fe5919594afe37d0019bf58c359e79b54979 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 9 Feb 2015 15:31:46 +0100 Subject: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) (029_nxcomp_ppc64.full+lite.patch) --- debian/patches/029_nxcomp_ppc64.full+lite.patch | 17 ----------------- debian/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 debian/patches/029_nxcomp_ppc64.full+lite.patch (limited to 'debian') diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch deleted file mode 100644 index 9d454d5db..000000000 --- a/debian/patches/029_nxcomp_ppc64.full+lite.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) -Author: Mihai Moldovan - ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -6832,9 +6832,9 @@ - { - sockaddr_in newAddr; - -- size_t addrLen = sizeof(sockaddr_in); -+ socklen_t addrLen = sizeof(sockaddr_in); - -- newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen); -+ newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen); - - if (newFD == -1) - { diff --git a/debian/patches/series b/debian/patches/series index b184a1fb0..de6e0905a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -029_nxcomp_ppc64.full+lite.patch 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch -- cgit v1.2.3 From 9f4b494fa49db53a440f544246d6922dbd0c4684 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Feb 2015 15:34:02 +0100 Subject: Allow to pass in configure args (030_nx-X11_configure-args.full.patch). --- .../patches/030_nx-X11_configure-args.full.patch | 51 ---------------------- debian/patches/series | 1 - 2 files changed, 52 deletions(-) delete mode 100644 debian/patches/030_nx-X11_configure-args.full.patch (limited to 'debian') diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch deleted file mode 100644 index 67184d330..000000000 --- a/debian/patches/030_nx-X11_configure-args.full.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Allow to pass in configure args. - Allow to pass in configure args. -Forward: pending -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- - nx-X11/lib/X11/Imakefile | 6 ++++-- - nx-X11/programs/Xserver/Imakefile | 4 +++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -Index: nx-X11/lib/X11/Imakefile -=================================================================== ---- a/nx-X11/lib/X11/Imakefile -+++ b/nx-X11/lib/X11/Imakefile -@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h - - includes:: ks_tables.h - -+CONFIGURE ?= ./configure -+ - #if NXLibraries - - $(NX_XCOMPCONFIGTARGET): - cd ../../../nxcomp && \ -- ./configure -+ ${CONFIGURE} - - $(NX_XCOMPEXTCONFIGTARGET): - cd ../../../nxcompext && \ -- ./configure -+ ${CONFIGURE} - - #ifdef SunArchitecture - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -Index: nx-X11/programs/Xserver/Imakefile -=================================================================== ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps - NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) - NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status - -+CONFIGURE ?= ./configure -+ - $(NX_XSHADOWCONFIGTARGET): - cd $(NX_XSHADOWLIBDIR) && \ -- ./configure -+ ${CONFIGURE} - - #ifdef SunArchitecture - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) diff --git a/debian/patches/series b/debian/patches/series index de6e0905a..1288ab3f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch -- cgit v1.2.3 From 6101bd9564d6334dea7c0de778536e3fe1a5e9b9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Feb 2015 15:38:59 +0100 Subject: Description: Enable parallel make (031_nx-X11_parallel-make.full.patch). Restore ability to build things in parallel. (${MAKE} must always appear in the rule directly, and not be hidden through expansions of other variables to get this to work.) --- debian/patches/031_nx-X11_parallel-make.full.patch | 200 --------------------- debian/patches/series | 1 - 2 files changed, 201 deletions(-) delete mode 100644 debian/patches/031_nx-X11_parallel-make.full.patch (limited to 'debian') diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch deleted file mode 100644 index 496020545..000000000 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ /dev/null @@ -1,200 +0,0 @@ -Description: Enable parallel make - Restore ability to build things in parallel. - (${MAKE} must always appear in the rule directly, and not be - hidden through expansions of other variables to get this to work.) -Forward: pending -Author: Jan Engelhardt -Last-Update: 2012-01-26 22:29:13.993994227 +0100 - ---- - nx-X11/Makefile | 64 +++++++++++++++++----------------- - nx-X11/config/imake/Makefile.ini | 1 - nx-X11/lib/X11/Imakefile | 12 ++---- - nx-X11/programs/Xserver/Imakefile | 4 +- - 10 files changed, 60 insertions(+), 69 deletions(-) - ---- a/nx-X11/Makefile -+++ b/nx-X11/Makefile -@@ -32,8 +32,8 @@ - VERSPROG = $(CONFIGSRC)/util/printver.exe - - all: -- @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial -- @$(MAKE_CMD) $@ -+ @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial -+ @${MAKE} ${MAKE_OPTS} $@ - - all-initial: - @echo Please use make World, or on NT use nmake World.Win32. -@@ -57,8 +57,8 @@ - @date - @echo "" - @if [ -f xmakefile ]; then \ -- $(MAKE_CMD) -k distclean || \ -- $(MAKE_CMD) -k clean || \ -+ ${MAKE} ${MAKE_OPTS} -k distclean || \ -+ ${MAKE} ${MAKE_OPTS} -k clean || \ - $(RM) xmakefile; \ - fi - @if [ ! -f $(IRULESRC)/host.def ]; then \ -@@ -84,14 +84,14 @@ - # fi - cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot -- $(MAKE_CMD) $(MFLAGS) version.def -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def - $(MAKE) $(MFLAGS) Makefile.boot -- $(MAKE_CMD) $(MFLAGS) VerifyOS -- $(MAKE_CMD) $(MFLAGS) Makefiles -- $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean -- $(MAKE_CMD) $(MFLAGS) includes -- $(MAKE_CMD) $(MFLAGS) depend -- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World - @echo "" - @date - @echo "" -@@ -154,15 +154,15 @@ - -if exist xmakefile.bak del xmakefile.bak - -if exist xmakefile ren xmakefile xmakefile.bak - $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -- $(MAKE_CMD) $(MFLAGS) VerifyOS -- $(MAKE_CMD) $(MFLAGS) Makefiles -- $(MAKE_CMD) $(MFLAGS) clean -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) clean - cd $(CONFIGSRC)\util - $(MAKE) mkdirhier.exe - cd ..\.. -- $(MAKE_CMD) $(MFLAGS) includes -- $(MAKE_CMD) $(MFLAGS) depend -- $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS) - @echo : - @echo : - @echo Full build of $(RELEASE) complete. -@@ -198,38 +198,38 @@ - # a copy of every rule that might be invoked at top level - - clean: -- -$(MAKE_CMD) $@ -+ -${MAKE_CMD} ${MAKE_OPTS} $@ - find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - rm -f config/cf/{version.def,date.def} - dangerous_strip_clean: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - distclean: -- -$(MAKE_CMD) $@ -+ -${MAKE} ${MAKE_OPTS} $@ - $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def - depend: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - Everything: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - external.ln: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - includes: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.sdk: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.ln: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.man: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - Makefiles: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - man_keywords: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - tags: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - VerifyOS: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ ---- a/nx-X11/config/imake/Makefile.ini -+++ b/nx-X11/config/imake/Makefile.ini -@@ -21,7 +21,6 @@ - SHELL = /bin/sh - RM = rm -f - MV = mv --MAKE = make - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ - tags TAGS make.log - NPROC = 1 ---- a/nx-X11/lib/X11/Imakefile -+++ b/nx-X11/lib/X11/Imakefile -@@ -1161,25 +1161,23 @@ - - #ifdef SunArchitecture - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- gmake -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- gmake -+ ${MAKE} -C ../../../nxcompext - - #else - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- make -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - --$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- make -+$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV) -+ ${MAKE} -C ../../../nxcompext - - #endif - --depend:: $(NX_XCOMPLIBTARGET) -+depend:: -+ -+lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET) - - all:: $(NX_XCOMPLIBTARGET) - ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1045,11 +1045,11 @@ - #ifdef SunArchitecture - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- gmake -+ ${MAKE} - #else - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- rm -f *.o && make -+ rm -f *.o && ${MAKE} - #endif - - ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ - diff --git a/debian/patches/series b/debian/patches/series index 1288ab3f4..2c9811e29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch 053_nx-X11_no-xcomp1-install-target.full.patch -- cgit v1.2.3 From 9054786947b2f6b82078f6e5f965c3b0b629c880 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 9 Feb 2015 15:41:35 +0100 Subject: workaround for Mac OS X 10.5 (051_nxcomp_macos105-fdisset.full+lite.patch( The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be writeable, although it does only access the data. Given that we have a const pointer for a const struct, copy and pass that. . Note that this is merely a workaround for OS X 10.5, as 10.6 and later define the second argument of FD_ISSET as const struct const *foo, too. . It is safe, as data is accessed read-only by FD_ISSET, even on 10.5. --- .../051_nxcomp_macos105-fdisset.full+lite.patch | 82 ---------------------- debian/patches/series | 1 - 2 files changed, 83 deletions(-) delete mode 100644 debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch (limited to 'debian') diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch deleted file mode 100644 index 6b78a6bc2..000000000 --- a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch +++ /dev/null @@ -1,82 +0,0 @@ -Description: workaround for Mac OS X 10.5 - The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be - writeable, although it does only access the data. Given that we have a - const pointer for a const struct, copy and pass that. - . - Note that this is merely a workaround for OS X 10.5, as 10.6 and later - define the second argument of FD_ISSET as const struct const *foo, too. - . - It is safe, as data is accessed read-only by FD_ISSET, even on 10.5. -Forward: pending -Author: Mihai Moldovan ---- - nxcomp/Agent.h | 28 ++++++++++++++++++++-------- - 1 files changed, 20 insertions(+), 8 deletions(-) - ---- a/nxcomp/Agent.h -+++ b/nxcomp/Agent.h -@@ -149,30 +149,38 @@ - - int remoteCanRead(const fd_set * const readSet) - { -+ // OS X 10.5 requires the second argument to be non-const, so copy readSet. -+ // It's safe though, as FD_ISSET does not operate on it. -+ fd_set readWorkSet = *readSet; -+ - #if defined(TEST) || defined(INFO) - *logofs << "Agent: remoteCanRead() is " << -- (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0) -- << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet) -+ (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0) -+ << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet) - << " and dequeuable " << transport_ -> dequeuable() - << ".\n" << logofs_flush; - #endif - -- return (FD_ISSET(remoteFd_, readSet) && -+ return (FD_ISSET(remoteFd_, &readWorkSet) && - transport_ -> dequeuable() != 0); - } - - int remoteCanWrite(const fd_set * const writeSet) - { -+ // OS X 10.5 requires the second argument to be non-const, so copy writeSet. -+ // It's safe though, as FD_ISSET does not operate on it. -+ fd_set writeWorkSet = *writeSet; -+ - #if defined(TEST) || defined(INFO) - *logofs << "Agent: remoteCanWrite() is " << -- (FD_ISSET(remoteFd_, writeSet) && transport_ -> -+ (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> - queuable() != 0 && canRead_ == 1) << " with FD_ISSET() " -- << (int) FD_ISSET(remoteFd_, writeSet) << " queueable " -+ << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable " - << transport_ -> queuable() << " channel can read " - << canRead_ << ".\n" << logofs_flush; - #endif - -- return (FD_ISSET(remoteFd_, writeSet) && -+ return (FD_ISSET(remoteFd_, &writeWorkSet) && - transport_ -> queuable() != 0 && - canRead_ == 1); - } -@@ -203,13 +211,17 @@ - - int proxyCanRead(const fd_set * const readSet) - { -+ // OS X 10.5 requires the second argument to be non-const, so copy readSet. -+ // It's safe though, as FD_ISSET does not operate on it. -+ fd_set readWorkSet = *readSet; -+ - #if defined(TEST) || defined(INFO) - *logofs << "Agent: proxyCanRead() is " -- << ((int) FD_ISSET(proxy -> getFd(), readSet) -+ << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet) - << ".\n" << logofs_flush; - #endif - -- return (FD_ISSET(proxy -> getFd(), readSet)); -+ return (FD_ISSET(proxy -> getFd(), &readWorkSet)); - } - - int enqueueData(const char *data, const int size) const diff --git a/debian/patches/series b/debian/patches/series index 2c9811e29..214bf6a69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -051_nxcomp_macos105-fdisset.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch 053_nx-X11_no-xcomp1-install-target.full.patch 054_nx-X11_ppc64-ftbfs.full.patch -- cgit v1.2.3 From e736fff09871bbbc6101f3da444afbccd473a915 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 9 Feb 2015 15:45:33 +0100 Subject: Fix nxauth location on Mac OS X 10 (052_nxcomp_macos10-nxauth-location.full+lite.patch) --- ..._nxcomp_macos10-nxauth-location.full+lite.patch | 41 ---------------------- debian/patches/series | 1 - 2 files changed, 42 deletions(-) delete mode 100644 debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch (limited to 'debian') diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch deleted file mode 100644 index 813363e69..000000000 --- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch +++ /dev/null @@ -1,41 +0,0 @@ -Description: Fix nxauth location on Mac OS X 10 -Author: Mihai Moldovan - ---- a/nxcomp/Auth.cpp -+++ b/nxcomp/Auth.cpp -@@ -217,22 +217,31 @@ - - // - // Use the nxauth command on Windows and the Mac, xauth -- // on all the other platforms. On Windows and on the Mac -- // we assume that the nxauth command is located under -- // bin in the client installation directory. On all the -+ // on all the other platforms. On Windows we assume that -+ // the nxauth command is located under bin in the client -+ // installation directory. On Mac OS X we assume that the -+ // command is located directly in the client installation -+ // directory, to make bundle shipping easier. On all the - // other platforms we use the default xauth command that - // is in our path. - // - - char command[DEFAULT_STRING_LIMIT]; - -- #if defined(__CYGWIN32__) || defined(__APPLE__) -+ #if defined(__CYGWIN32__) - - snprintf(command, DEFAULT_STRING_LIMIT - 1, - "%s/bin/nxauth", control -> SystemPath); - - *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; - -+ #elif defined(__APPLE__) -+ -+ snprintf(command, DEFAULT_STRING_LIMIT - 1, -+ "%s/nxauth", control -> SystemPath); -+ -+ *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; -+ - #else - - strcpy(command, "xauth"); diff --git a/debian/patches/series b/debian/patches/series index 214bf6a69..138d87ae9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -052_nxcomp_macos10-nxauth-location.full+lite.patch 053_nx-X11_no-xcomp1-install-target.full.patch 054_nx-X11_ppc64-ftbfs.full.patch 055_nx-X11_imake-Werror-format-security.full.patch -- cgit v1.2.3 From 9ea734b21c6f5485b0db305fa04b023b513e2490 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:47:44 +0100 Subject: Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch). --- .../053_nx-X11_no-xcomp1-install-target.full.patch | 32 ---------------------- debian/patches/series | 1 - 2 files changed, 33 deletions(-) delete mode 100644 debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch (limited to 'debian') diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch deleted file mode 100644 index acf9374e5..000000000 --- a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3) -Author: Orion Poplawski - ---- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700 -+++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700 -@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp - NX_XCOMPLIBLINK = Xcomp - NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) - NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) --NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) - NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status - - NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext -@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM - - all:: $(NX_XCOMPLIBTARGET) - --$(NX_XCOMPDEPTARGET): -- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) -- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 -- - depend:: $(NX_XCOMPLIBTARGET) - --all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET) -- --clean:: -- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) -- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 -+all:: $(NX_XCOMPEXTLIBTARGET) - - #endif - diff --git a/debian/patches/series b/debian/patches/series index 138d87ae9..5e2e29e68 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -053_nx-X11_no-xcomp1-install-target.full.patch 054_nx-X11_ppc64-ftbfs.full.patch 055_nx-X11_imake-Werror-format-security.full.patch 056_nx-X11_Werror-format-security.full.patch -- cgit v1.2.3 From 0b711de48cdb04f4328eff75f82b97f9a07cbfbf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:49:51 +0100 Subject: Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch). --- debian/patches/054_nx-X11_ppc64-ftbfs.full.patch | 14 -------------- debian/patches/series | 1 - 2 files changed, 15 deletions(-) delete mode 100644 debian/patches/054_nx-X11_ppc64-ftbfs.full.patch (limited to 'debian') diff --git a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch b/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch deleted file mode 100644 index d60426e91..000000000 --- a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix FTBFS on ppc64 architecture -Author: Orion Poplawski -diff -up a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc ---- a/nx-X11/lib/GL/mesa/main/Imakefile.inc 2014-01-04 13:39:35.000000000 -0700 -+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc 2014-01-24 12:04:00.085272615 -0700 -@@ -1,5 +1,8 @@ - XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ - -+/* gcc on ppc64 defines this, causes macro recursion with pixel below */ -+#undef pixel -+ - #ifndef MesaBuildDir - #define MesaBuildDir $(GLXLIBSRC)/mesa/main/ - #endif diff --git a/debian/patches/series b/debian/patches/series index 5e2e29e68..1b731170f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -054_nx-X11_ppc64-ftbfs.full.patch 055_nx-X11_imake-Werror-format-security.full.patch 056_nx-X11_Werror-format-security.full.patch 057_nx-X11_sanitize-eventmasks.full.patch -- cgit v1.2.3 From 95dbaa6149b496a6851fc6422f54dd8393217269 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:51:26 +0100 Subject: Fix FTBFS when compiled with -Werror=format-security (055_nx-X11_imake-Werror-format-security.full.patch). --- ..._nx-X11_imake-Werror-format-security.full.patch | 1090 -------------------- debian/patches/series | 1 - 2 files changed, 1091 deletions(-) delete mode 100644 debian/patches/055_nx-X11_imake-Werror-format-security.full.patch (limited to 'debian') diff --git a/debian/patches/055_nx-X11_imake-Werror-format-security.full.patch b/debian/patches/055_nx-X11_imake-Werror-format-security.full.patch deleted file mode 100644 index 6e5b4c80e..000000000 --- a/debian/patches/055_nx-X11_imake-Werror-format-security.full.patch +++ /dev/null @@ -1,1090 +0,0 @@ -Description: Fix FTBFS when compiled with -Werror=format-security -Author: Orion Poplawski -diff -up a/nx-X11/config/imake/imake.c b/nx-X11/config/imake/imake.c ---- a/nx-X11/config/imake/imake.c 2014-01-04 13:39:35.000000000 -0700 -+++ b/nx-X11/config/imake/imake.c 2014-01-24 13:55:53.940697330 -0700 -@@ -7,8 +7,6 @@ - * be passed to the template file. * - * * - ***************************************************************************/ --/* $XFree86: xc/config/imake/imake.c,v 3.63tsi Exp $ */ -- - /* - * - Copyright (c) 1985, 1986, 1987, 1998 The Open Group -@@ -153,23 +151,14 @@ in this Software without prior written a - #endif - #include - #include --#ifdef MONOLITH --# include "Xosdefs.h" --#else --# include --#endif -+#include -+#include -+#include - #include - #include - #ifdef WIN32 - # include "Xw32defs.h" - #endif --#if 0 --#ifndef X_NOT_POSIX --# ifndef _POSIX_SOURCE --# define _POSIX_SOURCE --# endif --#endif --#endif - #include - #include - #ifdef X_NOT_POSIX -@@ -231,22 +220,16 @@ typedef union wait waitType; - # define WIFEXITED(w) waitCode(w) - # endif - #endif /* X_NOT_POSIX */ --# include --#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ --char *malloc(), *realloc(); --#endif /* macII */ -+#include - #include - #ifdef __minix_vmd --#define USE_FREOPEN 1 -+# define USE_FREOPEN 1 - #endif - --#if !((defined(sun) && !defined(SVR4)) || defined(macII)) --#define USE_STRERROR 1 --#endif - #ifndef WIN32 --#include -+# include - #else --#include -+# include - #endif - #ifndef SYS_NMLN - # ifdef _SYS_NMLN -@@ -256,39 +239,22 @@ char *malloc(), *realloc(); - # endif - #endif - #if defined(linux) || defined(__GNU__) || defined(__GLIBC__) --#include --#include -+# include -+# include - #endif - #ifdef __QNX__ --#include --#endif -- --/* -- * This define of strerror is copied from (and should be identical to) -- * Xos.h, which we don't want to include here for bootstrapping reasons. -- */ --#ifndef USE_STRERROR --# ifndef strerror --extern char *sys_errlist[]; --extern int sys_nerr; --# define strerror(n) \ -- (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") --# endif -+# include - #endif - - #if defined(__NetBSD__) /* see code clock in init() below */ --#include --#endif -- --#if !(defined(Lynx) || defined(__Lynx__) || (defined(SVR4) && !defined(sun))) && !defined (__CYGWIN__) --#define HAS_MKSTEMP -+# include - #endif - - typedef unsigned char boolean; - #define TRUE 1 - #define FALSE 0 - --# include "imakemdep.h" -+#include "imakemdep.h" - #ifdef CROSSCOMPILE - # include "imakemdep_cpp.h" - #endif -@@ -305,7 +271,7 @@ int xvariables[10]; - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+# define PATH_MAX 1024 - #endif - - /* -@@ -331,11 +297,13 @@ void KludgeOutputLine(char **), KludgeRe - # endif - #endif - --char *cpp = NULL; -+const char *cpp = NULL; - --char *tmpMakefile = "/tmp/Imf.XXXXXX"; --char *tmpImakefile = "/tmp/IIf.XXXXXX"; --char *make_argv[ ARGUMENTS ] = { -+const char *tmpMakefile; -+const char *tmpMakefileTemplate = "/tmp/Imf.XXXXXX"; -+const char *tmpImakefile; -+const char *tmpImakefileTemplate = "/tmp/IIf.XXXXXX"; -+const char *make_argv[ ARGUMENTS ] = { - #ifdef WIN32 - "nmake" - #else -@@ -345,53 +313,53 @@ char *make_argv[ ARGUMENTS ] = { - - int make_argindex; - int cpp_argindex; --char *Imakefile = NULL; --char *Makefile = "Makefile"; --char *Template = "Imake.tmpl"; --char *ImakefileC = "Imakefile.c"; -+const char *Imakefile = NULL; -+const char *Makefile = "Makefile"; -+const char *Template = "Imake.tmpl"; -+const char *ImakefileC = "Imakefile.c"; - boolean haveImakefileC = FALSE; --char *cleanedImakefile = NULL; --char *program; --char *FindImakefile(char *Imakefile); --char *ReadLine(FILE *tmpfd, char *tmpfname); --char *CleanCppInput(char *imakefile); --char *Strdup(char *cp); -+const char *cleanedImakefile = NULL; -+const char *program; -+const char *FindImakefile(const char *Imakefile); -+char *ReadLine(FILE *tmpfd, const char *tmpfname); -+const char *CleanCppInput(const char *imakefile); -+char *Strdup(const char *cp); - char *Emalloc(int size); --void LogFatalI(char *s, int i), LogFatal(char *x0, char *x1), -- LogMsg(char *x0, char *x1); -+void LogFatal(const char *x0, ...) _X_ATTRIBUTE_PRINTF(1, 2); -+void LogMsg(const char *x0, ...) _X_ATTRIBUTE_PRINTF(1, 2); - - void showit(FILE *fd); - void wrapup(void); - void init(void); --void AddMakeArg(char *arg); --void AddCppArg(char *arg); -+void AddMakeArg(const char *arg); -+void AddCppArg(const char *arg); - #ifdef CROSSCOMPILE - char *CrossCompileCPP(void); - #endif - void SetOpts(int argc, char **argv); --void CheckImakefileC(char *masterc); --void cppit(char *imakefile, char *template, char *masterc, -- FILE *outfd, char *outfname); -+void CheckImakefileC(const char *masterc); -+void cppit(const char *imakefile, const char *template, const char *masterc, -+ FILE *outfd, const char *outfname); - void makeit(void); --void CleanCppOutput(FILE *tmpfd, char *tmpfname); -+void CleanCppOutput(FILE *tmpfd, const char *tmpfname); - boolean isempty(char *line); --void writetmpfile(FILE *fd, char *buf, int cnt, char *fname); -+void writetmpfile(FILE *fd, const char *buf, int cnt, const char *fname); - #ifdef SIGNALRETURNSINT - int catch(int sig); - #else - void catch(int sig); - #endif --void showargs(char **argv); --boolean optional_include(FILE *inFile, char *defsym, char *fname); --void doit(FILE *outfd, char *cmd, char **argv); -+void showargs(const char **argv); -+boolean optional_include(FILE *inFile, const char *defsym, const char *fname); -+void doit(FILE *outfd, const char *cmd, const char **argv); - boolean define_os_defaults(FILE *inFile); - #ifdef CROSSCOMPILE - static void get_cross_compile_dir(FILE *inFile); - #endif - #ifdef CROSSCOMPILEDIR --char *CrossCompileDir = CROSSCOMPILEDIR; -+const char *CrossCompileDir = CROSSCOMPILEDIR; - #else --char *CrossCompileDir = ""; -+const char *CrossCompileDir = ""; - #endif - boolean CrossCompiling = FALSE; - -@@ -428,24 +396,25 @@ main(int argc, char *argv[]) - if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL) - LogFatal("Cannot create temporary file %s.", tmpMakefile); - } else { --#ifdef HAS_MKSTEMP -+#ifdef HAVE_MKSTEMP - int fd; - #endif -- tmpMakefile = Strdup(tmpMakefile); --#ifndef HAS_MKSTEMP -- if (mktemp(tmpMakefile) == NULL || -- (tmpfd = fopen(tmpMakefile, "w+")) == NULL) { -- LogFatal("Cannot create temporary file %s.", tmpMakefile); -+ char *tmpMakefileName = Strdup(tmpMakefileTemplate); -+#ifndef HAVE_MKSTEMP -+ if (mktemp(tmpMakefileName) == NULL || -+ (tmpfd = fopen(tmpMakefileName, "w+")) == NULL) { -+ LogFatal("Cannot create temporary file %s.", tmpMakefileName); - } - #else -- fd = mkstemp(tmpMakefile); -+ fd = mkstemp(tmpMakefileName); - if (fd == -1 || (tmpfd = fdopen(fd, "w+")) == NULL) { - if (fd != -1) { -- unlink(tmpMakefile); close(fd); -+ unlink(tmpMakefileName); close(fd); - } -- LogFatal("Cannot create temporary file %s.", tmpMakefile); -+ LogFatal("Cannot create temporary file %s.", tmpMakefileName); - } - #endif -+ tmpMakefile = tmpMakefileName; - } - AddMakeArg("-f"); - AddMakeArg( tmpMakefile ); -@@ -498,7 +467,7 @@ void - catch(int sig) - { - errno = 0; -- LogFatalI("Signal %d.", sig); -+ LogFatal("Signal %d.", sig); - } - - /* -@@ -572,21 +541,21 @@ init(void) - } - - void --AddMakeArg(char *arg) -+AddMakeArg(const char *arg) - { - errno = 0; - if (make_argindex >= ARGUMENTS-1) -- LogFatal("Out of internal storage.", ""); -+ LogFatal("Out of internal storage."); - make_argv[ make_argindex++ ] = arg; - make_argv[ make_argindex ] = NULL; - } - - void --AddCppArg(char *arg) -+AddCppArg(const char *arg) - { - errno = 0; - if (cpp_argindex >= ARGUMENTS-1) -- LogFatal("Out of internal storage.", ""); -+ LogFatal("Out of internal storage."); - cpp_argv[ cpp_argindex++ ] = arg; - cpp_argv[ cpp_argindex ] = NULL; - } -@@ -618,7 +587,7 @@ SetOpts(int argc, char **argv) - else { - argc--, argv++; - if (! argc) -- LogFatal("No description arg after -f flag", ""); -+ LogFatal("No description arg after -f flag"); - Imakefile = argv[0]; - } - } else if (argv[0][1] == 's') { -@@ -628,7 +597,7 @@ SetOpts(int argc, char **argv) - else { - argc--, argv++; - if (!argc) -- LogFatal("No description arg after -s flag", ""); -+ LogFatal("No description arg after -s flag"); - Makefile = ((argv[0][0] == '-') && !argv[0][1]) ? - NULL : argv[0]; - } -@@ -642,7 +611,7 @@ SetOpts(int argc, char **argv) - else { - argc--, argv++; - if (! argc) -- LogFatal("No description arg after -T flag", ""); -+ LogFatal("No description arg after -T flag"); - Template = argv[0]; - } - } else if (argv[0][1] == 'C') { -@@ -651,7 +620,7 @@ SetOpts(int argc, char **argv) - else { - argc--, argv++; - if (! argc) -- LogFatal("No imakeCfile arg after -C flag", ""); -+ LogFatal("No imakeCfile arg after -C flag"); - ImakefileC = argv[0]; - } - } else if (argv[0][1] == 'v') { -@@ -667,10 +636,10 @@ SetOpts(int argc, char **argv) - if (!cpp) - { - AddCppArg("-E"); --#ifdef __GNUC__ -+# ifdef __GNUC__ - if (verbose) - AddCppArg("-v"); --#endif -+# endif - cpp = DEFAULT_CC; - } - # else -@@ -686,8 +655,8 @@ SetOpts(int argc, char **argv) - AddCppArg(ImakefileC); - } - --char * --FindImakefile(char *Imakefile) -+const char * -+FindImakefile(const char *Imakefile) - { - if (Imakefile) { - if (access(Imakefile, R_OK) < 0) -@@ -695,7 +664,7 @@ FindImakefile(char *Imakefile) - } else { - if (access("Imakefile", R_OK) < 0) { - if (access("imakefile", R_OK) < 0) -- LogFatal("No description file.", ""); -+ LogFatal("No description file."); - else - Imakefile = "imakefile"; - } else -@@ -704,44 +673,50 @@ FindImakefile(char *Imakefile) - return(Imakefile); - } - --void --LogFatalI(char *s, int i) -+static void _X_ATTRIBUTE_PRINTF(1, 0) -+vLogMsg(const char *fmt, va_list args) - { -- /*NOSTRICT*/ -- LogFatal(s, (char *)(long)i); -+ int error_number = errno; -+ -+ if (error_number) { -+ fprintf(stderr, "%s: ", program); -+ fprintf(stderr, "%s\n", strerror(error_number)); -+ } -+ fprintf(stderr, "%s: ", program); -+ vfprintf(stderr, fmt, args); -+ fprintf(stderr, "\n"); - } - - void --LogFatal(char *x0, char *x1) -+LogFatal(const char *fmt, ...) - { - static boolean entered = FALSE; -+ va_list args; - - if (entered) - return; - entered = TRUE; - -- LogMsg(x0, x1); -+ va_start(args, fmt); -+ vLogMsg(fmt, args); -+ va_end(args); - fprintf(stderr, " Stop.\n"); - wrapup(); - exit(1); - } - - void --LogMsg(char *x0, char *x1) -+LogMsg(const char *fmt, ...) - { -- int error_number = errno; -+ va_list args; - -- if (error_number) { -- fprintf(stderr, "%s: ", program); -- fprintf(stderr, "%s\n", strerror(error_number)); -- } -- fprintf(stderr, "%s: ", program); -- fprintf(stderr, x0, x1); -- fprintf(stderr, "\n"); -+ va_start(args, fmt); -+ vLogMsg(fmt, args); -+ va_end(args); - } - - void --showargs(char **argv) -+showargs(const char **argv) - { - for (; *argv; argv++) - fprintf(stderr, "%s ", *argv); -@@ -751,7 +726,7 @@ showargs(char **argv) - #define ImakefileCHeader "/* imake - temporary file */" - - void --CheckImakefileC(char *masterc) -+CheckImakefileC(const char *masterc) - { - char mkcbuf[1024]; - FILE *inFile; -@@ -767,7 +742,8 @@ CheckImakefileC(char *masterc) - fclose(inFile); - LogFatal("Refuse to overwrite: %s", masterc); - } -- fclose(inFile); -+ else -+ fclose(inFile); - } - } - -@@ -778,7 +754,7 @@ CheckImakefileC(char *masterc) - #define OverrideWarning "Warning: local file \"%s\" overrides global macros." - - boolean --optional_include(FILE *inFile, char *defsym, char *fname) -+optional_include(FILE *inFile, const char *defsym, const char *fname) - { - errno = 0; - if (access(fname, R_OK) == 0) { -@@ -790,7 +766,7 @@ optional_include(FILE *inFile, char *def - } - - void --doit(FILE *outfd, char *cmd, char **argv) -+doit(FILE *outfd, const char *cmd, const char **argv) - { - int pid; - waitType status; -@@ -805,18 +781,18 @@ doit(FILE *outfd, char *cmd, char **argv - if (status < 0) - LogFatal("Cannot spawn %s.", cmd); - if (status > 0) -- LogFatalI("Exit code %d.", status); -+ LogFatal("Exit code %d.", status); - #else - pid = fork(); - if (pid < 0) -- LogFatal("Cannot fork.", ""); -+ LogFatal("Cannot fork."); - if (pid) { /* parent... simply wait */ - while (wait(&status) > 0) { - errno = 0; - if (WIFSIGNALED(status)) -- LogFatalI("Signal %d.", waitSig(status)); -+ LogFatal("Signal %d.", waitSig(status)); - if (WIFEXITED(status) && waitCode(status)) -- LogFatalI("Exit code %d.", waitCode(status)); -+ LogFatal("Exit code %d.", waitCode(status)); - } - } - else { /* child... dup and exec cmd */ -@@ -832,7 +808,7 @@ doit(FILE *outfd, char *cmd, char **argv - - #if !defined WIN32 - static void --parse_utsname(struct utsname *name, char *fmt, char *result, char *msg) -+parse_utsname(struct utsname *name, const char *fmt, char *result, const char *msg) - { - char buf[SYS_NMLN * 5 + 1]; - char *ptr = buf; -@@ -892,7 +868,7 @@ parse_utsname(struct utsname *name, char - - /* Just in case... */ - if (strlen(buf) >= sizeof(buf)) -- LogFatal("Buffer overflow parsing uname.", ""); -+ LogFatal("Buffer overflow parsing uname."); - - /* Parse the buffer. The sscanf() return value is rarely correct. */ - *result = '\0'; -@@ -978,13 +954,23 @@ const char *libc_c= - static void - get_libc_version(FILE *inFile) - { -- char aout[] = "/tmp/imakeXXXXXX"; -+ char aout[4096], *tmpdir; - FILE *fp; - const char *format = "%s -o %s -x c -"; - char *cc; - int len; - char *command; - -+ /* If $TMPDIR is defined and has an acceptable length, -+ * use that as tmp dir, else use /tmp. That fixes -+ * problems with /tmp mounted "noexec". -+ */ -+ if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (4096-13)) -+ strcpy(aout, tmpdir); -+ else -+ strcpy(aout, "/tmp"); -+ strcat(aout, "/imakeXXXXXX"); -+ - /* Pre-create temp file safely */ - { - /* Linux + ELF has mkstemp() */ -@@ -1000,7 +986,8 @@ get_libc_version(FILE *inFile) - cc = "gcc"; - len = strlen (aout) + strlen (format) + strlen (cc); - if (len < 128) len = 128; -- command = alloca (len); -+ if((command = alloca (len)) == NULL) -+ abort(); - - if (snprintf (command , len, format, cc, aout) == len) - abort (); -@@ -1015,12 +1002,16 @@ get_libc_version(FILE *inFile) - abort (); - - while (fgets (command, len, fp)) -- fprintf (inFile, command); -+ fputs (command, inFile); - - len = pclose (fp); - remove (aout); -- if (len) -- abort (); -+ if (len) { -+ /* handwave furiously */ -+ printf("#define DefaultLinuxCLibMajorVersion 6\n"); -+ printf("#define DefaultLinuxCLibMinorVersion 12\n"); -+ printf("#define DefaultLinuxCLibTeenyVersion 0\n"); -+ } - } - #endif - -@@ -1031,14 +1022,14 @@ get_stackprotector(FILE *inFile) - FILE *fp; - char *cc; - char command[1024], buf[1024]; -- -+ - cc = getenv("CC"); - if (cc == NULL) { - cc = "cc"; - } - snprintf(command, sizeof(command), "%s -v 2>&1", cc); - fp = popen(command, "r"); -- if (fp == NULL) -+ if (fp == NULL) - abort(); - while (fgets(buf, sizeof(buf), fp)) { - if (strstr(buf, "propolice") != NULL) { -@@ -1046,11 +1037,10 @@ get_stackprotector(FILE *inFile) - break; - } - } -- if (pclose(fp)) -- abort(); -+ pclose(fp); - } - #endif -- -+ - - #if defined CROSSCOMPILE || defined linux || defined(__GLIBC__) - static void -@@ -1058,9 +1048,9 @@ get_distrib(FILE *inFile) - { - struct stat sb; - -- static char* suse = "/etc/SuSE-release"; -- static char* redhat = "/etc/redhat-release"; -- static char* debian = "/etc/debian_version"; -+ static const char* suse = "/etc/SuSE-release"; -+ static const char* redhat = "/etc/redhat-release"; -+ static const char* debian = "/etc/debian_version"; - - fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); - fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); -@@ -1076,14 +1066,14 @@ get_distrib(FILE *inFile) - fprintf (inFile, "%s\n", "#define LinuxWare 11"); - fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); - --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (CrossCompiling) { - fprintf (inFile, "%s\n", - "#define DefaultLinuxDistribution LinuxUnknown"); - fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Unknown"); - return; - } --#endif -+# endif - if (lstat (suse, &sb) == 0) { - fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE"); - fprintf (inFile, "%s\n", "#define DefaultLinuxDistName SuSE"); -@@ -1116,7 +1106,7 @@ get_ld_version(FILE *inFile) - int ldmajor, ldminor; - const char *ld = "ld -v"; - --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (CrossCompiling) { - char cmd[PATH_MAX]; - strcpy (cmd, CrossCompileDir); -@@ -1124,7 +1114,7 @@ get_ld_version(FILE *inFile) - strcat (cmd,ld); - ldprog = popen (cmd, "r"); - } else --#endif -+# endif - ldprog = popen (ld, "r"); - - if (ldprog) { -@@ -1192,7 +1182,7 @@ get_binary_format(FILE *inFile) - * Returns: 0 if successful, -1 if not. - */ - static int --ask_sun_compiler_for_versions(const char *cmd, const char *path, -+ask_sun_compiler_for_versions(const char *cmd, const char *path, - int *cmajor, int *cminor) - { - char buf[BUFSIZ]; -@@ -1201,7 +1191,7 @@ ask_sun_compiler_for_versions(const char - FILE* ccproc; - const char vflag[] = " -V 2>&1"; - int retval = -1; -- -+ - int len = strlen(cmd) + sizeof(vflag); - - if (path != NULL) { -@@ -1229,7 +1219,7 @@ ask_sun_compiler_for_versions(const char - } - } - if (retval != 0) { -- fprintf(stderr, -+ fprintf(stderr, - "warning: could not parse version number in output of:\n" - " %s\n", cmdtorun); - } -@@ -1247,23 +1237,22 @@ get_sun_compiler_versions (FILE *inFile) - { - const char* sunpro_path = "/opt/SUNWspro/bin"; - int cmajor, cminor, found = 0; -- struct stat sb; - - /* If cross-compiling, only check CrossCompilerDir for compilers. -- * If not cross-compiling, first check cc in users $PATH, -+ * If not cross-compiling, first check cc in users $PATH, - * then try /opt/SUNWspro if not found in the users $PATH - */ - --#if defined CROSSCOMPILE -+# if defined CROSSCOMPILE - if (CrossCompiling) { - if (ask_sun_compiler_for_versions("cc", CrossCompileDir, - &cmajor, &cminor) == 0) { - found = 1; - } -- } -+ } - else --#endif -- { -+# endif -+ { - if (ask_sun_compiler_for_versions("cc", NULL, &cmajor, &cminor) == 0) { - found = 1; - } else if (ask_sun_compiler_for_versions("cc", sunpro_path, -@@ -1282,22 +1271,22 @@ get_sun_compiler_versions (FILE *inFile) - - /* Now do it again for C++ compiler (CC) */ - found = 0; --#if defined CROSSCOMPILE -+# if defined CROSSCOMPILE - if (CrossCompiling) { - if (ask_sun_compiler_for_versions("CC", CrossCompileDir, - &cmajor, &cminor) == 0) { - found = 1; - } -- } -+ } - else --#endif -- { -+# endif -+ { - if (ask_sun_compiler_for_versions("CC", NULL, &cmajor, &cminor) == 0) { - found = 1; - } else if (ask_sun_compiler_for_versions("CC", sunpro_path, - &cmajor, &cminor) == 0) { - found = 1; -- fprintf(inFile, -+ fprintf(inFile, - "#define DefaultSunProCplusplusCompilerDir %s", sunpro_path); - } - } -@@ -1318,7 +1307,7 @@ static void - get_gcc_version(FILE *inFile, char *name) - { - fprintf (inFile, "#define HasGcc 1\n"); --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (CrossCompiling) - { - if (gnu_c > 1) { -@@ -1329,20 +1318,20 @@ get_gcc_version(FILE *inFile, char *name - fprintf (inFile, "#define GccMajorVersion %d\n", gnu_c); - fprintf (inFile, "#define GccMinorVersion %d\n", gnu_c_minor); - } else --#endif -+# endif - { --#if __GNUC__ > 1 -+# if __GNUC__ > 1 - fprintf (inFile, "#define HasGcc2 1\n"); --# if __GNUC__ > 2 -+# if __GNUC__ > 2 - fprintf (inFile, "#define HasGcc3 1\n"); -+# endif - # endif --#endif - fprintf (inFile, "#define GccMajorVersion %d\n", __GNUC__); - fprintf (inFile, "#define GccMinorVersion %d\n", __GNUC_MINOR__); - } --#if defined(HAS_MERGE_CONSTANTS) -+# if defined(HAS_MERGE_CONSTANTS) - fprintf (inFile, "#define HasGccMergeConstants %d\n", HAS_MERGE_CONSTANTS); --#endif -+# endif - } - #endif - -@@ -1350,8 +1339,8 @@ static boolean - get_gcc(char *cmd) - { - struct stat sb; -- static char* gcc_path[] = { --# if defined(linux) || \ -+ static const char* gcc_path[] = { -+#if defined(linux) || \ - defined(__NetBSD__) || \ - defined(__OpenBSD__) || \ - defined(__FreeBSD__) || \ -@@ -1362,14 +1351,14 @@ get_gcc(char *cmd) - defined(__GNU__) || \ - defined(__GLIBC__) - "/usr/bin/cc", /* for Linux PostIncDir */ --# endif -+#endif - "/usr/local/bin/gcc", - "/opt/gnu/bin/gcc", - "/usr/pkg/bin/gcc" - }; - - #ifdef CROSSCOMPILE -- static char* cross_cc_name[] = { -+ static const char* cross_cc_name[] = { - "cc", - "gcc" - }; -@@ -1399,7 +1388,7 @@ get_gcc(char *cmd) - return FALSE; - } - --#if defined CROSSCOMPILE || !defined __UNIXOS2__ -+#ifdef CROSSCOMPILE - static void - get_gcc_incdir(FILE *inFile, char* name) - { -@@ -1428,14 +1417,14 @@ get_gcc_incdir(FILE *inFile, char* name) - boolean - define_os_defaults(FILE *inFile) - { --#if defined CROSSCOMPILE || ( !defined(WIN32) && !defined(__UNIXOS2__) ) --#ifdef CROSSCOMPILE --#ifdef __GNUC__ -+#if defined CROSSCOMPILE || !defined(WIN32) -+# ifdef CROSSCOMPILE -+# ifdef __GNUC__ - if (1) --#else -+# else - if ((sys != win32) && (sys != emx)) --#endif --#endif -+# endif -+# endif - { - # if (defined(DEFAULT_OS_NAME) || defined(DEFAULT_OS_MAJOR_REV) || \ - defined(DEFAULT_OS_MINOR_REV) || defined(DEFAULT_OS_TEENY_REV)) -@@ -1444,16 +1433,16 @@ define_os_defaults(FILE *inFile) - char buf[SYS_NMLN * 5 + 1]; - - /* Obtain the system information. */ --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (!CrossCompiling) --#endif -+# endif - { - if (uname(&uts_name) < 0) -- LogFatal("Cannot invoke uname", ""); -+ LogFatal("Cannot invoke uname"); - else - name = &uts_name; - } --#if defined CROSSCOMPILE && (defined linux || defined(__GLIBC__)) -+# if defined CROSSCOMPILE && (defined linux || defined(__GLIBC__)) - else { - strncpy(uts_name.sysname,cross_uts_sysname,SYS_NMLN); - strncpy(uts_name.release,cross_uts_release,SYS_NMLN); -@@ -1461,14 +1450,14 @@ define_os_defaults(FILE *inFile) - strncpy(uts_name.machine,cross_uts_machine,SYS_NMLN); - name = &uts_name; - } --#endif --# ifdef __FreeBSD__ -+# endif -+# ifdef __FreeBSD__ - /* Override for compiling in chroot of other OS version, such as - * in the bento build cluster. - */ - { - char *e; -- if ((e = getenv("OSREL")) != NULL && -+ if ((e = getenv("OSREL")) != NULL && - strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) { - strcpy(name->release, e); - strcpy(name->version, name->sysname); -@@ -1476,7 +1465,7 @@ define_os_defaults(FILE *inFile) - strcat(name->version, e); - } - } --# endif -+# endif - - # if defined DEFAULT_OS_NAME - # if defined CROSSCOMPILE -@@ -1648,10 +1637,8 @@ define_os_defaults(FILE *inFile) - char name[PATH_MAX]; - if (get_gcc(name)) { - get_gcc_version (inFile,name); --# if defined CROSSCOMPILE || !defined __UNIXOS2__ --# if defined CROSSCOMPILE -+# if defined CROSSCOMPILE - if (sys != emx) --# endif - get_gcc_incdir(inFile,name); - # endif - } -@@ -1664,7 +1651,7 @@ define_os_defaults(FILE *inFile) - get_binary_format(inFile); - # endif - } --#endif /* !WIN32 && !__UNIXOS2__*/ -+#endif /* !WIN32 */ - #if defined WIN32 - # ifdef CROSSCOMPILE - else if (sys == win32 && !CrossCompiling) -@@ -1688,8 +1675,6 @@ define_os_defaults(FILE *inFile) - #endif /* WIN32 */ - #ifdef CROSSCOMPILE - else if (sys == emx) --#endif --#if defined CROSSCOMPILE || defined __UNIXOS2__ - { - fprintf(inFile, "#define DefaultOSMajorVersion 4\n"); - fprintf(inFile, "#define DefaultOSMinorVersion 0\n"); -@@ -1703,8 +1688,8 @@ define_os_defaults(FILE *inFile) - } - - void --cppit(char *imakefile, char *template, char *masterc, -- FILE *outfd, char *outfname) -+cppit(const char *imakefile, const char *template, const char *masterc, -+ FILE *outfd, const char *outfname) - { - FILE *inFile; - -@@ -1721,8 +1706,11 @@ cppit(char *imakefile, char *template, c - fprintf(inFile, IncludeFmt, ImakeTmplSym) < 0 || - optional_include(inFile, "IMAKE_ADMIN_MACROS", "adminmacros") || - optional_include(inFile, "IMAKE_LOCAL_MACROS", "localmacros") || -- fflush(inFile) || -- fclose(inFile)) -+ fflush(inFile)) { -+ fclose(inFile); -+ LogFatal("Cannot write to %s.", masterc); -+ } -+ else if (fclose(inFile)) - LogFatal("Cannot write to %s.", masterc); - /* - * Fork and exec cpp -@@ -1737,8 +1725,8 @@ makeit(void) - doit(NULL, make_argv[0], make_argv); - } - --char * --CleanCppInput(char *imakefile) -+const char * -+CleanCppInput(const char *imakefile) - { - FILE *outFile = NULL; - FILE *inFile; -@@ -1792,28 +1780,29 @@ CleanCppInput(char *imakefile) - strcmp(ptoken, "pragma") && - strcmp(ptoken, "undef")) { - if (outFile == NULL) { --#ifdef HAS_MKSTEMP -+#ifdef HAVE_MKSTEMP - int fd; - #endif -- tmpImakefile = Strdup(tmpImakefile); --#ifndef HAS_MKSTEMP -- if (mktemp(tmpImakefile) == NULL || -- (outFile = fopen(tmpImakefile, "w+")) == NULL) { -+ char *tmpImakefileName = Strdup(tmpImakefileTemplate); -+#ifndef HAVE_MKSTEMP -+ if (mktemp(tmpImakefileName) == NULL || -+ (outFile = fopen(tmpImakefileName, "w+")) == NULL) { - LogFatal("Cannot open %s for write.", -- tmpImakefile); -+ tmpImakefileName); - } - #else -- fd=mkstemp(tmpImakefile); -+ fd=mkstemp(tmpImakefileName); - if (fd != -1) - outFile = fdopen(fd, "w"); - if (outFile == NULL) { - if (fd != -1) { -- unlink(tmpImakefile); close(fd); -+ unlink(tmpImakefileName); close(fd); - } - LogFatal("Cannot open %s for write.", -- tmpImakefile); -+ tmpImakefileName); - } - #endif -+ tmpImakefile = tmpImakefileName; - } - writetmpfile(outFile, punwritten, pbuf-punwritten, - tmpImakefile); -@@ -1838,7 +1827,7 @@ CleanCppInput(char *imakefile) - } - - void --CleanCppOutput(FILE *tmpfd, char *tmpfname) -+CleanCppOutput(FILE *tmpfd, const char *tmpfname) - { - char *input; - int blankline = 0; -@@ -1960,7 +1949,7 @@ isempty(char *line) - - /*ARGSUSED*/ - char * --ReadLine(FILE *tmpfd, char *tmpfname) -+ReadLine(FILE *tmpfd, const char *tmpfname) - { - static boolean initialized = FALSE; - static char *buf, *pline, *end; -@@ -1988,10 +1977,10 @@ ReadLine(FILE *tmpfd, char *tmpfname) - fseek(tmpfd, 0, 0); - #if defined(SYSV) || defined(WIN32) || defined(USE_FREOPEN) - tmpfd = freopen(tmpfname, "w+", tmpfd); --#ifdef WIN32 -+# ifdef WIN32 - if (! tmpfd) /* if failed try again */ - tmpfd = freopen(tmpfname, "w+", fp); --#endif -+# endif - if (! tmpfd) - LogFatal("cannot reopen %s\n", tmpfname); - #else /* !SYSV */ -@@ -1999,8 +1988,6 @@ ReadLine(FILE *tmpfd, char *tmpfname) - #endif /* !SYSV */ - initialized = TRUE; - fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); -- fprintf (tmpfd, "# %s\n", -- "$Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $"); - } - - for (p1 = pline; p1 < end; p1++) { -@@ -2036,7 +2023,7 @@ ReadLine(FILE *tmpfd, char *tmpfname) - } - - void --writetmpfile(FILE *fd, char *buf, int cnt, char *fname) -+writetmpfile(FILE *fd, const char *buf, int cnt, const char *fname) - { - if (fwrite(buf, sizeof(char), cnt, fd) == -1) - LogFatal("Cannot write to %s.", fname); -@@ -2048,7 +2035,7 @@ Emalloc(int size) - char *p; - - if ((p = malloc(size)) == NULL) -- LogFatalI("Cannot allocate %d bytes", size); -+ LogFatal("Cannot allocate %d bytes", size); - return(p); - } - -@@ -2066,10 +2053,10 @@ KludgeOutputLine(char **pline) - break; - case ' ': /*May need a tab*/ - default: --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (inline_syntax) --#endif --#if defined CROSSCOMPILE || defined INLINE_SYNTAX -+# endif -+# if defined CROSSCOMPILE || defined INLINE_SYNTAX - { - if (*p == '<' && p[1] == '<') { /* inline file close */ - InInline--; -@@ -2077,7 +2064,7 @@ KludgeOutputLine(char **pline) - break; - } - } --#endif -+# endif - /* - * The following cases should not be treated as beginning of - * rules: -@@ -2116,26 +2103,26 @@ KludgeOutputLine(char **pline) - quotechar = ']'; - break; - case '=': --#ifdef CROSSCOMPILE -+# ifdef CROSSCOMPILE - if (remove_cpp_leadspace) --#endif --#if defined CROSSCOMPILE || defined REMOVE_CPP_LEADSPACE -+# endif -+# if defined CROSSCOMPILE || defined REMOVE_CPP_LEADSPACE - { - if (!InRule && **pline == ' ') { - while (**pline == ' ') - (*pline)++; - } - } --#endif -+# endif - goto breakfor; --#if defined CROSSCOMPILE || defined INLINE_SYNTAX -+# if defined CROSSCOMPILE || defined INLINE_SYNTAX - case '<': - if (inline_syntax) { - if (p[1] == '<') /* inline file start */ - InInline++; - } - break; --#endif -+# endif - case ':': - if (p[1] == '=') - goto breakfor; -@@ -2159,7 +2146,7 @@ KludgeResetRule(void) - } - #endif - char * --Strdup(char *cp) -+Strdup(const char *cp) - { - char *new = Emalloc(strlen(cp) + 1); - diff --git a/debian/patches/series b/debian/patches/series index 1b731170f..afae768fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -055_nx-X11_imake-Werror-format-security.full.patch 056_nx-X11_Werror-format-security.full.patch 057_nx-X11_sanitize-eventmasks.full.patch 101_nxagent_set-rgb-path.full.patch -- cgit v1.2.3 From 4dac57f3db5b283eb419f1e108cc8510bad1b0af Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:58:22 +0100 Subject: Fix -Werror=format-security errors (056_nx-X11_Werror-format-security.full.patch). The below patch fixes more -Werror=format-security errors. Interestingly, most of the errors only showed up on our arm builds. No idea why. --- .../056_nx-X11_Werror-format-security.full.patch | 107 --------------------- debian/patches/series | 1 - 2 files changed, 108 deletions(-) delete mode 100644 debian/patches/056_nx-X11_Werror-format-security.full.patch (limited to 'debian') diff --git a/debian/patches/056_nx-X11_Werror-format-security.full.patch b/debian/patches/056_nx-X11_Werror-format-security.full.patch deleted file mode 100644 index a047de774..000000000 --- a/debian/patches/056_nx-X11_Werror-format-security.full.patch +++ /dev/null @@ -1,107 +0,0 @@ -Description: Fix -Werror=format-security errors -Author: Orion Poplawski -Abstract: - The below patch fixes more -Werror=format-security errors. - Interestingly, most of the errors only showed up on our arm builds. No - idea why. ---- a/nx-X11/lib/xtrans/Xtransint.h -+++ b/nx-X11/lib/xtrans/Xtransint.h -@@ -444,7 +444,7 @@ - int hack= 0, saveerrno=errno; \ - struct timeval tp;\ - gettimeofday(&tp,0); \ -- ErrorF(__xtransname); \ -+ ErrorF("%s",__xtransname); \ - ErrorF(x+hack,a,b,c); \ - ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ - errno=saveerrno; \ -@@ -454,7 +454,7 @@ - int hack= 0, saveerrno=errno; \ - struct timeval tp;\ - gettimeofday(&tp,0); \ -- fprintf(stderr, __xtransname); fflush(stderr); \ -+ fprintf(stderr, "%s",__xtransname); fflush(stderr); \ - fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ - fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ - fflush(stderr); \ -@@ -466,14 +466,14 @@ - /* Use ErrorF() for the X server */ - #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ - int hack= 0, saveerrno=errno; \ -- ErrorF(__xtransname); \ -+ ErrorF("%s",__xtransname); \ - ErrorF(x+hack,a,b,c); \ - errno=saveerrno; \ - } else ((void)0) - #else - #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ - int hack= 0, saveerrno=errno; \ -- fprintf(stderr, __xtransname); fflush(stderr); \ -+ fprintf(stderr, "%s",__xtransname); fflush(stderr); \ - fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ - errno=saveerrno; \ - } else ((void)0) ---- a/nx-X11/programs/nxauth/process.c -+++ b/nx-X11/programs/nxauth/process.c -@@ -974,7 +974,7 @@ - char *hex; - - hex = bintohex(len, cp); -- fprintf(fp, hex); -+ fprintf(fp, "%s", hex); - free(hex); - } - ---- a/nx-X11/programs/Xserver/GL/glx/glximports.c -+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c -@@ -110,12 +110,12 @@ - - void __glXImpWarning(__GLcontext *gc, char *msg) - { -- ErrorF((char *)msg); -+ ErrorF("%s",(char *)msg); - } - - void __glXImpFatal(__GLcontext *gc, char *msg) - { -- ErrorF((char *)msg); -+ ErrorF("%s",(char *)msg); - __glXAbort(); - } - ---- a/nx-X11/programs/Xserver/hw/nxagent/Error.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c -@@ -232,7 +232,7 @@ - - int nxagentExitHandler(const char *message) - { -- FatalError(message); -+ FatalError("%s", message); - - return 0; - } ---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -481,7 +481,7 @@ - - nxagentStartRedirectToClientsLog(); - -- fprintf(stderr, buffer); -+ fprintf(stderr, "%s", buffer); - - nxagentEndRedirectToClientsLog(); - } ---- a/nx-X11/programs/Xserver/os/log.c -+++ b/nx-X11/programs/Xserver/os/log.c -@@ -692,9 +692,9 @@ - return; - sprintf(err, "%s: ", str); - strcat(err, strerror(saveErrno)); -- LogWrite(-1, err); -+ LogWrite(-1, "%s", err); - } else -- LogWrite(-1, strerror(saveErrno)); -+ LogWrite(-1, "%s", strerror(saveErrno)); - } - - void diff --git a/debian/patches/series b/debian/patches/series index afae768fa..ef4671ef7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -056_nx-X11_Werror-format-security.full.patch 057_nx-X11_sanitize-eventmasks.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch -- cgit v1.2.3 From 2d68caca72bd36b168b36b252c8035643c69e692 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 10 Feb 2015 18:41:08 +0100 Subject: Create Windows and fix drawing issues on Big Endian 64bit systems (057_nx-X11_sanitize-eventmasks.full.patch). Multiple endiannes issues were setting incorrect event masks when creating and drawing X11 windows. This time, a smaller integer has been casted to a bigger one and passed to some function actually setting its value. This meant, that garbage from stack was attached to the smaller integer value, putting unknown memory into the lower bytes of the bigger integer. Fix this by creating a big, initialized temporary variable, let the function do its magic on that one and pass the value back to the smaller variable--and cross your fingers the smaller variable can hold it without overrunning. (The last bit is a design issue we can't really fix and has been around even before this patch.) --- .../057_nx-X11_sanitize-eventmasks.full.patch | 70 ---------------------- debian/patches/series | 1 - 2 files changed, 71 deletions(-) delete mode 100644 debian/patches/057_nx-X11_sanitize-eventmasks.full.patch (limited to 'debian') diff --git a/debian/patches/057_nx-X11_sanitize-eventmasks.full.patch b/debian/patches/057_nx-X11_sanitize-eventmasks.full.patch deleted file mode 100644 index 9c1171712..000000000 --- a/debian/patches/057_nx-X11_sanitize-eventmasks.full.patch +++ /dev/null @@ -1,70 +0,0 @@ -Description: Create Windows and fix drawing issues on Big Endian 64bit systems -Author: Mihai Moldovan -Abstract: - Multiple endiannes issues were setting incorrect event masks when creating and - drawing X11 windows. - . - This time, a smaller integer has been casted to a bigger one and passed to some - function actually setting its value. - . - This meant, that garbage from stack was attached to the smaller integer value, - putting unknown memory into the lower bytes of the bigger integer. - . - Fix this by creating a big, initialized temporary variable, let the function do - its magic on that one and pass the value back to the smaller variable--and - cross your fingers the smaller variable can hold it without overrunning. (The - last bit is a design issue we can't really fix and has been around even before - this patch.) - ---- a/nx-X11/programs/Xserver/hw/nxagent/Window.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c -@@ -327,7 +327,10 @@ - - if (mask & CWEventMask) - { -- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); -+ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ -+ Mask tmp_mask = attributes.event_mask; -+ nxagentGetEventMask(pWin, &tmp_mask); -+ attributes.event_mask = (int)tmp_mask; - } - #ifdef WARNING - else -@@ -2891,7 +2894,10 @@ - - if (mask & CWEventMask) - { -- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); -+ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ -+ Mask tmp_mask = attributes.event_mask; -+ nxagentGetEventMask(pWin, &tmp_mask); -+ attributes.event_mask = (int)tmp_mask; - } - #ifdef WARNING - else -@@ -3352,7 +3358,10 @@ - - if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) - { -- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); -+ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ -+ Mask tmp_mask = attributes.event_mask; -+ nxagentGetEventMask(pWin, &tmp_mask); -+ attributes.event_mask = (int)tmp_mask; - - XChangeWindowAttributes(nxagentDisplay, nxagentWindow(pWin), mask, &attributes); - } ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1665,7 +1665,10 @@ - - attributes.background_pixel = nxagentBlackPixel; - -- nxagentGetDefaultEventMask((Mask*)&attributes.event_mask); -+ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ -+ Mask tmp_mask = attributes.event_mask; -+ nxagentGetDefaultEventMask(&tmp_mask); -+ attributes.event_mask = (int)tmp_mask; - - attributes.colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen)); - diff --git a/debian/patches/series b/debian/patches/series index ef4671ef7..fed95824d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -057_nx-X11_sanitize-eventmasks.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch -- cgit v1.2.3 From ceb70505c8c9796fe601b888d02cd98d62e47939 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 10 Feb 2015 18:48:39 +0100 Subject: FHS path fix for rgb file This patch is needed on Debian only, not reporting this path addition to upstream. Patch was modified by Mike Gabriel --- debian/patches/101_nxagent_set-rgb-path.full.patch | 19 ------------------- debian/patches/series | 1 - 2 files changed, 20 deletions(-) delete mode 100644 debian/patches/101_nxagent_set-rgb-path.full.patch (limited to 'debian') diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch deleted file mode 100644 index 9d20bee24..000000000 --- a/debian/patches/101_nxagent_set-rgb-path.full.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: FHS path fix for rgb file - This patch is needed on Debian only, not reporting this path - addition to upstream. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-01-12 ---- a/nx-X11/programs/Xserver/os/oscolor.c -+++ b/nx-X11/programs/Xserver/os/oscolor.c -@@ -53,7 +53,7 @@ - #include - #include - --static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; - static char _NXRgbPath[1024]; - - #endif diff --git a/debian/patches/series b/debian/patches/series index fed95824d..ceeaa8a97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch -- cgit v1.2.3 From 057999efabe7f1d857f6a94116bcafdeaa309fcf Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 10 Feb 2015 18:52:39 +0100 Subject: FHS path fix for SecurityPolicy file (102_xserver-xext_set-securitypolicy-path.full.patch). This patch is needed for Tarball installation mode of NX (redistributed) only, not reporting this path change to upstream. --- ...02_xserver-xext_set-securitypolicy-path.full.patch | 19 ------------------- debian/patches/series | 1 - 2 files changed, 20 deletions(-) delete mode 100644 debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch (limited to 'debian') diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch deleted file mode 100644 index 9d27a372f..000000000 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: FHS path fix for SecurityPolicy file - This patch is needed for Tarball installation mode of NX (redistributed) - only, not reporting this path change to upstream. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-01-12 ---- a/nx-X11/programs/Xserver/Xext/security.c -+++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -86,7 +86,7 @@ - - #ifdef NXAGENT_SERVER - --#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy" -+#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" - - #endif - diff --git a/debian/patches/series b/debian/patches/series index ceeaa8a97..d84cbd8b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch 106_nxagent_utf8-copy-clipboard.full.patch -- cgit v1.2.3 From c106ad8e833f05bbe181e28e8e8826115f8424cd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 18:54:29 +0100 Subject: FHS path fix for keyboard config file (103_nxagent_set-X0-config-path.full.patch). This patch is needed for Tarball installation and on Distros like Debian, not reporting this path addition to upstream. Originally contributed by FreeNX Team. --- .../103_nxagent_set-X0-config-path.full.patch | 40 ---------------------- debian/patches/series | 1 - 2 files changed, 41 deletions(-) delete mode 100644 debian/patches/103_nxagent_set-X0-config-path.full.patch (limited to 'debian') diff --git a/debian/patches/103_nxagent_set-X0-config-path.full.patch b/debian/patches/103_nxagent_set-X0-config-path.full.patch deleted file mode 100644 index eb705ca81..000000000 --- a/debian/patches/103_nxagent_set-X0-config-path.full.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: FHS path fix for keyboard config file - This patch is needed for Tarball installation and on Distros like - Debian, not reporting this path addition to upstream. - . - Originally contributed by FreeNX Team. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -@@ -136,7 +136,7 @@ - #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" - #endif - #ifndef XKB_CONFIG_FILE --#define XKB_CONFIG_FILE "X0-config.keyboard" -+#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" - #endif - #ifndef XKB_DFLT_RULES_FILE - #define XKB_DFLT_RULES_FILE "xfree86" -@@ -985,8 +985,7 @@ - - XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); - -- nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) + -- strlen(XKB_CONFIG_FILE) + 1; -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); - - nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); - -@@ -995,9 +994,7 @@ - FatalError("nxagentKeyboardProc: malloc failed."); - } - -- strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory); -- strcat(nxagentXkbConfigFilePath, "/"); -- strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); -+ strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); - - #ifdef TEST - fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", diff --git a/debian/patches/series b/debian/patches/series index d84cbd8b2..cfe913d4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch 106_nxagent_utf8-copy-clipboard.full.patch 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch -- cgit v1.2.3 From c91fe980b952d4d357a291fcda89f35ea1a83993 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 10 Feb 2015 18:56:59 +0100 Subject: Export remote keyboard configuration to session directory (105_nxagent_export-remote-keyboard-config.full.patch) Let nxagent write the keyboard configuration to /keyboard and make it available within the NX session. --- ...xagent_export-remote-keyboard-config.full.patch | 96 ---------------------- debian/patches/series | 1 - 2 files changed, 97 deletions(-) delete mode 100644 debian/patches/105_nxagent_export-remote-keyboard-config.full.patch (limited to 'debian') diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch deleted file mode 100644 index 389feaf92..000000000 --- a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch +++ /dev/null @@ -1,96 +0,0 @@ -Description: Export remote keyboard configuration to session directory - Let nxagent write the keyboard configuration to /keyboard - and make it available within the NX session. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Error.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c -@@ -497,7 +497,7 @@ - return rootPath; - } - --char *nxagentGetSessionPath() -+char *nxagentGetSessionPath(void) - { - - char *rootPath; ---- a/nx-X11/programs/Xserver/hw/nxagent/Error.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.h -@@ -34,4 +34,6 @@ - - void nxagentEndRedirectToClientsLog(void); - -+char *nxagentGetSessionPath(void); -+ - #endif /* __Error_H__ */ ---- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -@@ -52,6 +52,7 @@ - #include "Keyboard.h" - #include "Events.h" - #include "Options.h" -+#include "Error.h" - - #include "NXlib.h" - -@@ -72,6 +73,8 @@ - - #include "Xatom.h" - -+#include -+ - static int nxagentXkbGetNames(char **rules, char **model, char **layout, - char **variant, char **options); - -@@ -1790,6 +1793,48 @@ - } - #endif - -+ if (drulesLen != 0) -+ { -+ char *sessionpath = nxagentGetSessionPath(); -+ if (sessionpath != NULL){ -+ int keyboard_file_path_size = strlen(sessionpath) + strlen("/keyboard"); -+ char *keyboard_file_path = malloc((keyboard_file_path_size + 1) * sizeof(char)); -+ FILE *keyboard_file; -+ if ( keyboard_file_path == NULL) -+ { -+ FatalError("nxagentKeyboardProc: malloc failed."); -+ } -+ strcpy(keyboard_file_path, sessionpath); -+ strcat(keyboard_file_path, "/keyboard"); -+ if ((keyboard_file = fopen(keyboard_file_path, "w")) != NULL) { -+ if ( drules != NULL ) -+ fprintf(keyboard_file, "rules=%s\n", drules); -+ if ( dmodel != NULL ) -+ fprintf(keyboard_file, "model=%s\n", dmodel); -+ if ( dlayout != NULL ) -+ fprintf(keyboard_file, "layout=%s\n", dlayout); -+ if ( dvariant != NULL ) -+ fprintf(keyboard_file, "variant=%s\n", dvariant); -+ if ( doptions != NULL ) -+ fprintf(keyboard_file, "options=%s\n", doptions); -+ fclose(keyboard_file); -+ fprintf(stderr, "keyboard file created\n"); -+ } -+ else { -+ int save_err = errno; -+ fprintf(stderr, "keyboard file not created: %s\n", strerror(save_err)); -+ } -+ free(keyboard_file_path); -+ } -+ else { -+ fprintf(stderr, "SessionPath not defined\n"); -+ } -+ } -+ else -+ { -+ fprintf(stderr, "Failed to create the keyboard file\n"); -+ } -+ - if (nxagentOption(ClientOs) == ClientOsLinux && - drules != NULL && dmodel != NULL && - (strcmp(drules, "evdev") == 0 || diff --git a/debian/patches/series b/debian/patches/series index cfe913d4b..d34201547 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -105_nxagent_export-remote-keyboard-config.full.patch 106_nxagent_utf8-copy-clipboard.full.patch 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch 108_nxagent_wine-close-delay.full.patch -- cgit v1.2.3 From 9674c43460e69eb88fa97f6b69911d61d0f767cd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:00:06 +0100 Subject: UTF-8 Clipboard copying (106_nxagent_utf8-copy-clipboard.full.patch). Enable UTF-8 clipboard copies. Originally contributed by FreeNX Team (dimbor). --- .../106_nxagent_utf8-copy-clipboard.full.patch | 52 ---------------------- debian/patches/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 debian/patches/106_nxagent_utf8-copy-clipboard.full.patch (limited to 'debian') diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch deleted file mode 100644 index 9c0a047d6..000000000 --- a/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: UTF-8 Clipboard copying - Enable UTF-8 clipboard copies. - . - Originally contributed by FreeNX Team (dimbor). -Forwarded: not-yet -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -@@ -166,7 +166,9 @@ - - if (target == XA_STRING) return True; - if (target == serverTEXT) return True; -- -+ /* by dimbor */ -+ if (target == serverUTF8_STRING) return True; -+ - return False; - } - -@@ -402,7 +404,12 @@ - lastServerProperty = X->xselectionrequest.property; - lastServerRequestor = X->xselectionrequest.requestor; - lastServerTarget = X->xselectionrequest.target; -- lastServerTime = X->xselectionrequest.time; -+ -+ /* by dimbor */ -+ if (lastServerTarget != XA_STRING) -+ lastServerTarget = serverUTF8_STRING; -+ -+ lastServerTime = X->xselectionrequest.time; - - x.u.u.type = SelectionRequest; - x.u.selectionRequest.time = GetTimeInMillis(); -@@ -424,11 +431,12 @@ - - x.u.selectionRequest.selection = CurrentSelections[i].selection; - -- /* -- * x.u.selectionRequest.target = X->xselectionrequest.target; -- */ -- -- x.u.selectionRequest.target = XA_STRING; -+ /* by dimbor (idea from zahvatov) */ -+ if (X->xselectionrequest.target != XA_STRING) -+ x.u.selectionRequest.target = clientUTF8_STRING; -+ else -+ x.u.selectionRequest.target = XA_STRING; -+ - x.u.selectionRequest.property = clientCutProperty; - - (void) TryClientEvents(lastSelectionOwner[i].client, &x, 1, diff --git a/debian/patches/series b/debian/patches/series index d34201547..c0c34264a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -106_nxagent_utf8-copy-clipboard.full.patch 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch 108_nxagent_wine-close-delay.full.patch 110_nxagent_createpixmap-bounds-check.full.patch -- cgit v1.2.3 From 658d07e939261da0cb4835f03ab908e16540b57c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:04:00 +0100 Subject: Prevent sending COMPOUND_TEXT (107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch). Do not send COMPOUND_TEXT to client. Originally contributed by FreeNX Team (dimbor). --- ...board-compound-text+small-bed-sheets.full.patch | 47 ---------------------- debian/patches/series | 1 - 2 files changed, 48 deletions(-) delete mode 100644 debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch (limited to 'debian') diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch deleted file mode 100644 index 129cb707e..000000000 --- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Prevent sending COMPOUND_TEXT - Do not send COMPOUND_TEXT to client. - . - Originally contributed by FreeNX Team (dimbor). -Forwarded: not-yet -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -@@ -1226,10 +1226,11 @@ - Atom xa_STRING[4]; - xEvent x; - -+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */ - xa_STRING[0] = XA_STRING; -- xa_STRING[1] = clientTEXT; -- xa_STRING[2] = clientCOMPOUND_TEXT; -- xa_STRING[3] = clientUTF8_STRING; -+ xa_STRING[1] = clientUTF8_STRING; -+ xa_STRING[2] = clientTEXT; -+ xa_STRING[3] = clientCOMPOUND_TEXT; - - ChangeWindowProperty(pWin, - property, ---- a/nx-X11/programs/Xserver/hw/nxagent/Image.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c -@@ -644,6 +644,10 @@ - pDrawable -> depth != 1 && - nxagentOption(DeferLevel) >= 1) - { -+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/ -+ if (dstHeight > 16) -+ { -+ /* -------------------------------------------------------------------------------- */ - #ifdef TEST - fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] " - "for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1, -@@ -654,6 +658,9 @@ - nxagentMarkCorruptedRegion(pDrawable, pRegion); - - goto nxagentPutImageEnd; -+ /* --- changed by dimbor ---*/ -+ } -+ /* ------------------------- */ - } - - if (pDrawable -> type == DRAWABLE_WINDOW && diff --git a/debian/patches/series b/debian/patches/series index c0c34264a..7f8abfcba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch 108_nxagent_wine-close-delay.full.patch 110_nxagent_createpixmap-bounds-check.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch -- cgit v1.2.3 From 223f5548b70910a2d745b7b48d2096f29b560def Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:14:04 +0100 Subject: Wine Close Delay (108_nxagent_wine-close-delay.full.patch). Wine close delay. Originally contributed by FreeNX team (dimbor). --- .../108_nxagent_wine-close-delay.full.patch | 60 ---------------------- debian/patches/series | 1 - 2 files changed, 61 deletions(-) delete mode 100644 debian/patches/108_nxagent_wine-close-delay.full.patch (limited to 'debian') diff --git a/debian/patches/108_nxagent_wine-close-delay.full.patch b/debian/patches/108_nxagent_wine-close-delay.full.patch deleted file mode 100644 index 7a9c18cf2..000000000 --- a/debian/patches/108_nxagent_wine-close-delay.full.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Wine Close Delay - Wine close delay. - . - Originally contributed by FreeNX Team (dimbor). -Forwarded: not-yet -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Window.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c -@@ -176,6 +176,14 @@ - - static int nxagentForceExposure(WindowPtr pWin, pointer ptr); - -+/* by dimbor */ -+typedef struct -+{ -+ CARD32 state; -+ Window icon; -+} -+nxagentWMStateRec; -+ - /* - * This is currently unused. - */ -@@ -1861,6 +1869,17 @@ - nxagentAddConfiguredWindow(pWin, CWStackingOrder); - nxagentAddConfiguredWindow(pWin, CW_Shape); - -+ /* add by dimbor */ -+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) -+ { -+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); -+ nxagentWMStateRec wmState; -+ wmState.state = 1; /* NormalState */ -+ wmState.icon = None; -+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) -+ fprintf(stderr, "nxagentRealizeWindow: Additing WM_STATE fail.\n"); -+ } -+ - #ifdef SHAPE - - /* -@@ -1907,6 +1926,17 @@ - return True; - } - -+ /* add by dimbor */ -+ if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) -+ { -+ Atom prop = MakeAtom("WM_STATE", strlen("WM_STATE"), True); -+ nxagentWMStateRec wmState; -+ wmState.state = 3; /* WithdrawnState */ -+ wmState.icon = None; -+ if (ChangeWindowProperty(pWin, prop, prop, 32, 0, 2, &wmState, 1) != Success) -+ fprintf(stderr, "nxagentUnRealizeWindow: Changing WM_STATE failed.\n"); -+ } -+ - XUnmapWindow(nxagentDisplay, nxagentWindow(pWin)); - - return True; diff --git a/debian/patches/series b/debian/patches/series index 7f8abfcba..c904d1894 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -108_nxagent_wine-close-delay.full.patch 110_nxagent_createpixmap-bounds-check.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch -- cgit v1.2.3 From 471223907081355a288a315b33a2b70eb4c8fb1e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:17:58 +0100 Subject: Avoid large pixmaps (110_nxagent_createpixmap-bounds-check.full.patch). It is allowed to try and allocate a pixmap which is larger than 32767 in either dimension. However, all of the framebuffer code is buggy and does not reliably draw to such big pixmaps, basically because the Region data structure operates with signed shorts for the rectangles in it. Furthermore, several places in the X server computes the size in bytes of the pixmap and tries to store it in an integer. This integer can overflow and cause the allocated size to be much smaller. So, such big pixmaps are rejected here with a BadAlloc Originally contributed by FreeNX Team --- ...10_nxagent_createpixmap-bounds-check.full.patch | 44 ---------------------- debian/patches/series | 1 - 2 files changed, 45 deletions(-) delete mode 100644 debian/patches/110_nxagent_createpixmap-bounds-check.full.patch (limited to 'debian') diff --git a/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch b/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch deleted file mode 100644 index d65862bdc..000000000 --- a/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Avoid large pixmaps - It is allowed to try and allocate a pixmap which is larger than - 32767 in either dimension. However, all of the framebuffer code - is buggy and does not reliably draw to such big pixmaps, basically - because the Region data structure operates with signed shorts - for the rectangles in it. - . - Furthermore, several places in the X server computes the - size in bytes of the pixmap and tries to store it in an - integer. This integer can overflow and cause the allocated size - to be much smaller. - . - So, such big pixmaps are rejected here with a BadAlloc - . - Originally contributed by FreeNX Team -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c -@@ -1973,6 +1973,23 @@ - client->errorValue = 0; - return BadValue; - } -+ if (stuff->width > 32767 || stuff->height > 32767) -+ { -+ /* It is allowed to try and allocate a pixmap which is larger than -+ * 32767 in either dimension. However, all of the framebuffer code -+ * is buggy and does not reliably draw to such big pixmaps, basically -+ * because the Region data structure operates with signed shorts -+ * for the rectangles in it. -+ * -+ * Furthermore, several places in the X server computes the -+ * size in bytes of the pixmap and tries to store it in an -+ * integer. This integer can overflow and cause the allocated size -+ * to be much smaller. -+ * -+ * So, such big pixmaps are rejected here with a BadAlloc -+ */ -+ return BadAlloc; -+ } - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; diff --git a/debian/patches/series b/debian/patches/series index c904d1894..5a5a30e08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -110_nxagent_createpixmap-bounds-check.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-X11_enable-xinerama.full.patch -- cgit v1.2.3 From 1681f1110ece0e5ad0accda009f106a2081c660c Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:19:25 +0100 Subject: Detect nxagent/x2goagent flavour (200_nxagent_check-binary-x2go-flavour.full.patch). Whether the agent runs in X2Go or NX mode is decide by the name of the binary that executes the code. Binary name equal to nxagent -> (Free)NX flavour Binary name equal to x2goagent -> X2Go flavour --- ...00_nxagent_check-binary-x2go-flavour.full.patch | 64 ---------------------- debian/patches/series | 1 - 2 files changed, 65 deletions(-) delete mode 100644 debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch (limited to 'debian') diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch deleted file mode 100644 index c69202088..000000000 --- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch +++ /dev/null @@ -1,64 +0,0 @@ -Description: Detect nxagent/x2goagent flavour - Whether the agent runs in X2Go or NX mode is decide by the - name of the binary that executes the code. - . - Binary name equal to nxagent -> (Free)NX flavour - Binary name equal to x2goagent -> X2Go flavour -Forwarded: not-needed -Author: Oleksandr Shneyder -Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -177,6 +177,29 @@ - - int nxagentDoFullGeneration = 1; - -+ /* -+ * 1 if agent running as X2goAgent -+ * 0 if NX Agent -+ */ -+int nxagentX2go; -+ -+/* -+ * Checking if agent is x2go agent -+ */ -+ -+void checkX2goAgent() -+{ -+ extern const char *__progname; -+ if( strcasecmp(__progname,"x2goagent") == 0) -+ { -+ fprintf(stderr, "\nrunning as X2Go Agent\n"); -+ nxagentX2go=1; -+ } -+ else -+ nxagentX2go=0; -+} -+ -+ - /* - * Called at X server's initialization. - */ -@@ -193,6 +216,11 @@ - #endif - - /* -+ * Check if we running as X2Go Agent -+ */ -+ checkX2goAgent(); -+ -+ /* - * Print our pid and version information. - */ - ---- a/nx-X11/programs/Xserver/hw/nxagent/Init.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h -@@ -37,6 +37,8 @@ - extern int nxagentBackingStore; - extern int nxagentSaveUnder; - -+extern int nxagentX2go; -+ - extern ServerGrabInfoRec nxagentGrabServerInfo; - - #endif /* __Init_H__ */ diff --git a/debian/patches/series b/debian/patches/series index 5a5a30e08..f1c8a87b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-X11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch -- cgit v1.2.3 From 6aa18cc28c4adee20b7a6494c8acb430380c4c98 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:21:35 +0100 Subject: X2Go icon when run with x2goagent flavour (201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch). Depending on the binary name of the agent either nxagent.xpm or x2go.xpm is used as window icon. --- ...t_set-x2go-icon-if-x2goagent-flavour.full.patch | 219 --------------------- debian/patches/series | 1 - 2 files changed, 220 deletions(-) delete mode 100644 debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch (limited to 'debian') diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch deleted file mode 100644 index 48e4c4a4b..000000000 --- a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch +++ /dev/null @@ -1,219 +0,0 @@ -Description: X2Go icon when run with x2goagent flavour - Depending on the binary name of the agent either nxagent.xpm - or x2go.xpm is used as window icon. -Forwarded: not-needed -Author: Oleksandr Shneyder -Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -77,6 +77,7 @@ - #include "NXlib.h" - - #include NXAGENT_ICON_NAME -+#include X2GOAGENT_ICON_NAME - - /* - * Set here the required log level. -@@ -1941,12 +1942,29 @@ - Bool success = False; - XlibPixmap IconPixmap; - XlibPixmap IconShape; -+ char* agent_icon_name; -+ char* agentIconData; - -- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); -+ /* -+ * selecting x2go icon when running as X2Go agent -+ */ -+ if(nxagentX2go) -+ { -+ agent_icon_name=X2GOAGENT_ICON_NAME; -+ agentIconData=x2goagentIconData; -+ } -+ else -+ { -+ agent_icon_name=NXAGENT_ICON_NAME; -+ agentIconData=nxagentIconData; -+ } -+ -+ -+ snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", agent_icon_name); - - if ((icon_fp = fopen(default_path, "r")) == NULL) - { -- icon_fp = nxagentLookForIconFile(NXAGENT_ICON_NAME, "r", icon_path); -+ icon_fp = nxagentLookForIconFile(agent_icon_name, "r", icon_path); - - if (icon_fp != NULL) - { -@@ -1985,7 +2003,7 @@ - { - status = XpmCreatePixmapFromData(display, - DefaultRootWindow(display), -- nxagentIconData, -+ agentIconData, - &IconPixmap, - &IconShape, - NULL); ---- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h -@@ -24,6 +24,8 @@ - - #define NXAGENT_ICON_NAME "nxagent.xpm" - -+#define X2GOAGENT_ICON_NAME "x2go.xpm" -+ - #define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm" - - #endif /* __Icons_H__ */ ---- /dev/null -+++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm -@@ -0,0 +1,148 @@ -+/* XPM */ -+static char *x2goagentIconData[]={ -+"128 128 17 1", -+". c None", -+"m c #323232", -+"l c #323232", -+"f c #323232", -+"e c #323232", -+"o c #323232", -+"# c #323232", -+"h c #323232", -+"i c #323232", -+"n c #323232", -+"d c #323232", -+"a c #323232", -+"g c #323232", -+"j c #323232", -+"b c #323232", -+"k c #323232", -+"c c #323232", -+".....#abccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbde.....", -+"...fbccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgf...", -+"..#ccccaheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeijccckf..", -+".ecccgl..................................................................................................................ejcckf.", -+".bccd.....................................................................................................................mdccg.", -+"#cca.......................................................................................................................mjcce", -+"gckm........................................................................................................................eccd", -+"ccn..........................................................................................................................jcb", -+"cce..........................................................................................................................icc", -+"ccm..........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc............................................meeee..........................................................................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccc....#ggggggggggggggggggggggggggggf.............ggggggggggggggggggggggf....ecc", -+"cc....meeeeoiiiiiiiinggggggggjccccccccccccccccccccc....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", -+"cc....................................meeeeeeeeoiii....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", -+"cc.......................................................menbccccccccccccccccccbhe..................logccccccccccccghe.......ecc", -+"cc...........................................................iccccccccccccccccdm.......................#cccccccccke..........ecc", -+"cc..............................................lee...........#cccccccccccccckm.........................jccccccckm...........ecc", -+"cc........feeeeeeeeoiiiiiiiiiaggggggggjcccccccccccc............icccccccccccccd..........................icccccccf............ecc", -+"cc....meeeeeoiiiiiiiinggggggggjcccccccccccccccccccciiiiii#m.....jcccccccccccci..........................icccccci.............ecc", -+"cc......................................eeeeeeeeeiiiiiiiiigl....eccccccccccccd..........................dcccccj..............ecc", -+"cc...............................................................dcccccccccccj..........................bccccce..............ecc", -+"cc...............................................................lccccccccccccl........................lccccca...............ecc", -+"cc.............................................meeeeeeee#iiiie....dccccccccccch........................icccccl...............ecc", -+"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccb....ecccccccccccb........................bccccn................ecc", -+"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccc#....gccccccccccco......................#cccckm................ecc", -+"cc....................................meeeeeeeeeiiiiiiiiiaggggd....#cccccccccccg......................bcccci.................ecc", -+"cc..................................................................bcccccccccccf....................#cccckm.................ecc", -+"cc..................................................................hcccccccccccd...................mkcccci..................ecc", -+"cc............................................meeeeeeeeoiiiiiiiil...mkcccccccccccl..................icccckm..................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccn....dccccccccccci.................mkcccci...................ecc", -+"cc....meeeeeiiiiiiiiiaggggggggbccccccccccccccccccccccccccccccccckm...lccccccccccck.................icccckm...................ecc", -+"cc.....................................leeeeeeeeoiiiiiiiiigggggggo....accccccccccc#...............mkcccch....................ecc", -+"cc....................................................................ecccccccccccb...............iccccb.....................ecc", -+"cc.....................................................................jccccccccccce.............mkcccc#.....................ecc", -+"cc.............................................meeeeeeeeehiiiiiiii#....#ccccccccccca.............nccccb......................ecc", -+"cc........feeeeeeee#iiiiiiiiigggggggggkccccccccccccccccccccccccccccl....kcccccccccccl...........lccccc#......................ecc", -+"cc....meeeeeoiiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccd....icccccccccccd...........dccccb.......................ecc", -+"cc......................................leeeeeeeeoiiiiiiiingggggggga....mccccccccccckm.........lccccc#.......................ecc", -+"cc.......................................................................dccccccccccch.........dccccb........................ecc", -+"cc.......................................................................lcccccccccccb........lccccc#........................ecc", -+"cc.............................................meeeeeeeeoiiiiiiiingggo....gccccccccccc#.......dccccg.........................ecc", -+"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccccccg....occcccccccccg......lccccce.........................ecc", -+"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccccccccccce....bccccccccccce.....gccccg..........................ecc", -+"cc....................................meeeeeeeeeiiiiiiiiigggggggggkcccd....#cccccccccccd....eccccce..........................ecc", -+"cc.........................................................................mkcccccccccccl...gccccg...........................ecc", -+"cc..........................................................................nccccccccccci..eccccce...........................ecc", -+"cc............................................meeeeeeeeoiiiiiiiingggggggm...lccccccccccckm.gccccg............................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjcccccccccccccccccccccccccccccccccc#....dccccccccccc#eccccce............................ecc", -+"cc....meeeeeiiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccccccccccb....ecccccccccccbgccccg.............................ecc", -+"cc.....................................leeeeeeeeoiiiiiiiiigggggggggkccccco....gccccccccccccccccl.............................ecc", -+"cc............................................................................#cccccccccccccccd..............................ecc", -+"cc.............................................................................bccccccccccccccl..............................ecc", -+"cc.............................................leeeeeeeeeiiiiiiiiiagggggggi....icccccccccccccd...............................ecc", -+"cc........feeeeeeee#iiiiiiiingggggggggkccccccccccccccccccccccccccccccccccckm...mkccccccccccccl...............................ecc", -+"cc....meeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccccccccci....dccccccccccca................................ecc", -+"cc......................................leeeeeeeeoiiiiiiiiigggggggggccccccck....lccccccccccckm...............................ecc", -+"cc...............................................................................accccccccccc#...............................ecc", -+"cc...............................................................................ecccccccccccb...............................ecc", -+"cc............................................leeeeeeeeeiiiiiiiiiaggggggggbcce....bccccccccccce..............................ecc", -+"cc.......feeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccccccd....#cccccccccccg..............................ecc", -+"cc....meeeeeeoiiiiiiiingggggggggccccccccccccccccccccccccccccccccccccccccccccccl....kcccccccccccl.............................ecc", -+"cc.......................................feeeeeeeehiiiiiiiidggggggggbccccccccci....ncccccccccccd.............................ecc", -+"cc...........................................................................mm....bccccccccccccm............................ecc", -+"cc................................................................................#ccccccccccccci............................ecc", -+"cc..........................................leeeeeeee#iiiiiiiidggggggggbcccccl....bccccccccccccck............................ecc", -+"cc......feeeeeeeehiiiiiiiiaggggggggkccccccccccccccccccccccccccccccccccccccccd....#ccccccccccccccc#...........................ecc", -+"cc....meeeeeee#iiiiiiiidggggggggjcccccccccccccccccccccccccccccccccccccccccccl....bcccccccccccccccb...........................ecc", -+"cc.......................................meeeeeeeeeiiiiiiiiigggggggggkcccccd....#cccccbccccccccccce..........................ecc", -+"cc..............................................................................bccccdhcccccccccccg..........................ecc", -+"cc.............................................................................#ccccclmkcccccccccccl.........................ecc", -+"cc..........................................meeeeeeeeeiiiiiiiiiaggggggggbkm....bccccd..ncccccccccccd.........................ecc", -+"cc.....leeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccci....hcccckl..lccccccccccccm........................ecc", -+"cc....meeeeeeeehiiiiiiiidggggggggbcccccccccccccccccccccccccccccccccccccckm...mkcccci....dccccccccccci........................ecc", -+"cc........................................leeeeeeee#iiiiiiiinggggggggjcci....icccckm....eccccccccccck........................ecc", -+"cc..........................................................................mkcccci......gccccccccccc#.......................ecc", -+"cc..........................................................................icccckm......#cccccccccccb.......................ecc", -+"cc.........................................leeeeeeeeoiiiiiiiiigggggggga....mkcccci........bccccccccccce......................ecc", -+"cc....meeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccci....icccckm........hcccccccccccg......................ecc", -+"cc.....feeeeeeeehiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccckm...mkcccci.........mkcccccccccccl.....................ecc", -+"cc.........................................feeeeeeeehiiiiiiiiagggggggh....icccckm..........icccccccccccd.....................ecc", -+"cc.......................................................................mkcccci...........lccccccccccccm....................ecc", -+"cc.......................................................................icccckm............dccccccccccci....................ecc", -+"cc...........................................eeeeeeeeehiiiiiiiidggga....mkcccci.............fccccccccccck....................ecc", -+"cc......feeeeeeee#iiiiiiiingggggggggccccccccccccccccccccccccccccccci....iccccb...............gccccccccccc#...................ecc", -+"cc....meeeeeeeoiiiiiiiiigggggggggbcccccccccccccccccccccccccccccccckm...mkcccc#...............occcccccccccb...................ecc", -+"cc........................................meeeeeeeeeiiiiiiiiidgggg#....iccccb.................bccccccccccce..................ecc", -+"cc....................................................................mkcccc#.................#cccccccccccg..................ecc", -+"cc....................................................................iccccb..................mkcccccccccccl.................ecc", -+"cc..........................................eeeeeeeeeiiiiiiiiiaga....mkcccc#...................icccccccccccd.................ecc", -+"cc.....leeeeeeee#iiiiiiiinggggggggjccccccccccccccccccccccccccccci....iccccb....................lccccccccccccm................ecc", -+"cc....meeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccckm...mkcccc#.....................dccccccccccci................ecc", -+"cc.........................................leeeeeeeeoiiiiiiiiiah....iccccb......................lccccccccccck................ecc", -+"cc.................................................................mkcccc#.......................gccccccccccc#...............ecc", -+"cc.................................................................dccccj........................ecccccccccccj...............ecc", -+"cc..........................................leeeeeeeeeiiiiiiih....lccccce.........................bccccccccccce..............ecc", -+"cc....meeeeeeeeeiiiiiiiiidgggggggggcccccccccccccccccccccccccci....dccccg..........................#ccccccccccca..............ecc", -+"cc.....feeeeeeeeiiiiiiiinggggggggbcccccccccccccccccccccccccckm...lccccce...........................kcccccccccccl.............ecc", -+"cc........................................leeeeeeeehiiiiiiiih....dccccg............................ncccccccccccd.............ecc", -+"cc..............................................................lccccce............................fccccccccccccf............ecc", -+"cc..............................................................dccccb..............................jcccccccccccg............ecc", -+"cc.........................................meeeeeeeeoiiiiil....lcccccn..............................icccccccccccce...........ecc", -+"cc......feeeeeeeehiiiiiiiigggggggggccccccccccccccccjgggggo.....gccccc#..............................eccccccccccccbm..........ecc", -+"cc....meeeeeeeoiiiiiiiiidgggggggggccccccccccccccccc...........hcccccco...............................cccccccccccccn..........ecc", -+"cc.........................................leeeeeee..........ecccccccn..............................lcccccccccccccc#.........ecc", -+"cc..........................................................#kccccccckf.............................nccccccccccccccc#........ecc", -+"cc........................................................ldcccccccccck#m.........................lncccccccccccccccccdl......ecc", -+"cc.........................................feeeeeee....ogjcccccccccccccccggi..................oggbcccccccccccccccccccccja....ecc", -+"cc.....leeeeeeee#iiiiiiiidggggggggbcccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", -+"cc....meeeeeeeehiiiiiiiiaggggggggkccccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", -+"cc........................................feeeeeeee..........................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cce..........................................................................................................................hcc", -+"ccn..........................................................................................................................acb", -+"jcb.........................................................................................................................lcca", -+"hcci........................................................................................................................acc#", -+"mkcc#......................................................................................................................dccb.", -+".occci...................................................................................................................macccf.", -+"..#cccbne.............................................................................................................menkccc#..", -+"...okccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbe...", -+"....mhjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccg#....."}; diff --git a/debian/patches/series b/debian/patches/series index f1c8a87b1..d9b63cce7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-X11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch -- cgit v1.2.3 From d26930d59838e2a8305c66b67aaa163db157920c Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:23:16 +0100 Subject: Enable Xinerama support for NX (202_nx-X11_enable-xinerama.full.patch). This patch adds Xinerama awareness to NX agent windows. The advantage of Xinerama awareness is that an NX session window will only maximize to the dimensions of the active physical display. --- .../patches/202_nx-X11_enable-xinerama.full.patch | 292 --------------------- debian/patches/series | 1 - 2 files changed, 293 deletions(-) delete mode 100644 debian/patches/202_nx-X11_enable-xinerama.full.patch (limited to 'debian') diff --git a/debian/patches/202_nx-X11_enable-xinerama.full.patch b/debian/patches/202_nx-X11_enable-xinerama.full.patch deleted file mode 100644 index 6845ec51e..000000000 --- a/debian/patches/202_nx-X11_enable-xinerama.full.patch +++ /dev/null @@ -1,292 +0,0 @@ -Description: Enable Xinerama support for NX - This patch adds Xinerama awareness to NX agent windows. - . - The advantage of Xinerama awareness is that an NX session window - will only maximize to the dimensions of the active physical - display. -Forwarded: pending -Author: Oleksandr Shneyder -Last-Update: 2012-01-13 ---- a/nx-X11/config/cf/host.def -+++ b/nx-X11/config/cf/host.def -@@ -686,7 +686,7 @@ - * - #define BuildXinerama NO - */ --#define BuildXinerama NO -+#define BuildXinerama YES - - /* - * If you don't want to build support for the GLX extension, uncomment this. ---- a/nx-X11/config/cf/X11.tmpl -+++ b/nx-X11/config/cf/X11.tmpl -@@ -456,7 +456,7 @@ - #define BuildXinerama NO - #endif - #ifndef BuildXineramaLibrary --#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly) -+#define BuildXineramaLibrary (BuildXinerama) - #endif - #ifndef BuildDmxDevelTools - #define BuildDmxDevelTools NO ---- a/nx-X11/lib/Xinerama/Xinerama.c -+++ b/nx-X11/lib/Xinerama/Xinerama.c -@@ -34,7 +34,7 @@ - #include - #include - #include -- -+#include - - static XExtensionInfo _panoramiX_ext_info_data; - static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data; -@@ -249,6 +249,16 @@ - xXineramaIsActiveReq *req; - XExtDisplayInfo *info = find_display (dpy); - -+ -+ FILE* fptr; -+ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) { -+ fclose (fptr); -+ return True; -+ } -+ else { -+ return False; -+ } -+ - if(!XextHasExtension(info)) - return False; /* server doesn't even have the extension */ - -@@ -266,7 +276,6 @@ - return rep.state; - } - --#include - - XineramaScreenInfo * - XineramaQueryScreens( -@@ -279,39 +288,72 @@ - xXineramaQueryScreensReq *req; - XineramaScreenInfo *scrnInfo = NULL; - -- PanoramiXCheckExtension (dpy, info, 0); -+ int i; -+ int x,y,w,h; -+ FILE* fptr; -+ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))==NULL) { -+ PanoramiXCheckExtension (dpy, info, 0); -+ LockDisplay (dpy); -+ GetReq (XineramaQueryScreens, req); -+ req->reqType = info->codes->major_opcode; -+ req->panoramiXReqType = X_XineramaQueryScreens; -+ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { -+ UnlockDisplay (dpy); -+ SyncHandle (); -+ return NULL; -+ } -+ if(rep.number) { -+ if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number))) { -+ xXineramaScreenInfo scratch; -+ int i; -+ -+ for(i = 0; i < rep.number; i++) { -+ _XRead(dpy, (char*)(&scratch), sz_XineramaScreenInfo); -+ scrnInfo[i].screen_number = i; -+ scrnInfo[i].x_org = scratch.x_org; -+ scrnInfo[i].y_org = scratch.y_org; -+ scrnInfo[i].width = scratch.width; -+ scrnInfo[i].height = scratch.height; -+ } -+ -+ *number = rep.number; -+ } else { -+ _XEatData(dpy, rep.length << 2); -+ } -+ } - -- LockDisplay (dpy); -- GetReq (XineramaQueryScreens, req); -- req->reqType = info->codes->major_opcode; -- req->panoramiXReqType = X_XineramaQueryScreens; -- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { - UnlockDisplay (dpy); - SyncHandle (); -- return NULL; -- } - -- if(rep.number) { -- if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number))) { -- xXineramaScreenInfo scratch; -- int i; -- -- for(i = 0; i < rep.number; i++) { -- _XRead(dpy, (char*)(&scratch), sz_XineramaScreenInfo); -- scrnInfo[i].screen_number = i; -- scrnInfo[i].x_org = scratch.x_org; -- scrnInfo[i].y_org = scratch.y_org; -- scrnInfo[i].width = scratch.width; -- scrnInfo[i].height = scratch.height; -- } -+ } else { - -- *number = rep.number; -- } else -- _XEatData(dpy, rep.length << 2); -+ i=0; -+ while(!feof(fptr)) { -+ w=h=0; -+ fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h); -+ if(w&&h) -+ i++; -+ } -+ rewind(fptr); -+ *number=i; -+ if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * i))) { -+ i=0; -+ while(!feof(fptr)){ -+ w=h=0; -+ fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h); -+ if(w&&h){ -+ scrnInfo[i].screen_number=i; -+ scrnInfo[i].x_org=x; -+ scrnInfo[i].y_org=y; -+ scrnInfo[i].width=w; -+ scrnInfo[i].height=h; -+ i++; -+ } -+ } -+ } -+ fclose(fptr); - } - -- UnlockDisplay (dpy); -- SyncHandle (); - return scrnInfo; - } - ---- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile -+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile -@@ -206,7 +206,7 @@ - -UNX_DEBUG_INPUT \ - -DRANDR_10_INTERFACE \ - -DRANDR_12_INTERFACE \ -- -UPANORAMIX \ -+ -DPANORAMIX \ - -UDEBUG_TREE - - all:: $(OBJS) ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c -@@ -275,17 +275,19 @@ - case xv_PutVideo: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvPutVideo(client)); break; -+ result = (XineramaXvPutVideo(client)); - else - #endif -- result = (ProcXvPutVideo(client)); break; -+ result = (ProcXvPutVideo(client)); -+ break; - case xv_PutStill: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvPutStill(client)); break -+ result = (XineramaXvPutStill(client)); - else - #endif -- result = (ProcXvPutStill(client)); break; -+ result = (ProcXvPutStill(client)); -+ break; - case xv_GetVideo: result = (ProcXvGetVideo(client)); break; - case xv_GetStill: result = (ProcXvGetStill(client)); break; - case xv_GrabPort: result = (ProcXvGrabPort(client)); break; -@@ -295,35 +297,39 @@ - case xv_StopVideo: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvStopVideo(client)); break; -+ result = (XineramaXvStopVideo(client)); - else - #endif -- result = (ProcXvStopVideo(client)); break; -+ result = (ProcXvStopVideo(client)); -+ break; - case xv_SetPortAttribute: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvSetPortAttribute(client)); break; -+ result = (XineramaXvSetPortAttribute(client)); - else - #endif -- result = (ProcXvSetPortAttribute(client)); break; -+ result = (ProcXvSetPortAttribute(client)); -+ break; - case xv_GetPortAttribute: result = (ProcXvGetPortAttribute(client)); break; - case xv_QueryBestSize: result = (ProcXvQueryBestSize(client)); break; - case xv_QueryPortAttributes: result = (ProcXvQueryPortAttributes(client)); break; - case xv_PutImage: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvPutImage(client)); break; -+ result = (XineramaXvPutImage(client)); - else - #endif -- result = (ProcXvPutImage(client)); break; -+ result = (ProcXvPutImage(client)); -+ break; - #ifdef MITSHM - case xv_ShmPutImage: - #ifdef PANORAMIX - if(!noPanoramiXExtension) -- result = (XineramaXvShmPutImage(client)); break; -+ result = (XineramaXvShmPutImage(client)); - else - #endif -- result = (ProcXvShmPutImage(client)); break; -+ result = (ProcXvShmPutImage(client)); -+ break; - #endif - case xv_QueryImageAttributes: result = (ProcXvQueryImageAttributes(client)); break; - case xv_ListImageFormats: result = (ProcXvListImageFormats(client)); break; ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1021,7 +1021,7 @@ - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama - #endif - - #endif ---- a/nx-X11/programs/Xserver/Xext/panoramiX.c -+++ b/nx-X11/programs/Xserver/Xext/panoramiX.c -@@ -1045,16 +1045,7 @@ - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; --#if 1 -- { -- /* The following hack fools clients into thinking that Xinerama -- * is disabled even though it is not. */ -- extern Bool PanoramiXExtensionDisabledHack; -- rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack; -- } --#else - rep.state = !noPanoramiXExtension; --#endif - if (client->swapped) { - register int n; - swaps (&rep.sequenceNumber, n); ---- a/nx-X11/programs/Xserver/Xext/panoramiX.h -+++ b/nx-X11/programs/Xserver/Xext/panoramiX.h -@@ -44,7 +44,7 @@ - #define _PANORAMIX_H_ - - #include --#include "gcstruct.h" -+/*#include "gcstruct.h"*/ - - - typedef struct _PanoramiXData { diff --git a/debian/patches/series b/debian/patches/series index d9b63cce7..746c6ad43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -202_nx-X11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch 205_nxagent_refresh-adsl.full.patch -- cgit v1.2.3 From 4f5dc807a7a421aa0c5f52b84cd33ff41505de38 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:26:42 +0100 Subject: Add -norootlessexit cmdline option to nxagent (203_nxagent_disable-rootless-exit.full.patch). This change enables to launch an nxagent in rootless mode that waits forever for Xclients to appear. This feature got added when X2Go introduced Published Applications support. --- .../203_nxagent_disable-rootless-exit.full.patch | 63 ---------------------- debian/patches/series | 1 - 2 files changed, 64 deletions(-) delete mode 100644 debian/patches/203_nxagent_disable-rootless-exit.full.patch (limited to 'debian') diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch deleted file mode 100644 index 74579f4d8..000000000 --- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Add -norootlessexit cmdline option to nxagent -Author: Oleksandr Shneyder - ---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -672,6 +672,12 @@ - return 1; - } - -+ if (!strcmp(argv[i], "-norootlessexit")) { -+ nxagentChangeOption(NoRootlessExit, True); -+ return 1; -+ } -+ -+ - if (!strcmp(argv[i], "-noonce")) - { - nxagentOnce = False; -@@ -1855,6 +1861,7 @@ - ErrorF("The NX system adds the following arguments:\n"); - ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); - ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); -+ ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n"); - #ifdef RENDER - ErrorF("-norender disable the use of the render extension\n"); - ErrorF("-nocomposite disable the use of the composite extension\n"); ---- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c -@@ -219,7 +219,7 @@ - - if (nxagentOption(Rootless) && - nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 && -- now > nxagentLastWindowDestroyedTime + 30 * 1000) -+ now > nxagentLastWindowDestroyedTime + 30 * 1000 && !nxagentOption(NoRootlessExit)) - { - #ifdef WARNING - fprintf(stderr, "nxagentBlockHandler: No application running. Closing the session.\n"); ---- a/nx-X11/programs/Xserver/hw/nxagent/Options.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c -@@ -56,6 +56,7 @@ - nxagentOptions.Persistent = 1; - nxagentOptions.Rootless = UNDEFINED; - nxagentOptions.Fullscreen = UNDEFINED; -+ nxagentOptions.NoRootlessExit = False; - - nxagentOptions.X = 0; - nxagentOptions.Y = 0; ---- a/nx-X11/programs/Xserver/hw/nxagent/Options.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h -@@ -381,6 +381,13 @@ - - int ImageRateLimit; - -+ /* -+ * True if agent should not exit if there are no -+ * clients in rootless mode -+ */ -+ -+ int NoRootlessExit; -+ - } AgentOptionsRec; - - typedef AgentOptionsRec *AgentOptionsPtr; diff --git a/debian/patches/series b/debian/patches/series index 746c6ad43..424c3e990 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch 205_nxagent_refresh-adsl.full.patch 206_nxagent_clipboard-as-nxoption.full.patch -- cgit v1.2.3 From db870556433fd737640f7038e0583242724e2d52 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:29:53 +0100 Subject: Fix repainting of SolidFill pictures with libcairo > 1.12.x (204_nxagent_repaint-solidpict.full.patch). --- .../204_nxagent_repaint-solidpict.full.patch | 53 ---------------------- debian/patches/series | 1 - 2 files changed, 54 deletions(-) delete mode 100644 debian/patches/204_nxagent_repaint-solidpict.full.patch (limited to 'debian') diff --git a/debian/patches/204_nxagent_repaint-solidpict.full.patch b/debian/patches/204_nxagent_repaint-solidpict.full.patch deleted file mode 100644 index 139a46ad3..000000000 --- a/debian/patches/204_nxagent_repaint-solidpict.full.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: Fix repainting of SolidFill pictures with libcairo > 1.12.x -Author: Oleksandr Shneyder -diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c ---- a/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-05-16 18:05:07.000000000 +0200 -+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-09-20 20:53:37.893459269 +0200 -@@ -2689,11 +2689,17 @@ void nxagentReconnectPicture(pointer p0, - #endif - } - -- if (!pForm) -+ if (!pForm && pPicture->pSourcePict) - { -- *pBool = False; -- -- return; -+ /*possible we need to add support for other picture types, for example gradients...*/ -+ switch(pPicture->pSourcePict->type) -+ { -+ case SourcePictTypeSolidFill: -+ nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay, -+ (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor); -+ break; -+ } -+ return; - } - - #ifdef TEST -diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2010-11-11 21:18:00.000000000 +0100 -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2012-09-20 20:54:50.209817849 +0200 -@@ -1137,6 +1137,10 @@ CreateSolidPicture (Picture pid, xRender - } - pPicture->pSourcePict->type = SourcePictTypeSolidFill; - pPicture->pSourcePict->solidFill.color = xRenderColorToCard32(*color); -+ pPicture->pSourcePict->solidFill.fullColor.alpha=color->alpha; -+ pPicture->pSourcePict->solidFill.fullColor.red=color->red; -+ pPicture->pSourcePict->solidFill.fullColor.green=color->green; -+ pPicture->pSourcePict->solidFill.fullColor.blue=color->blue; - return pPicture; - } - -diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2010-10-22 16:04:24.000000000 +0200 -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2012-09-20 20:55:31.106020653 +0200 -@@ -95,6 +95,7 @@ typedef struct _PictTransform { - typedef struct _PictSolidFill { - unsigned int type; - CARD32 color; -+ xRenderColor fullColor; - } PictSolidFill, *PictSolidFillPtr; - - typedef struct _PictGradientStop { - diff --git a/debian/patches/series b/debian/patches/series index 424c3e990..82d5eb9aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -204_nxagent_repaint-solidpict.full.patch 205_nxagent_refresh-adsl.full.patch 206_nxagent_clipboard-as-nxoption.full.patch 207_nxagent_fix-xfixes-selection.full.patch -- cgit v1.2.3 From 35aab85c79200d861c906b691bf8b6be99d58590 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:32:12 +0100 Subject: Fix refresh errors on Win2012 RDP connections with speed=ADS (205_nxagent_refresh-adsl.full.patch). --- debian/patches/205_nxagent_refresh-adsl.full.patch | 14 -------------- debian/patches/series | 1 - 2 files changed, 15 deletions(-) delete mode 100644 debian/patches/205_nxagent_refresh-adsl.full.patch (limited to 'debian') diff --git a/debian/patches/205_nxagent_refresh-adsl.full.patch b/debian/patches/205_nxagent_refresh-adsl.full.patch deleted file mode 100644 index 4840ea7ce..000000000 --- a/debian/patches/205_nxagent_refresh-adsl.full.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix refresh errors on Win2012 RDP connections with speed=ADSL -Author: Oleksandr Shneyder -diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c ---- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c 2014-05-06 12:52:35.082288455 +0200 -+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c 2014-05-06 12:54:00.258710819 +0200 -@@ -339,7 +339,7 @@ FIXME: The popup could be synchronized w - */ - - if ((pDstDrawable -> type == DRAWABLE_PIXMAP && -- nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 2) -+ nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 3) - { - pClipRegion = nxagentCreateRegion(pSrcDrawable, NULL, srcx, srcy, - width, height); diff --git a/debian/patches/series b/debian/patches/series index 82d5eb9aa..4bbe897df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -205_nxagent_refresh-adsl.full.patch 206_nxagent_clipboard-as-nxoption.full.patch 207_nxagent_fix-xfixes-selection.full.patch 209_x2goagent_add-man-page.full.patch -- cgit v1.2.3 From 4ef611eea9b10ed5851abb990835ce73bbac6a9f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:33:51 +0100 Subject: Add -clipboard cmdline option to nxagent (206_nxagent_clipboard-as-nxoption.full.patch). --- .../206_nxagent_clipboard-as-nxoption.full.patch | 53 ---------------------- debian/patches/series | 1 - 2 files changed, 54 deletions(-) delete mode 100644 debian/patches/206_nxagent_clipboard-as-nxoption.full.patch (limited to 'debian') diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch deleted file mode 100644 index 12b51dc0e..000000000 --- a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch +++ /dev/null @@ -1,53 +0,0 @@ -Descripion: Add -clipboard cmdline option to nxagent -Author: Mike Gabriel - ---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -984,7 +984,7 @@ - - if (!strcmp(argv[i], "-clipboard")) - { -- if (!strcmp(argv[i+1], "both")) -+ if ((!strcmp(argv[i+1], "both")) || (!strcmp(argv[i+1], "1"))) - { - nxagentChangeOption(Clipboard, ClipboardBoth); - } -@@ -996,7 +996,7 @@ - { - nxagentChangeOption(Clipboard, ClipboardServer); - } -- else if (!strcmp(argv[i+1], "none")) -+ else if ((!strcmp(argv[i+1], "none")) || (!strcmp(argv[i+1], "1"))) - { - nxagentChangeOption(Clipboard, ClipboardNone); - } -@@ -1255,6 +1255,29 @@ - - return; - } -+ else if (strcmp(name, "clipboard") == 0) -+ { -+ if ((strcmp(value, "both") == 0) || (strcmp(value, "1") == 0)) -+ { -+ nxagentChangeOption(Clipboard, ClipboardBoth); -+ } -+ else if (strcmp(value, "client") == 0) -+ { -+ nxagentChangeOption(Clipboard, ClipboardClient); -+ } -+ else if (strcmp(value, "server") == 0) -+ { -+ nxagentChangeOption(Clipboard, ClipboardServer); -+ } -+ else if ((strcmp(value, "none") == 0) || (strcmp(value, "0") == 0)) -+ { -+ nxagentChangeOption(Clipboard, ClipboardNone); -+ } -+ else -+ { -+ nxagentChangeOption(Clipboard, ClipboardBoth); -+ } -+ } - else - { - #ifdef DEBUG diff --git a/debian/patches/series b/debian/patches/series index 4bbe897df..dbc6d9ce6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -206_nxagent_clipboard-as-nxoption.full.patch 207_nxagent_fix-xfixes-selection.full.patch 209_x2goagent_add-man-page.full.patch 210_nxagent_save_session_state.full.patch -- cgit v1.2.3 From 57a58c73cfe91c94d8a18a6e823bc687fab45d8f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 10 Feb 2015 19:36:57 +0100 Subject: Fix XFIXES selection handling (copy and paste via middle mouse button) (207_nxagent_fix-xfixes-selection.full.patch). When nxagent has the XFIXES extension enabled copy and paste from outside applications to applications within the session that rely on XFixesSelectSelectionInput (e.g. qt applications like konsole) did never receive any notifications because the nxagent did not register itself at the real X server to receive them. Fixes X2Go Bug #585 (http://bugs.x2go.org/585). --- .../207_nxagent_fix-xfixes-selection.full.patch | 33 ---------------------- debian/patches/series | 1 - 2 files changed, 34 deletions(-) delete mode 100644 debian/patches/207_nxagent_fix-xfixes-selection.full.patch (limited to 'debian') diff --git a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch b/debian/patches/207_nxagent_fix-xfixes-selection.full.patch deleted file mode 100644 index 712b36914..000000000 --- a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix XFIXES selection handling (copy and paste via middle mouse button). -Abstract: - When nxagent has the XFIXES extension enabled copy and - paste from outside applications to applications within the session - that rely on XFixesSelectSelectionInput (e.g. qt applications like - konsole) did never receive any notifications because the nxagent did - not register itself at the real X server to receive them. Fixes Bug - #585. -Author: Ulrich Sibiller - -Index: nx-libs/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -=================================================================== ---- nx-libs.orig/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c 2014-11-04 22:42:50.893569624 +0100 -+++ nx-libs/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c 2014-11-04 22:42:50.893569624 +0100 -@@ -1556,10 +1556,14 @@ - fprintf(stderr, "nxagentInitClipboard: Registering for XFixesSelectionNotify events.\n"); - #endif - -- XFixesSelectSelectionInput(nxagentDisplay, iWindow, nxagentClipboardAtom, -- XFixesSetSelectionOwnerNotifyMask | -- XFixesSelectionWindowDestroyNotifyMask | -- XFixesSelectionClientCloseNotifyMask); -+ for (i = 0; i < nxagentMaxSelections; i++) -+ { -+ XFixesSelectSelectionInput(nxagentDisplay, iWindow, -+ lastSelectionOwner[i].selection, -+ XFixesSetSelectionOwnerNotifyMask | -+ XFixesSelectionWindowDestroyNotifyMask | -+ XFixesSelectionClientCloseNotifyMask); -+ } - - nxagentXFixesInfo.Initialized = 1; - } diff --git a/debian/patches/series b/debian/patches/series index dbc6d9ce6..4ebb735ca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -207_nxagent_fix-xfixes-selection.full.patch 209_x2goagent_add-man-page.full.patch 210_nxagent_save_session_state.full.patch 210_nxcomp_save_session_state.full+lite.patch -- cgit v1.2.3 From 4a6ccd5037c8410f24dc177c9286272c2f47cd9d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 19:38:45 +0100 Subject: Add x2goagent man page (209_x2goagent_add-man-page.full.patch). --- .../patches/209_x2goagent_add-man-page.full.patch | 41 ---------------------- debian/patches/series | 1 - 2 files changed, 42 deletions(-) delete mode 100644 debian/patches/209_x2goagent_add-man-page.full.patch (limited to 'debian') diff --git a/debian/patches/209_x2goagent_add-man-page.full.patch b/debian/patches/209_x2goagent_add-man-page.full.patch deleted file mode 100644 index 310fa87d6..000000000 --- a/debian/patches/209_x2goagent_add-man-page.full.patch +++ /dev/null @@ -1,41 +0,0 @@ -Description: Add x2goagent man page -Author: Mike Gabriel - ---- /dev/null -+++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 -@@ -0,0 +1,35 @@ -+.TH x2goagent 1 -+.SH NAME -+x2goagent \- X2Go Agent. -+.SH SYNOPSIS -+.B x2goagent -+.I "[options]" -+ -+.SH DESCRIPTION -+\fBx2goagent\fR is an Xnest-like X server for remote application/desktop access. -+.PP -+\fBx2goagent\fR implements a very efficient compression of the X11 protocol. -+.PP -+This increases performance when using X applications over high latency and -+low bandwidth networks, while providing a local (LAN-like) usage experience -+even if connecting from off-site locations (via cable modem or GSM). -+.PP -+\fBx2goagent\fR is not designed to be used as a standalone application. -+It has to be launched on the server side by the X2Go server software. -+.PP -+Available clients are -+\fBx2goclient\fR, \fBpyhoca-gui\fR and \fBpyhoca-gui\fR (using the -+Python X2Go API). -+ -+.SH OPTIONS -+.TP -+.B \--help -+Lists all others options that are not listed here. -+ -+.SH FURTHER READINGS -+Information on X2Go: http://wiki.x2go.org -+.PP -+Information on NX: http://www.nomachine.com -+ -+.SH AUTHOR -+This manual page was written by Mike Gabriel . diff --git a/debian/patches/series b/debian/patches/series index 4ebb735ca..48b9abddc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -209_x2goagent_add-man-page.full.patch 210_nxagent_save_session_state.full.patch 210_nxcomp_save_session_state.full+lite.patch 211_nxcomp_set_default_options.full+lite.patch -- cgit v1.2.3 From 8c1b852abf692af4898368132292eb8c7278a7c2 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:43:41 +0100 Subject: Save session state in file. 210_nxagent_save_session_state.full.patch 210_nxcomp_save_session_state.full+lite.patch This patch adds a "state" option to NX (agent) which allows one to specify a file where nxagent will write its session state into. --- .../210_nxagent_save_session_state.full.patch | 176 --------------------- .../210_nxcomp_save_session_state.full+lite.patch | 15 -- debian/patches/series | 2 - 3 files changed, 193 deletions(-) delete mode 100644 debian/patches/210_nxagent_save_session_state.full.patch delete mode 100644 debian/patches/210_nxcomp_save_session_state.full+lite.patch (limited to 'debian') diff --git a/debian/patches/210_nxagent_save_session_state.full.patch b/debian/patches/210_nxagent_save_session_state.full.patch deleted file mode 100644 index 223d0bc7a..000000000 --- a/debian/patches/210_nxagent_save_session_state.full.patch +++ /dev/null @@ -1,176 +0,0 @@ -Description: Save session state in file -Author: Oleksandr Shneyder - ---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -60,6 +60,7 @@ - #endif - #include "Handlers.h" - #include "Error.h" -+#include "Reconnect.h" - - /* - * NX includes and definitions. -@@ -1090,6 +1091,11 @@ - - return; - } -+ else if (!strcmp(name, "state")) -+ { -+ setStatePath(value); -+ return; -+ } - else if (!strcmp(name, "fullscreen")) - { - if (nxagentReconnectTrap == True) -@@ -1369,6 +1375,11 @@ - validateString(nxagentOptionFile)); - #endif - -+ /* -+ * Init statePath -+ */ -+ setStatePath(""); -+ - if (nxagentOptionFile == NULL) - { - return; ---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -63,7 +63,7 @@ - - #include "NX.h" - #include "NXlib.h" -- -+#include "Reconnect.h" - /* - * Set here the required log level. - */ -@@ -233,6 +233,7 @@ - fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid()); - - fprintf(stderr, "Session: Starting session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("STARTING"); - } - - /* ---- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c -@@ -118,6 +118,33 @@ - - static enum RECONNECTION_STEP failedStep; - -+#include -+ -+/* -+ * Path of state File -+ */ -+char stateFile[PATH_MAX]; -+ -+ -+void setStatePath(char* path) -+{ -+ strncpy(stateFile, path, PATH_MAX-1); -+} -+ -+void saveAgentState(char* state) -+{ -+ FILE* fptr; -+ if(strlen(stateFile)) -+ { -+ fptr=fopen(stateFile, "w"); -+ if(!fptr) -+ return; -+ fprintf(fptr,"%s", state); -+ fclose(fptr); -+ } -+} -+ -+ - int nxagentHandleConnectionStates(void) - { - #ifdef TEST -@@ -211,6 +238,7 @@ - fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString()); - - fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("SUSPENDING"); - } - - nxagentDisconnectSession(); -@@ -265,6 +293,7 @@ - fprintf(stderr, "Session: Session suspended at '%s'.\n", GetTimeAsString()); - #endif - } -+ saveAgentState("SUSPENDED"); - - nxagentResetDisplayHandlers(); - -@@ -622,6 +651,7 @@ - #else - fprintf(stderr, "Session: Session resumed at '%s'.\n", GetTimeAsString()); - #endif -+ saveAgentState("RUNNING"); - - nxagentRemoveSplashWindow(NULL); - -@@ -785,12 +815,14 @@ - if (nxagentSessionState == SESSION_GOING_DOWN) - { - fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("SUSPENDING"); - - nxagentDisconnectSession(); - } - else if (nxagentSessionState == SESSION_GOING_UP) - { - fprintf(stderr, "Session: Resuming session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("RESUMING"); - - if (nxagentReconnectSession()) - { -@@ -803,6 +835,7 @@ - fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString()); - - fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("SUSPENDING"); - - nxagentDisconnectSession(); - } ---- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h -@@ -34,6 +34,8 @@ - Bool nxagentReconnectSession(void); - int nxagentHandleConnectionStates(void); - void nxagentHandleConnectionChanges(void); -+void setStatePath(char*); -+void saveAgentState(char*); - - enum SESSION_STATE - { ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c -@@ -609,6 +609,7 @@ - #endif - - nxagentSessionState = SESSION_UP; -+ saveAgentState("RUNNING"); - } - - #ifdef BLOCKS -@@ -823,6 +824,7 @@ - */ - - fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString()); -+ saveAgentState("TERMINATING"); - - nxagentWaitDisplay(); - -@@ -833,6 +835,7 @@ - { - NXShadowDestroy(); - } -+ saveAgentState("TERMINATED"); - - KillAllClients(); - DEALLOCATE_LOCAL(clientReady); diff --git a/debian/patches/210_nxcomp_save_session_state.full+lite.patch b/debian/patches/210_nxcomp_save_session_state.full+lite.patch deleted file mode 100644 index 1ef4440d8..000000000 --- a/debian/patches/210_nxcomp_save_session_state.full+lite.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Ignore state= option in nxproxy/nxcomp -Author: Oleksandr Shneyder - ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -8872,7 +8872,8 @@ - } - else if (strcasecmp(name, "defer") == 0 || - strcasecmp(name, "tile") == 0 || -- strcasecmp(name, "menu") == 0) -+ strcasecmp(name, "menu") == 0 || -+ strcasecmp(name, "state") == 0 ) - { - #ifdef DEBUG - *logofs << "Loop: Ignoring agent option '" << name diff --git a/debian/patches/series b/debian/patches/series index 48b9abddc..9e0e64701 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -210_nxagent_save_session_state.full.patch -210_nxcomp_save_session_state.full+lite.patch 211_nxcomp_set_default_options.full+lite.patch 212_nxcomp_build-on-Android.full+lite.patch 220_nxproxy_bind-loopback-only.full+lite.patch -- cgit v1.2.3 From 46c2aebca5196ad4c10bb4f6f2558d656c22f5d9 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:46:04 +0100 Subject: Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch). --- .../211_nxcomp_set_default_options.full+lite.patch | 27 ---------------------- debian/patches/series | 1 - 2 files changed, 28 deletions(-) delete mode 100644 debian/patches/211_nxcomp_set_default_options.full+lite.patch (limited to 'debian') diff --git a/debian/patches/211_nxcomp_set_default_options.full+lite.patch b/debian/patches/211_nxcomp_set_default_options.full+lite.patch deleted file mode 100644 index 7bd8a781d..000000000 --- a/debian/patches/211_nxcomp_set_default_options.full+lite.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Set default pack and link options to avoid damage of session. -Author: Oleksandr Shneyder - ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -8328,8 +8328,8 @@ - - cerr << "Error" << ": Can't identify 'link' option in string '" - << value << "'.\n"; -- -- return -1; -+ if (ParseLinkOption("adsl") < 0) -+ return -1; - } - } - else if (strcasecmp(name, "limit") == 0) -@@ -8783,8 +8783,8 @@ - - cerr << "Error" << ": Can't identify pack method for string '" - << value << "'.\n"; -- -- return -1; -+ if (ParsePackOption("nopack")<0) -+ return -1; - } - } - else if (strcasecmp(name, "core") == 0) diff --git a/debian/patches/series b/debian/patches/series index 9e0e64701..0174ca194 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -211_nxcomp_set_default_options.full+lite.patch 212_nxcomp_build-on-Android.full+lite.patch 220_nxproxy_bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch -- cgit v1.2.3 From 79f218b563f6a4d3b17e92ee85ad242575daf8da Mon Sep 17 00:00:00 2001 From: Nito Martinez Date: Tue, 10 Feb 2015 19:47:58 +0100 Subject: Fix FTBFS of nxproxy/nxcomp on Android (212_nxcomp_build-on-Android.full+lite.patch). --- .../212_nxcomp_build-on-Android.full+lite.patch | 253 --------------------- debian/patches/series | 1 - 2 files changed, 254 deletions(-) delete mode 100644 debian/patches/212_nxcomp_build-on-Android.full+lite.patch (limited to 'debian') diff --git a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch b/debian/patches/212_nxcomp_build-on-Android.full+lite.patch deleted file mode 100644 index 528d33b74..000000000 --- a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch +++ /dev/null @@ -1,253 +0,0 @@ -Author: Nito Martinez -Description: Fix FTBFS of nxproxy/nxcomp on Android - ---- a/nxcomp/Jpeg.cpp -+++ b/nxcomp/Jpeg.cpp -@@ -17,6 +17,9 @@ - - #include - -+#ifdef ANDROID -+#include -+#endif - #include - #include - #include ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -4187,7 +4187,7 @@ - - #endif - -- char *separator = rindex(display, ':'); -+ char *separator = strrchr(display, ':'); - - if ((separator == NULL) || !isdigit(*(separator + 1))) - { -@@ -8240,7 +8240,7 @@ - char *name; - char *value; - -- value = rindex(nextOpts, ':'); -+ value = strrchr(nextOpts, ':'); - - if (value != NULL) - { -@@ -11010,7 +11010,7 @@ - packMethod == PACK_LOSSLESS || - packMethod == PACK_ADAPTIVE) - { -- const char *dash = rindex(opt, '-'); -+ const char *dash = strrchr(opt, '-'); - - if (dash != NULL && strlen(dash) == 2 && - *(dash + 1) >= '0' && *(dash + 1) <= '9') -@@ -12275,6 +12275,10 @@ - control -> ShmemServer = 0; - } - -+ // For android, no shared memory available -+ control -> ShmemServer = 0; -+ control -> ShmemClientSize = 0; -+ - return 1; - } - -@@ -13525,7 +13529,7 @@ - - int newPort = port; - -- const char *separator = rindex(opt, ':'); -+ const char *separator = strrchr(opt, ':'); - - if (separator != NULL) - { ---- a/nxcomp/Pgn.cpp -+++ b/nxcomp/Pgn.cpp -@@ -23,6 +23,9 @@ - - #include - -+#ifdef ANDROID -+#include -+#endif - #include - #include - #include ---- a/nxcomp/Proxy.cpp -+++ b/nxcomp/Proxy.cpp -@@ -20,6 +20,11 @@ - #include - #include - #include -+#ifdef ANDROID -+#include -+#include -+#include -+#endif - - #include "Misc.h" - -@@ -31,9 +36,11 @@ - #include - #endif - -+#ifndef ANDROID - #include - #include - #include -+#endif - - #if defined(__EMX__ ) || defined(__CYGWIN32__) - ---- a/nxcomp/ServerChannel.cpp -+++ b/nxcomp/ServerChannel.cpp -@@ -18,7 +18,9 @@ - #include - #include - #include -+#ifndef ANDROID - #include -+#endif - - #include - #include -@@ -1079,7 +1081,6 @@ - - priority_++; - } -- - // - // Account this data to the original opcode. - // -@@ -1500,7 +1501,6 @@ - continue; - } - } -- - // - // Check if user pressed the CTRL+ALT+SHIFT+ESC key - // sequence because was unable to kill the session -@@ -5475,7 +5475,7 @@ - *logofs << "handleColormap: Dumping colormap entries:\n" - << logofs_flush; - -- const unsigned char *p = unpackState_[resource] -> colormap -> data; -+ const unsigned char *p = (const unsigned char *) unpackState_[resource] -> colormap -> data; - - for (unsigned int i = 0; i < unpackState_[resource] -> - colormap -> entries; i++) -@@ -7100,7 +7100,12 @@ - { - encodeBuffer.encodeValue(stage, 2); - -+#ifndef ANDROID - shmemState_ -> present = *(buffer + 8); -+#else -+ shmemState_ -> present = 0; -+ cerr << "Info: handleShmemReply: In android no shared memory. Setting present to 0 hardcoded\n"; -+#endif - shmemState_ -> opcode = *(buffer + 9); - shmemState_ -> event = *(buffer + 10); - shmemState_ -> error = *(buffer + 11); -@@ -7128,7 +7133,12 @@ - cerr << "Info" << ": Using shared memory parameters 1/" - << (shmemState_ -> size / 1024) << "K.\n"; - -+#ifndef ANDROID - shmemState_ -> enabled = 1; -+#else -+ cerr << "Info: handleShmemReply: In android no shared memory. Setting enabled to -1. This should not be displayed\n"; -+ shmemState_ -> enabled = -1; -+#endif - - encodeBuffer.encodeBoolValue(1); - } -@@ -7241,7 +7251,7 @@ - // memory support is disabled by the - // user. - // -- -+#ifndef ANDROID - if (control -> ShmemServer == 1 && - control -> ShmemServerSize > 0 && - enableServer == 1) -@@ -7252,8 +7262,12 @@ - { - memcpy(buffer + 8, "NO-MIT-", 7); - } -+#else -+ cerr << "Info: handleShmemRequest: In android no shared memory. Returning NO-MIT- answer\n"; - -- sequenceQueue_.push(clientSequence_, opcode, -+ memcpy(buffer + 8, "NO-MIT-", 7); -+#endif -+ sequenceQueue_.push(clientSequence_, opcode, - opcodeStore_ -> getShmemParameters, stage); - - // -@@ -7289,9 +7303,13 @@ - - shmemState_ -> size = control -> ShmemServerSize; - -+#ifndef ANDROID - shmemState_ -> id = shmget(IPC_PRIVATE, shmemState_ -> size, - IPC_CREAT | permissions); -- -+#else -+ cerr << "Info: handleShmemReqyest: In android no shared memory (shmget). This message should not be displayed present should never be 1 in android\n"; -+ shmemState_ -> id = -1; -+#endif - if (shmemState_ -> id >= 0) - { - #if defined(TEST) || defined(INFO) -@@ -7302,8 +7320,12 @@ - #endif - - -+#ifndef ANDROID - shmemState_ -> address = shmat(shmemState_ -> id, 0, 0); -- -+#else -+ cerr << "Info: handleShmemReqyest: In android no shared memory (shmat). This message should not be displayed. present should never be 1 in android\n"; -+ shmemState_ -> address = NULL; -+#endif - if (shmemState_ -> address != NULL) - { - #ifdef TEST -@@ -7437,6 +7459,10 @@ - - return 0; - } -+#ifdef ANDROID -+ cerr << "Info: handleShmem: In android no shared memory. enabled should never be 1. This should not be displayed\n"; -+ return 0; -+#endif - - // - // Ignore null requests and requests that will not result -@@ -8054,14 +8080,22 @@ - { - if (shmemState_ != NULL) - { -- if (shmemState_ -> address != NULL) -+ if (shmemState_ -> address != NULL) - { -- shmdt((char *) shmemState_ -> address); -+#ifndef ANDROID -+ shmdt((char *) shmemState_ -> address); -+#else -+ cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. address should always be NULL\n"; -+#endif - } - - if (shmemState_ -> id > 0) - { -+#ifndef ANDROID - shmctl(shmemState_ -> id, IPC_RMID, 0); -+#else -+ cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. id should always be 0\n"; -+#endif - } - - delete shmemState_; diff --git a/debian/patches/series b/debian/patches/series index 0174ca194..b6a467730 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -212_nxcomp_build-on-Android.full+lite.patch 220_nxproxy_bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch -- cgit v1.2.3 From 1be1c4a21bb54e60ec60456374d9ef55aaf55e2f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 10 Feb 2015 21:11:27 +0100 Subject: Force NX proxy to bind to loopback devices only (loopback option) (220_nxproxy_bind-loopback-only.full+lite.patch). --- .../220_nxproxy_bind-loopback-only.full+lite.patch | 130 --------------------- debian/patches/series | 1 - 2 files changed, 131 deletions(-) delete mode 100644 debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch (limited to 'debian') diff --git a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch b/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch deleted file mode 100644 index c65b85501..000000000 --- a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch +++ /dev/null @@ -1,130 +0,0 @@ -Description: Force NX proxy to bind to loopback devices only (loopback option) -Author: Mike Gabriel ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -952,6 +952,7 @@ - static char displayHost[DEFAULT_STRING_LENGTH] = { 0 }; - static char authCookie[DEFAULT_STRING_LENGTH] = { 0 }; - -+static int loopbackBind = DEFAULT_LOOPBACK_BIND; - static int proxyPort = DEFAULT_NX_PROXY_PORT; - static int xPort = DEFAULT_NX_X_PORT; - -@@ -3959,7 +3960,14 @@ - - tcpAddr.sin_family = AF_INET; - tcpAddr.sin_port = htons(proxyPortTCP); -- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ if ( loopbackBind ) -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); -+ } -+ else -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ } - - if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1) - { -@@ -4550,7 +4558,14 @@ - - tcpAddr.sin_family = AF_INET; - tcpAddr.sin_port = htons(portTCP); -- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ if ( loopbackBind ) -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); -+ } -+ else -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ } - - if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1) - { -@@ -6718,7 +6733,14 @@ - - #ifdef __APPLE__ - -- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ if ( loopbackBind ) -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); -+ } -+ else -+ { -+ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); -+ } - - #else - -@@ -8397,6 +8419,10 @@ - - listenPort = ValidateArg("local", name, value); - } -+ else if (strcasecmp(name, "loopback") == 0) -+ { -+ loopbackBind = ValidateArg("local", name, value); -+ } - else if (strcasecmp(name, "accept") == 0) - { - if (*connectHost != '\0') -@@ -13778,7 +13804,14 @@ - } - else - { -- address = htonl(INADDR_ANY); -+ if ( loopbackBind ) -+ { -+ address = htonl(INADDR_LOOPBACK); -+ } -+ else -+ { -+ address = htonl(INADDR_ANY); -+ } - } - } - else ---- a/nxcomp/Misc.cpp -+++ b/nxcomp/Misc.cpp -@@ -42,6 +42,14 @@ - #undef DEBUG - - // -+// By default nxproxy binds to all network interfaces, setting -+// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback -+// device only. -+// -+ -+const int DEFAULT_LOOPBACK_BIND = 0; -+ -+// - // TCP port offset applied to any NX port specification. - // - -@@ -137,6 +145,8 @@ - \n\ - listen=n Local port used for accepting the proxy connection.\n\ - \n\ -+ loopback=b Bind to the loopback device only.\n\ -+\n\ - accept=s Name or IP of host that can connect to the proxy.\n\ - \n\ - connect=s Name or IP of host that the proxy will connect to.\n\ ---- a/nxcomp/Misc.h -+++ b/nxcomp/Misc.h -@@ -90,6 +90,14 @@ - extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET; - - // -+// NX proxy binds to all network interfaces by default -+// With the -loopback parameter, you can switch -+// over to binding to the loopback device only. -+// -+ -+extern const int DEFAULT_LOOPBACK_BIND; -+ -+// - // Return strings containing various info. - // - diff --git a/debian/patches/series b/debian/patches/series index b6a467730..30ed936f9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -220_nxproxy_bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch 302_nx-X11_xkbbasedir-detection.full.patch -- cgit v1.2.3 From 1e99734ec8862a68b8f46cf6714d269fff625ec3 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 21:45:19 +0100 Subject: Set WM_CLASS to X2GoAgent/NXAgent (300_nxagent_set-wm-class.full.patch). Depending on the binary name of the agent either NXAgent or X2GoAgent is set as WM_Class. This is needed for some window managers (like the one shipped with Maemo) The original WM_CLASS patch has been taken from the FreeNX patch series, author unknown. The nxagent/x2goagent has been done by the X2Go Project, author see below. --- debian/patches/300_nxagent_set-wm-class.full.patch | 60 ---------------------- debian/patches/series | 1 - 2 files changed, 61 deletions(-) delete mode 100644 debian/patches/300_nxagent_set-wm-class.full.patch (limited to 'debian') diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/300_nxagent_set-wm-class.full.patch deleted file mode 100644 index 70b1c9212..000000000 --- a/debian/patches/300_nxagent_set-wm-class.full.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Set WM_CLASS to X2GoAgent/NXAgent - Depending on the binary name of the agent either NXAgent - or X2GoAgent is set as WM_Class. - . - This is needed for some window managers (like the one shipped with - Maemo) - . - The original WM_CLASS patch has been taken from the FreeNX patch - series, author unknown. - . - The nxagent/x2goagent has been done by the X2Go Project, author - see below. -Forwarded: not-needed -Author: Oleksandr Shneyder -Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1762,6 +1762,42 @@ - nxagentDefaultWindows[pScreen->myNum]); - #endif - -+ /* -+ * Setting WM_CLASS to "X2GoAgent" when running in X2Go Agent mode -+ * we need it to properly display all window parameters by some WMs -+ * (for example on Maemo) -+ */ -+ if(nxagentX2go) -+ { -+ #ifdef TEST -+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", -+ nxagentDefaultWindows[pScreen->myNum]); -+ #endif -+ XClassHint hint; -+ hint.res_name=malloc(strlen("X2GoAgent")+1); -+ hint.res_class=malloc(strlen("X2GoAgent")+1); -+ strcpy(hint.res_name,"X2GoAgent"); -+ strcpy(hint.res_class,"X2GoAgent"); -+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); -+ free(hint.res_name); -+ free(hint.res_class); -+ } else { -+ #ifdef TEST -+ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n", -+ nxagentDefaultWindows[pScreen->myNum]); -+ #endif -+ -+ XClassHint hint; -+ hint.res_name=malloc(strlen("NXAgent")+1); -+ hint.res_class=malloc(strlen("NXAgent")+1); -+ strcpy(hint.res_name,"NXAgent"); -+ strcpy(hint.res_class,"NXAgent"); -+ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint); -+ free(hint.res_name); -+ free(hint.res_class); -+ } -+ -+ - if (nxagentOption(Fullscreen)) - { - nxagentFullscreenWindow = nxagentDefaultWindows[pScreen->myNum]; diff --git a/debian/patches/series b/debian/patches/series index 30ed936f9..503a51155 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch 302_nx-X11_xkbbasedir-detection.full.patch 320_nxagent_configurable-keystrokes.full.patch -- cgit v1.2.3 From 6fc37fa762efc55e5d59158eb180cfe1c0405b26 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2015 21:47:31 +0100 Subject: Use shared libraries (301_nx-X11_use-shared-libs.full.patch). Many distributions have a policy to reduce code duplications. One means to avoid such duplications is to use shared libraries instead of using libs that are ofter shipped for convenience. Fedora: http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries Debian (Section 10.7.4 of Debian policy): http://www.debian.org/doc/debian-policy/ch-files.html --- .../patches/301_nx-X11_use-shared-libs.full.patch | 106 --------------------- debian/patches/series | 1 - 2 files changed, 107 deletions(-) delete mode 100644 debian/patches/301_nx-X11_use-shared-libs.full.patch (limited to 'debian') diff --git a/debian/patches/301_nx-X11_use-shared-libs.full.patch b/debian/patches/301_nx-X11_use-shared-libs.full.patch deleted file mode 100644 index 200147449..000000000 --- a/debian/patches/301_nx-X11_use-shared-libs.full.patch +++ /dev/null @@ -1,106 +0,0 @@ -Description: Use shared libraries - Many distributions have a policy to reduce code duplications. - One means to avoid such duplications is to use shared libraries - instead of using libs that are ofter shipped for convenience. - . - Fedora: - http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries - . - Debian (Section 10.7.4 of Debian policy): - http://www.debian.org/doc/debian-policy/ch-files.html -Forwarded: pending... -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- - nx-X11/config/cf/host.def | 11 ++++++----- - nx-X11/programs/Xserver/Imakefile | 6 +++--- - nx-X11/programs/nxauth/Imakefile | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) - -Index: nx-X11/config/cf/host.def -=================================================================== ---- a/nx-X11/config/cf/host.def -+++ b/nx-X11/config/cf/host.def -@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - #define BuildRenderLibrary YES - #define SharedLibFreetype2 YES - #define NormalLibFreetype2 YES --#define FontLibSharedFreeType NO -+#define FontLibSharedFreeType YES - #endif - - /* -@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - * - #define XserverStaticFontLib NO - */ -+#define XserverStaticFontLib YES - - /* - * To enable binary compatibility with previous versions of the font -@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - #define BuildXKB YES - #define BuildXKBlib YES - --#define SharedLibXau NO -+#define SharedLibXau YES - - /* - * If you are running NetBSD 0.9C or later, and have the aperture driver -@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - #define BuildXterm YES - */ - --#define SharedLibXau NO -+#define SharedLibXau YES - --#define SharedLibXdmcp NO -+#define SharedLibXdmcp YES - - #define BuildXaw7 YES - -@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - #define BuildFontServer NO - #define BuildFreeType NO - #define BuildXTrueType NO --#define FontLibSharedFreeType NO -+#define FontLibSharedFreeType YES - #endif - - #if !defined(NXZaurusXServer) && defined(NXiPAQXServer) -Index: nx-X11/programs/Xserver/Imakefile -=================================================================== ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS - #if defined(SunArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp - #elif defined(cygwinArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp - #endif - - #endif -Index: nx-X11/programs/nxauth/Imakefile -=================================================================== ---- a/nx-X11/programs/nxauth/Imakefile -+++ b/nx-X11/programs/nxauth/Imakefile -@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakef - - INCLUDES=-I../../lib - DEPLIBS = $(DEPXAUTHLIB) -- LOCAL_LIBRARIES = ../../exports/lib/libXau.a -+ LOCAL_LIBRARIES = $(XAUTHLIB) - SRCS = xauth.c gethost.c process.c parsedpy.c - OBJS = xauth.o gethost.o process.o parsedpy.o - CONN_DEFINES = $(CONNECTION_FLAGS) diff --git a/debian/patches/series b/debian/patches/series index 503a51155..a901010c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -301_nx-X11_use-shared-libs.full.patch 302_nx-X11_xkbbasedir-detection.full.patch 320_nxagent_configurable-keystrokes.full.patch 321_nxagent_x2go-specific-keystroke-config.full.patch -- cgit v1.2.3 From 4436e97903aa6e2a7732fb98dcb46758a73fe130 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Wed, 11 Feb 2015 19:02:57 -0500 Subject: Fix build when LDFLAGS (etc) contains spaces. Was needed and was tested on Ubuntu 14.04. --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index b8e4ad4e1..e406f56e7 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,10 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS --export=cmdline) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS --export=cmdline) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS --export=cmdline) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS --export=cmdline) export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- cgit v1.2.3 From a7cc4edef158a1d7c02eb074baf74b7bd3cb0fec Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 12 Feb 2015 09:59:12 +0100 Subject: Remove upstream nx-libs ChangeLog during override_dh_clean. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bbd4372d9..00523babe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium etc/x2goagent.keyboard) before dh_auto_build. + Add to B-D: expat. + Install upstream ChangeLogs into bin:packages. + + Remove upstream nx-libs ChangeLog during override_dh_clean. * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do diff --git a/debian/rules b/debian/rules index e406f56e7..1a9b12341 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure rm -f nx*/changelog + rm -f doc/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi -- cgit v1.2.3 From d569145e640c40ea4cccbdd8703a254618b10c73 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 12 Feb 2015 09:59:57 +0100 Subject: Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. --- debian/Makefile.nx-libs | 6 ++++-- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index e85f40447..3aeda739b 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -60,10 +60,12 @@ install: install-lite: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for f in nxproxy; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done + mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/ + mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/ + for f in nxproxy; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ diff --git a/debian/changelog b/debian/changelog index 00523babe..515186119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Makefile.nx-libs: Don't allow symlinks to point into buildroot. * Makefile.nx-libs: Install man pages via main Makefile. * Add Description: and Author: fields to various patch headers. + * Makefile.nx-libs: Run make install for nxproxy first, then create the + wrapper script. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in -- cgit v1.2.3 From fa8fb728824ab71cf578b1463e0daddc601f5fc8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 12 Feb 2015 10:07:40 +0100 Subject: changelog: add 3.5.0.x entry for commit 4436e97 --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 515186119..369440453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). + [ Michael DePaulo ] + * debian/rules: + + Fix build for LDFLAGS containing spaces. + [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. -- cgit v1.2.3 From 08114b1e41f4128cd753217bdb4e037d4be64140 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 1 Feb 2015 22:27:06 +0100 Subject: Fix patch rollout in tarball --- debian/roll-tarballs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index a8d3cf63f..3ff7667f7 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -82,9 +82,9 @@ mkdir -p doc/applied-patches # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - find debian/patches | sort | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file do - cp -v $file doc/applied-patches + cp -v debian/patches/$file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done mkdir -p ./etc/ @@ -96,9 +96,9 @@ else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - find debian/patches | sort | egrep "(debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file + cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file do - cp -v $file doc/applied-patches + cp -v debian/patches/$file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done fi -- cgit v1.2.3 From a43c49594ca0c894cdc460f6b5c538122b6c224d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Feb 2015 05:11:09 +0100 Subject: update changelog --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 369440453..a8c2480f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,18 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. - Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/ folder lists in text files named debian/CODE-REDUCTION_*. + - Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by + the NX code reduction effort. + - Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build + process. + - Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't + patch files matter to the NX code reduction efforts. + - Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in + NX code tree. + - Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch, + 018_nx-X11_update-libtool-ltmain-script.full.patch, + 019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files + that are not used at build time. * Debian/Ubuntu packaging: + Fully rework the way nx-libs gets packaged for Debian/Ubuntu. -- cgit v1.2.3 From 4dc1bd0043aed6b92526cbda26991be1f611a121 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 13 Feb 2015 09:49:52 +0100 Subject: Test for xkb/rules/base instead of xkb/keymap.dir for setting XkbBaseDir (302_nx-X11_xkbbasedir-detection.full.patch). In recent (as of 2014/06) X.org release, the keymap.dir file has become obsolete. Let's test for the xkb/rules/base file instead. --- .../302_nx-X11_xkbbasedir-detection.full.patch | 84 ---------------------- debian/patches/series | 1 - 2 files changed, 85 deletions(-) delete mode 100644 debian/patches/302_nx-X11_xkbbasedir-detection.full.patch (limited to 'debian') diff --git a/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch b/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch deleted file mode 100644 index dac3d8a08..000000000 --- a/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch +++ /dev/null @@ -1,84 +0,0 @@ -Description: Test for xkb/rules/base instead of xkb/keymap.dir for setting XkbBaseDir -Author: Mike Gabriel -Abstract: - In recent (as of 2014/06) X.org release, the keymap.dir file - has become obsolete. Let's test for the xkb/rules/base file - instead. ---- a/nx-X11/programs/Xserver/xkb/ddxLoad.c -+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c -@@ -180,7 +180,7 @@ - - #define NX_XKB_BASE_DIRECTORY "/usr/lib/X11/xkb" - #define NX_XKB_ALTERNATE_BASE_DIRECTORY "/usr/share/X11/xkb" --#define NX_KEYMAP_DIR_FILE "keymap.dir" -+#define NX_XKB_RULES_BASE_FILE "rules/base" - #define NX_ALT_XKBCOMP_PATH "/usr/bin" - - static char _NXXkbBasePath[PATH_MAX]; -@@ -189,43 +189,43 @@ - static int NXVerifyXkbBaseDirectory(const char *dirPath) - { - int size; -- char *keymapDirFilePath; -- struct stat keymapDirFileStat; -+ char *rulesBaseFilePath; -+ struct stat rulesBaseFileStat; - - /* -- * If keymap.dir file -- * is not present into -- * Xkb Base Directory, -+ * If rules/base file -+ * is not present inside -+ * the Xkb Base Directory, - * we suppose that the - * path is not valid. - */ - - size = strlen(dirPath) + strlen("/") + -- strlen(NX_KEYMAP_DIR_FILE) + 1; -+ strlen(NX_XKB_RULES_BASE_FILE) + 1; - -- if ((keymapDirFilePath = malloc((size + 1) * sizeof(char))) == NULL) -+ if ((rulesBaseFilePath = malloc((size + 1) * sizeof(char))) == NULL) - { - FatalError("NXVerifyXkbBaseDirectory: malloc failed.\n"); - } - -- strcpy(keymapDirFilePath, dirPath); -- strcat(keymapDirFilePath, "/"); -- strcat(keymapDirFilePath, NX_KEYMAP_DIR_FILE); -+ strcpy(rulesBaseFilePath, dirPath); -+ strcat(rulesBaseFilePath, "/"); -+ strcat(rulesBaseFilePath, NX_XKB_RULES_BASE_FILE); - - #ifdef TEST - fprintf(stderr, "NXVerifyXkbBaseDirectory: Looking for [%s] file.\n", -- keymapDirFilePath); -+ rulesBaseFilePath); - #endif - -- if (stat(keymapDirFilePath, &keymapDirFileStat) != 0) -+ if (stat(rulesBaseFilePath, &rulesBaseFileStat) != 0) - { - - #ifdef TEST - fprintf(stderr, "NXVerifyXkbBaseDirectory: Can't find the keymap.dir file [%s].\n", -- keymapDirFilePath); -+ rulesBaseFilePath); - #endif - -- free(keymapDirFilePath); -+ free(rulesBaseFilePath); - - return 0; - } -@@ -235,7 +235,7 @@ - dirPath); - #endif - -- free(keymapDirFilePath); -+ free(rulesBaseFilePath); - - return 1; - } diff --git a/debian/patches/series b/debian/patches/series index a901010c2..5780128b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -302_nx-X11_xkbbasedir-detection.full.patch 320_nxagent_configurable-keystrokes.full.patch 321_nxagent_x2go-specific-keystroke-config.full.patch 400_nxcomp-version.full+lite.patch -- cgit v1.2.3 From e91277d02bf1288909daed3b0de8f876f6403acf Mon Sep 17 00:00:00 2001 From: Alexander Wuerstlein Date: Fri, 13 Feb 2015 09:52:21 +0100 Subject: Make nxagent-specific keyboard bindings configurable (320_nxagent_configurable-keystrokes.full.patch). Replaces the hardcoded nxagent keybindings by a configurable table of keybindings. The default configuration is the same as the original one, to maintain compatibility. A user/administrator can either specify a command line parameter, environment variable or place a file in ~/.nx/config/keystrokes.cfg or /etc/nxagent/keystrokes.cfg to reconfigure these keybindings. The configuration file format is XML, a dependency on libxml2 is added to allow parsing the configuration. --- .../320_nxagent_configurable-keystrokes.full.patch | 1031 -------------------- debian/patches/series | 1 - 2 files changed, 1032 deletions(-) delete mode 100644 debian/patches/320_nxagent_configurable-keystrokes.full.patch (limited to 'debian') diff --git a/debian/patches/320_nxagent_configurable-keystrokes.full.patch b/debian/patches/320_nxagent_configurable-keystrokes.full.patch deleted file mode 100644 index c799c8b93..000000000 --- a/debian/patches/320_nxagent_configurable-keystrokes.full.patch +++ /dev/null @@ -1,1031 +0,0 @@ -Author: Alexander Wuerstlein -Description: Make nxagent-specific keyboard bindings configurable - Replaces the hardcoded nxagent keybindings by a configurable - table of keybindings. The default configuration is the same as the - original one, to maintain compatibility. A user/administrator can either - specify a command line parameter, environment variable or place a file - in ~/.nx/config/keystrokes.cfg or /etc/nxagent/keystrokes.cfg to reconfigure - these keybindings. - . - The configuration file format is XML, a dependency on libxml2 is added - to allow parsing the configuration. ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1013,15 +1013,18 @@ - #if defined(SunArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp -+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ -+`pkg-config --libs libxml-2.0` - #elif defined(cygwinArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp -+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ -+`pkg-config --libs libxml-2.0` - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp -+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ -+`pkg-config --libs libxml-2.0` - #endif - - #endif ---- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile -+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile -@@ -142,7 +142,8 @@ - -I../../miext/damage -I../../miext/cw \ - -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) -+ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ -+ `pkg-config --cflags-only-I libxml-2.0` - #ifdef SunArchitecture - INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ - -I../../../../extras/Mesa/include \ -@@ -152,7 +153,8 @@ - -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ - -I../../miext/damage -I../../miext/cw \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) -+ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ -+ `pkg-config --cflags-only-I libxml-2.0` - #else - #ifdef cygwinArchitecture - INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -@@ -162,7 +164,8 @@ - -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ - -I../../../../extras/Mesa/include \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -- $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) -+ $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ -+ `pkg-config --cflags-only-I libxml-2.0` - #endif - #endif - ---- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c -@@ -28,8 +28,15 @@ - #include "Keystroke.h" - #include "Drawable.h" - -+#include -+ -+#include -+#include -+ - extern Bool nxagentWMIsRunning; - extern Bool nxagentIpaq; -+extern char *nxagentKeystrokeFile; -+Bool nxagentKeystrokeFileParsed = False; - - #ifdef NX_DEBUG_INPUT - int nxagentDebugInputDevices = 0; -@@ -47,297 +54,528 @@ - #undef DEBUG - #undef DUMP - --int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) --{ -- KeySym sym; -- int index = 0; - -- *result = doNothing; -+/* this table is used to parse actions given on the command line or in the -+ * config file, therefore indices have to match the enum in Keystroke.h */ -+char * nxagentSpecialKeystrokeNames[] = { -+ "end_marker", -+ "close_session", -+ "switch_all_screens", -+ "minimize", -+ "left", -+ "up", -+ "right", -+ "down", -+ "resize", -+ "defer", -+ "ignore", -+ "force_synchronization", -+ -+ "debug_tree", -+ "regions_on_screen", -+ "test_input", -+ "deactivate_input_devices_grab", -+ -+ "fullscreen", -+ "viewport_move_left", -+ "viewport_move_up", -+ "viewport_move_right", -+ "viewport_move_down", -+ NULL, -+}; -+ -+struct nxagentSpecialKeystrokeMap default_map[] = { -+ /* stroke, modifierMask, modifierAltMeta, keysym */ -+ {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_q}, -+ {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_Q}, -+ {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_t}, -+ {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_T}, -+ {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_f}, -+ {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_F}, -+ {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_m}, -+ {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_M}, -+ {KEYSTROKE_LEFT, ControlMask, 1, XK_Left}, -+ {KEYSTROKE_LEFT, ControlMask, 1, XK_KP_Left}, -+ {KEYSTROKE_UP, ControlMask, 1, XK_Up}, -+ {KEYSTROKE_UP, ControlMask, 1, XK_KP_Up}, -+ {KEYSTROKE_RIGHT, ControlMask, 1, XK_Right}, -+ {KEYSTROKE_RIGHT, ControlMask, 1, XK_KP_Right}, -+ {KEYSTROKE_DOWN, ControlMask, 1, XK_Down}, -+ {KEYSTROKE_DOWN, ControlMask, 1, XK_KP_Down}, -+ {KEYSTROKE_RESIZE, ControlMask, 1, XK_r}, -+ {KEYSTROKE_RESIZE, ControlMask, 1, XK_R}, -+ {KEYSTROKE_DEFER, ControlMask, 1, XK_e}, -+ {KEYSTROKE_DEFER, ControlMask, 1, XK_E}, -+ {KEYSTROKE_IGNORE, ControlMask, 1, XK_BackSpace}, -+ {KEYSTROKE_IGNORE, 0, 0, XK_Terminate_Server}, -+ {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_j}, -+ {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_J}, -+ {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_a}, -+ {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_A}, -+ {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_x}, -+ {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_X}, -+ {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_y}, -+ {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_Y}, -+ {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_f}, -+ {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_F}, -+ {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_Left}, -+ {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_KP_Left}, -+ {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_Up}, -+ {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_KP_Up}, -+ {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_Right}, -+ {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_KP_Right}, -+ {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_Down}, -+ {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_KP_Down}, -+ {KEYSTROKE_END_MARKER, 0, 0, 0}, -+}; -+struct nxagentSpecialKeystrokeMap *map = default_map; - -- /* -- * I don't know how much hard work is doing this operation. -- * Do we need a cache ? -+static int modifier_matches(unsigned int mask, int compare_alt_meta, unsigned int state) -+{ -+ /* nxagentAltMetaMask needs special handling -+ * it seems to me its an and-ed mask of all possible meta and alt keys -+ * somehow... -+ * -+ * otherwise this function would be just a simple bitop - */ -+ int ret = 1; - -- sym = XKeycodeToKeysym(nxagentDisplay, X -> keycode, index); -+ if (compare_alt_meta) { -+ if (! (state & nxagentAltMetaMask)) { -+ ret = 0; -+ } - -- if (sym == XK_VoidSymbol || sym == NoSymbol) -- { -- return 0; -+ mask &= ~nxagentAltMetaMask; - } - -- #ifdef TEST -- fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - sym %lx\n", -- X -> keycode, X -> state, sym); -- #endif -- -- /* -- * Check special keys. -- */ -- -- /* -- * FIXME: We should use the keysym instead that the keycode -- * here. -- */ -+ /* all modifiers except meta/alt have to match exactly, extra bits are evil */ -+ if ((mask & state) != mask) { -+ ret = 0; -+ } - -- if (X -> keycode == 130 && nxagentIpaq) -- { -- *result = doStartKbd; -+ return ret; -+} - -- return 1; -- } -+static int read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystrokeMap *ret) -+{ -+ int successful = 0; -+ struct nxagentSpecialKeystrokeMap new = {0, 0, 0, 0}; -+ xmlAttr *attr; - -- if ((X -> state & nxagentAltMetaMask) && -- ((X -> state & (ControlMask | ShiftMask)) == ControlMask)) -+ for (attr = node->properties; attr; attr = attr->next) - { -- switch (sym) -+ /* ignore attributes without data (which should never happen anyways) */ -+ if (attr->children->content == NULL) - { -- #ifdef DEBUG_TREE -- -- case XK_q: -- case XK_Q: -- { -- *result = doDebugTree; -- -- break; -- } -- -- #endif /* DEBUG_TREE */ -- -- case XK_t: -- case XK_T: -- { -- *result = doCloseSession; -- -- break; -- } -- case XK_f: -- case XK_F: -+ char *aname = (attr->name)?(attr->name):"unknown"; -+ fprintf(stderr, "attribute %s with NULL value", aname); -+ continue; -+ } -+ if (strcmp((char *)attr->name, "action") == 0) -+ { -+ int i; -+ for (i = 0; nxagentSpecialKeystrokeNames[i] != NULL; i++) - { -- if (nxagentOption(Rootless) == False) -+ if (strcmp(nxagentSpecialKeystrokeNames[i],(char *)attr->children->content) == 0) - { -- *result = doSwitchAllScreens; -+ /* this relies on the values of enum nxagentSpecialKeystroke and the -+ * indices of nxagentSpecialKeystrokeNames being in sync */ -+ new.stroke = i; -+ break; - } -- -- break; - } -- case XK_m: -- case XK_M: -+ continue; -+ } -+ else if (strcmp((char *)attr->name, "key") == 0) -+ { -+ new.keysym = XStringToKeysym((char *)attr->children->content); -+ /* NoSymbol is usually 0, but could there be weird implementations? */ -+ if (new.keysym == NoSymbol) - { -- if (nxagentOption(Rootless) == False) -- { -- *result = doMinimize; -- } -- -- break; -+ new.keysym = 0; - } -- case XK_Left: -- case XK_KP_Left: -- { -- if (nxagentOption(Rootless) == False && -- nxagentOption(DesktopResize) == False) -- { -- *result = doViewportLeft; -- } -+ continue; -+ } - -- break; -- } -- case XK_Up: -- case XK_KP_Up: -- { -- if (nxagentOption(Rootless) == False && -- nxagentOption(DesktopResize) == False) -- { -- *result = doViewportUp; -- } -+ /* ignore attributes with value="0" or "false", everything else is interpreted as true */ -+ if (strcmp((char *)attr->children->content, "0") == 0 || strcmp((char *)attr->children->content, "false") == 0) -+ continue; - -- break; -- } -- case XK_Right: -- case XK_KP_Right: -- { -- if (nxagentOption(Rootless) == False && -- nxagentOption(DesktopResize) == False) -- { -- *result = doViewportRight; -- } -+ if (strcmp((char *)attr->name, "Mod1") == 0) -+ { -+ new.modifierMask |= Mod1Mask; -+ } -+ else if (strcmp((char *)attr->name, "Mod2") == 0) -+ { -+ new.modifierMask |= Mod2Mask; -+ } -+ else if (strcmp((char *)attr->name, "Mod3") == 0) -+ { -+ new.modifierMask |= Mod3Mask; -+ } -+ else if (strcmp((char *)attr->name, "Mod4") == 0) -+ { -+ new.modifierMask |= Mod4Mask; -+ } -+ else if (strcmp((char *)attr->name, "Control") == 0) -+ { -+ new.modifierMask |= ControlMask; -+ } -+ else if (strcmp((char *)attr->name, "Shift") == 0) -+ { -+ new.modifierMask |= ShiftMask; -+ } -+ else if (strcmp((char *)attr->name, "Lock") == 0) -+ { -+ new.modifierMask |= LockMask; -+ } -+ else if (strcmp((char *)attr->name, "AltMeta") == 0) -+ { -+ new.modifierAltMeta = 1; -+ } -+ } - -- break; -- } -- case XK_Down: -- case XK_KP_Down: -- { -- if (nxagentOption(Rootless) == 0 && -- nxagentOption(DesktopResize) == 0) -- { -- *result = doViewportDown; -- } -+ if (new.stroke != 0 && new.keysym != 0) -+ { -+ /* keysym and stroke are required, everything else is optional */ -+ successful = 1; -+ memcpy(ret, &new, sizeof(struct nxagentSpecialKeystrokeMap)); -+ } -+ return successful; -+} - -- break; -- } -- case XK_R: -- case XK_r: -- { -- if (nxagentOption(Rootless) == 0) -- { -- *result = doSwitchResizeMode; -- } -+/* -+ * searches a keystroke xml file -+ * -+ * search order: -+ * - '-keystrokefile' commandline parameter -+ * - $NXAGENT_KEYSTROKEFILE environment variable -+ * - $HOME/.nx/config/keystrokes.cfg -+ * - /etc/nxagent/keystrokes.cfg -+ * - hardcoded traditional NX default settings -+ */ -+static void parse_keystroke_file(void) -+{ -+ char *filename = NULL; - -- break; -- } -- case XK_E: -- case XK_e: -- { -- *result = doSwitchDeferMode; -+ char *homefile = "/.nx/config/keystrokes.cfg"; -+ char *etcfile = "/etc/nxagent/keystrokes.cfg"; - -- break; -+ if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0) -+ { -+ filename = strdup(nxagentKeystrokeFile); -+ if (filename == NULL) -+ { -+ fprintf(stderr, "malloc failed"); -+ exit(EXIT_FAILURE); -+ } -+ } -+ else if ((filename = getenv("NXAGENT_KEYSTROKEFILE")) != NULL && access(filename, R_OK) == 0) -+ { -+ filename = strdup(filename); -+ if (filename == NULL) -+ { -+ fprintf(stderr, "malloc failed"); -+ exit(EXIT_FAILURE); -+ } -+ } -+ else -+ { -+ char *homedir = getenv("HOME"); -+ filename = NULL; -+ if (homedir != NULL) -+ { -+ homedir = strdup(homedir); -+ if (homedir == NULL) -+ { -+ fprintf(stderr, "malloc failed"); -+exit(EXIT_FAILURE); - } -- case XK_BackSpace: -- case XK_Terminate_Server: -+ filename = calloc(1, strlen(homefile) + strlen(homedir) + 1); -+ if (filename == NULL) - { -- /* -- * Discard Ctrl-Alt-BackSpace key. -- */ -- -- return 1; -- -- break; -+ fprintf(stderr, "malloc failed"); -+ exit(EXIT_FAILURE); - } -- -- case XK_J: -- case XK_j: -+ strcpy(filename, homedir); -+ strcpy(filename + strlen(homedir), homefile); -+ if (homedir) - { -- nxagentForceSynchronization = 1; -- -- return 1; -+ free(homedir); - } -+ } - -- #ifdef DUMP -- -- case XK_A: -- case XK_a: -+ if (access(filename, R_OK) == 0) -+ { -+ /* empty */ -+ } -+ else if (access(etcfile, R_OK) == 0) -+ { -+ if (filename) -+ free(filename); -+ filename = strdup(etcfile); -+ if (filename == NULL) - { -- /* -- * Used to test the lazy encoding. -- */ -- -- nxagentRegionsOnScreen(); -- -- return 1; -+ fprintf(stderr, "malloc failed"); -+ exit(EXIT_FAILURE); - } -+ } -+ else -+ { -+ if (filename) -+free(filename); -+ filename = NULL; -+ } -+ } - -- #endif -- -- #ifdef NX_DEBUG_INPUT -+ /* now we know which file to read, if any */ -+ if (filename) -+ { -+ xmlDoc *doc = NULL; -+ xmlNode *root = NULL; -+ LIBXML_TEST_VERSION -+ doc = xmlReadFile(filename, NULL, 0); -+ if (doc != NULL) -+ { -+ xmlNode *cur = NULL; -+ root = xmlDocGetRootElement(doc); - -- case XK_X: -- case XK_x: -+ for (cur = root; cur; cur = cur->next) - { -- /* -- * Used to test the input devices state. -- */ -+ if (cur->type == XML_ELEMENT_NODE && strcmp((char *)cur->name, "keystrokes") == 0) -+{ -+ xmlNode *bindings = NULL; -+ int num = 0; -+ int idx = 0; - -- if (X -> type == KeyPress) -- { -- if (nxagentDebugInputDevices == 0) -+ for (bindings = cur->children; bindings; bindings = bindings->next) - { -- fprintf(stderr, "Info: Turning input devices debug ON.\n"); -- -- nxagentDebugInputDevices = 1; -+ if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) -+ { -+ num++; -+ } - } -- else -+ map = calloc((num + 1), sizeof(struct nxagentSpecialKeystrokeMap)); -+ if (map == NULL) - { -- fprintf(stderr, "Info: Turning input devices debug OFF.\n"); -- -- nxagentDebugInputDevices = 0; -- -- nxagentLastInputDevicesDumpTime = 0; -+ fprintf(stderr, "malloc failed"); -+ exit(EXIT_FAILURE); - } -- } -- -- return 1; -- } - -- case XK_Y: -- case XK_y: -- { -- /* -- * Used to deactivate input devices grab. -- */ -+ for (bindings = cur->children; bindings; bindings = bindings->next) -+ { -+ if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) -+ { -+ int res = 0; -+ res = read_binding_from_xmlnode(bindings, &(map[idx])); -+ if (res) -+ idx++; -+ } -+ } - -- if (X -> type == KeyPress) -- { -- nxagentDeactivateInputDevicesGrabs(); -+ map[idx].stroke = KEYSTROKE_END_MARKER; - } -- -- return 1; - } - -+ xmlFreeDoc(doc); -+ xmlCleanupParser(); -+ } -+ else -+ { -+ #ifdef DEBUG -+ fprintf("XML parsing for %s failed\n", filename); - #endif - } -+ free(filename); - } -- else if ((X -> state & nxagentAltMetaMask) && -- ((X -> state & (ControlMask | ShiftMask)) == (ControlMask | -- ShiftMask))) -+} -+ -+static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) -+{ -+ KeySym keysym = XKeycodeToKeysym(nxagentDisplay, X->keycode, 0); -+ struct nxagentSpecialKeystrokeMap *cur = map; -+ -+ if (! nxagentKeystrokeFileParsed) - { -- switch (sym) -- { -- case XK_f: -- case XK_F: -- { -- if (nxagentOption(Rootless) == 0) -- { -- *result = doSwitchFullscreen; -- } -+ parse_keystroke_file(); -+ nxagentKeystrokeFileParsed = True; -+ } - -- break; -- } -- case XK_Left: -- case XK_KP_Left: -- { -- if (nxagentOption(Rootless) == 0 && -- nxagentOption(DesktopResize) == 0) -- { -- *result = doViewportMoveLeft; -- } -+ enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING; - -- break; -- } -- case XK_Up: -- case XK_KP_Up: -- { -- if (nxagentOption(Rootless) == 0 && -- nxagentOption(DesktopResize) == 0) -- { -- *result = doViewportMoveUp; -- } -+ while (cur->stroke != KEYSTROKE_END_MARKER) { -+ if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { -+ return cur->stroke; -+ } -+ cur++; -+ } - -- break; -- } -- case XK_Right: -- case XK_KP_Right: -- { -- if (nxagentOption(Rootless) == 0 && -- nxagentOption(DesktopResize) == 0) -- { -- *result = doViewportMoveRight; -- } -+ return ret; -+} - -- break; -- } -- case XK_Down: -- case XK_KP_Down: -- { -- if (nxagentOption(Rootless) == 0 && -- nxagentOption(DesktopResize) == 0) -- { -- *result = doViewportMoveDown; -- } -+int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) -+{ -+ KeySym sym; -+ int index = 0; -+ enum nxagentSpecialKeystroke stroke = find_keystroke(X); - -- break; -- } -- } -+ *result = doNothing; -+ -+ /* -+ * I don't know how much hard work is doing this operation. -+ * Do we need a cache ? -+ */ -+ -+ sym = XKeycodeToKeysym(nxagentDisplay, X -> keycode, index); -+ -+ if (sym == XK_VoidSymbol || sym == NoSymbol) -+ { -+ return 0; - } - -+ #ifdef TEST -+ fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - sym %lx\n", -+ X -> keycode, X -> state, sym); -+ #endif -+ -+ /* -+ * Check special keys. -+ */ -+ -+ /* -+ * FIXME: We should use the keysym instead that the keycode -+ * here. -+ */ -+ -+ if (X -> keycode == 130 && nxagentIpaq) -+ { -+ *result = doStartKbd; -+ -+ return 1; -+ } -+ -+ switch (stroke) { -+ case KEYSTROKE_DEBUG_TREE: -+ #ifdef DEBUG_TREE -+ *result = doDebugTree; -+ #endif -+ break; -+ case KEYSTROKE_CLOSE_SESSION: -+ *result = doCloseSession; -+ break; -+ case KEYSTROKE_SWITCH_ALL_SCREENS: -+ if (nxagentOption(Rootless) == False) { -+ *result = doSwitchAllScreens; -+ } -+ break; -+ case KEYSTROKE_MINIMIZE: -+ if (nxagentOption(Rootless) == False) { -+ *result = doMinimize; -+ } -+ break; -+ case KEYSTROKE_LEFT: -+ if (nxagentOption(Rootless) == False && -+ nxagentOption(DesktopResize) == False) { -+ *result = doViewportLeft; -+ } -+ break; -+ case KEYSTROKE_UP: -+ if (nxagentOption(Rootless) == False && -+ nxagentOption(DesktopResize) == False) { -+ *result = doViewportUp; -+ } -+ break; -+ case KEYSTROKE_RIGHT: -+ if (nxagentOption(Rootless) == False && -+ nxagentOption(DesktopResize) == False) { -+ *result = doViewportRight; -+ } -+ break; -+ case KEYSTROKE_DOWN: -+ if (nxagentOption(Rootless) == False && -+ nxagentOption(DesktopResize) == False) { -+ *result = doViewportDown; -+ } -+ break; -+ case KEYSTROKE_RESIZE: -+ if (nxagentOption(Rootless) == False) { -+ *result = doSwitchResizeMode; -+ } -+ break; -+ case KEYSTROKE_DEFER: -+ *result = doSwitchDeferMode; -+ break; -+ case KEYSTROKE_IGNORE: -+ /* this is used e.g. to ignore C-A-Backspace aka XK_Terminate_Server */ -+ return 1; -+ break; -+ case KEYSTROKE_FORCE_SYNCHRONIZATION: -+ nxagentForceSynchronization = 1; -+ break; -+ case KEYSTROKE_REGIONS_ON_SCREEN: -+ #ifdef DUMP -+ nxagentRegionsOnScreen(); -+ #endif -+ break; -+ case KEYSTROKE_TEST_INPUT: -+ /* -+ * Used to test the input devices state. -+ */ -+ #ifdef NX_DEBUG_INPUT -+ if (X -> type == KeyPress) { -+ if (nxagentDebugInputDevices == 0) { -+ fprintf(stderr, "Info: Turning input devices debug ON.\n"); -+ nxagentDebugInputDevices = 1; -+ } else { -+ fprintf(stderr, "Info: Turning input devices debug OFF.\n"); -+ nxagentDebugInputDevices = 0; -+ nxagentLastInputDevicesDumpTime = 0; -+ } -+ } -+ return 1; -+ #endif -+ break; -+ case KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB: -+ #ifdef NX_DEBUG_INPUT -+ if (X->type == KeyPress) { -+ nxagentDeactivateInputDevicesGrab(); -+ } -+ return 1; -+ #endif -+ break; -+ case KEYSTROKE_FULLSCREEN: -+ if (nxagentOption(Rootless) == 0) { -+ *result = doSwitchFullscreen; -+ } -+ break; -+ case KEYSTROKE_VIEWPORT_MOVE_LEFT: -+ if (nxagentOption(Rootless) == 0 && -+ nxagentOption(DesktopResize) == 0) { -+ *result = doViewportMoveLeft; -+ } -+ break; -+ case KEYSTROKE_VIEWPORT_MOVE_UP: -+ if (nxagentOption(Rootless) == 0 && -+ nxagentOption(DesktopResize) == 0) { -+ *result = doViewportMoveUp; -+ } -+ break; -+ case KEYSTROKE_VIEWPORT_MOVE_RIGHT: -+ if (nxagentOption(Rootless) == 0 && -+ nxagentOption(DesktopResize) == 0) { -+ *result = doViewportMoveRight; -+ } -+ break; -+ case KEYSTROKE_VIEWPORT_MOVE_DOWN: -+ if (nxagentOption(Rootless) == 0 && -+ nxagentOption(DesktopResize) == 0) { -+ *result = doViewportMoveDown; -+ } -+ break; -+ case KEYSTROKE_NOTHING: /* do nothing. difference to KEYSTROKE_IGNORE is the return value */ -+ case KEYSTROKE_END_MARKER: /* just to make gcc STFU */ -+ case KEYSTROKE_MAX: -+ break; -+ } - return (*result == doNothing) ? 0 : 1; - } ---- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h -@@ -24,4 +24,51 @@ - - unsigned int nxagentAltMetaMask; - -+/* keep this sorted, do not rely on any numerical value in this enum, and be aware -+ * that KEYSTROKE_MAX may be used in a malloc */ -+ -+/* also be aware that if changing any numerical values, you also need to change values -+ * Keystroke.c nxagentSpecialKeystrokeNames */ -+enum nxagentSpecialKeystroke { -+ /* 0 is used as end marker */ -+ KEYSTROKE_END_MARKER = 0, -+ KEYSTROKE_CLOSE_SESSION = 1, -+ KEYSTROKE_SWITCH_ALL_SCREENS = 2, -+ KEYSTROKE_MINIMIZE = 3, -+ KEYSTROKE_LEFT = 4, -+ KEYSTROKE_UP = 5, -+ KEYSTROKE_RIGHT = 6, -+ KEYSTROKE_DOWN = 7, -+ KEYSTROKE_RESIZE = 8, -+ KEYSTROKE_DEFER = 9, -+ KEYSTROKE_IGNORE = 10, -+ KEYSTROKE_FORCE_SYNCHRONIZATION = 11, -+ -+ /* stuff used for debugging, probably not useful for most people */ -+ KEYSTROKE_DEBUG_TREE = 12, -+ KEYSTROKE_REGIONS_ON_SCREEN = 13, -+ KEYSTROKE_TEST_INPUT = 14, -+ KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 15, -+ -+ KEYSTROKE_FULLSCREEN = 16, -+ KEYSTROKE_VIEWPORT_MOVE_LEFT = 17, -+ KEYSTROKE_VIEWPORT_MOVE_UP = 18, -+ KEYSTROKE_VIEWPORT_MOVE_RIGHT = 19, -+ KEYSTROKE_VIEWPORT_MOVE_DOWN = 20, -+ -+ KEYSTROKE_NOTHING = 21, -+ -+ /* insert more here, increment KEYSTROKE_MAX accordingly. -+ * then update string translation below */ -+ -+ KEYSTROKE_MAX=22, -+}; -+ -+struct nxagentSpecialKeystrokeMap { -+ enum nxagentSpecialKeystroke stroke; -+ unsigned int modifierMask; /* everything except alt/meta */ -+ int modifierAltMeta; /* modifier combination should include alt/meta */ -+ KeySym keysym; -+}; -+ - #endif /* __Keystroke_H__ */ ---- /dev/null -+++ b/README.keystrokes -@@ -0,0 +1,83 @@ -+Configurable keybindings in nxagent -+ -+Keybindings in the redistributed x2go version of nxagent can now be configured -+by the user. This is done via a configuration file. -+ -+File location -+------------- -+ -+nxagent searches for the configuration file in the following order: -+- in the location given by the '-keystrokefile' command line parameter -+- in the location given by the NXAGENT_KEYSTROKEFILE environment variable -+- in ~/.nx/config/keystrokes.cfg -+- in /etc/nxagent/keystrokes.cfg -+ -+If none of those files is accessible, the default configuration is used which -+is the same as the old, traditional nxagent keybindings. -+ -+File format -+----------- -+ -+The configuration file is XML with the following format: -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+Each 'action' defines an action to be executed when receiving that keystroke. A -+list of possible actions is given below. Some of those actions are only -+available with debug builds of nxagent. -+ -+Keys are given as a combination of 'key' and (optionally) a number of -+modifiers. The key attribute is evaluated into a X11 key via the usual -+XStringToKeysym function. A list of possible keys can be found in -+/usr/include/X11/keysymdef.h, the names are specified without the leading -+'XK_'. Evaluation is case-sensitive, so, 'space' and 'Escape' will work while -+'Space' and 'escape' won't. -+ -+Modifiers are given as boolean attributes, possible modifiers are Mod1, Mod2, -+Mod3, Mod4, Control, Shift, Lock. Sensible combinations strongly depend on your -+keyboard configuration, but usually you will need Mod1 and Control. Boolean in -+this context means '0', 'false' and an unspecified attribute are false, anything -+else is considered true. -+ -+Everything in this file is case-sensitive. Unknown lines are ignored. -+Keybindings are evaluated from top to bottom, so if a keybinding matches, other -+keybindings further down will be ignored. The contents of the file replaces the -+default keybindings, and only one file is read, no merging between different -+configuration files is done. This also means that an empty or invalid configuration -+file deactivates all keybindings. -+ -+List of possible 'action' attributes: -+------------------------------------- -+ -+close_session -+switch_all_screens -+minimize -+left -+up -+right -+down -+resize -+defer -+ignore -+fullscreen -+viewport_move_left -+viewport_move_up -+viewport_move_right -+viewport_move_down -+ -+Only in builds with certain debugging options enabled, ignored otherwise: -+force_synchronization -+debug_tree -+regions_on_screen -+test_input -+deactivate_input_devices_grab ---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -149,6 +149,8 @@ - - char nxagentVerbose = 0; - -+char *nxagentKeystrokeFile = NULL; -+ - int ddxProcessArgument(int argc, char *argv[], int i) - { - /* -@@ -1022,6 +1024,20 @@ - return 1; - } - -+ if (!strcmp(argv[i], "-keystrokefile")) -+ { -+ if (i + 1 < argc) -+ { -+ if (NULL != (nxagentKeystrokeFile = strdup(argv[i + 1]))) -+ { -+ return 2; -+ } else { -+ FatalError("malloc failed"); -+ } -+ } -+ return 0; -+ } -+ - return 0; - } - ---- a/nx-X11/programs/Xserver/hw/nxagent/Args.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h -@@ -83,4 +83,6 @@ - - extern int nxagentRemoteMajor; - -+extern char *nxagentKeystrokeFile; -+ - #endif /* __Args_H__ */ diff --git a/debian/patches/series b/debian/patches/series index 5780128b2..764a6fe1f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -320_nxagent_configurable-keystrokes.full.patch 321_nxagent_x2go-specific-keystroke-config.full.patch 400_nxcomp-version.full+lite.patch #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -- cgit v1.2.3 From fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Fri, 13 Feb 2015 13:06:53 +0100 Subject: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent (321_nxagent_x2go-specific-keystroke-config.full.patch). --- ...agent_x2go-specific-keystroke-config.full.patch | 25 ---------------------- debian/patches/series | 1 - 2 files changed, 26 deletions(-) delete mode 100644 debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch (limited to 'debian') diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch deleted file mode 100644 index 795f10b76..000000000 --- a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent -Author: Horst Schirmeier - ---- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c -@@ -27,6 +27,7 @@ - #include "Options.h" - #include "Keystroke.h" - #include "Drawable.h" -+#include "Init.h" /* extern int nxagentX2go */ - - #include - -@@ -261,6 +262,11 @@ static void parse_keystroke_file(void) - char *homefile = "/.nx/config/keystrokes.cfg"; - char *etcfile = "/etc/nxagent/keystrokes.cfg"; - -+ if (nxagentX2go) { -+ homefile = "/.x2go/config/keystrokes.cfg"; -+ etcfile = "/etc/x2go/keystrokes.cfg"; -+ } -+ - if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0) - { - filename = strdup(nxagentKeystrokeFile); diff --git a/debian/patches/series b/debian/patches/series index 764a6fe1f..86575ece8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -321_nxagent_x2go-specific-keystroke-config.full.patch 400_nxcomp-version.full+lite.patch #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch -- cgit v1.2.3 From d4d3fe0e6e77a58e68defc5895a589a681d7d092 Mon Sep 17 00:00:00 2001 From: Nito Martinez Date: Fri, 13 Feb 2015 13:26:27 +0100 Subject: Allow version 4-digit version comparison/handshake (400_nxcomp-version.full+lite.patch). --- debian/patches/400_nxcomp-version.full+lite.patch | 240 ---------------------- debian/patches/series | 1 - 2 files changed, 241 deletions(-) delete mode 100644 debian/patches/400_nxcomp-version.full+lite.patch (limited to 'debian') diff --git a/debian/patches/400_nxcomp-version.full+lite.patch b/debian/patches/400_nxcomp-version.full+lite.patch deleted file mode 100644 index 703cec823..000000000 --- a/debian/patches/400_nxcomp-version.full+lite.patch +++ /dev/null @@ -1,240 +0,0 @@ -Description: Allow version 4-digit version comparison/handshake -Author: Nito Martinez ---- a/nxcomp/Control.cpp -+++ b/nxcomp/Control.cpp -@@ -15,6 +15,7 @@ - /* */ - /**************************************************************************/ - -+#include "NX.h" - #include "NXpack.h" - - #include "Control.h" -@@ -594,44 +595,17 @@ - RemoteVersionMajor = -1; - RemoteVersionMinor = -1; - RemoteVersionPatch = -1; -+ RemoteVersionMaintenancePatch = -1; - - CompatVersionMajor = -1; - CompatVersionMinor = -1; - CompatVersionPatch = -1; -+ CompatVersionMaintenancePatch = -1; - -- char version[32]; -- -- strcpy(version, VERSION); -- -- char *value; -- -- value = strtok(version, "."); -- -- for (int i = 0; value != NULL && i < 3; i++) -- { -- switch (i) -- { -- case 0: -- -- LocalVersionMajor = atoi(value); -- -- break; -- -- case 1: -- -- LocalVersionMinor = atoi(value); -- -- break; -- -- case 2: -- -- LocalVersionPatch = atoi(value); -- -- break; -- } -- -- value = strtok(NULL, "."); -- } -+ LocalVersionMajor = NXMajorVersion(); -+ LocalVersionMinor = NXMinorVersion(); -+ LocalVersionPatch = NXPatchVersion(); -+ LocalVersionMaintenancePatch = NXMaintenancePatchVersion(); - - #ifdef TEST - *logofs << "Control: Major version is " << LocalVersionMajor ---- a/nxcomp/Control.h -+++ b/nxcomp/Control.h -@@ -299,17 +299,26 @@ - // Version number of local and remote proxy. - // - -+ /* -+ * LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch -+ * CompatVersionMaintenancePatch -+ * -+ * currently not used, for future compatibility checks -+ */ - int LocalVersionMajor; - int LocalVersionMinor; - int LocalVersionPatch; -+ int LocalVersionMaintenancePatch; - - int RemoteVersionMajor; - int RemoteVersionMinor; - int RemoteVersionPatch; -+ int RemoteVersionMaintenancePatch; - - int CompatVersionMajor; - int CompatVersionMinor; - int CompatVersionPatch; -+ int CompatVersionMaintenancePatch; - - // - // Which unpack methods are implemented in proxy? ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -14250,7 +14250,8 @@ - cerr << "NXPROXY - " << "Version " - << control -> LocalVersionMajor << "." - << control -> LocalVersionMinor << "." -- << control -> LocalVersionPatch; -+ << control -> LocalVersionPatch << "." -+ << control -> LocalVersionMaintenancePatch; - - cerr << endl; - } ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -105,7 +105,8 @@ - - CSRC = MD5.c \ - Pack.c \ -- Vars.c -+ Vars.c \ -+ Version.c - - CXXSRC = Loop.cpp \ - Children.cpp \ ---- a/nxcomp/NX.h -+++ b/nxcomp/NX.h -@@ -442,6 +442,12 @@ - - extern void NXTransCleanup(void) __attribute__((noreturn)); - -+extern const char* NXVersion(); -+extern int NXMajorVersion(); -+extern int NXMinorVersion(); -+extern int NXPatchVersion(); -+extern int NXMaintenancePatchVersion(); -+ - #ifdef __cplusplus - } - #endif ---- /dev/null -+++ b/nxcomp/Version.c -@@ -0,0 +1,106 @@ -+/**************************************************************************/ -+/* */ -+/* Copyright (C) 2014 Qindel http://qindel.com and QVD http://theqvd.com */ -+/* */ -+/* This program is free software; you can redistribute it and/or modify */ -+/* it under the terms of the GNU General Public License as published by */ -+/* the Free Software Foundation; either version 3 of the License, or (at */ -+/* your option) any later version. */ -+/* */ -+/* This program is distributed in the hope that it will be useful, but */ -+/* WITHOUT ANY WARRANTY; without even the implied warranty of */ -+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -+/* See the GNU General Public License for more details. */ -+/* */ -+/* You should have received a copy of the GNU General Public License */ -+/* along with this program; if not, see . */ -+/* */ -+/* Additional permission under GNU GPL version 3 section 7 */ -+/* */ -+/* If you modify this Program, or any covered work, by linking or */ -+/* combining it with [name of library] (or a modified version of that */ -+/* library), containing parts covered by the terms of [name of library's */ -+/* license], the licensors of this Program grant you additional */ -+/* permission to convey the resulting work. {Corresponding Source for a */ -+/* non-source form of such a combination shall include the source code */ -+/* for the parts of [name of library] used as well as that of the covered */ -+/* work.} */ -+/* */ -+/* */ -+/**************************************************************************/ -+ -+#include -+#include -+#include -+#include "NX.h" -+ -+ -+static int _NXVersionMajor = -1; -+static int _NXVersionMinor = -1; -+static int _NXVersionPatch = -1; -+static int _NXVersionMaintenancePatch = -1; -+ -+ -+const char* NXVersion() { -+ const char *version = VERSION; -+ return version; -+} -+ -+void _parseNXVersion() { -+ char version[32]; -+ int i; -+ strcpy(version, VERSION); -+ -+ char *value; -+ /* Reset values to 0 if undefined */ -+ _NXVersionMajor = _NXVersionMinor = _NXVersionPatch = _NXVersionMaintenancePatch = 0; -+ -+ -+#define NXVERSIONSEPARATOR "." -+ value = strtok(version, NXVERSIONSEPARATOR); -+ -+ for (i = 0; value != NULL && i < 4; i++) -+ { -+ switch (i) -+ { -+ case 0: -+ _NXVersionMajor = atoi(value); -+ break; -+ -+ case 1: -+ _NXVersionMinor = atoi(value); -+ break; -+ -+ case 2: -+ _NXVersionPatch = atoi(value); -+ break; -+ -+ case 3: -+ _NXVersionMaintenancePatch = atoi(value); -+ break; -+ } -+ -+ value = strtok(NULL, NXVERSIONSEPARATOR); -+ } -+} -+ -+int NXMajorVersion() { -+ if (_NXVersionMajor == -1) -+ _parseNXVersion(); -+ return _NXVersionMajor; -+} -+int NXMinorVersion() { -+ if (_NXVersionMinor == -1) -+ _parseNXVersion(); -+ return _NXVersionMinor; -+} -+int NXPatchVersion() { -+ if (_NXVersionPatch == -1) -+ _parseNXVersion(); -+ return _NXVersionPatch; -+} -+int NXMaintenancePatchVersion() { -+ if (_NXVersionMaintenancePatch == -1) -+ _parseNXVersion(); -+ return _NXVersionMaintenancePatch; -+} diff --git a/debian/patches/series b/debian/patches/series index 86575ece8..b00553eed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -400_nxcomp-version.full+lite.patch #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch -- cgit v1.2.3 From c4a8556c45786c83b04b2e958234cb4c724e1910 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Feb 2015 13:27:42 +0100 Subject: Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch). We really want to make use of rpm's automatic dependency finding. Binaries are scanned for DT_NEEDED entries, the latter of which are then used for populating the "Requires"-type deps. The "nxagent" binary for example would require libX11.so.6. That incurs problems: 1. A package manager told to install nxagent could select xorg-x11 rather than nx-libs, even though nxagent depends on the NX version. 2. A package manager told to install $some_program could select nx-libs rather than xorg-x11 (since both provide libX11.so.6), but, since the NX library is in an obscure directory, running $some_program would fail as libX11.so.6 is not found. To solve this, give the NX libraries unique names different from the Xorg ones. --- ...nxcompext+nxcompshad_unique-libnames.full.patch | 1183 -------------------- debian/patches/series | 1 - 2 files changed, 1184 deletions(-) delete mode 100644 debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch (limited to 'debian') diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch deleted file mode 100644 index 7c21c6fe5..000000000 --- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch +++ /dev/null @@ -1,1183 +0,0 @@ -Description: Unique Library Names Patch - Patch from the RPM folks... - . - We really want to make use of rpm's automatic dependency finding. - Binaries are scanned for DT_NEEDED entries, the latter of which are - then used for populating the "Requires"-type deps. The "nxagent" - binary for example would require libX11.so.6. That incurs problems: - . - 1. A package manager told to install nxagent could select xorg-x11 - rather than nx-libs, even though nxagent depends on the NX version. - . - 2. A package manager told to install $some_program could select nx-libs - rather than xorg-x11 (since both provide libX11.so.6), but, since - the NX library is in an obscure directory, running $some_program - would fail as libX11.so.6 is not found. - . - To solve this, give the NX libraries unique names different from the - Xorg ones. -Forward: pending -Author: Jan Engelhardt -Last-Update: 2012-02-15 ---- - nx-X11/config/cf/Imake.rules | 12 - - nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- - nx-X11/config/cf/lnxLib.rules | 16 - - nx-X11/config/cf/lnxLib.tmpl | 4 - nx-X11/lib/X11/Imakefile | 2 - nx-X11/lib/XRes/Imakefile | 2 - nx-X11/lib/Xau/Imakefile | 2 - nx-X11/lib/Xcomposite/Imakefile | 2 - nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 - nx-X11/lib/Xcursor/Imakefile | 2 - nx-X11/lib/Xcursor/xcursor.pc.in | 2 - nx-X11/lib/Xdamage/Imakefile | 2 - nx-X11/lib/Xdamage/xdamage.pc.in | 2 - nx-X11/lib/Xdmcp/Imakefile | 2 - nx-X11/lib/Xext/Imakefile | 2 - nx-X11/lib/Xfixes/Imakefile | 2 - nx-X11/lib/Xfixes/xfixes.pc.in | 2 - nx-X11/lib/Xinerama/Imakefile | 2 - nx-X11/lib/Xpm/Imakefile | 2 - nx-X11/lib/Xrandr/Imakefile | 2 - nx-X11/lib/Xrender/Imakefile | 2 - nx-X11/lib/Xrender/xrender.pc.in | 2 - nx-X11/lib/Xtst/Imakefile | 2 - nx-X11/lib/font/Imakefile | 2 - nx-X11/lib/oldX/Imakefile | 2 - nx-X11/lib/xkbfile/Imakefile | 2 - nx-X11/lib/xkbui/Imakefile | 2 - nx-X11/programs/Xserver/Imakefile | 18 - - nxcompext/Makefile.in | 4 - nxcompshad/Makefile.in | 4 - 103 files changed, 294 insertions(+), 294 deletions(-) - ---- a/nx-X11/config/cf/Imake.rules -+++ b/nx-X11/config/cf/Imake.rules -@@ -2124,9 +2124,9 @@ - */ - #ifndef ProjectUnsharedFontLibReferences - #define ProjectUnsharedFontLibReferences() @@\ --DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* -@@ -2142,9 +2142,9 @@ - #ifndef SharedFontLibReferences - #define SharedFontLibReferences() @@\ - SOFONTREV = SharedFontRev @@\ --DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* ---- a/nx-X11/config/cf/X11.tmpl -+++ b/nx-X11/config/cf/X11.tmpl -@@ -1835,9 +1835,9 @@ - #ifndef SharedX11Rev - #define SharedX11Rev 6.2 - #endif --SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) -+SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) - #else --ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) - #endif - /* Common alternate spellings */ - DEPXLIBONLY = $(DEPXONLYLIB) -@@ -2466,9 +2466,9 @@ - #ifndef SharedXextRev - #define SharedXextRev 6.4 - #endif --SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) -+SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) - #else --ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) - #endif - LINTEXTENSIONLIB = $(LINTEXTENSION) - DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) -@@ -2480,9 +2480,9 @@ - #ifndef SharedXssRev - #define SharedXssRev 1.0 - #endif --SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) -+SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) - #else --ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) - #endif - - XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -@@ -2490,9 +2490,9 @@ - #ifndef SharedXxf86miscRev - #define SharedXxf86miscRev 1.1 - #endif --SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) -+SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) - #else --ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) - #endif - - XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -@@ -2500,9 +2500,9 @@ - #ifndef SharedXxf86vmRev - #define SharedXxf86vmRev 1.0 - #endif --SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) -+SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) - #else --ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) - #endif - - XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -@@ -2510,9 +2510,9 @@ - #ifndef SharedXxf86dgaRev - #define SharedXxf86dgaRev 1.0 - #endif --SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) -+SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) - #else --ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) - #endif - - #if BuildDmxLibrary -@@ -2544,9 +2544,9 @@ - #ifndef SharedXxf86rushRev - #define SharedXxf86rushRev 1.0 - #endif --SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) -+SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) - #else --ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) - #endif - - -@@ -2555,9 +2555,9 @@ - #ifndef SharedXvRev - #define SharedXvRev 1.0 - #endif --SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) -+SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) - #else --ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) - #endif - - -@@ -2566,9 +2566,9 @@ - #ifndef SharedXvMCRev - #define SharedXvMCRev 1.0 - #endif --SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) -+SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) - #else --ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) - #endif - - XINERAMALIBSRC = $(LIBSRC)/Xinerama -@@ -2576,9 +2576,9 @@ - #ifndef SharedXineramaRev - #define SharedXineramaRev 1.0 - #endif --SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) -+SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) - #else --ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) - #endif - - XRESLIBSRC = $(LIBSRC)/XRes -@@ -2586,9 +2586,9 @@ - #ifndef SharedXResRev - #define SharedXResRev 1.0 - #endif --SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) -+SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) - #else --ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) - #endif - - DMXLIBSRC = $(LIBSRC)/dmx -@@ -2596,9 +2596,9 @@ - #ifndef SharedDmxRev - #define SharedDmxRev 1.0 - #endif --SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) -+SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) - #else --ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) - #endif - - DPSLIBSRC = $(LIBSRC)/dps -@@ -2606,9 +2606,9 @@ - #ifndef SharedDpsRev - #define SharedDpsRev 1.0 - #endif --SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) -+SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) - #else --ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) - #endif - - DPSTKLIBSRC = $(LIBSRC)/dpstk -@@ -2616,9 +2616,9 @@ - #ifndef SharedDpsTkRev - #define SharedDpsTkRev 1.0 - #endif --SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) -+SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) - #else --ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) - #endif - - PSRESLIBSRC = $(LIBSRC)/psres -@@ -2626,9 +2626,9 @@ - #ifndef SharedPSResRev - #define SharedPSResRev 1.0 - #endif --SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) -+SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) - #else --ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) - #endif - - GLULIBSRC = $(LIBSRC)/GLU -@@ -2636,9 +2636,9 @@ - #ifndef SharedGluRev - #define SharedGluRev 1.3 - #endif --SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) -+SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) - #else --ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) - #endif - - GLXLIBSRC = $(LIBSRC)/GL -@@ -2646,18 +2646,18 @@ - #ifndef SharedGlxRev - #define SharedGlxRev 1.2 - #endif --SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) -+SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) - #else --ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) - #endif - GLWIDGETSRC = $(LIBSRC)/GLw - #if SharedLibGLw - #ifndef SharedGLwRev - #define SharedGLwRev 1.0 /* used to name the shared library */ - #endif --SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) -+SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) - #else --ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) - #endif - - XRENDERLIBSRC = $(LIBSRC)/Xrender -@@ -2665,9 +2665,9 @@ - #ifndef SharedXrenderRev - #define SharedXrenderRev 1.2.2 - #endif --SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) -+SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) - #else --ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) - #endif - - XRANDRLIBSRC = $(LIBSRC)/Xrandr -@@ -2675,9 +2675,9 @@ - #ifndef SharedXrandrRev - #define SharedXrandrRev 2.0 - #endif --SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) -+SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) - #else --ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) - #endif - - XFIXESLIBSRC = $(LIBSRC)/Xfixes -@@ -2685,9 +2685,9 @@ - #ifndef SharedXfixesRev - #define SharedXfixesRev 3.0 - #endif --SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) -+SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) - #else --ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) - #endif - - XDAMAGELIBSRC = $(LIBSRC)/Xdamage -@@ -2695,9 +2695,9 @@ - #ifndef SharedXdamageRev - #define SharedXdamageRev 1.0 - #endif --SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) -+SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) - #else --ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) - #endif - - XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite -@@ -2705,9 +2705,9 @@ - #ifndef SharedXcompositeRev - #define SharedXcompositeRev 1.0 - #endif --SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) -+SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) - #else --ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) - #endif - - XEVIELIBSRC = $(LIBSRC)/Xevie -@@ -2715,9 +2715,9 @@ - #ifndef SharedXevieRev - #define SharedXevieRev 1.0 - #endif --SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) -+SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) - #else --ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) - #endif - - XCURSORLIBSRC = $(LIBSRC)/Xcursor -@@ -2725,9 +2725,9 @@ - #ifndef SharedXcursorRev - #define SharedXcursorRev 1.0.2 - #endif --SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) -+SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) - #else --ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) - #endif - - APPLEWMLIBSRC = $(LIBSRC)/apple -@@ -2735,9 +2735,9 @@ - #ifndef SharedAppleWMRev - #define SharedAppleWMRev 1.0 - #endif --SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) -+SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) - #else --ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) - #endif - - WINDOWSWMLIBSRC = $(LIBSRC)/windows -@@ -2745,9 +2745,9 @@ - #ifndef SharedWindowsWMRev - #define SharedWindowsWMRev 1.0 - #endif --SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) -+SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) - #else --ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) - #endif - - # ifndef SharedLibXfontcache -@@ -2768,9 +2768,9 @@ - #ifndef SharedXfontcacheRev - #define SharedXfontcacheRev 1.2 - #endif --SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) -+SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) - #else --ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXau -@@ -2790,12 +2790,12 @@ - #ifndef SharedXauRev - #define SharedXauRev 6.0 - #endif --SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) -+SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) - #else - #if !UseInstalledXauLib --ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) - #else --ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) -+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) - #endif - #endif - -@@ -2816,12 +2816,12 @@ - #ifndef SharedXdmcpRev - #define SharedXdmcpRev 6.0 - #endif --SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) -+SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) - #else - #if !UseInstalledXdmcpLib --ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) - #else --ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) -+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) - #endif - #endif - -@@ -2842,9 +2842,9 @@ - #ifndef SharedXmuRev - #define SharedXmuRev 6.2 - #endif --SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) -+SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) - #else --ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXmuu -@@ -2864,9 +2864,9 @@ - #ifndef SharedXmuuRev - #define SharedXmuuRev 1.0 - #endif --SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) -+SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) - #else --ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) - #endif - - #ifndef SharedOldX -@@ -2886,9 +2886,9 @@ - #ifndef SharedOldXRev - #define SharedOldXRev 6.0 - #endif --SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) -+SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) - #else --ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXp -@@ -2908,9 +2908,9 @@ - #ifndef SharedXpRev - #define SharedXpRev 6.2 - #endif --SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) -+SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) - #else --ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXt -@@ -2930,9 +2930,9 @@ - #ifndef SharedXtRev - #define SharedXtRev 6.0 - #endif --SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) -+SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) - #else --ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) - #endif - DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) - XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) -@@ -2956,9 +2956,9 @@ - #ifndef SharedXaRev - #define SharedXaRev 1.0 - #endif --SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) -+SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) - #else --UnsharedLibReferences(XA,Xa,$(XALIBSRC)) -+UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) - #endif - - #ifndef BuildXaw -@@ -2985,9 +2985,9 @@ - #ifndef SharedXawRev - #define SharedXawRev 8.0 - #endif --SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) - #else --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) - #endif - #endif - -@@ -3013,14 +3013,14 @@ - #ifndef SharedXaw7Rev - #define SharedXaw7Rev 7.0 - #endif --SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) -+SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) - #if !BuildXaw --SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) - #endif - #else --ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) - #if !BuildXaw --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) - #endif - #endif - #endif -@@ -3048,14 +3048,14 @@ - #ifndef SharedXaw6Rev - #define SharedXaw6Rev 6.1 - #endif --SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) -+SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) - #if !BuildXaw && !BuildXaw7 --SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) - #endif - #else --ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) - #if !BuildXaw && !BuildXaw7 --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) - #endif - #endif - #endif -@@ -3077,9 +3077,9 @@ - #ifndef SharedXiRev - #define SharedXiRev 6.0 - #endif --SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) -+SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) - #else --ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXtst -@@ -3099,12 +3099,12 @@ - #ifndef SharedXtstRev - #define SharedXtstRev 6.1 - #endif --SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) -+SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) - #else --ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) - #endif - --ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) -+ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) - - #ifndef SharedLibICE - #define SharedLibICE HasSharedLibraries -@@ -3123,9 +3123,9 @@ - #ifndef SharedICERev - #define SharedICERev 6.4 - #endif --SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) -+SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) - #else --ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) -+ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) - #endif - - #ifndef SharedLibSM -@@ -3145,9 +3145,9 @@ - #ifndef SharedSMRev - #define SharedSMRev 6.0 - #endif --SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) -+SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) - #else --ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXkey -@@ -3167,9 +3167,9 @@ - #ifndef SharedXkeyRev - #define SharedXkeyRev 6.0 - #endif --SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) -+SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) - #else --ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) - #endif - - #ifndef SharedLibFS -@@ -3189,9 +3189,9 @@ - #ifndef SharedFSRev - #define SharedFSRev 6.0 - #endif --SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) -+SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) - #else --ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibFont -@@ -3212,14 +3212,14 @@ - #define SharedFontRev 1.5 - #endif - SharedFontLibReferences() --XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) -+XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) - #else - ProjectUnsharedFontLibReferences() --XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) -+XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) - #endif - - FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs --ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) - DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) - -@@ -3241,9 +3241,9 @@ - #ifndef SharedFontEncRev - #define SharedFontEncRev 1.0 - #endif --SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) -+SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) - #else --ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXpm -@@ -3263,9 +3263,9 @@ - #ifndef SharedXpmRev - #define SharedXpmRev 4.11 - #endif --SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) -+SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) - #else --ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) - #endif - - #if UseFreetype2 -@@ -3313,9 +3313,9 @@ - #define SharedFreetype2Rev 9.0 - #endif - #endif --SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) -+SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) - #else --ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) - #endif - - #ifdef UseInstalled -@@ -3470,9 +3470,9 @@ - #define SharedExpatRev 4.0 - #endif - #endif --SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) -+SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) - #else --ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) - #endif - - #if UseExpat -@@ -3552,9 +3552,9 @@ - #ifndef SharedXft1Rev - #define SharedXft1Rev 1.1 - #endif --SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) -+SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) - #else --ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) - #endif - - #ifndef Xft1ClientDepLibs -@@ -3589,9 +3589,9 @@ - #ifndef SharedXftRev - #define SharedXftRev 2.1.2 - #endif --SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) -+SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) - #else --ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) - #endif - - #ifndef XftClientDepLibs -@@ -3622,9 +3622,9 @@ - #ifndef SharedFontconfigRev - #define SharedFontconfigRev 1.0.4 - #endif --SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) -+SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) - #else --ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) - #endif - - #ifdef UseInstalled -@@ -3827,9 +3827,9 @@ - # ifndef SharedxkbfileRev - # define SharedxkbfileRev 1.0 - # endif --SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) -+SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) - #else --ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) - #endif - - #if BuildXKBlib -@@ -3899,9 +3899,9 @@ - # ifndef SharedxkbuiRev - # define SharedxkbuiRev 1.0 - # endif --SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) -+SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) - #else --ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) - #endif - - #ifndef XkbuiLibs -@@ -3974,9 +3974,9 @@ - #ifndef SharedXTrapRev - #define SharedXTrapRev 6.4 - #endif --SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) -+SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) - #else --ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) - #endif - - #ifndef NeedDefaultDepLibs ---- a/nx-X11/config/cf/lnxLib.rules -+++ b/nx-X11/config/cf/lnxLib.rules -@@ -389,7 +389,7 @@ - XCOMM libX11.so (X11, SM, ICE) - JUMP_ROOT_X11 = $(XLIBSRC) - JUMP_IS_HOST_X11 = YES --JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa -+JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa - JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) - JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared - JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) -@@ -400,9 +400,9 @@ - JUMP_ADDRESS_X11 = 0x60200000 - JUMP_JUMPTABLESIZE_X11 = 0x4000 - JUMP_GOTSIZE_X11 = 4096 --JUMP_STUBNAMES_X11 = libX11 libSM libICE -+JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE - JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) --JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ -+JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ - JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) - - XCOMM libSM (part of libX11.so) -@@ -435,9 +435,9 @@ - JUMP_GOTSIZE_Xt = 4096 - JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp - JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) --JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ --JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \ -- $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -+JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ -+JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ -+ $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) - - XCOMM libXmu (part of libXt.so) - JUMP_ROOT_Xmu = $(XMUSRC) -@@ -485,8 +485,8 @@ - JUMP_GOTSIZE_Xaw = 4096 - JUMP_STUBNAMES_Xaw = libXaw - JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) --JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ -- $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ -+JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ -+ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ - $(JUMP_LDLIBS_libc) - - # endif /* !UseInstalled */ ---- a/nx-X11/config/cf/lnxLib.tmpl -+++ b/nx-X11/config/cf/lnxLib.tmpl -@@ -9,7 +9,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - -@@ -66,7 +66,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIB = -lXmu $(XLIB) -+XMULIB = -lNX_Xmu $(XLIB) - #endif - - #endif /* UseElfFormat */ ---- a/nx-X11/lib/X11/Imakefile -+++ b/nx-X11/lib/X11/Imakefile -@@ -82,7 +82,7 @@ - #define DoExtraLib SharedLibX11 - #define DoDebugLib DebugLibX11 - #define DoProfileLib ProfileLibX11 --#define LibName X11 -+#define LibName NX_X11 - #define SoRev SOXLIBREV - #define HugeLibrary YES - #define IncSubdir X11 ---- a/nx-X11/lib/XRes/Imakefile -+++ b/nx-X11/lib/XRes/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXRes - #define DoDebugLib DebugLibXRes - #define DoProfileLib ProfileLibXRes --#define LibName XRes -+#define LibName NX_XRes - #define SoRev SOXRESREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xau/Imakefile -+++ b/nx-X11/lib/Xau/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXau - #define DoDebugLib DebugLibXau - #define DoProfileLib ProfileLibXau --#define LibName Xau -+#define LibName NX_Xau - #define SoRev SOXAUTHREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xcomposite/Imakefile -+++ b/nx-X11/lib/Xcomposite/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXcomposite - #define DoProfileLib ProfileLibXcomposite - --#define LibName Xcomposite -+#define LibName NX_Xcomposite - #define SoRev SOXCOMPOSITEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xcomposite/xcomposite.pc.in -+++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in -@@ -7,4 +7,4 @@ - Description: X Composite Library - Version: @VERSION@ - Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ --Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ -+Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ ---- a/nx-X11/lib/Xcursor/Imakefile -+++ b/nx-X11/lib/Xcursor/Imakefile -@@ -15,7 +15,7 @@ - #define DoDebugLib DebugLibXcursor - #define DoProfileLib ProfileLibXcursor - --#define LibName Xcursor -+#define LibName NX_Xcursor - #define SoRev SOXCURSORREV - #define IncSubdir X11 - #define IncSubSubdir Xcursor ---- a/nx-X11/lib/Xcursor/xcursor.pc.in -+++ b/nx-X11/lib/Xcursor/xcursor.pc.in -@@ -12,4 +12,4 @@ - Version: @VERSION@ - Requires: xrender - Cflags: -I${includedir} ${xrendercflags} ${xcflags} --Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} -+Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} ---- a/nx-X11/lib/Xdamage/Imakefile -+++ b/nx-X11/lib/Xdamage/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXdamage - #define DoProfileLib ProfileLibXdamage - --#define LibName Xdamage -+#define LibName NX_Xdamage - #define SoRev SOXDAMAGEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xdamage/xdamage.pc.in -+++ b/nx-X11/lib/Xdamage/xdamage.pc.in -@@ -7,4 +7,4 @@ - Description: X Damage Library - Version: @VERSION@ - Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ --Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ -+Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ ---- a/nx-X11/lib/Xdmcp/Imakefile -+++ b/nx-X11/lib/Xdmcp/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXdmcp - #define DoDebugLib DebugLibXdmcp - #define DoProfileLib ProfileLibXdmcp --#define LibName Xdmcp -+#define LibName NX_Xdmcp - #define SoRev SOXDMCPREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xext/Imakefile -+++ b/nx-X11/lib/Xext/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXext - #define DoDebugLib DebugLibXext - #define DoProfileLib ProfileLibXext --#define LibName Xext -+#define LibName NX_Xext - #define SoRev SOXEXTREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xfixes/Imakefile -+++ b/nx-X11/lib/Xfixes/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXfixes - #define DoProfileLib ProfileLibXfixes - --#define LibName Xfixes -+#define LibName NX_Xfixes - #define SoRev SOXFIXESREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xfixes/xfixes.pc.in -+++ b/nx-X11/lib/Xfixes/xfixes.pc.in -@@ -7,4 +7,4 @@ - Description: X Fixes Library - Version: @VERSION@ - Cflags: -I${includedir} @X_CFLAGS@ --Libs: -L${libdir} -lXfixes @X_LIBS@ -+Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ ---- a/nx-X11/lib/Xinerama/Imakefile -+++ b/nx-X11/lib/Xinerama/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXinerama - #define DoDebugLib DebugLibXinerama - #define DoProfileLib ProfileLibXinerama --#define LibName Xinerama -+#define LibName NX_Xinerama - #define SoRev SOXINERAMAREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xpm/Imakefile -+++ b/nx-X11/lib/Xpm/Imakefile -@@ -12,7 +12,7 @@ - #define DoDebugLib DebugLibXpm - #define DoProfileLib ProfileLibXpm - #define HasSharedData NO --#define LibName Xpm -+#define LibName NX_Xpm - #define SoRev SOXPMREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xrandr/Imakefile -+++ b/nx-X11/lib/Xrandr/Imakefile -@@ -5,7 +5,7 @@ - #define DoSharedLib SharedLibXrandr - #define DoDebugLib DebugLibXrandr - #define DoProfileLib ProfileLibXrandr --#define LibName Xrandr -+#define LibName NX_Xrandr - #define SoRev SOXRANDRREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xrender/Imakefile -+++ b/nx-X11/lib/Xrender/Imakefile -@@ -74,7 +74,7 @@ - #define DoSharedLib SharedLibXrender - #define DoDebugLib DebugLibXrender - #define DoProfileLib ProfileLibXrender --#define LibName Xrender -+#define LibName NX_Xrender - #define SoRev SOXRENDERREV - - #ifdef XBuildIncDir ---- a/nx-X11/lib/Xrender/xrender.pc.in -+++ b/nx-X11/lib/Xrender/xrender.pc.in -@@ -8,4 +8,4 @@ - Version: @VERSION@ - Requires: @X_REQUIRES@ - Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ --Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ -+Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ ---- a/nx-X11/lib/Xtst/Imakefile -+++ b/nx-X11/lib/Xtst/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXtst - #define DoDebugLib DebugLibXtst - #define DoProfileLib ProfileLibXtst --#define LibName Xtst -+#define LibName NX_Xtst - #define SoRev SOXTESTREV - #define LibHeaders NO - ---- a/nx-X11/lib/font/Imakefile -+++ b/nx-X11/lib/font/Imakefile -@@ -31,7 +31,7 @@ - STUBDIRS = stubs - #endif - --LIBNAME = Xfont -+LIBNAME = NX_Xfont - SOREV = $(SOFONTREV) - - #ifndef SeparateSharedCompile ---- a/nx-X11/lib/oldX/Imakefile -+++ b/nx-X11/lib/oldX/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedOldX - #define DoDebugLib DebugOldX - #define DoProfileLib ProfileOldX --#define LibName oldX -+#define LibName NX_oldX - #define SoRev SOOLDXREV - #define IncSubdir X11 - ---- a/nx-X11/lib/xkbfile/Imakefile -+++ b/nx-X11/lib/xkbfile/Imakefile -@@ -11,7 +11,7 @@ - #define DoDebugLib DebugLibxkbfile - #define DoProfileLib ProfileLibxkbfile - #define HasSharedData NO --#define LibName xkbfile -+#define LibName NX_xkbfile - #define SoRev SOXKBFILEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/xkbui/Imakefile -+++ b/nx-X11/lib/xkbui/Imakefile -@@ -6,7 +6,7 @@ - #define DoDebugLib DebugLibxkbui - #define DoProfileLib ProfileLibxkbui - #define HasSharedData NO --#define LibName xkbui -+#define LibName NX_xkbui - #define SoRev SOXKBUIREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -313,7 +313,7 @@ - FONTBASE = $(FONTLIBSRC)/fontbase.o \ - $(FONTLIBSRC)/LibraryTargetName(fontbase) - #if XserverStaticFontLib -- FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) -+ FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB) - #else - FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) - #endif -@@ -994,7 +994,7 @@ - dix/main.o - #endif - --XPMLIB = -lXpm -+XPMLIB = -lNX_Xpm - NXAGENT = hw/nxagent/LibraryTargetName(nxagent) - NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) - NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) -@@ -1012,18 +1012,18 @@ - - #if defined(SunArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -- -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ -+ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #elif defined(cygwinArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ -+ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ -+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ -+ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #endif - -@@ -1078,7 +1078,7 @@ - else exit 0; fi - $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ - $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ -- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) -+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) - #endif /* NXAgentServer */ - - #if defined(XnonServer) && XnonServer ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -42,12 +42,12 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ -L../nxcomp --LIBS = @LIBS@ -lz -lX11 -lXcomp -+LIBS = @LIBS@ -lz -lNX_X11 -lXcomp - - # - # Only if THREADS is defined - # --# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp -+# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp - # - - srcdir = @srcdir@ ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -lX11 -+LIBS = @LIBS@ -lNX_X11 - - # - # Only if THREADS is defined. -@@ -139,7 +139,7 @@ - - else - --EXTRALIBS = -lXtst -lXrandr -lXdamage -+EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage - - all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) - diff --git a/debian/patches/series b/debian/patches/series index b00553eed..6a20a8f47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch -- cgit v1.2.3 From 456f887d95ca34974c1192a477dfca117827457f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 Feb 2015 13:30:31 +0100 Subject: Do not build bundled libraries (601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch). This commit has been submitted by Orion in two portions. One was submitted to X2Go BTS and created on Wed, 10 Jul 2013. The other portion has been taken from the Fedora package by Mike Gabriel and worked into this patch on Fri, 06 Dec 2013. --- ...changes-to-not-use-bundled-libraries.full.patch | 99 ---------------------- debian/patches/series | 1 - 2 files changed, 100 deletions(-) delete mode 100644 debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch (limited to 'debian') diff --git a/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch b/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch deleted file mode 100644 index dbb2e85b0..000000000 --- a/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch +++ /dev/null @@ -1,99 +0,0 @@ -Description: Do not build bundled libraries. -Author: Orion Poplawski -Abstract: - This commit has been submitted by Orion in two - portions. One was submitted to X2Go BTS and created - on Wed, 10 Jul 2013. - . - The other portion has been taken from the Fedora - package by Mike Gabriel and worked into this - patch on Fri, 06 Dec 2013. ---- - nx-X11/config/cf/host.def | 10 +++++++--- - nx-X11/lib/font/include/Imakefile | 2 +- - 2 files changed, 8 insertions(+), 4 deletions(-) - ---- a/nx-X11/config/cf/host.def -+++ b/nx-X11/config/cf/host.def -@@ -311,6 +311,7 @@ - * - #define BuildFreeType NO - */ -+#define BuildFreeType NO - - /* - * To set non-default build options for the underlying FreeType libraries, -@@ -892,7 +893,7 @@ - * - #define HasFreetype2 NO - */ --#define HasFreetype2 NO -+#define HasFreetype2 YES - - /* - * To use a FreeType library already installed outside the default search -@@ -909,7 +910,7 @@ - * - #define HasFontconfig NO - */ --#define HasFontconfig NO -+#define HasFontconfig YES - - /* - * To use a Fontconfig library already installed outside the default search -@@ -925,7 +926,7 @@ - * - #define HasExpat NO - */ --#define HasExpat NO -+#define HasExpat YES - - /* - * To use a Expat library already installed outside the default search -@@ -961,7 +962,7 @@ - - #define SharedLibXdmcp YES - --#define BuildXaw7 YES -+#define BuildXaw7 NO - - #else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ - -@@ -1019,3 +1020,11 @@ - #endif - - #endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ -+ -+#define BuildRman NO -+#define BuildFontEncLib NO -+#define BuildXcursorLibrary NO -+#define BuildXftLibrary NO -+#define BuildXft1Library NO -+#define SharedLibFont NO -+#define BuildLoadableXlibI18n NO ---- a/nx-X11/lib/font/include/Imakefile -+++ b/nx-X11/lib/font/include/Imakefile -@@ -1,5 +1,5 @@ - XCOMM $Xorg$ -- HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h fontenc.h \ -+ HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \ - fontencc.h fontmisc.h fontmod.h fontshow.h fontutil.h \ - fontxlfd.h - all:: ---- a/nx-X11/lib/Imakefile -+++ b/nx-X11/lib/Imakefile -@@ -213,14 +213,8 @@ - - #if BuildLibraries - OLDXLIBDIR = oldX --ICELIBDIR = ICE --SMLIBDIR = SM --XTLIBDIR = Xt --XMULIBDIR = Xmu --XMUULIBDIR = Xmuu - XPMLIBDIR = Xpm - XTSTLIBDIR = Xtst --FSLIBDIR = FS - #endif - - diff --git a/debian/patches/series b/debian/patches/series index 6a20a8f47..21cf21d53 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch -- cgit v1.2.3 From 415b20b6fbf562d4132fca90a00b6c32d94040ed Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 Feb 2015 13:32:17 +0100 Subject: Be compliant with POS36-C: Observe correct revocation order while relinquishing privileges (602_nx-X11_initgroups.full.patch). The Fedora review of NX (redistributed) caught the following rpmlint issue: This executable is calling setuid and setgid without setgroups or initgroups. There is a high probability this mean it didn't relinquish all groups, and this would be a potential security issue to be fixed. Seek POS36-C on the web for details about the problem. Ref POS36-C: https://www.securecoding.cert.org/confluence/display/seccode/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges This patch adds initgroups() calls to the code to initialize the supplemental group list. --- debian/patches/602_nx-X11_initgroups.full.patch | 67 ------------------------- debian/patches/series | 1 - 2 files changed, 68 deletions(-) delete mode 100644 debian/patches/602_nx-X11_initgroups.full.patch (limited to 'debian') diff --git a/debian/patches/602_nx-X11_initgroups.full.patch b/debian/patches/602_nx-X11_initgroups.full.patch deleted file mode 100644 index 182b378dc..000000000 --- a/debian/patches/602_nx-X11_initgroups.full.patch +++ /dev/null @@ -1,67 +0,0 @@ -Description: Be compliant with POS36-C: Observe correct revocation order while relinquishing privileges -Author: Orion Poplawski -Abstract: - The Fedora review of NX (redistributed) caught the following rpmlint issue: - . - This executable is calling setuid and setgid without setgroups or initgroups. - There is a high probability this mean it didn't relinquish all groups, and this - would be a potential security issue to be fixed. Seek POS36-C on the web for - details about the problem. - . - Ref POS36-C: - https://www.securecoding.cert.org/confluence/display/seccode/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges - . - This patch adds initgroups() calls to the code to initialize the supplemental group list. -diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c -index 7e62654..9b2431a 100644 ---- a/nx-X11/programs/Xserver/os/utils.c -+++ b/nx-X11/programs/Xserver/os/utils.c -@@ -112,6 +112,9 @@ OR PERFORMANCE OF THIS SOFTWARE. - #include - #include /* for isspace */ - #include -+#include -+#include -+#include - - #if defined(DGUX) - #include -@@ -1770,6 +1773,7 @@ System(char *command) - void (*csig)(int); - #endif - int status; -+ struct passwd *pwent; - - if (!command) - return(1); -@@ -1791,6 +1795,9 @@ System(char *command) - case -1: /* error */ - p = -1; - case 0: /* child */ -+ pwent = getpwuid(getuid()); -+ if (initgroups(pwent->pw_name,getgid()) == -1) -+ _exit(127); - if (setgid(getgid()) == -1) - _exit(127); - if (setuid(getuid()) == -1) -diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp -index 7238d0c..aacbbae 100644 ---- a/nxcomp/Pipe.cpp -+++ b/nxcomp/Pipe.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "Pipe.h" - #include "Misc.h" -@@ -234,6 +235,8 @@ FILE *Popen(char * const parameters[], const char *type) - // Child. - // - -+ struct passwd *pwent = getpwuid(getuid()); -+ if (pwent) initgroups(pwent->pw_name,getgid()); - setgid(getgid()); - setuid(getuid()); - diff --git a/debian/patches/series b/debian/patches/series index 21cf21d53..c80570682 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch -- cgit v1.2.3 From 96d5e74a30ea8571c3e403bd5d5b3080aaa193f1 Mon Sep 17 00:00:00 2001 From: Mirraz Mirraz Date: Fri, 13 Feb 2015 13:34:16 +0100 Subject: Handle some serious compilation warnings (603_nx-X11_compilation_warnings.full.patch). --- .../603_nx-X11_compilation_warnings.full.patch | 38 ---------------------- debian/patches/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 debian/patches/603_nx-X11_compilation_warnings.full.patch (limited to 'debian') diff --git a/debian/patches/603_nx-X11_compilation_warnings.full.patch b/debian/patches/603_nx-X11_compilation_warnings.full.patch deleted file mode 100644 index 3656461b6..000000000 --- a/debian/patches/603_nx-X11_compilation_warnings.full.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Handle some serious compilation warnings -Author: Mirraz Mirraz ---- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c 2013-09-30 18:39:42.357560169 +0600 -@@ -3259,7 +3259,6 @@ - vp->SrcReg[0].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[1].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[2].Swizzle = SWIZZLE_NOOP; -- vp->SrcReg[3].Swizzle = SWIZZLE_NOOP; - vp->DstReg.WriteMask = 0xf; - - switch (type) { ---- a/nx-X11/lib/X11/imLcPrs.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/lib/X11/imLcPrs.c 2013-09-30 19:02:56.925125678 +0600 -@@ -589,7 +589,7 @@ - - l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1); - if (l == LOCAL_UTF8_BUFSIZE - 1) { -- local_wc_buf[l] = '\0'; -+ local_utf8_buf[l] = '\0'; - } - if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) { - Xfree( rhs_string_wc ); ---- a/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-08-30 20:18:40.000000000 +0600 -+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c 2013-09-30 18:56:27.358995920 +0600 -@@ -37,6 +37,12 @@ - #include - #include - #include -+ -+/* stat() */ -+#include -+#include -+#include -+ - #define NEED_EVENTS 1 - #include - #include diff --git a/debian/patches/series b/debian/patches/series index c80570682..1d0f53bf9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -603_nx-X11_compilation_warnings.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch -- cgit v1.2.3 From ab8d1276f5c7ebef6f959cfb691cce5fff6867b4 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Fri, 13 Feb 2015 13:35:40 +0100 Subject: In Types.h, don't use STL internals on libc++ (605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch). The nx-libs-lite package does not compile on OS X Mavericks because Apple's clang compilers now default to compiling against the libc++ STL rather than (their outdated copy of) libstdc++. While the compiler still allows changing that, we should not rely on this being possible forever. The compiler chokes in Types.h, specifically the clear() methods in subclasses of vectors that use implementation details of the GNU STL. The attached patch fixes these compilation issues by not overriding the clear() method when compiling against libc++, since the libc++ headers seem to do essentially the same as the overriden method. --- ...ont-use-STL-internals-on-libc++.full+lite.patch | 52 ---------------------- debian/patches/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch (limited to 'debian') diff --git a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch deleted file mode 100644 index 60f33ce3f..000000000 --- a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: In Types.h, don't use STL internals on libc++. -Author: Clemens Lang -Abstract: - The nx-libs-lite package does not compile on OS X Mavericks because - Apple's clang compilers now default to compiling against the libc++ STL - rather than (their outdated copy of) libstdc++. - . - While the compiler still allows changing that, we should not rely on - this being possible forever. - . - The compiler chokes in Types.h, specifically the clear() methods in - subclasses of vectors that use implementation details of the GNU STL. - The attached patch fixes these compilation issues by not overriding the - clear() method when compiling against libc++, since the libc++ headers - seem to do essentially the same as the overriden method. ---- a/nxcomp/Types.h 2013-11-05 01:35:22.000000000 +0100 -+++ b/nxcomp/Types.h 2013-11-05 01:37:30.000000000 +0100 -@@ -55,6 +55,9 @@ - return &*(vector < unsigned char >::begin()); - } - -+ // Avoid overriding clear() when using libc++. Fiddling with STL internals -+ // doesn't really seem like a good idea to me anyway. -+ #ifndef _LIBCPP_VECTOR - void clear() - { - #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -@@ -95,12 +98,16 @@ - - #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */ - } -+ #endif /* #ifdef _LIBCPP_VECTOR */ - }; - - class T_messages : public vector < Message * > - { - public: - -+ // Avoid overriding clear() when using libc++. Fiddling with STL internals -+ // doesn't really seem like a good idea to me anyway. -+ #ifndef _LIBCPP_VECTOR - void clear() - { - #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -@@ -141,6 +148,7 @@ - - #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */ - } -+ #endif /* #ifndef _LIBCPP_VECTOR */ - }; - - typedef md5_byte_t * T_checksum; diff --git a/debian/patches/series b/debian/patches/series index 1d0f53bf9..ee95c5b49 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch 990_fix-DEBUG-and-TEST-builds.full.patch -- cgit v1.2.3 From 31cdd874cf2ca5b5cfad699ff1d283f0747821e4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 Feb 2015 13:37:33 +0100 Subject: Provide build support for aarch64 architecture (606_nx-X11_build-on-aarch64.full.patch). --- .../patches/606_nx-X11_build-on-aarch64.full.patch | 77 ---------------------- debian/patches/series | 1 - 2 files changed, 78 deletions(-) delete mode 100644 debian/patches/606_nx-X11_build-on-aarch64.full.patch (limited to 'debian') diff --git a/debian/patches/606_nx-X11_build-on-aarch64.full.patch b/debian/patches/606_nx-X11_build-on-aarch64.full.patch deleted file mode 100644 index bda43399a..000000000 --- a/debian/patches/606_nx-X11_build-on-aarch64.full.patch +++ /dev/null @@ -1,77 +0,0 @@ -Description: Provide build support for aarch64 architecture -Author: Orion Poplawski ---- a/nx-X11/config/cf/Imake.cf -+++ b/nx-X11/config/cf/Imake.cf -@@ -908,6 +908,9 @@ - # endif - # undef __ARMEB__ - # endif -+# ifdef __aarch64__ -+# define Arm64Architecture -+# endif - # ifdef mc68000 - # define Mc68020Architecture - # undef mc68000 ---- a/nx-X11/config/cf/linux.cf -+++ b/nx-X11/config/cf/linux.cf -@@ -844,6 +844,16 @@ - # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* Arm32Achitecture */ - -+#ifdef Arm64Architecture -+# define DefaultCCOptions -+# ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O3 -+# endif -+# define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm -+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* Arm64Achitecture */ -+ - #ifdef HPArchitecture - # define OptimizedCDebugFlags -O2 GccAliasingArgs - # define LinuxMachineDefines -D__hppa__ ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -526,6 +526,10 @@ - #define ByteOrder X_BIG_ENDIAN - #elif defined(Arm32Architecture) - #define ByteOrder X_LITTLE_ENDIAN -+#elif defined(Arm64ebArchitecture) -+#define ByteOrder X_BIG_ENDIAN -+#elif defined(Arm64Architecture) -+#define ByteOrder X_LITTLE_ENDIAN - #elif defined(RsArchitecture) - #define ByteOrder X_BIG_ENDIAN - #elif defined(PpcArchitecture) || defined(Ppc64Architecture) ---- a/nx-X11/programs/Xserver/include/servermd.h -+++ b/nx-X11/programs/Xserver/include/servermd.h -@@ -154,6 +154,28 @@ - - #endif /* __arm32__ */ - -+#ifdef __aarch64__ -+ -+#ifdef __AARCH64EL__ -+#define IMAGE_BYTE_ORDER LSBFirst -+#define BITMAP_BIT_ORDER LSBFirst -+#endif -+#ifdef __AARCH64EB__ -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#endif -+ -+# if defined(XF86MONOVGA) || defined(XF86VGA16) -+# define BITMAP_SCANLINE_UNIT 8 -+# endif -+ -+#define GLYPHPADBYTES 4 -+#define GETLEFTBITS_ALIGNMENT 1 -+#define LARGE_INSTRUCTION_CACHE -+#define AVOID_MEMORY_READ -+ -+#endif /* __aarch64__ */ -+ - #if defined (hpux) || defined __hppa__ - - #define IMAGE_BYTE_ORDER MSBFirst diff --git a/debian/patches/series b/debian/patches/series index ee95c5b49..e975e3cac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch 990_fix-DEBUG-and-TEST-builds.full.patch 991_fix-hr-typos.full+lite.patch -- cgit v1.2.3 From a8fb7d4f5149e28216ffd38838af1cbfd6527002 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 13 Feb 2015 13:38:39 +0100 Subject: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond (607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch). --- ...comp_macosx-X11-launcher-in-private-tmp.full+lite.patch | 14 -------------- debian/patches/series | 1 - 2 files changed, 15 deletions(-) delete mode 100644 debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch (limited to 'debian') diff --git a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch b/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch deleted file mode 100644 index 535671fef..000000000 --- a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond -Author: Mike Gabriel - ---- a/nxcomp/Loop.cpp -+++ b/nxcomp/Loop.cpp -@@ -4183,7 +4183,7 @@ - - #ifdef __APPLE__ - -- if (strncasecmp(display, "/tmp/launch", 11) == 0) -+ if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0)) - { - #ifdef TEST - *logofs << "Loop: Using launchd service on socket '" diff --git a/debian/patches/series b/debian/patches/series index e975e3cac..0c9d34366 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch 990_fix-DEBUG-and-TEST-builds.full.patch 991_fix-hr-typos.full+lite.patch 991_fix-hr-typos.full.patch -- cgit v1.2.3 From 6e662473126d0668493732ece7e3c3bb1b0ea72c Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Fri, 13 Feb 2015 13:41:31 +0100 Subject: Several fixes for building debug versions of NX (990_fix-DEBUG-and-TEST-builds.full.patch). (1) In nx-X11/programs/Xserver/dix: Fix several compile errors when specifying -DDEBUG globally. Previous GCC versions were more liberal and the code thus compiled. Also initialize/reset a count variable correctly. (2) In nx-X11/programs/Xserver/hw/nxagent/Render.c: Check for pSrc->pDrawable to exist instead of having nxagent segfault when it does not. This enables the possibility of compiling all nxagent modules in TEST mode. --- .../990_fix-DEBUG-and-TEST-builds.full.patch | 69 ---------------------- debian/patches/series | 1 - 2 files changed, 70 deletions(-) delete mode 100644 debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch (limited to 'debian') diff --git a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch b/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch deleted file mode 100644 index 23c8508a2..000000000 --- a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch +++ /dev/null @@ -1,69 +0,0 @@ -Author: Mihai Moldovan -Description: Several fixes for building debug versions of NX -Abstract: - (1) In nx-X11/programs/Xserver/dix: - . - Fix several compile errors when specifying -DDEBUG globally. Previous GCC - versions were more liberal and the code thus compiled. - . - Also initialize/reset a count variable correctly. - . - . - (2) In nx-X11/programs/Xserver/hw/nxagent/Render.c: - . - Check for pSrc->pDrawable to exist instead of having nxagent segfault when - it does not. - . - This enables the possibility of compiling all nxagent modules in TEST mode. - ---- a/nx-X11/programs/Xserver/dix/dixfonts.c -+++ b/nx-X11/programs/Xserver/dix/dixfonts.c -@@ -2203,7 +2203,7 @@ - byte = 0; - for (l = 0; l <= (cip->metrics.rightSideBearing - - cip->metrics.leftSideBearing); l++) { -- if (maskTab[l & 7] & row[l >> 3]) -+ if (maskTab[l & 7] & (((int*)row)[l >> 3])) - putchar('X'); - else - putchar('.'); ---- a/nx-X11/programs/Xserver/hw/nxagent/Render.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c -@@ -1678,10 +1678,11 @@ - - #ifdef TEST - -- fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", -- (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), -- pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); -- -+ if (pSrc->pDrawable) { -+ fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", -+ (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), -+ pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); -+ } - if (pSrc ->pDrawable != pDst -> pDrawable) - { - fprintf(stderr, "nxagentTrapezoids: Destination is a [%s] of geometry [%d,%d].\n", ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c -@@ -735,7 +735,7 @@ - - client->sequence++; - #ifdef DEBUG -- if (client->requestLogIndex == MAX_REQUEST_LOG) -+ if ((client->requestLogIndex >= MAX_REQUEST_LOG) || (client->requestLogIndex <= 0)) - client->requestLogIndex = 0; - client->requestLog[client->requestLogIndex] = MAJOROP; - client->requestLogIndex++; ---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c -@@ -2351,7 +2351,7 @@ - byte = 0; - for (l = 0; l <= (cip->metrics.rightSideBearing - - cip->metrics.leftSideBearing); l++) { -- if (maskTab[l & 7] & row[l >> 3]) -+ if (maskTab[l & 7] & (((int *)row)[l >> 3])) - putchar('X'); - else - putchar('.'); diff --git a/debian/patches/series b/debian/patches/series index 0c9d34366..76709c4ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -990_fix-DEBUG-and-TEST-builds.full.patch 991_fix-hr-typos.full+lite.patch 991_fix-hr-typos.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch -- cgit v1.2.3 From 23fb617551f7d89dbc1fc9e216b7f12d2936e1a2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 13 Feb 2015 13:43:54 +0100 Subject: Fix several typos in nxcomp. Former patch file names: 991_fix-hr-typos.full+lite.patch 991_fix-hr-typos.full.patch --- debian/patches/991_fix-hr-typos.full+lite.patch | 97 ------------------------- debian/patches/991_fix-hr-typos.full.patch | 36 --------- debian/patches/series | 2 - 3 files changed, 135 deletions(-) delete mode 100644 debian/patches/991_fix-hr-typos.full+lite.patch delete mode 100644 debian/patches/991_fix-hr-typos.full.patch (limited to 'debian') diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/991_fix-hr-typos.full+lite.patch deleted file mode 100644 index 4ff18462e..000000000 --- a/debian/patches/991_fix-hr-typos.full+lite.patch +++ /dev/null @@ -1,97 +0,0 @@ -Description: Fix several typos in nxcomp -Author: Mike Gabriel - ---- a/nxcomp/CHANGELOG -+++ b/nxcomp/CHANGELOG -@@ -668,7 +668,7 @@ - - nxcomp-2.0.0-69 - --- Changed the format of the persistent cache to accomodate the new -+- Changed the format of the persistent cache to accommodate the new - encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0 - should be still loaded and saved correctly when connected to and - old version of the library. ---- a/nxcomp/ClientReadBuffer.cpp -+++ b/nxcomp/ClientReadBuffer.cpp -@@ -29,7 +29,7 @@ - // - // Even if the pending data is not - // enough to make a complete message, -- // resize the buffer to accomodate -+ // resize the buffer to accommodate - // it all. - // - ---- a/nxcomp/EncodeBuffer.cpp -+++ b/nxcomp/EncodeBuffer.cpp -@@ -505,12 +505,12 @@ - { - #ifdef PANIC - *logofs << "EncodeBuffer: PANIC! Error in context [C] " -- << "growing buffer to accomodate " << numBytes -+ << "growing buffer to accommodate " << numBytes - << " bytes .\n" << logofs_flush; - #endif - - cerr << "Error" << ": Error in context [C] " -- << "growing encode buffer to accomodate " -+ << "growing encode buffer to accommodate " - << numBytes << " bytes.\n"; - - HandleAbort(); ---- a/nxcomp/GenericChannel.cpp -+++ b/nxcomp/GenericChannel.cpp -@@ -210,7 +210,7 @@ - // All data has been read from the read buffer. - // We still need to mark the end of the encode - // buffer just before sending the frame. This -- // allows us to accomodate multiple reads in -+ // allows us to accommodate multiple reads in - // a single frame. - // - ---- a/nxcomp/ProxyReadBuffer.cpp -+++ b/nxcomp/ProxyReadBuffer.cpp -@@ -50,7 +50,7 @@ - // - // Even if the readable data is not - // enough to make a complete message, -- // resize the buffer to accomodate -+ // resize the buffer to accommodate - // it all. - // - ---- a/nxcomp/ServerReadBuffer.cpp -+++ b/nxcomp/ServerReadBuffer.cpp -@@ -46,7 +46,7 @@ - // - // Even if the readable data is not - // enough to make a complete message, -- // resize the buffer to accomodate -+ // resize the buffer to accommodate - // it all. - // - ---- a/nxcomp/Transport.h -+++ b/nxcomp/Transport.h -@@ -226,7 +226,7 @@ - protected: - - // -- // Make room in the buffer to accomodate -+ // Make room in the buffer to accommodate - // at least size bytes. - // - ---- a/nxcomp/Types.h -+++ b/nxcomp/Types.h -@@ -179,7 +179,7 @@ - typedef list < int > T_list; - - // --// Used to accomodate data to be read and -+// Used to accommodate data to be read and - // written to a socket. - // - diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch deleted file mode 100644 index 3836adf55..000000000 --- a/debian/patches/991_fix-hr-typos.full.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Fix several typos in nx-X11 -Author: Mike Gabriel - ---- a/nx-X11/extras/Mesa/src/mesa/main/debug.c -+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c -@@ -43,7 +43,7 @@ - "GL_QUAD_STRIP", - "GL_POLYGON", - "outside begin/end", -- "inside unkown primitive", -+ "inside unknown primitive", - "unknown state" - }; - ---- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c -+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c -@@ -4106,7 +4106,7 @@ - if (*inst++ != REVISION) { - _mesa_set_program_error (ctx, 0, "Grammar version mismatch"); - _mesa_error(ctx, GL_INVALID_OPERATION, -- "glProgramStringARB(Grammar verison mismatch)"); -+ "glProgramStringARB(Grammar version mismatch)"); - err = GL_TRUE; - } - else { ---- a/nx-X11/ChangeLog.X.org -+++ b/nx-X11/ChangeLog.X.org -@@ -12733,7 +12733,7 @@ - * programs/xkill/xkill.c: (get_window_id): - Changed cursor for the 'kill' action from XC_draped_box to - XC_Pirate. If you don't like it we can change it back -- (original author unkown). -+ (original author unknown). - - * programs/xman/vendor.h: - Added 'pic' to the man page rendering command pipeline diff --git a/debian/patches/series b/debian/patches/series index 76709c4ad..3ee62f39c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -991_fix-hr-typos.full+lite.patch -991_fix-hr-typos.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch -- cgit v1.2.3 From 1fd8551f1632efbc2655c9293087bba08cf2f0c9 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Fri, 13 Feb 2015 13:57:39 +0100 Subject: Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen (999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch). When launched with NX Agent flavour, the startup screen gets unbranded by this patch (the !M logo does not get shown). When launched with X2Go Agent flavour, the startup screen gets branded with the X2GO logo. --- ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 367 --------------------- debian/patches/series | 1 - 2 files changed, 368 deletions(-) delete mode 100644 debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch (limited to 'debian') diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch deleted file mode 100644 index 62c85cfb2..000000000 --- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch +++ /dev/null @@ -1,367 +0,0 @@ -Description: Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen - When launched with NX Agent flavour, the startup screen gets unbranded by - this patch (the !M logo does not get shown). - . - When launched with X2Go Agent flavour, the startup screen gets branded - with the X2GO logo. -Forwarded: not-needed -Author: Oleksandr Shneyder -Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c -@@ -35,6 +35,7 @@ - #include "Windows.h" - #include "Atoms.h" - #include "Trap.h" -+#include "Init.h" - - /* - * Set here the required log level. -@@ -53,6 +54,7 @@ - int nxagentLogoWhite; - int nxagentLogoRed; - int nxagentLogoBlack; -+int nxagentLogoGray; - - void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height); - -@@ -166,6 +168,15 @@ - XPoint m[12]; - int w, h, c, w2, h2; - -+ /* -+ * Show only X2GO Logo when running as X2Go Agent -+ */ -+ if(! nxagentX2go) -+ { -+ nxagentPixmapLogo = 0L; -+ return; -+ } -+ - #ifdef DEBUG - fprintf(stderr, "nxagenShowtLogo: Got called.\n"); - #endif -@@ -218,75 +229,146 @@ - XSetForeground(nxagentDisplay, gc, nxagentLogoRed); - XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); - -- rect[0].x = w2-10*c; rect[0].y = h2-8*c; -- rect[1].x = w2-10*c; rect[1].y = h2+8*c; -- rect[2].x = w2+10*c; rect[2].y = h2+8*c; -- rect[3].x = w2+10*c; rect[3].y = h2-8*c; -+ /* -+ * Draw X2GO Logo -+ */ - -+ /* -+ * Begin 'X'. -+ */ -+ -+ XSetForeground(nxagentDisplay, gc, nxagentLogoGray); -+ XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); -+ rect[0].x = w2-7*c; rect[0].y = h2-5*c; -+ rect[1].x = w2-8*c; rect[1].y = h2-5*c; -+ rect[2].x = w2-4*c; rect[2].y = h2+3*c; -+ rect[3].x = w2-3*c; rect[3].y = h2+3*c; - XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -- #ifdef NXAGENT_LOGO_DEBUG -- fprintf(stderr, "filled red rect\n"); -- #endif -+ rect[0].x = w2-4*c; rect[0].y = h2-5*c; -+ rect[1].x = w2-3*c; rect[1].y = h2-5*c; -+ rect[2].x = w2-7*c; rect[2].y = h2+3*c; -+ rect[3].x = w2-8*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -- rect[0].x = w2-9*c; rect[0].y = h2-7*c; -- rect[1].x = w2-9*c; rect[1].y = h2+7*c; -- rect[2].x = w2+9*c; rect[2].y = h2+7*c; -- rect[3].x = w2+9*c; rect[3].y = h2-7*c; -+ /* -+ * End 'X'. -+ */ - -- XSetForeground(nxagentDisplay, gc, nxagentLogoWhite); -- XSetBackground(nxagentDisplay, gc, nxagentLogoRed); -+ /* -+ * Start '2'. -+ */ -+ -+ rect[0].x = w2-2*c; rect[0].y = h2-5*c; -+ rect[1].x = w2-1*c; rect[1].y = h2-5*c; -+ rect[2].x = w2-1*c; rect[2].y = h2-3*c; -+ rect[3].x = w2-2*c; rect[3].y = h2-3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); -+ -+ rect[0].x = w2-2*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+2*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+2*c; rect[2].y = h2-4*c; -+ rect[3].x = w2-2*c; rect[3].y = h2-4*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -+ rect[0].x = w2+1*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+2*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+2*c; rect[2].y = h2-2*c; -+ rect[3].x = w2+1*c; rect[3].y = h2-2*c; - XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -+ rect[0].x = w2+2*c; rect[0].y = h2-2*c; -+ rect[1].x = w2+1*c; rect[1].y = h2-2*c; -+ rect[2].x = w2-2*c; rect[2].y = h2+2*c; -+ rect[3].x = w2-1*c; rect[3].y = h2+2*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); -+ -+ -+ rect[0].x = w2-2*c; rect[0].y = h2+2*c; -+ rect[1].x = w2+2*c; rect[1].y = h2+2*c; -+ rect[2].x = w2+2*c; rect[2].y = h2+3*c; -+ rect[3].x = w2-2*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - /* -- * Begin 'M'. -+ * End '2'. - */ - -- m[0].x = w2-3*c; m[0].y = h2-5*c; -- m[1].x = w2+7*c; m[1].y = h2-5*c; -- m[2].x = w2+7*c; m[2].y = h2+5*c; -- m[3].x = w2+5*c; m[3].y = h2+5*c; -- m[4].x = w2+5*c; m[4].y = h2-3*c; -- m[5].x = w2+3*c; m[5].y = h2-3*c; -- m[6].x = w2+3*c; m[6].y = h2+5*c; -- m[7].x = w2+1*c; m[7].y = h2+5*c; -- m[8].x = w2+1*c; m[8].y = h2-3*c; -- m[9].x = w2-1*c; m[9].y = h2-3*c; -- m[10].x = w2-1*c; m[10].y = h2+5*c; -- m[11].x = w2-3*c; m[11].y = h2+5*c; -+ /* -+ * Start 'G'. -+ */ - -- XSetForeground(nxagentDisplay, gc, nxagentLogoRed); -- XSetBackground(nxagentDisplay, gc, nxagentLogoWhite); -+ rect[0].x = w2+3*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+7*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+7*c; rect[2].y = h2-4*c; -+ rect[3].x = w2+3*c; rect[3].y = h2-4*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -- XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, m, 12, Nonconvex, CoordModeOrigin); -+ rect[0].x = w2+3*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+4*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+4*c; rect[2].y = h2+3*c; -+ rect[3].x = w2+3*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -+ rect[0].x = w2+3*c; rect[0].y = h2+2*c; -+ rect[1].x = w2+7*c; rect[1].y = h2+2*c; -+ rect[2].x = w2+7*c; rect[2].y = h2+3*c; -+ rect[3].x = w2+3*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); -+ -+ rect[0].x = w2+6*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+7*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+7*c; rect[2].y = h2-3*c; -+ rect[3].x = w2+6*c; rect[3].y = h2-3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); -+ -+ rect[0].x = w2+6*c; rect[0].y = h2-0*c; -+ rect[1].x = w2+7*c; rect[1].y = h2-0*c; -+ rect[2].x = w2+7*c; rect[2].y = h2+3*c; -+ rect[3].x = w2+6*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); -+ -+ rect[0].x = w2+5*c; rect[0].y = h2-1*c; -+ rect[1].x = w2+7*c; rect[1].y = h2-1*c; -+ rect[2].x = w2+7*c; rect[2].y = h2+0*c; -+ rect[3].x = w2+5*c; rect[3].y = h2+0*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - /* -- * End 'M'. -+ * End 'G'. - */ - - /* -- * Begin '!'. -+ * Start 'O'. - */ - -- rect[0].x = w2-7*c; rect[0].y = h2-5*c; -- rect[1].x = w2-5*c; rect[1].y = h2-5*c; -- rect[2].x = w2-5*c; rect[2].y = h2+2*c; -- rect[3].x = w2-7*c; rect[3].y = h2+2*c; -+ rect[0].x = w2+8*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+12*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+12*c; rect[2].y = h2-4*c; -+ rect[3].x = w2+8*c; rect[3].y = h2-4*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -+ rect[0].x = w2+8*c; rect[0].y = h2+3*c; -+ rect[1].x = w2+12*c; rect[1].y = h2+3*c; -+ rect[2].x = w2+12*c; rect[2].y = h2+2*c; -+ rect[3].x = w2+8*c; rect[3].y = h2+2*c; - XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -- rect[0].x = w2-7*c; rect[0].y = h2+3*c; -- rect[1].x = w2-5*c; rect[1].y = h2+3*c; -- rect[2].x = w2-5*c; rect[2].y = h2+5*c; -- rect[3].x = w2-7*c; rect[3].y = h2+5*c; -+ rect[0].x = w2+8*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+9*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+9*c; rect[2].y = h2+3*c; -+ rect[3].x = w2+8*c; rect[3].y = h2+3*c; -+ XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - -+ rect[0].x = w2+11*c; rect[0].y = h2-5*c; -+ rect[1].x = w2+12*c; rect[1].y = h2-5*c; -+ rect[2].x = w2+12*c; rect[2].y = h2+3*c; -+ rect[3].x = w2+11*c; rect[3].y = h2+3*c; - XFillPolygon(nxagentDisplay, nxagentPixmapLogo, gc, rect, 4, Convex, CoordModeOrigin); - - /* -- * End 'M'. -+ * End 'O'. - */ - -+ - XSetWindowBackgroundPixmap(nxagentDisplay, win, nxagentPixmapLogo); - - #ifdef NXAGENT_LOGO_DEBUG ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -1430,22 +1430,10 @@ - g = pV.green_mask; - b = pV.blue_mask; - -- if (!pV.red_mask || !pV.green_mask || !pV.blue_mask) -- { -- nxagentLogoBlack = 0x000000; -- nxagentLogoRed = 0xff0000; -- nxagentLogoWhite = 0xffffff; -- } -- else -- { -- for (or=0, off=0x800000; (r&(off>>or)) == 0; or++); -- for (og=0, off=0x800000; (g&(off>>og)) == 0; og++); -- for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++); -- -- nxagentLogoRed = nxagentLogoColor(0xff0000); -- nxagentLogoBlack = nxagentLogoColor(0x000000); -- nxagentLogoWhite = 0xffffff; -- } -+ nxagentLogoBlack = 0x000000; -+ nxagentLogoRed = 0xff0000; -+ nxagentLogoWhite = 0xffffff; -+ nxagentLogoGray = 0x222222; - - #ifdef WATCH - -@@ -2696,22 +2684,10 @@ - g = pV.green_mask; - b = pV.blue_mask; - -- if (!pV.red_mask || !pV.green_mask || !pV.blue_mask) -- { -- nxagentLogoBlack = 0x000000; -- nxagentLogoRed = 0xff0000; -- nxagentLogoWhite = 0xffffff; -- } -- else -- { -- for (or=0, off=0x800000; (r&(off>>or)) == 0; or++); -- for (og=0, off=0x800000; (g&(off>>og)) == 0; og++); -- for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++); -- -- nxagentLogoRed = nxagentLogoColor(0xff0000); -- nxagentLogoBlack = nxagentLogoColor(0x000000); -- nxagentLogoWhite = 0xffffff; -- } -+ nxagentLogoBlack = 0x000000; -+ nxagentLogoRed = 0xff0000; -+ nxagentLogoWhite = 0xffffff; -+ nxagentLogoGray = 0x222222; - - useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape); - ---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h -@@ -33,6 +33,7 @@ - extern int nxagentLogoWhite; - extern int nxagentLogoRed; - extern int nxagentLogoBlack; -+extern int nxagentLogoGray; - - extern Window nxagentSplashWindow; - ---- a/nx-X11/programs/Xserver/os/oscolor.c -+++ b/nx-X11/programs/Xserver/os/oscolor.c -@@ -53,7 +53,19 @@ - #include - #include - --static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+/* FIXME: we need more intelligent code (like provided by the nxagentX2go -+ * var in hw/nxagent/Init.h) to detect our current runtime mode (running -+ * as x2goagent, running as nxagent) -+ */ -+static char* nxAltRgbPaths[] = {"/etc/x2go/rgb", \ -+ "/usr/share/x2go/rgb", \ -+ "/usr/local/share/x2go/rgb", \ -+ "/etc/nxagent/rgb", \ -+ "/usr/share/nx/rgb", \ -+ "/usr/local/share/nx/rgb", \ -+ "/usr/NX/share/rgb", \ -+ "/usr/share/X11/rgb", \ -+ "/etc/X11/rgb"}; - static char _NXRgbPath[1024]; - - #endif ---- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c -@@ -62,6 +62,7 @@ - - #include "globals.h" - #include "property.h" -+#include "Init.h" - - #include - -@@ -138,8 +139,11 @@ - #ifndef XKB_ALTERNATE_BASE_DIRECTORY - #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" - #endif --#ifndef XKB_CONFIG_FILE --#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" -+#ifndef XKB_CONFIG_FILE_NX -+#define XKB_CONFIG_FILE_NX "/etc/nxagent/nxagent.keyboard" -+#endif -+#ifndef XKB_CONFIG_FILE_X2GO -+#define XKB_CONFIG_FILE_X2GO "/etc/x2go/x2goagent.keyboard" - #endif - #ifndef XKB_DFLT_RULES_FILE - #define XKB_DFLT_RULES_FILE "xfree86" -@@ -988,7 +992,10 @@ - - XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); - -- nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); -+ if (nxagentX2go) -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); -+ else -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); - - nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); - -@@ -997,7 +1004,10 @@ - FatalError("nxagentKeyboardProc: malloc failed."); - } - -- strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); -+ if (nxagentX2go) -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); -+ else -+ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); - - #ifdef TEST - fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", diff --git a/debian/patches/series b/debian/patches/series index 3ee62f39c..1a9405986 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch -- cgit v1.2.3 From db3c6a6d2ce6e5ca7528b918327104df0c846b53 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 14:21:52 +0100 Subject: Revert "Fix build when LDFLAGS (etc) contains spaces." This reverts commit 4436e97903aa6e2a7732fb98dcb46758a73fe130. --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 1a9b12341..396f9b937 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,10 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS --export=cmdline) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS --export=cmdline) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS --export=cmdline) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS --export=cmdline) +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- cgit v1.2.3 From e54e896a6e2dcfc2c80a4d77db819b802dfd1fc1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 14:23:10 +0100 Subject: Use proper quoting on build flag vars (they may contain spaces). --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a8c2480f6..6ce69dbc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + Add to B-D: expat. + Install upstream ChangeLogs into bin:packages. + Remove upstream nx-libs ChangeLog during override_dh_clean. + + Use proper quoting on build flag vars (they may contain spaces). * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do diff --git a/debian/rules b/debian/rules index 396f9b937..b38d8a0b6 100755 --- a/debian/rules +++ b/debian/rules @@ -114,7 +114,7 @@ override_dh_auto_build: # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst - LOCAL_LDFLAGS=$(LDFLAGS) SHLIBGLOBALSFLAGS=$(LDFLAGS) SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel + LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From 2d4a61d3c59c1a1bd8c01d28f48e42dba85ba1b7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 14:28:35 +0100 Subject: Version bump, continuing NX 3.x development.. Targetting NX 3.6.x some time. --- debian/VERSION | 2 +- debian/changelog | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/VERSION b/debian/VERSION index 22c248445..9af1780f9 100644 --- a/debian/VERSION +++ b/debian/VERSION @@ -1 +1 @@ -3.5.0.29 +3.5.99.0 diff --git a/debian/changelog b/debian/changelog index 6ce69dbc5..834868790 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium + + * Version bump, continuing NX 3.x development.. + Targeting NX 3.6.x.y some time. + + -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 + nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium [ Paul Szabo ] @@ -124,7 +131,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. - -- Mike Gabriel Thu, 13 Nov 2014 21:59:00 +0100 + -- Mike Gabriel Sat, 14 Feb 2015 14:25:17 +0100 nx-libs (2:3.5.0.28-0x2go1) unstable; urgency=medium -- cgit v1.2.3 From ea8ca04a7cb478c6c379e64e5db655fff9c0e15a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:08:07 +0100 Subject: Move Makefile (and auxiliary file replace.sh) into base folder. Adapt packaging these scripts: debian/roll-tarballs.sh debian/rules nx-libs.spec --- debian/Makefile.nx-libs | 184 --------------------------------------------- debian/Makefile.replace.sh | 51 ------------- debian/roll-tarballs.sh | 5 -- debian/rules | 5 +- 4 files changed, 1 insertion(+), 244 deletions(-) delete mode 100644 debian/Makefile.nx-libs delete mode 100644 debian/Makefile.replace.sh (limited to 'debian') diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs deleted file mode 100644 index 3aeda739b..000000000 --- a/debian/Makefile.nx-libs +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/make -f - -INSTALL_DIR=install -d -m 755 -INSTALL_FILE=install -m 644 -INSTALL_PROGRAM=install -m 755 -INSTALL_SYMLINK=ln -s -f -COPY_SYMLINK=cp -a -RM_FILE=rm -f -RM_DIR=rmdir -p --ignore-fail-on-non-empty - -ETCDIR_NX ?= /etc/nxagent -ETCDIR_X2GO ?= /etc/x2go -PREFIX ?= /usr/local -BINDIR ?= $(PREFIX)/bin -LIBDIR ?= $(PREFIX)/lib -USRLIBDIR ?= $(LIBDIR) -INCLUDEDIR ?= $(PREFIX)/include -NXLIBDIR ?= $(PREFIX)/lib/nx -X2GOLIBDIR ?= $(PREFIX)/lib/x2go -CONFIGURE ?= ./configure - -SHELL:=/bin/bash - -%: - if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi - if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi - if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ - if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ - if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ - fi - -all: build - -test: - echo "No testing for NX (redistributed)" - -build-lite: - cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} - cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} - -build-full: -# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... - cd nxcomp && autoconf - cd nxcompext && autoconf - cd nxcompshad && autoconf - cd nx-X11 && ${MAKE} World - cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} - -build: - if ! test -d nx-X11; then \ - ${MAKE} build-lite; \ - else \ - ${MAKE} build-full; \ - fi - -install: - $(MAKE) install-lite - [ ! -d nx-X11 ] || $(MAKE) install-full - -install-lite: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for d in nxcomp nxproxy; do \ - $(MAKE) -C $$d install; done - mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/ - mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/ - for f in nxproxy; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ - $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ - gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 - - -install-full: - for f in nxagent nxauth x2goagent; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done - for d in nxcompext nxcompshad; do \ - $(MAKE) -C $$d install; done - - $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ - cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(NXLIBDIR)/bin/nxagent x2goagent - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps - $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps - $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx - $(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions - $(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions - - $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin - $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin - $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ - $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/ - $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/ - $(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/ - mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1 - gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 - - # create a clean nx-X11/.build-exports space - rm -Rf nx-X11/.build-exports - mkdir -p nx-X11/.build-exports/include - mkdir -p nx-X11/.build-exports/lib - - # copy headers (for libnx-x11-dev) - cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - - # copy libs (for libnx-x11), we want the targets of the links - . replace.sh; set -x; find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ - libfile=$$(basename $$libpath); \ - libdir=$$(dirname $$libpath); \ - link=$$(readlink $$libpath); \ - \ - mkdir -p "$$(string_rep "$$libdir" exports .build-exports)"; \ - cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \ - done; - - $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR) - $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(USRLIBDIR)/ - - . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ - while read dirname; do \ - $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"; \ - $(INSTALL_FILE) $${dirname}/*.h \ - "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"/ || true; \ - done; \ - - # Provide means for Xinerama support in NX/X2Go sessions. This - # This also requires two post-install symlinks: - # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr//libX11.so.6 - # (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr//libXext.so.6 - $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama - $(INSTALL_SYMLINK) $(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 - - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps - $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ - $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps/ - - $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX) - $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO) - $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/ - $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_X2GO)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_X2GO)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_NX)/ - $(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/ - $(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/ - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go - $(INSTALL_SYMLINK) $(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb - - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx - $(INSTALL_SYMLINK) $(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb - -uninstall: - $(MAKE) uninstall-lite - [ ! -d nx-X11 ] || $(MAKE) uninstall-full - -uninstall-lite: - for f in nxproxy; do \ - $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done - -uninstall-full: - for f in nxagent nxauth x2goagent; do \ - $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done - - $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent - $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ - - if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi - if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi - - if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ - if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ - if test -f nx-X11/Makefile; then \ - if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \ - if test -d $(INCLUDEDIR)/nx; then rm -rf $(INCLUDEDIR)/nx; fi; \ - fi; \ - fi diff --git a/debian/Makefile.replace.sh b/debian/Makefile.replace.sh deleted file mode 100644 index 83d6b5b3e..000000000 --- a/debian/Makefile.replace.sh +++ /dev/null @@ -1,51 +0,0 @@ -# from http://mywiki.wooledge.org/BashFAQ/021 - -# The ${a/b/c} substitution is not POSIX compatible. Additionally, in -# bash 3.x, quotes do not escape slashes. This causes screwed up -# installation paths. -# -# SLES 11, bash-3.2-147.9.13 -# $ dirname="foo/bar" -# $ echo ${dirname//"foo/bar"/"omg/nei"} -# bar/omg/nei/bar -# -# openSUSE 12.2, bash-4.2-51.6.1 -# $ dirname="foo/bar" -# $ echo ${dirname//"foo/bar"/"omg/nei"} -# omg/nei -# -# openSUSE 12.2, dash-0.5.7-5.1.2.x86_64 -# $ dirname="foo/bar" -# $ echo ${dirname//"foo/bar"/"omg/nei"} -# dash: 2: Bad substitution -# -# Source this file into your bash scripts to make available -# a replacement (the string_rep function) for this substitution -# mess. -# - -string_rep() -{ - # initialize vars - in=$1 - unset out - - # SEARCH must not be empty - test -n "$2" || return - - while true; do - # break loop if SEARCH is no longer in "$in" - case "$in" in - *"$2"*) : ;; - *) break;; - esac - - # append everything in "$in", up to the first instance of SEARCH, and REP, to "$out" - out=$out${in%%"$2"*}$3 - # remove everything up to and including the first instance of SEARCH from "$in" - in=${in#*"$2"} - done - - # append whatever is left in "$in" after the last instance of SEARCH to out, and print - printf '%s%s\n' "$out" "$in" -} diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 3ff7667f7..02a25dff5 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -34,7 +34,6 @@ PROJECT="nx-libs" NULL="" test -d .git || usage -test -f debian/Makefile.nx-libs || usage RELEASE="$1" test -n "${RELEASE}" || usage CHECKOUT="$2" @@ -135,10 +134,6 @@ fi mv -v debian/changelog doc/changelog -# copy the top-level makefile if no quilt patch created it before -test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile -test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index b38d8a0b6..ad9ddded6 100755 --- a/debian/rules +++ b/debian/rules @@ -23,9 +23,8 @@ override_dh_clean: rm -f doc/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi @@ -98,8 +97,6 @@ override_dh_auto_build: cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog cp -a nxproxy/CHANGELOG nxproxy/changelog - ln -s debian/Makefile.nx-libs Makefile - ln -s debian/Makefile.replace.sh replace.sh ln -s debian/wrappers bin mkdir -p etc/ ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg -- cgit v1.2.3 From ce531230f148a8c586a6e29c340e2db03d7bd3bb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:14:23 +0100 Subject: VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION and hw/nxagent/VERSION. This commit removes the debian/VERSION file at makes it now unnecessary to copy/symlink the VERSION file at build time. These build scripts got adapted: debian/roll-tarballs.sh debian/rules nx-libs.spec Furthermore, all NX component now use the main VERSION file as reference. typechange: nxcomp/VERSION typechange: nxcompext/VERSION typechange: nxcompshad/VERSION typechange: nxproxy/VERSION --- debian/VERSION | 1 - debian/roll-tarballs.sh | 2 -- debian/rules | 6 +----- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 debian/VERSION (limited to 'debian') diff --git a/debian/VERSION b/debian/VERSION deleted file mode 100644 index 9af1780f9..000000000 --- a/debian/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.99.0 diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 02a25dff5..03ab6778b 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -90,7 +90,6 @@ if [ "x$MODE" = "xfull" ]; then cp -v debian/rgb ./etc/ cp -v debian/nxagent.keyboard ./etc/ cp -v debian/x2goagent.keyboard ./etc/ - cp -v debian/VERSION ./VERSION.x2goagent else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* @@ -101,7 +100,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/VERSION ./nxcomp/VERSION cp -v debian/COPYING.full+lite COPYING cp -v debian/nxagent.keyboard nxagent.keyboard cp -v debian/x2goagent.keyboard x2goagent.keyboard diff --git a/debian/rules b/debian/rules index ad9ddded6..e0b4166f5 100755 --- a/debian/rules +++ b/debian/rules @@ -24,10 +24,9 @@ override_dh_clean: rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ - if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi dh_clean override_dh_installchangelog: @@ -91,7 +90,6 @@ override_dh_auto_build: # create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog cp -a nxcomp/CHANGELOG nxcomp/changelog - if [ -f nxcomp/VERSION ]; then cp nxcomp/VERSION nxcomp/.VERSION.NoMachine; fi cp -a nxcompext/CHANGELOG nxcompext/changelog cp -a nxcompshad/CHANGELOG nxcompshad/changelog cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog @@ -105,8 +103,6 @@ override_dh_auto_build: ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard mkdir -p doc/ ln -s ../debian/changelog doc/changelog - ln -sf debian/VERSION VERSION.x2goagent - ln -sf ../debian/VERSION nxcomp/VERSION # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst -- cgit v1.2.3 From 1a824cfb54fa4a60a50b75923e4b32a2458d9404 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:23:59 +0100 Subject: Prepare for maintaing upstream changes in upstream ChangeLog. This makes it obsolete to add changes to debian/changelog. We document our changes in Git (3.6.x branch and other related branches). On release, we generate an upstream ChangeLog from Git history. Only on the 3.5.0.x, we continue maintaining our changes in debian/changelog (to be compliant with current nx-libs release workflow in X2Go). The following packaging scripts needed adaptations to this change: debian/roll-tarballs.sh debian/rules nx-libs.spec --- debian/roll-tarballs.sh | 2 -- debian/rules | 19 ------------------- 2 files changed, 21 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 03ab6778b..37c897a66 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -130,8 +130,6 @@ else test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg fi -mv -v debian/changelog doc/changelog - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index e0b4166f5..b17828231 100755 --- a/debian/rules +++ b/debian/rules @@ -19,21 +19,12 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - rm -f nx*/changelog - rm -f doc/changelog - rm -f nx-X11/programs/Xserver/hw/nxagent/changelog - rm -f nx-X11/programs/nxauth/changelog . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean -override_dh_installchangelog: - - ### the doc/changelog file is the actual NX (redistributed) ChangeLog - dh_installchangelog doc/changelog - override_dh_install: # handle builds for Debian squeeze (non multi-arch) @@ -87,22 +78,12 @@ override_dh_auto_install: override_dh_auto_build: - # create copies of upstream changelogs so that names apply to Debian policy... - cp -a nx-X11/CHANGELOG nx-X11/changelog - cp -a nxcomp/CHANGELOG nxcomp/changelog - cp -a nxcompext/CHANGELOG nxcompext/changelog - cp -a nxcompshad/CHANGELOG nxcompshad/changelog - cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog - cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog - cp -a nxproxy/CHANGELOG nxproxy/changelog ln -s debian/wrappers bin mkdir -p etc/ ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s ../debian/rgb etc/rgb ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard - mkdir -p doc/ - ln -s ../debian/changelog doc/changelog # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst -- cgit v1.2.3 From 53329e60938447850479858449a94f3d0467ef03 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:29:25 +0100 Subject: Provide wrapper scripts for launch NX components in $(src)/bin/. The installation process copies NX wrapper scripts into $(srcbase)/bin/ before build time. Those wrapper scripts are now in place natively and need not to be copied prior to building NX. Packaging scripts with adaptation: debian/roll-tarballs.sh debian/rules debian/*.docs nx-libs.spec --- debian/libnx-x11-6.docs | 1 - debian/libnx-xau6.docs | 1 - debian/libnx-xcomposite1.docs | 1 - debian/libnx-xdamage1.docs | 1 - debian/libnx-xdmcp6.docs | 1 - debian/libnx-xext6.docs | 1 - debian/libnx-xfixes3.docs | 1 - debian/libnx-xinerama1.docs | 1 - debian/libnx-xpm4.docs | 1 - debian/libnx-xrandr2.docs | 1 - debian/libnx-xrender1.docs | 1 - debian/libnx-xtst6.docs | 1 - debian/libxcomp3.docs | 1 - debian/libxcompext3.docs | 1 - debian/libxcompshad3.docs | 1 - debian/nxagent.docs | 1 - debian/nxauth.docs | 1 - debian/nxproxy.docs | 1 - debian/roll-tarballs.sh | 10 +--------- debian/rules | 3 +-- debian/wrappers/nxagent | 29 ----------------------------- debian/wrappers/nxauth | 29 ----------------------------- debian/wrappers/nxproxy | 29 ----------------------------- debian/wrappers/x2goagent | 29 ----------------------------- 24 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 debian/libnx-x11-6.docs delete mode 100644 debian/libnx-xau6.docs delete mode 100644 debian/libnx-xcomposite1.docs delete mode 100644 debian/libnx-xdamage1.docs delete mode 100644 debian/libnx-xdmcp6.docs delete mode 100644 debian/libnx-xext6.docs delete mode 100644 debian/libnx-xfixes3.docs delete mode 100644 debian/libnx-xinerama1.docs delete mode 100644 debian/libnx-xpm4.docs delete mode 100644 debian/libnx-xrandr2.docs delete mode 100644 debian/libnx-xrender1.docs delete mode 100644 debian/libnx-xtst6.docs delete mode 100644 debian/libxcomp3.docs delete mode 100644 debian/libxcompext3.docs delete mode 100644 debian/libxcompshad3.docs delete mode 100644 debian/nxauth.docs delete mode 100644 debian/wrappers/nxagent delete mode 100644 debian/wrappers/nxauth delete mode 100644 debian/wrappers/nxproxy delete mode 100644 debian/wrappers/x2goagent (limited to 'debian') diff --git a/debian/libnx-x11-6.docs b/debian/libnx-x11-6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-x11-6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xau6.docs b/debian/libnx-xau6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xau6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xcomposite1.docs b/debian/libnx-xcomposite1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xcomposite1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xdamage1.docs b/debian/libnx-xdamage1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xdamage1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xdmcp6.docs b/debian/libnx-xdmcp6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xdmcp6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xext6.docs b/debian/libnx-xext6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xext6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xfixes3.docs b/debian/libnx-xfixes3.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xfixes3.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xinerama1.docs b/debian/libnx-xinerama1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xinerama1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xpm4.docs b/debian/libnx-xpm4.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xpm4.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xrandr2.docs b/debian/libnx-xrandr2.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xrandr2.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xrender1.docs b/debian/libnx-xrender1.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xrender1.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libnx-xtst6.docs b/debian/libnx-xtst6.docs deleted file mode 100644 index 5a57a3fdc..000000000 --- a/debian/libnx-xtst6.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/changelog \ No newline at end of file diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs deleted file mode 100644 index 97efc9f41..000000000 --- a/debian/libxcomp3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcomp/changelog diff --git a/debian/libxcompext3.docs b/debian/libxcompext3.docs deleted file mode 100644 index 8323a3471..000000000 --- a/debian/libxcompext3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcompext/changelog diff --git a/debian/libxcompshad3.docs b/debian/libxcompshad3.docs deleted file mode 100644 index 33632b9a6..000000000 --- a/debian/libxcompshad3.docs +++ /dev/null @@ -1 +0,0 @@ -nxcompshad/changelog diff --git a/debian/nxagent.docs b/debian/nxagent.docs index 6d791c6da..5d7d87aed 100644 --- a/debian/nxagent.docs +++ b/debian/nxagent.docs @@ -1,2 +1 @@ -nx-X11/programs/Xserver/hw/nxagent/changelog README.keystrokes \ No newline at end of file diff --git a/debian/nxauth.docs b/debian/nxauth.docs deleted file mode 100644 index aaa115f2c..000000000 --- a/debian/nxauth.docs +++ /dev/null @@ -1 +0,0 @@ -nx-X11/programs/nxauth/changelog \ No newline at end of file diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs index 4b3d18d8c..2243d21ac 100644 --- a/debian/nxproxy.docs +++ b/debian/nxproxy.docs @@ -1,4 +1,3 @@ -nxproxy/changelog nxproxy/README nxproxy/README-IPAQ nxproxy/README-VALGRIND diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 37c897a66..384bc57e8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -116,15 +116,7 @@ for f in $(ls README* 2>/dev/null); do mv -v $f doc/; done -mkdir -p bin/ -if [ "$MODE" = "lite" ]; then - # copy wrapper script nxproxy only into tarball - cp -v debian/wrappers/nxproxy bin/ -else - # copy wrapper scripts into tarball - for w in $(ls debian/wrappers/* 2>/dev/null); do - cp -v $w bin/ - done +if [ "$MODE" = "full" ]; then # provide a default keystrokes.cfg file mkdir -p etc test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg diff --git a/debian/rules b/debian/rules index b17828231..7b60a46a4 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean @@ -78,7 +78,6 @@ override_dh_auto_install: override_dh_auto_build: - ln -s debian/wrappers bin mkdir -p etc/ ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s ../debian/rgb etc/rgb diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent deleted file mode 100644 index 6306ed069..000000000 --- a/debian/wrappers/nxagent +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2012 Mike Gabriel -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. - -NXAPP=nxagent -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx - -# make sure nxagent starts properly with pam_tmpdir.so being in use -NX_TEMP=${NX_TEMP:-/tmp} -export NX_TEMP - -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@" diff --git a/debian/wrappers/nxauth b/debian/wrappers/nxauth deleted file mode 100644 index c8dbb83f3..000000000 --- a/debian/wrappers/nxauth +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2012 Mike Gabriel -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. - -NXAPP=nxauth -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx - -# make sure nxagent starts properly with pam_tmpdir.so being in use -NX_TEMP=${NX_TEMP:-/tmp} -export NX_TEMP - -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file diff --git a/debian/wrappers/nxproxy b/debian/wrappers/nxproxy deleted file mode 100644 index 23e7109e3..000000000 --- a/debian/wrappers/nxproxy +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2012 Mike Gabriel -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. - -NXAPP=nxproxy -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx - -# make sure nxagent starts properly with pam_tmpdir.so being in use -NX_TEMP=${NX_TEMP:-/tmp} -export NX_TEMP - -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent deleted file mode 100644 index 09011efbe..000000000 --- a/debian/wrappers/x2goagent +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2012 Mike Gabriel -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. - -NXAPP=x2goagent -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx - -# make sure nxagent starts properly with pam_tmpdir.so being in use -NX_TEMP=${NX_TEMP:-/tmp} -export NX_TEMP - -test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/../x2go/bin/$NXAPP "$@" -- cgit v1.2.3 From 9000c00dcc60b5a8402d4a944503ff68bb283c20 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:52:29 +0100 Subject: Move all config files from $(srcbase)/debian/ into $(srcbase)/etc/ folder. Affected packagings scripts: debian/roll-tarballs.sh debian/rules nx-libs.spec --- debian/keystrokes.cfg | 19 -- debian/nxagent.keyboard | 1 - debian/rgb | 754 ---------------------------------------------- debian/roll-tarballs.sh | 12 - debian/rules | 7 - debian/x2goagent.keyboard | 1 - 6 files changed, 794 deletions(-) delete mode 100644 debian/keystrokes.cfg delete mode 100644 debian/nxagent.keyboard delete mode 100644 debian/rgb delete mode 100644 debian/x2goagent.keyboard (limited to 'debian') diff --git a/debian/keystrokes.cfg b/debian/keystrokes.cfg deleted file mode 100644 index a5e521071..000000000 --- a/debian/keystrokes.cfg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/debian/nxagent.keyboard b/debian/nxagent.keyboard deleted file mode 100644 index afe283260..000000000 --- a/debian/nxagent.keyboard +++ /dev/null @@ -1 +0,0 @@ -rules=xfree86 diff --git a/debian/rgb b/debian/rgb deleted file mode 100644 index b9e56c602..000000000 --- a/debian/rgb +++ /dev/null @@ -1,754 +0,0 @@ -! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ -255 250 250 snow -248 248 255 ghost white -248 248 255 GhostWhite -245 245 245 white smoke -245 245 245 WhiteSmoke -220 220 220 gainsboro -255 250 240 floral white -255 250 240 FloralWhite -253 245 230 old lace -253 245 230 OldLace -250 240 230 linen -250 235 215 antique white -250 235 215 AntiqueWhite -255 239 213 papaya whip -255 239 213 PapayaWhip -255 235 205 blanched almond -255 235 205 BlanchedAlmond -255 228 196 bisque -255 218 185 peach puff -255 218 185 PeachPuff -255 222 173 navajo white -255 222 173 NavajoWhite -255 228 181 moccasin -255 248 220 cornsilk -255 255 240 ivory -255 250 205 lemon chiffon -255 250 205 LemonChiffon -255 245 238 seashell -240 255 240 honeydew -245 255 250 mint cream -245 255 250 MintCream -240 255 255 azure -240 248 255 alice blue -240 248 255 AliceBlue -230 230 250 lavender -255 240 245 lavender blush -255 240 245 LavenderBlush -255 228 225 misty rose -255 228 225 MistyRose -255 255 255 white - 0 0 0 black - 47 79 79 dark slate gray - 47 79 79 DarkSlateGray - 47 79 79 dark slate grey - 47 79 79 DarkSlateGrey -105 105 105 dim gray -105 105 105 DimGray -105 105 105 dim grey -105 105 105 DimGrey -112 128 144 slate gray -112 128 144 SlateGray -112 128 144 slate grey -112 128 144 SlateGrey -119 136 153 light slate gray -119 136 153 LightSlateGray -119 136 153 light slate grey -119 136 153 LightSlateGrey -190 190 190 gray -190 190 190 grey -211 211 211 light grey -211 211 211 LightGrey -211 211 211 light gray -211 211 211 LightGray - 25 25 112 midnight blue - 25 25 112 MidnightBlue - 0 0 128 navy - 0 0 128 navy blue - 0 0 128 NavyBlue -100 149 237 cornflower blue -100 149 237 CornflowerBlue - 72 61 139 dark slate blue - 72 61 139 DarkSlateBlue -106 90 205 slate blue -106 90 205 SlateBlue -123 104 238 medium slate blue -123 104 238 MediumSlateBlue -132 112 255 light slate blue -132 112 255 LightSlateBlue - 0 0 205 medium blue - 0 0 205 MediumBlue - 65 105 225 royal blue - 65 105 225 RoyalBlue - 0 0 255 blue - 30 144 255 dodger blue - 30 144 255 DodgerBlue - 0 191 255 deep sky blue - 0 191 255 DeepSkyBlue -135 206 235 sky blue -135 206 235 SkyBlue -135 206 250 light sky blue -135 206 250 LightSkyBlue - 70 130 180 steel blue - 70 130 180 SteelBlue -176 196 222 light steel blue -176 196 222 LightSteelBlue -173 216 230 light blue -173 216 230 LightBlue -176 224 230 powder blue -176 224 230 PowderBlue -175 238 238 pale turquoise -175 238 238 PaleTurquoise - 0 206 209 dark turquoise - 0 206 209 DarkTurquoise - 72 209 204 medium turquoise - 72 209 204 MediumTurquoise - 64 224 208 turquoise - 0 255 255 cyan -224 255 255 light cyan -224 255 255 LightCyan - 95 158 160 cadet blue - 95 158 160 CadetBlue -102 205 170 medium aquamarine -102 205 170 MediumAquamarine -127 255 212 aquamarine - 0 100 0 dark green - 0 100 0 DarkGreen - 85 107 47 dark olive green - 85 107 47 DarkOliveGreen -143 188 143 dark sea green -143 188 143 DarkSeaGreen - 46 139 87 sea green - 46 139 87 SeaGreen - 60 179 113 medium sea green - 60 179 113 MediumSeaGreen - 32 178 170 light sea green - 32 178 170 LightSeaGreen -152 251 152 pale green -152 251 152 PaleGreen - 0 255 127 spring green - 0 255 127 SpringGreen -124 252 0 lawn green -124 252 0 LawnGreen - 0 255 0 green -127 255 0 chartreuse - 0 250 154 medium spring green - 0 250 154 MediumSpringGreen -173 255 47 green yellow -173 255 47 GreenYellow - 50 205 50 lime green - 50 205 50 LimeGreen -154 205 50 yellow green -154 205 50 YellowGreen - 34 139 34 forest green - 34 139 34 ForestGreen -107 142 35 olive drab -107 142 35 OliveDrab -189 183 107 dark khaki -189 183 107 DarkKhaki -240 230 140 khaki -238 232 170 pale goldenrod -238 232 170 PaleGoldenrod -250 250 210 light goldenrod yellow -250 250 210 LightGoldenrodYellow -255 255 224 light yellow -255 255 224 LightYellow -255 255 0 yellow -255 215 0 gold -238 221 130 light goldenrod -238 221 130 LightGoldenrod -218 165 32 goldenrod -184 134 11 dark goldenrod -184 134 11 DarkGoldenrod -188 143 143 rosy brown -188 143 143 RosyBrown -205 92 92 indian red -205 92 92 IndianRed -139 69 19 saddle brown -139 69 19 SaddleBrown -160 82 45 sienna -205 133 63 peru -222 184 135 burlywood -245 245 220 beige -245 222 179 wheat -244 164 96 sandy brown -244 164 96 SandyBrown -210 180 140 tan -210 105 30 chocolate -178 34 34 firebrick -165 42 42 brown -233 150 122 dark salmon -233 150 122 DarkSalmon -250 128 114 salmon -255 160 122 light salmon -255 160 122 LightSalmon -255 165 0 orange -255 140 0 dark orange -255 140 0 DarkOrange -255 127 80 coral -240 128 128 light coral -240 128 128 LightCoral -255 99 71 tomato -255 69 0 orange red -255 69 0 OrangeRed -255 0 0 red -255 105 180 hot pink -255 105 180 HotPink -255 20 147 deep pink -255 20 147 DeepPink -255 192 203 pink -255 182 193 light pink -255 182 193 LightPink -219 112 147 pale violet red -219 112 147 PaleVioletRed -176 48 96 maroon -199 21 133 medium violet red -199 21 133 MediumVioletRed -208 32 144 violet red -208 32 144 VioletRed -255 0 255 magenta -238 130 238 violet -221 160 221 plum -218 112 214 orchid -186 85 211 medium orchid -186 85 211 MediumOrchid -153 50 204 dark orchid -153 50 204 DarkOrchid -148 0 211 dark violet -148 0 211 DarkViolet -138 43 226 blue violet -138 43 226 BlueViolet -160 32 240 purple -147 112 219 medium purple -147 112 219 MediumPurple -216 191 216 thistle -255 250 250 snow1 -238 233 233 snow2 -205 201 201 snow3 -139 137 137 snow4 -255 245 238 seashell1 -238 229 222 seashell2 -205 197 191 seashell3 -139 134 130 seashell4 -255 239 219 AntiqueWhite1 -238 223 204 AntiqueWhite2 -205 192 176 AntiqueWhite3 -139 131 120 AntiqueWhite4 -255 228 196 bisque1 -238 213 183 bisque2 -205 183 158 bisque3 -139 125 107 bisque4 -255 218 185 PeachPuff1 -238 203 173 PeachPuff2 -205 175 149 PeachPuff3 -139 119 101 PeachPuff4 -255 222 173 NavajoWhite1 -238 207 161 NavajoWhite2 -205 179 139 NavajoWhite3 -139 121 94 NavajoWhite4 -255 250 205 LemonChiffon1 -238 233 191 LemonChiffon2 -205 201 165 LemonChiffon3 -139 137 112 LemonChiffon4 -255 248 220 cornsilk1 -238 232 205 cornsilk2 -205 200 177 cornsilk3 -139 136 120 cornsilk4 -255 255 240 ivory1 -238 238 224 ivory2 -205 205 193 ivory3 -139 139 131 ivory4 -240 255 240 honeydew1 -224 238 224 honeydew2 -193 205 193 honeydew3 -131 139 131 honeydew4 -255 240 245 LavenderBlush1 -238 224 229 LavenderBlush2 -205 193 197 LavenderBlush3 -139 131 134 LavenderBlush4 -255 228 225 MistyRose1 -238 213 210 MistyRose2 -205 183 181 MistyRose3 -139 125 123 MistyRose4 -240 255 255 azure1 -224 238 238 azure2 -193 205 205 azure3 -131 139 139 azure4 -131 111 255 SlateBlue1 -122 103 238 SlateBlue2 -105 89 205 SlateBlue3 - 71 60 139 SlateBlue4 - 72 118 255 RoyalBlue1 - 67 110 238 RoyalBlue2 - 58 95 205 RoyalBlue3 - 39 64 139 RoyalBlue4 - 0 0 255 blue1 - 0 0 238 blue2 - 0 0 205 blue3 - 0 0 139 blue4 - 30 144 255 DodgerBlue1 - 28 134 238 DodgerBlue2 - 24 116 205 DodgerBlue3 - 16 78 139 DodgerBlue4 - 99 184 255 SteelBlue1 - 92 172 238 SteelBlue2 - 79 148 205 SteelBlue3 - 54 100 139 SteelBlue4 - 0 191 255 DeepSkyBlue1 - 0 178 238 DeepSkyBlue2 - 0 154 205 DeepSkyBlue3 - 0 104 139 DeepSkyBlue4 -135 206 255 SkyBlue1 -126 192 238 SkyBlue2 -108 166 205 SkyBlue3 - 74 112 139 SkyBlue4 -176 226 255 LightSkyBlue1 -164 211 238 LightSkyBlue2 -141 182 205 LightSkyBlue3 - 96 123 139 LightSkyBlue4 -198 226 255 SlateGray1 -185 211 238 SlateGray2 -159 182 205 SlateGray3 -108 123 139 SlateGray4 -202 225 255 LightSteelBlue1 -188 210 238 LightSteelBlue2 -162 181 205 LightSteelBlue3 -110 123 139 LightSteelBlue4 -191 239 255 LightBlue1 -178 223 238 LightBlue2 -154 192 205 LightBlue3 -104 131 139 LightBlue4 -224 255 255 LightCyan1 -209 238 238 LightCyan2 -180 205 205 LightCyan3 -122 139 139 LightCyan4 -187 255 255 PaleTurquoise1 -174 238 238 PaleTurquoise2 -150 205 205 PaleTurquoise3 -102 139 139 PaleTurquoise4 -152 245 255 CadetBlue1 -142 229 238 CadetBlue2 -122 197 205 CadetBlue3 - 83 134 139 CadetBlue4 - 0 245 255 turquoise1 - 0 229 238 turquoise2 - 0 197 205 turquoise3 - 0 134 139 turquoise4 - 0 255 255 cyan1 - 0 238 238 cyan2 - 0 205 205 cyan3 - 0 139 139 cyan4 -151 255 255 DarkSlateGray1 -141 238 238 DarkSlateGray2 -121 205 205 DarkSlateGray3 - 82 139 139 DarkSlateGray4 -127 255 212 aquamarine1 -118 238 198 aquamarine2 -102 205 170 aquamarine3 - 69 139 116 aquamarine4 -193 255 193 DarkSeaGreen1 -180 238 180 DarkSeaGreen2 -155 205 155 DarkSeaGreen3 -105 139 105 DarkSeaGreen4 - 84 255 159 SeaGreen1 - 78 238 148 SeaGreen2 - 67 205 128 SeaGreen3 - 46 139 87 SeaGreen4 -154 255 154 PaleGreen1 -144 238 144 PaleGreen2 -124 205 124 PaleGreen3 - 84 139 84 PaleGreen4 - 0 255 127 SpringGreen1 - 0 238 118 SpringGreen2 - 0 205 102 SpringGreen3 - 0 139 69 SpringGreen4 - 0 255 0 green1 - 0 238 0 green2 - 0 205 0 green3 - 0 139 0 green4 -127 255 0 chartreuse1 -118 238 0 chartreuse2 -102 205 0 chartreuse3 - 69 139 0 chartreuse4 -192 255 62 OliveDrab1 -179 238 58 OliveDrab2 -154 205 50 OliveDrab3 -105 139 34 OliveDrab4 -202 255 112 DarkOliveGreen1 -188 238 104 DarkOliveGreen2 -162 205 90 DarkOliveGreen3 -110 139 61 DarkOliveGreen4 -255 246 143 khaki1 -238 230 133 khaki2 -205 198 115 khaki3 -139 134 78 khaki4 -255 236 139 LightGoldenrod1 -238 220 130 LightGoldenrod2 -205 190 112 LightGoldenrod3 -139 129 76 LightGoldenrod4 -255 255 224 LightYellow1 -238 238 209 LightYellow2 -205 205 180 LightYellow3 -139 139 122 LightYellow4 -255 255 0 yellow1 -238 238 0 yellow2 -205 205 0 yellow3 -139 139 0 yellow4 -255 215 0 gold1 -238 201 0 gold2 -205 173 0 gold3 -139 117 0 gold4 -255 193 37 goldenrod1 -238 180 34 goldenrod2 -205 155 29 goldenrod3 -139 105 20 goldenrod4 -255 185 15 DarkGoldenrod1 -238 173 14 DarkGoldenrod2 -205 149 12 DarkGoldenrod3 -139 101 8 DarkGoldenrod4 -255 193 193 RosyBrown1 -238 180 180 RosyBrown2 -205 155 155 RosyBrown3 -139 105 105 RosyBrown4 -255 106 106 IndianRed1 -238 99 99 IndianRed2 -205 85 85 IndianRed3 -139 58 58 IndianRed4 -255 130 71 sienna1 -238 121 66 sienna2 -205 104 57 sienna3 -139 71 38 sienna4 -255 211 155 burlywood1 -238 197 145 burlywood2 -205 170 125 burlywood3 -139 115 85 burlywood4 -255 231 186 wheat1 -238 216 174 wheat2 -205 186 150 wheat3 -139 126 102 wheat4 -255 165 79 tan1 -238 154 73 tan2 -205 133 63 tan3 -139 90 43 tan4 -255 127 36 chocolate1 -238 118 33 chocolate2 -205 102 29 chocolate3 -139 69 19 chocolate4 -255 48 48 firebrick1 -238 44 44 firebrick2 -205 38 38 firebrick3 -139 26 26 firebrick4 -255 64 64 brown1 -238 59 59 brown2 -205 51 51 brown3 -139 35 35 brown4 -255 140 105 salmon1 -238 130 98 salmon2 -205 112 84 salmon3 -139 76 57 salmon4 -255 160 122 LightSalmon1 -238 149 114 LightSalmon2 -205 129 98 LightSalmon3 -139 87 66 LightSalmon4 -255 165 0 orange1 -238 154 0 orange2 -205 133 0 orange3 -139 90 0 orange4 -255 127 0 DarkOrange1 -238 118 0 DarkOrange2 -205 102 0 DarkOrange3 -139 69 0 DarkOrange4 -255 114 86 coral1 -238 106 80 coral2 -205 91 69 coral3 -139 62 47 coral4 -255 99 71 tomato1 -238 92 66 tomato2 -205 79 57 tomato3 -139 54 38 tomato4 -255 69 0 OrangeRed1 -238 64 0 OrangeRed2 -205 55 0 OrangeRed3 -139 37 0 OrangeRed4 -255 0 0 red1 -238 0 0 red2 -205 0 0 red3 -139 0 0 red4 -215 7 81 DebianRed -255 20 147 DeepPink1 -238 18 137 DeepPink2 -205 16 118 DeepPink3 -139 10 80 DeepPink4 -255 110 180 HotPink1 -238 106 167 HotPink2 -205 96 144 HotPink3 -139 58 98 HotPink4 -255 181 197 pink1 -238 169 184 pink2 -205 145 158 pink3 -139 99 108 pink4 -255 174 185 LightPink1 -238 162 173 LightPink2 -205 140 149 LightPink3 -139 95 101 LightPink4 -255 130 171 PaleVioletRed1 -238 121 159 PaleVioletRed2 -205 104 137 PaleVioletRed3 -139 71 93 PaleVioletRed4 -255 52 179 maroon1 -238 48 167 maroon2 -205 41 144 maroon3 -139 28 98 maroon4 -255 62 150 VioletRed1 -238 58 140 VioletRed2 -205 50 120 VioletRed3 -139 34 82 VioletRed4 -255 0 255 magenta1 -238 0 238 magenta2 -205 0 205 magenta3 -139 0 139 magenta4 -255 131 250 orchid1 -238 122 233 orchid2 -205 105 201 orchid3 -139 71 137 orchid4 -255 187 255 plum1 -238 174 238 plum2 -205 150 205 plum3 -139 102 139 plum4 -224 102 255 MediumOrchid1 -209 95 238 MediumOrchid2 -180 82 205 MediumOrchid3 -122 55 139 MediumOrchid4 -191 62 255 DarkOrchid1 -178 58 238 DarkOrchid2 -154 50 205 DarkOrchid3 -104 34 139 DarkOrchid4 -155 48 255 purple1 -145 44 238 purple2 -125 38 205 purple3 - 85 26 139 purple4 -171 130 255 MediumPurple1 -159 121 238 MediumPurple2 -137 104 205 MediumPurple3 - 93 71 139 MediumPurple4 -255 225 255 thistle1 -238 210 238 thistle2 -205 181 205 thistle3 -139 123 139 thistle4 - 0 0 0 gray0 - 0 0 0 grey0 - 3 3 3 gray1 - 3 3 3 grey1 - 5 5 5 gray2 - 5 5 5 grey2 - 8 8 8 gray3 - 8 8 8 grey3 - 10 10 10 gray4 - 10 10 10 grey4 - 13 13 13 gray5 - 13 13 13 grey5 - 15 15 15 gray6 - 15 15 15 grey6 - 18 18 18 gray7 - 18 18 18 grey7 - 20 20 20 gray8 - 20 20 20 grey8 - 23 23 23 gray9 - 23 23 23 grey9 - 26 26 26 gray10 - 26 26 26 grey10 - 28 28 28 gray11 - 28 28 28 grey11 - 31 31 31 gray12 - 31 31 31 grey12 - 33 33 33 gray13 - 33 33 33 grey13 - 36 36 36 gray14 - 36 36 36 grey14 - 38 38 38 gray15 - 38 38 38 grey15 - 41 41 41 gray16 - 41 41 41 grey16 - 43 43 43 gray17 - 43 43 43 grey17 - 46 46 46 gray18 - 46 46 46 grey18 - 48 48 48 gray19 - 48 48 48 grey19 - 51 51 51 gray20 - 51 51 51 grey20 - 54 54 54 gray21 - 54 54 54 grey21 - 56 56 56 gray22 - 56 56 56 grey22 - 59 59 59 gray23 - 59 59 59 grey23 - 61 61 61 gray24 - 61 61 61 grey24 - 64 64 64 gray25 - 64 64 64 grey25 - 66 66 66 gray26 - 66 66 66 grey26 - 69 69 69 gray27 - 69 69 69 grey27 - 71 71 71 gray28 - 71 71 71 grey28 - 74 74 74 gray29 - 74 74 74 grey29 - 77 77 77 gray30 - 77 77 77 grey30 - 79 79 79 gray31 - 79 79 79 grey31 - 82 82 82 gray32 - 82 82 82 grey32 - 84 84 84 gray33 - 84 84 84 grey33 - 87 87 87 gray34 - 87 87 87 grey34 - 89 89 89 gray35 - 89 89 89 grey35 - 92 92 92 gray36 - 92 92 92 grey36 - 94 94 94 gray37 - 94 94 94 grey37 - 97 97 97 gray38 - 97 97 97 grey38 - 99 99 99 gray39 - 99 99 99 grey39 -102 102 102 gray40 -102 102 102 grey40 -105 105 105 gray41 -105 105 105 grey41 -107 107 107 gray42 -107 107 107 grey42 -110 110 110 gray43 -110 110 110 grey43 -112 112 112 gray44 -112 112 112 grey44 -115 115 115 gray45 -115 115 115 grey45 -117 117 117 gray46 -117 117 117 grey46 -120 120 120 gray47 -120 120 120 grey47 -122 122 122 gray48 -122 122 122 grey48 -125 125 125 gray49 -125 125 125 grey49 -127 127 127 gray50 -127 127 127 grey50 -130 130 130 gray51 -130 130 130 grey51 -133 133 133 gray52 -133 133 133 grey52 -135 135 135 gray53 -135 135 135 grey53 -138 138 138 gray54 -138 138 138 grey54 -140 140 140 gray55 -140 140 140 grey55 -143 143 143 gray56 -143 143 143 grey56 -145 145 145 gray57 -145 145 145 grey57 -148 148 148 gray58 -148 148 148 grey58 -150 150 150 gray59 -150 150 150 grey59 -153 153 153 gray60 -153 153 153 grey60 -156 156 156 gray61 -156 156 156 grey61 -158 158 158 gray62 -158 158 158 grey62 -161 161 161 gray63 -161 161 161 grey63 -163 163 163 gray64 -163 163 163 grey64 -166 166 166 gray65 -166 166 166 grey65 -168 168 168 gray66 -168 168 168 grey66 -171 171 171 gray67 -171 171 171 grey67 -173 173 173 gray68 -173 173 173 grey68 -176 176 176 gray69 -176 176 176 grey69 -179 179 179 gray70 -179 179 179 grey70 -181 181 181 gray71 -181 181 181 grey71 -184 184 184 gray72 -184 184 184 grey72 -186 186 186 gray73 -186 186 186 grey73 -189 189 189 gray74 -189 189 189 grey74 -191 191 191 gray75 -191 191 191 grey75 -194 194 194 gray76 -194 194 194 grey76 -196 196 196 gray77 -196 196 196 grey77 -199 199 199 gray78 -199 199 199 grey78 -201 201 201 gray79 -201 201 201 grey79 -204 204 204 gray80 -204 204 204 grey80 -207 207 207 gray81 -207 207 207 grey81 -209 209 209 gray82 -209 209 209 grey82 -212 212 212 gray83 -212 212 212 grey83 -214 214 214 gray84 -214 214 214 grey84 -217 217 217 gray85 -217 217 217 grey85 -219 219 219 gray86 -219 219 219 grey86 -222 222 222 gray87 -222 222 222 grey87 -224 224 224 gray88 -224 224 224 grey88 -227 227 227 gray89 -227 227 227 grey89 -229 229 229 gray90 -229 229 229 grey90 -232 232 232 gray91 -232 232 232 grey91 -235 235 235 gray92 -235 235 235 grey92 -237 237 237 gray93 -237 237 237 grey93 -240 240 240 gray94 -240 240 240 grey94 -242 242 242 gray95 -242 242 242 grey95 -245 245 245 gray96 -245 245 245 grey96 -247 247 247 gray97 -247 247 247 grey97 -250 250 250 gray98 -250 250 250 grey98 -252 252 252 gray99 -252 252 252 grey99 -255 255 255 gray100 -255 255 255 grey100 -169 169 169 dark grey -169 169 169 DarkGrey -169 169 169 dark gray -169 169 169 DarkGray -0 0 139 dark blue -0 0 139 DarkBlue -0 139 139 dark cyan -0 139 139 DarkCyan -139 0 139 dark magenta -139 0 139 DarkMagenta -139 0 0 dark red -139 0 0 DarkRed -144 238 144 light green -144 238 144 LightGreen diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 384bc57e8..fcb83679c 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -86,10 +86,6 @@ if [ "x$MODE" = "xfull" ]; then cp -v debian/patches/$file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done - mkdir -p ./etc/ - cp -v debian/rgb ./etc/ - cp -v debian/nxagent.keyboard ./etc/ - cp -v debian/x2goagent.keyboard ./etc/ else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* @@ -101,8 +97,6 @@ else done fi cp -v debian/COPYING.full+lite COPYING -cp -v debian/nxagent.keyboard nxagent.keyboard -cp -v debian/x2goagent.keyboard x2goagent.keyboard # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then @@ -116,12 +110,6 @@ for f in $(ls README* 2>/dev/null); do mv -v $f doc/; done -if [ "$MODE" = "full" ]; then - # provide a default keystrokes.cfg file - mkdir -p etc - test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg -fi - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index 7b60a46a4..2375b46ac 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,6 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean @@ -78,12 +77,6 @@ override_dh_auto_install: override_dh_auto_build: - mkdir -p etc/ - ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg - ln -s ../debian/rgb etc/rgb - ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard - ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard - # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst diff --git a/debian/x2goagent.keyboard b/debian/x2goagent.keyboard deleted file mode 100644 index afe283260..000000000 --- a/debian/x2goagent.keyboard +++ /dev/null @@ -1 +0,0 @@ -rules=xfree86 -- cgit v1.2.3 From 902dc519d96be582088e5fe0644cefac7ecc0133 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:58:11 +0100 Subject: Move COPYING.full+lite as COPYING to / Adapted packaging scripts: debian/roll-tarballs.sh nx-libs.spec --- debian/COPYING.full+lite | 55 ------------------------------------------------ debian/roll-tarballs.sh | 1 - 2 files changed, 56 deletions(-) delete mode 100644 debian/COPYING.full+lite (limited to 'debian') diff --git a/debian/COPYING.full+lite b/debian/COPYING.full+lite deleted file mode 100644 index a2b32ef06..000000000 --- a/debian/COPYING.full+lite +++ /dev/null @@ -1,55 +0,0 @@ -The software components were originally downloaded from http://www.nomachine.com/sources.php - -The software has been improved via various patches by the X2Go project. -The patches reside in the subfolder doc/applied-patches/ of this source tree. - -Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org/. -Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: - - Redistribution and use in source and binary forms are permitted provided - that the above copyright notice and this paragraph are duplicated in all - such forms. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - Copyright (c) 1995,1996 Brian Pane - Copyright (c) 1996,1997 Zachary Vonler and Brian Pane - Copyright (c) 1999 Kevin Vigor and Brian Pane - Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane - -The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index fcb83679c..c7cac5f08 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -96,7 +96,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/COPYING.full+lite COPYING # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then -- cgit v1.2.3 From e4d97018b4bed33afb3a6c61894272615f97e43d Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 14 Feb 2015 17:07:21 -0500 Subject: Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 834868790..0eae634e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -125,8 +125,73 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium (Fixes: #744). [ Michael DePaulo ] - * debian/rules: - + Fix build for LDFLAGS containing spaces. + * Security fixes: + - Rebase loads of X.Org patches (mainly from RHEL-5) against NX. If not + all patches from a CVE patch series appear here, then it means that + the affected file/code is not used in NX at build time. + + - X.Org CVE-2011-2895: + 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch + - X.Org CVE-2011-4028: + 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch + - X.Org CVE-2013-4396: + 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch + - X.Org CVE-2013-6462: + 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch + - X.Org CVE-2014-0209: + 1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch + 1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch + - X.Org CVE-2014-0210: + 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch + 1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch + 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch + 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch + 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch + 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch + 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch + - X.Org CVE-2014-0211: + 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch + 1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch + 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch + 1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch + - X.Org CVE-2014-8092: + 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch + 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch + 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch + 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch + - X.Org CVE-2014-8097: + 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch + - X.Org CVE-2014-8095: + 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch + - X.Org CVE-2014-8096: + 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch + - X.Org CVE-2014-8099: + 1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch + - X.Org CVE-2014-8100: + 1027-render-check-request-size-before-reading-it-CVE-2014.patch + 1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch + - X.Org CVE-2014-8102: + 1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch + - X.Org CVE-2014-8101: + 1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch + - X.Org CVE-2014-8093: + 1031-glx-Be-more-paranoid-about-variable-length-requests-.patch + 1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch + 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch + 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch + 1036-glx-Integer-overflow-protection-for-non-generated-re.patch + - X.Org CVE-2014-8098: + 1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch + 1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch + 1038-glx-Length-checking-for-non-generated-single-request.patch + 1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch + 1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch + + - Security fixes with no assigned CVE: + 1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch + + - Fix FTBFS due to the nxproxy executable already existing under + /usr/lib/nx/bin/nx/ [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. -- cgit v1.2.3 From f29cc29fd37731c09c04e615da4ee345bbc92733 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 21:55:30 +0100 Subject: Install "%{_libdir}/nx/bin" into nxproxy package. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0eae634e9..bd10412ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,6 +111,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium time. + Assure that BuildRoot: is set. + On SLE 11.x: libX* packages are prefixed with "xorg-x11-". + + Install "%{_libdir}/nx/bin" into nxproxy package. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, -- cgit v1.2.3 From 892c08ddc4f4f7fc84b22081a53e4385a737ab23 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 16 Feb 2015 05:45:17 +0100 Subject: Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bd10412ed..ad42842bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Add Description: and Author: fields to various patch headers. * Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. + * Make install-lite rule in Makefile.nx-libs more predictable and not + rely on nxproxy/Makefile.in. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in -- cgit v1.2.3 From db12538ddeb32db3bfd1882d2bb34ff00809301e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 16 Feb 2015 05:51:02 +0100 Subject: Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad42842bf..476fadac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium wrapper script. * Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. + * Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp + uninstallation has to be in uninstall-lite, not in uninstall-full. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in -- cgit v1.2.3 From 1f3222fa07c1695b13340247cde58a95ceaba1c5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 16 Feb 2015 06:19:54 +0100 Subject: debian/changelog: fix too-long lines --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 476fadac1..37a666ecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,12 +60,12 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium process. - Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files matter to the NX code reduction efforts. - - Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in - NX code tree. - - Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch, - 018_nx-X11_update-libtool-ltmain-script.full.patch, - 019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files - that are not used at build time. + - Update 0031_nx-X11_parallel-make.full.patch. Don't patch .original files + in NX code tree. + - Drop patches: 0017_nx-X11_update-autotools-helper-files.full.patch, + 0018_nx-X11_update-libtool-ltmain-script.full.patch, + 0019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch + files that are not used at build time. * Debian/Ubuntu packaging: + Fully rework the way nx-libs gets packaged for Debian/Ubuntu. -- cgit v1.2.3 From 26cfe931f864b92c4b6026002f37987c56665977 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 16 Feb 2015 06:24:38 +0100 Subject: fix 3.5.0.29 changelog entry --- debian/changelog | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 37a666ecc..f77a28219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,26 +8,26 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium [ Paul Szabo ] - * DISABLED:401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. + * DISABLED:0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. Enable support for the X11 big requests extension and the generic events extension. [ Mike Gabriel ] - * Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header + * Update 0320_nxagent_configurable-keystrokes.full.patch. Fix patch header referring to keystrokes.cfg (plural), not keystroke.cfg. * Allow sysadmins to manipulate nxagent's / x2goagent's rgb file by placing it into /etc/nxagent or /etc/x2go. * Provide support for separate .keyboard files for nxagent/x2goagent. - * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. - * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb + * Modify 0101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. + * Extend 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb. - * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow + * Extend 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. - * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't + * Update 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files that get removed during code reduction. - * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch. + * Add 0991_fix-hr-typos.full+lite.patch and 0991_fix-hr-typos.full.patch. Fix several typos in upstream code detected by lintian. * Makefile.nx-libs: Don't allow symlinks to point into buildroot. * Makefile.nx-libs: Install man pages via main Makefile. @@ -54,11 +54,11 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. - Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/ folder lists in text files named debian/CODE-REDUCTION_*. - - Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by + - Update 0991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort. - - Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build + - Drop 0604_nx-X11_recent-freetype-API.full.patch. Not used in current build process. - - Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't + - Update 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files matter to the NX code reduction efforts. - Update 0031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree. @@ -122,10 +122,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium x2goagent.keyboard). [ Horst Schirmeier ] - * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that + * Update 0320_nxagent_configurable-keystrokes.full.patch. Fix a typo that prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes: #741). - * Add 321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is + * Add 0321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). -- cgit v1.2.3 From c29c331cecbb592b6f795ef85c755eb1947216ee Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Wed, 18 Feb 2015 07:51:55 -0500 Subject: Update changelog for the CVE-2015-0255 commit and its 3 prereq commits --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f77a28219..42eef93d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -191,10 +191,18 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium 1038-glx-Length-checking-for-non-generated-single-request.patch 1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch 1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch + - X.org CVE-2015-0255 + 1104-xkb-Check-strings-length-against-request-size.patch - Security fixes with no assigned CVE: 1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch + - Rebase the following patches that are prerequisites for the + CVE-2015-0255 patch: + 1101-Coverity-844-845-846-Fix-memory-leaks.patch + 1102-include-introduce-byte-counting-functions.patch + 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch + - Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx/ -- cgit v1.2.3 From 1d71c9ebd1df43797089f22fe5f61e2abf93821f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 27 Feb 2015 00:14:10 +0100 Subject: library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library. --- debian/control | 38 ++++++++++------------- debian/libnx-xpm-dev.install.in | 2 -- debian/libnx-xpm4.install.in | 1 - debian/libnx-xpm4.symbols | 68 ----------------------------------------- 4 files changed, 16 insertions(+), 93 deletions(-) delete mode 100644 debian/libnx-xpm-dev.install.in delete mode 100644 debian/libnx-xpm4.install.in delete mode 100644 debian/libnx-xpm4.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index b931567c4..65a8f9433 100644 --- a/debian/control +++ b/debian/control @@ -17,12 +17,12 @@ Build-Depends: libfreetype6-dev, libxmltok1-dev, libxml2-dev, + libxpm-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-xinerama-dev, @@ -683,18 +683,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 pixmap library +Description: nx-X11 pixmap library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xpm provides support and common operation for the XPM pixmap - format, which is commonly used in legacy X applications. XPM is an - extension of the monochrome XBM bitmap specified in the X protocol. + This package removes the obsoleted libNX_Xpm.so.4 library. With + recent versions of NX, the system-wide installed libXpm gets used. + . + This package can be safely removed. Package: libnx-xpm-dev Provides: libnx-xpm4-dev @@ -702,20 +700,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xpm4 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 pixmap library (development headers) +Description: nx-X11 pixmap library (development headers, dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xpm provides support and common operation for the XPM pixmap - format, which is commonly used in legacy X applications. XPM is an - extension of the monochrome XBM bitmap specified in the X protocol. + This package removes the obsoleted headers for the libNX_Xpm.so.4 + library. With recent versions of NX, the system-wide installed libXpm + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: libnx-xpm4-dbg Architecture: any @@ -723,20 +718,19 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xpm4 (= ${binary:Version}), ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 pixmap library (debug package) +Description: nx-X11 pixmap library (debug package, dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xpm provides support and common operation for the XPM pixmap - format, which is commonly used in legacy X applications. XPM is an - extension of the monochrome XBM bitmap specified in the X protocol. + This package removes the obsoleted debug symbols for the libNX_Xpm.so.4 + library. With recent versions of NX, the system-wide installed libXpm + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xrandr2 Architecture: any diff --git a/debian/libnx-xpm-dev.install.in b/debian/libnx-xpm-dev.install.in deleted file mode 100644 index 36c9bb485..000000000 --- a/debian/libnx-xpm-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xpm.so -usr/include/*/nx/X11/xpm.h diff --git a/debian/libnx-xpm4.install.in b/debian/libnx-xpm4.install.in deleted file mode 100644 index 5bc9da2a0..000000000 --- a/debian/libnx-xpm4.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xpm.so.* diff --git a/debian/libnx-xpm4.symbols b/debian/libnx-xpm4.symbols deleted file mode 100644 index f5aa3297d..000000000 --- a/debian/libnx-xpm4.symbols +++ /dev/null @@ -1,68 +0,0 @@ -libNX_Xpm.so.4 libnx-xpm4 #MINVER# - XpmAttributesSize@Base 3.5.0.29 - XpmCreateBufferFromImage@Base 3.5.0.29 - XpmCreateBufferFromPixmap@Base 3.5.0.29 - XpmCreateBufferFromXpmImage@Base 3.5.0.29 - XpmCreateDataFromImage@Base 3.5.0.29 - XpmCreateDataFromPixmap@Base 3.5.0.29 - XpmCreateDataFromXpmImage@Base 3.5.0.29 - XpmCreateImageFromBuffer@Base 3.5.0.29 - XpmCreateImageFromData@Base 3.5.0.29 - XpmCreateImageFromXpmImage@Base 3.5.0.29 - XpmCreatePixmapFromBuffer@Base 3.5.0.29 - XpmCreatePixmapFromData@Base 3.5.0.29 - XpmCreatePixmapFromXpmImage@Base 3.5.0.29 - XpmCreateXpmImageFromBuffer@Base 3.5.0.29 - XpmCreateXpmImageFromData@Base 3.5.0.29 - XpmCreateXpmImageFromImage@Base 3.5.0.29 - XpmCreateXpmImageFromPixmap@Base 3.5.0.29 - XpmFree@Base 3.5.0.29 - XpmFreeAttributes@Base 3.5.0.29 - XpmFreeExtensions@Base 3.5.0.29 - XpmFreeXpmImage@Base 3.5.0.29 - XpmFreeXpmInfo@Base 3.5.0.29 - XpmGetErrorString@Base 3.5.0.29 - XpmLibraryVersion@Base 3.5.0.29 - XpmReadFileToBuffer@Base 3.5.0.29 - XpmReadFileToData@Base 3.5.0.29 - XpmReadFileToImage@Base 3.5.0.29 - XpmReadFileToPixmap@Base 3.5.0.29 - XpmReadFileToXpmImage@Base 3.5.0.29 - XpmWriteFileFromBuffer@Base 3.5.0.29 - XpmWriteFileFromData@Base 3.5.0.29 - XpmWriteFileFromImage@Base 3.5.0.29 - XpmWriteFileFromPixmap@Base 3.5.0.29 - XpmWriteFileFromXpmImage@Base 3.5.0.29 - xpmColorKeys@Base 3.5.0.29 - xpmCreateImageFromPixmap@Base 3.5.0.29 - xpmCreatePixmapFromImage@Base 3.5.0.29 - xpmDataTypes@Base 3.5.0.29 - xpmFreeColorTable@Base 3.5.0.29 - xpmFreeRgbNames@Base 3.5.0.29 - xpmGetCmt@Base 3.5.0.29 - xpmGetRgbName@Base 3.5.0.29 - xpmGetString@Base 3.5.0.29 - xpmHashIntern@Base 3.5.0.29 - xpmHashSlot@Base 3.5.0.29 - xpmHashTableFree@Base 3.5.0.29 - xpmHashTableInit@Base 3.5.0.29 - xpmInitAttributes@Base 3.5.0.29 - xpmInitXpmImage@Base 3.5.0.29 - xpmInitXpmInfo@Base 3.5.0.29 - xpmNextString@Base 3.5.0.29 - xpmNextUI@Base 3.5.0.29 - xpmNextWord@Base 3.5.0.29 - xpmParseColors@Base 3.5.0.29 - xpmParseData@Base 3.5.0.29 - xpmParseDataAndCreate@Base 3.5.0.29 - xpmParseExtensions@Base 3.5.0.29 - xpmParseHeader@Base 3.5.0.29 - xpmParseValues@Base 3.5.0.29 - xpmPipeThrough@Base 3.5.0.29 - xpmReadRgbNames@Base 3.5.0.29 - xpmSetAttributes@Base 3.5.0.29 - xpmSetInfo@Base 3.5.0.29 - xpmSetInfoMask@Base 3.5.0.29 - xpm_xynormalizeimagebits@Base 3.5.0.29 - xpm_znormalizeimagebits@Base 3.5.0.29 - xpmatoui@Base 3.5.0.29 -- cgit v1.2.3 From 98e56c125294824a1ac17861d9b5e5a5a35bec5c Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 15 Mar 2015 01:10:31 +0100 Subject: debian/changelog: merge with 3.5.0.x release branch. --- debian/changelog | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 42eef93d4..f021a4d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,15 +3,36 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium * Version bump, continuing NX 3.x development.. Targeting NX 3.6.x.y some time. - -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 - -nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium - [ Paul Szabo ] * DISABLED:0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. Enable support for the X11 big requests extension and the generic events extension. + -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 + +nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low + + [ X2Go Release Manager ] + * Continue development + + -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 + +nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * Version bump release of nx-libs to assure a working + upgrade path on Ubuntu (where the build daemons strip-off + the "-0x2goX" revision suffix from the package version. + + [ X2Go Release Manager ] + * debian/roll-tarball.sh: + + Only clean up nx-X11 source tree if it is there (i.e., skip that + for the nx-libs-lite tarball generation). + + -- Mike Gabriel Sat, 14 Mar 2015 14:37:58 +0100 + +nx-libs (2:3.5.0.29-0x2go2) unstable; urgency=medium + [ Mike Gabriel ] * Update 0320_nxagent_configurable-keystrokes.full.patch. Fix patch header referring to keystrokes.cfg (plural), not keystroke.cfg. @@ -38,6 +59,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium rely on nxproxy/Makefile.in. * Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full. + * Update 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch. + Fix broken comment paragraph, whitespace fix. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in @@ -67,6 +90,11 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium 0019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files that are not used at build time. + * Patch system: + - Prepend a "0" to every patch file name in debian/patches/. The patch + order is now given by a 4 digit ID. Adapt only this changelog stanza to + this modification. + * Debian/Ubuntu packaging: + Fully rework the way nx-libs gets packaged for Debian/Ubuntu. + Split up libnx-x11 into individual packages. @@ -208,6 +236,17 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. + * CVE security review: + - Update 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch. + Use xfree() instead of free() in nx-libs. + - Update 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch. + Apply correctly on nx-libs 3.6.x. + - Update 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch. + Human-readable version of "1 MB". + - Add 1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch. + Initialize remaining bufleft variables (nx-X11/lib/font/fc/fserve.c). + - Add 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch. + Do proper input validation to fix for CVE-2011-2895. -- Mike Gabriel Sat, 14 Feb 2015 14:25:17 +0100 -- cgit v1.2.3 From c460e090bce0b01effcb2409a28bc20cf7a0f013 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 15 Mar 2015 01:13:56 +0100 Subject: debian/changelog: fix wrong signature. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f021a4d32..3b4175f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -248,7 +248,7 @@ nx-libs (2:3.5.0.29-0x2go2) unstable; urgency=medium - Add 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch. Do proper input validation to fix for CVE-2011-2895. - -- Mike Gabriel Sat, 14 Feb 2015 14:25:17 +0100 + -- X2Go Release Manager Fri, 13 Mar 2015 15:50:00 +0100 nx-libs (2:3.5.0.28-0x2go1) unstable; urgency=medium -- cgit v1.2.3 From 5464a6dba5742a9f22ba18c9b307d4ee42394378 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:22:38 +0100 Subject: nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b4175f92..664717898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,8 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low - [ X2Go Release Manager ] - * Continue development + [ Clemens Lang ] + * Use path discovery for finding makedepend. Remove old cruft. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 -- cgit v1.2.3 From ad7e12ed39cc4091ff878ea2b3e748e0147dd57f Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:26:24 +0100 Subject: nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 664717898..771139d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low [ Clemens Lang ] * Use path discovery for finding makedepend. Remove old cruft. + * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 -- cgit v1.2.3 From 638e31c2f33723123d35ce65db88071a1be5cdb0 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:29:50 +0100 Subject: nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 771139d9a..197b257a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low [ Clemens Lang ] * Use path discovery for finding makedepend. Remove old cruft. * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + * Use the correct library naming scheme on OS X. It differs from other + UNIX-based systems. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 -- cgit v1.2.3 From 8a260b94f83fd3865ee84e49655ff75ee97eca2b Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 17 Mar 2015 18:26:26 +0100 Subject: nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*. Cherry-picked from branch 3.5.0.x. Conflicts: debian/changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 197b257a1..2fbaeca28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,13 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low * Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. + [ Mihai Moldovan ] + * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail + if it is not available. + * nx-libs.spec: + - Versioned libXcomp* should obsolete unversioned libXcomp*, not + libNX_Xcomp*. + -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low -- cgit v1.2.3 From fcb2cb5e00c19c7ed0fab137db97faee69c4e147 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 17 Mar 2015 18:28:15 +0100 Subject: nx-libs.spec: add overlooked Obsolete: statement to libNX_Xfixes3. Cherry-picked from branch 3.5.0.x. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2fbaeca28..2d6344395 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low * nx-libs.spec: - Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*. + - Add overlooked Obsolete: statement to libNX_Xfixes3. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 -- cgit v1.2.3 From 68be7d1c8ff0b36357e4af739f2c0e80283716af Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 26 Mar 2015 00:41:45 +0100 Subject: debian/changelog: sync with 3.5.0.x branch. --- debian/changelog | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d6344395..40c087893 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,23 +10,67 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 -nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low +nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low + + [ Mihai Moldovan ] + * Only use the first three numbers in the full version for current_version + on OS X. ld(1) on 10.6 fails otherwise. + Affected: + - 0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch + - 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch + + -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 + +nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low [ Clemens Lang ] - * Use path discovery for finding makedepend. Remove old cruft. + * Use path discovery for finding makedepend. Remove old cruft. Adds: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + Adds: + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch * Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. + Adds: + - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch [ Mihai Moldovan ] * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available. + * Rename: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => + 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => + 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => + 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => + 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch * nx-libs.spec: - Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*. - Add overlooked Obsolete: statement to libNX_Xfixes3. + * Mid-release fixup: + - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. - -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 + -- X2Go Release Manager Tue, 17 Mar 2015 18:48:06 +0100 nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low -- cgit v1.2.3 From ab4e5bf66af57831316312d869f0832d21438212 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 29 Mar 2015 08:02:43 +0200 Subject: debian/changelog: sync with 3.5.0.x branch. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 40c087893..26a540fc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,13 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - 0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch - 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch + * nx-X11: handle source pictures (those without a Drawable surface) + gracefully. + Adds: + - 0017_nx-X11_fix-SetPictureFilter.full.patch + * nx-X11: fix typo in previous patch. + Affects: + - 0017_nx-X11_fix-SetPictureFilter.full.patch -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 -- cgit v1.2.3 From 8ed8a43d2cad421561d0082949d2bfa9f29c7675 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 29 Mar 2015 08:03:13 +0200 Subject: nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. Cherry-picked from branch 3.5.0.x. --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 26a540fc1..4bbe4028f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nx-X11: fix typo in previous patch. Affects: - 0017_nx-X11_fix-SetPictureFilter.full.patch + * nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. + Affects: + - 0990_fix-DEBUG-and-TEST-builds.full.patch -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 -- cgit v1.2.3 From ebe00df38f264ef71dac3c73d416a74685c8cbd2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 08:35:50 +0100 Subject: imake cleanup: Drop all references to XdmxServer and BuildXdmx*. --- debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 2375b46ac..d3532b36b 100755 --- a/debian/rules +++ b/debian/rules @@ -59,8 +59,6 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxext.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h -- cgit v1.2.3 From f5f280417cb0af489406c8c3234e4ad69b008c74 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 13:29:02 +0100 Subject: imake cleanup: Drop all references to XprtServer and BuildXprint*. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index d3532b36b..445f015cf 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,6 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/Print*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h -- cgit v1.2.3 From 2f4d7dbb4d2fae7f6f376f7d2f032a9a0e4cea45 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 11 Apr 2015 17:38:02 +0200 Subject: fix for libXpm4-cleanup --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 445f015cf..e58b79121 100755 --- a/debian/rules +++ b/debian/rules @@ -88,7 +88,6 @@ override_dh_strip: dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg - dh_strip -plibnx-xpm4 --dbg-package=libnx-xpm4-dbg dh_strip -plibnx-xrandr2 --dbg-package=libnx-xrandr2-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg -- cgit v1.2.3 From 70b77a0fc329e2e205a596a738c7307d354e7b1c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Apr 2015 09:24:55 +0200 Subject: library clean-up: Don't build and link libXfont.a anymore. Use system's libXfont shared library and link dynamically. --- debian/control | 4 +--- debian/rules | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 65a8f9433..9572f7ce7 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,10 @@ Build-Depends: libjpeg-dev, zlib1g-dev, quilt (>= 0.46-7~), - libfontconfig1-dev, - libfontenc-dev, - libfreetype6-dev, libxmltok1-dev, libxml2-dev, libxpm-dev, + libxfont-dev, autoconf, pkg-config, x11proto-core-dev, diff --git a/debian/rules b/debian/rules index e58b79121..6d076a1c4 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,6 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/fonts/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/ dh_install --fail-missing -- cgit v1.2.3 From 294d91223f75a70614a4b8f5e93ddfc7cd7565e5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Apr 2015 22:39:14 +0200 Subject: debian/control: Typo fix (Meas -> Mesa). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 9572f7ce7..e17a387e2 100644 --- a/debian/control +++ b/debian/control @@ -977,7 +977,7 @@ Architecture: any Depends: libnx-x11-dev (= ${binary:Version}), ${misc:Depends}, -Description: Library headers for nx-X11/Meas (dummy package) +Description: Library headers for nx-X11/Mesa (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. -- cgit v1.2.3 From 49fc383a4107062a843bc0c3a8fd9cae7e20e032 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Apr 2015 18:07:53 +0200 Subject: library clean-up: Don't build libNX_Xdmcp anymore. Use system's libXdmcp shared library. --- debian/control | 39 +++++++++++++-------------------- debian/libnx-x11-6.symbols | 8 +++---- debian/libnx-xdmcp-dev.install.in | 2 -- debian/libnx-xdmcp6.install.in | 1 - debian/libnx-xdmcp6.symbols | 46 --------------------------------------- debian/rules | 1 - 6 files changed, 19 insertions(+), 78 deletions(-) delete mode 100644 debian/libnx-xdmcp-dev.install.in delete mode 100644 debian/libnx-xdmcp6.install.in delete mode 100644 debian/libnx-xdmcp6.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index e17a387e2..4e4918999 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: libxml2-dev, libxpm-dev, libxfont-dev, + libxdmcp-dev, autoconf, pkg-config, x11proto-core-dev, @@ -367,19 +368,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library + This package removes the obsoleted libNX_Xdmcp.so.6 library. With + recent versions of NX, the system-wide installed libXdmcp gets used. . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package can be safely removed. Package: libnx-xdmcp-dev Provides: libnx-xdmcp6-dev @@ -387,21 +385,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xdmcp6 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library (development headers) +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library - . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package removes the obsoleted headers for the libNX_Xdmcp.so.6 + library. With recent versions of NX, the system-wide installed libXdmcp + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: libnx-xdmcp6-dbg Architecture: any @@ -409,21 +403,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xdmcp6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library (debug package) +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library - . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6 + library. With recent versions of NX, the system-wide installed libXdmcp + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xext6 Architecture: any diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 4b7ceacbe..b9ab97120 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -547,7 +547,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XcmsTekHVCWhiteShiftColors@Base 3.5.0.29 XcmsUNDEFINEDColorSpace@Base 3.5.0.29 XcmsVisualOfCCC@Base 3.5.0.29 - XdmcpWrap@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# XdmcpWrap@Base 3.5.0.29 XkbAddDeviceLedInfo@Base 3.5.0.29 XkbAddGeomColor@Base 3.5.0.29 XkbAddGeomDoodad@Base 3.5.0.29 @@ -956,9 +956,9 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XcmsTekHVC_prefix@Base 3.5.0.29 _XcmsUnresolveColor@Base 3.5.0.29 _Xdebug@Base 3.5.0.29 - _XdmcpAuthDoIt@Base 3.5.0.29 - _XdmcpAuthSetup@Base 3.5.0.29 - _XdmcpWrapperToOddParity@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthDoIt@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthSetup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpWrapperToOddParity@Base 3.5.0.29 _Xevent_to_mask@Base 3.5.0.29 _Xglobal_lock@Base 3.5.0.29 _Xi18n_lock@Base 3.5.0.29 diff --git a/debian/libnx-xdmcp-dev.install.in b/debian/libnx-xdmcp-dev.install.in deleted file mode 100644 index 2c2457b10..000000000 --- a/debian/libnx-xdmcp-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xdmcp.so -usr/include/*/nx/X11/Xdmcp.h diff --git a/debian/libnx-xdmcp6.install.in b/debian/libnx-xdmcp6.install.in deleted file mode 100644 index 69100139e..000000000 --- a/debian/libnx-xdmcp6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xdmcp.so.* diff --git a/debian/libnx-xdmcp6.symbols b/debian/libnx-xdmcp6.symbols deleted file mode 100644 index 49645d63a..000000000 --- a/debian/libnx-xdmcp6.symbols +++ /dev/null @@ -1,46 +0,0 @@ -libNX_Xdmcp.so.6 libnx-xdmcp6 #MINVER# - Xalloc@Base 3.5.0.29 - XdmcpARRAY8Equal@Base 3.5.0.29 - XdmcpAllocARRAY16@Base 3.5.0.29 - XdmcpAllocARRAY32@Base 3.5.0.29 - XdmcpAllocARRAY8@Base 3.5.0.29 - XdmcpAllocARRAYofARRAY8@Base 3.5.0.29 - XdmcpCompareKeys@Base 3.5.0.29 - XdmcpCopyARRAY8@Base 3.5.0.29 - XdmcpDecrementKey@Base 3.5.0.29 - XdmcpDisposeARRAY16@Base 3.5.0.29 - XdmcpDisposeARRAY32@Base 3.5.0.29 - XdmcpDisposeARRAY8@Base 3.5.0.29 - XdmcpDisposeARRAYofARRAY8@Base 3.5.0.29 - XdmcpFill@Base 3.5.0.29 - XdmcpFlush@Base 3.5.0.29 - XdmcpGenerateKey@Base 3.5.0.29 - XdmcpIncrementKey@Base 3.5.0.29 - XdmcpReadARRAY16@Base 3.5.0.29 - XdmcpReadARRAY32@Base 3.5.0.29 - XdmcpReadARRAY8@Base 3.5.0.29 - XdmcpReadARRAYofARRAY8@Base 3.5.0.29 - XdmcpReadCARD16@Base 3.5.0.29 - XdmcpReadCARD32@Base 3.5.0.29 - XdmcpReadCARD8@Base 3.5.0.29 - XdmcpReadHeader@Base 3.5.0.29 - XdmcpReadRemaining@Base 3.5.0.29 - XdmcpReallocARRAY16@Base 3.5.0.29 - XdmcpReallocARRAY32@Base 3.5.0.29 - XdmcpReallocARRAY8@Base 3.5.0.29 - XdmcpReallocARRAYofARRAY8@Base 3.5.0.29 - XdmcpUnwrap@Base 3.5.0.29 - XdmcpWrap@Base 3.5.0.29 - XdmcpWriteARRAY16@Base 3.5.0.29 - XdmcpWriteARRAY32@Base 3.5.0.29 - XdmcpWriteARRAY8@Base 3.5.0.29 - XdmcpWriteARRAYofARRAY8@Base 3.5.0.29 - XdmcpWriteCARD16@Base 3.5.0.29 - XdmcpWriteCARD32@Base 3.5.0.29 - XdmcpWriteCARD8@Base 3.5.0.29 - XdmcpWriteHeader@Base 3.5.0.29 - Xfree@Base 3.5.0.29 - Xrealloc@Base 3.5.0.29 - _XdmcpAuthDoIt@Base 3.5.0.29 - _XdmcpAuthSetup@Base 3.5.0.29 - _XdmcpWrapperToOddParity@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index 6d076a1c4..dd4f1c7c2 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,6 @@ override_dh_strip: dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg - dh_strip -plibnx-xdmcp6 --dbg-package=libnx-xdmcp6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg -- cgit v1.2.3 From e69b7d1ecf9672effd4715a4bc8d5bd729b5bd37 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 21 Apr 2015 10:42:47 +0200 Subject: xbitmaps cleanup: The headers are not required at build time for NX. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index dd4f1c7c2..0da6db71a 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,6 @@ override_dh_install: # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/bitmaps/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h -- cgit v1.2.3 From e68c36625d9d76d96ebe0d94ba02803bee574783 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 26 Apr 2015 23:45:42 +0200 Subject: debian/roll-tarballs.sh: use more quotes. Fixes potential bugs, including one triggered by an unquoted hash within the command line. BASH accepts this. Other shells do not (i.e., treat everything following the hash character as a comment.) --- debian/roll-tarballs.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index c7cac5f08..c2819cfc8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -33,7 +33,7 @@ usage() { PROJECT="nx-libs" NULL="" -test -d .git || usage +test -d ".git" || usage RELEASE="$1" test -n "${RELEASE}" || usage CHECKOUT="$2" @@ -52,14 +52,14 @@ else fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT=HEAD + CHECKOUT="HEAD" fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then echo " '${RELEASE}' is not a valid release number because there is no git tag named $CHECKOUT." echo " Please specify one of the following releases:" echo "HEAD" - git tag -l | grep ^redist | cut -f2 -d/ | sort -u + git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u exit 1 fi @@ -71,42 +71,42 @@ TEMP_DIR="$(mktemp -d)" trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location -git archive --format=tar ${CHECKOUT} --prefix=${PROJECT}-${RELEASE}/ | ( cd $TEMP_DIR; tar xf - ) +git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) echo "Created tarball for $CHECKOUT" cd "$TEMP_DIR/${PROJECT}-${RELEASE}/" -mkdir -p doc/applied-patches +mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file do - cp -v debian/patches/$file doc/applied-patches - echo ${file##*/} >> doc/applied-patches/series + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" done else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file do - cp -v debian/patches/$file doc/applied-patches - echo ${file##*/} >> doc/applied-patches/series + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" done fi # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then - QUILT_PATCHES=doc/applied-patches quilt --quiltrc /dev/null push -a -q + QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q else echo "No patches applied at all. Very old release?" fi # very old release did not add any README for f in $(ls README* 2>/dev/null); do - mv -v $f doc/; + mv -v "$f" "doc/"; done # remove folders that we do not want to roll into the tarball @@ -116,7 +116,7 @@ rm -Rf "debian/" # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* -cd $OLDPWD +cd "$OLDPWD" # create target location for tarball mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" @@ -124,7 +124,7 @@ mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" # roll the ball... cd "$TEMP_DIR" find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" -cd $OLDPWD +cd "$OLDPWD" tar c -C "$TEMP_DIR" \ --owner 0 \ -- cgit v1.2.3 From cf9181918ac8f3b884f7a975c108611d613e1d0f Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 26 Apr 2015 23:47:33 +0200 Subject: debian/roll-tarballs.sh: convert tabs to spaces. --- debian/roll-tarballs.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index c2819cfc8..f692c2983 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -39,16 +39,16 @@ test -n "${RELEASE}" || usage CHECKOUT="$2" test -n "$CHECKOUT" || usage -if [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then - MODE="full" - CHECKOUT="redist-server/${RELEASE}" - RELEASE_SUFFIX='-full' -elif [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then - MODE="lite" - CHECKOUT="redist-client/${RELEASE}" - RELEASE_SUFFIX='-lite' +if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then + MODE="full" + CHECKOUT="redist-server/${RELEASE}" + RELEASE_SUFFIX='-full' +elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then + MODE="lite" + CHECKOUT="redist-client/${RELEASE}" + RELEASE_SUFFIX='-lite' else - usage + usage fi if [ x"$RELEASE" == "xHEAD" ]; then -- cgit v1.2.3 From 21a556b37f9bacb2a0e0f3246c6bd06359f97bd8 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 26 Apr 2015 23:48:02 +0200 Subject: debian/roll-tarballs.sh: use more curly braces. Prevents random characters as being treated as part of a variable name. --- debian/roll-tarballs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index f692c2983..8bf2d51ee 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -56,7 +56,7 @@ if [ x"$RELEASE" == "xHEAD" ]; then fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then - echo " '${RELEASE}' is not a valid release number because there is no git tag named $CHECKOUT." + echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." echo " Please specify one of the following releases:" echo "HEAD" git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u @@ -75,7 +75,7 @@ git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd echo "Created tarball for $CHECKOUT" -cd "$TEMP_DIR/${PROJECT}-${RELEASE}/" +cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" mkdir -p "doc/applied-patches" @@ -119,7 +119,7 @@ rm -Rf nx*/configure nx*/autom4te.cache* cd "$OLDPWD" # create target location for tarball -mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" +mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" # roll the ball... cd "$TEMP_DIR" -- cgit v1.2.3 From 347e973353e64c7f004950cd846360254effd324 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 26 Apr 2015 23:49:06 +0200 Subject: debian/roll-tarballs.sh: don't escape last newline of a multiline command. Worked out fine so far, because the next line was empty, but this can easily change... --- debian/roll-tarballs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 8bf2d51ee..954986b5f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -133,6 +133,6 @@ tar c -C "$TEMP_DIR" \ --no-recursion \ --files-from "$MANIFEST" \ --gzip \ - > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" \ + > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" -- cgit v1.2.3 From 99ef17f907e0c1b21122a7e273885a18f86235a1 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 27 Apr 2015 02:56:07 +0200 Subject: debian/changelog: merge with 3.5.0.x branch. --- debian/changelog | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4bbe4028f..dda68a4cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,140 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - Add overlooked Obsolete: statement to libNX_Xfixes3. * Mid-release fixup: - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. + * CVE patches were previously not included in release tarballs. + Rename: + - 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch => + 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch + - 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch => + 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch + - 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch => + 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch + - 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch => + 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch + - 1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch => + 1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch + - 1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch => + 1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch + - 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch => + 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch + - 1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch => + 1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch + - 1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch => + 1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch + - 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch => + 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch + - 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch => + 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch => + 1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch + - 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch => + 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch + - 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch => + 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch => + 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => + 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => + 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch => + 1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch + - 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch => + 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch + - 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch => + 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch + - 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch => + 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch + - 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch => + 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch + - 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch => + 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch + - 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch => + 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch + - 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch => + 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch + - 1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch => + 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch + - 1027-render-check-request-size-before-reading-it-CVE-2014.patch => + 1027-render-check-request-size-before-reading-it-CVE.full.patch + - 1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch => + 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch + - 1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch => + 1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch + - 1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch => + 1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch + - 1031-glx-Be-more-paranoid-about-variable-length-requests-.patch => + 1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch + - 1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch => + 1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch + - 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch => + 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch + - 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch => + 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch + - 1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch => + 1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch + - 1036-glx-Integer-overflow-protection-for-non-generated-re.patch => + 1036-glx-Integer-overflow-protection-for-non-generat.full.patch + - 1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch => + 1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch + - 1038-glx-Length-checking-for-non-generated-single-request.patch => + 1038-glx-Length-checking-for-non-generated-single-re.full.patch + - 1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch => + 1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch + - 1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch => + 1040-glx-Pass-remaining-request-length-into-varsize-.full.patch + - 1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch => + 1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch + - 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch => + 1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch + - 1101-Coverity-844-845-846-Fix-memory-leaks.patch => + 1101-Coverity-844-845-846-Fix-memory-leaks.full.patch + - 1102-include-introduce-byte-counting-functions.patch => + 1102-include-introduce-byte-counting-functions.full.patch + - 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch => + 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch + - 1104-xkb-Check-strings-length-against-request-size.patch => + 1104-xkb-Check-strings-length-against-request-size.full.patch + * debian/rolltarball.sh: + Cherry-picked from Arctica GH 3.6.x branch. + + - Use more quotes. Fixes potential bugs, including one triggered by an + unquoted hash within the command line. BASH accepts this. Other shells + do not (i.e., treat everything following the hash character as a + comment.) + - Convert tabs to spaces for consistency. + - Use more curly braces. Prevents random characters as being treated as + part of a variable name. + - Don't escape last newline of a multiline command. Worked out fine so + far, because the next line was empty, but this can easily change... + * README.keystrokes: + Backported from Arctica GH 3.6.x branch. + Affects: + + 0320_nxagent_configurable-keystrokes.full.patch + + - Copy actions documentation from the wiki. + - Add documentation for branding behavior. + - Remove accidentally copied Dokuwiki syntax. + * debian/keystrokes.cfg: fix whitespace errors. + Backported from Arctica GH 3.6.x branch. + + [ Bernard Cafarelli ] + * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. + Fixes: #853. + v2: generally link to libdl in all of nx-X11. (Mike Gabriel) + Adds: + - 0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch + + [ Mike Gabriel ] + * Security fixes: + - X.Org CVE-2013-7439: + 1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch + * nx-X11: Prevent underlinking by linking to libNX_X{11,damage,fixes). + Adds: + - 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch + * nxcompshad: Prevent underlinking by linking to libNX_Xext. + Adds: + - 0650_nxcompshad_link-to-NX_Xext.full.patch -- X2Go Release Manager Tue, 17 Mar 2015 18:48:06 +0100 -- cgit v1.2.3 From 83983e944e5076ad2d8beb6dd9190559fb6c5937 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 28 Apr 2015 23:00:43 +0200 Subject: libnx-xinerama1: also create libXinerama symlink in postinst (and remove in prerm.) Due to the nx-x11-common package being a noarch/allarch package, creating the symlink in nx-libs' Makefile will lead to the symlink referencing the "default" architecture dpkg uses for building noarch/allarch packages. Incidentally, this worked fine for Debian, as amd64 seems to be the default architecture. On Ubuntu, however, the default architecture up to Vivid (15.04) was i386. For those builds, the symlink pointed to the 32 bit library of libNX_Xinerama.so.1 -- essentially breaking this feature. Move the symlink creation to the arch-sensitive libnx-xinerama1 package. The postinst and prerm scriptlets will work fine, unless someone installs the i386 package version *after* the amd64 version. Given that we already create symlinks to libNX_X11 and friends using that method, no new regression is introduced. Strictly speaking that's a bug, but we'll hopefully clean that up later... --- debian/libnx-xinerama1.postinst.in | 12 +++++++++-- debian/libnx-xinerama1.prerm | 42 ++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 24 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index c690be387..9b88c4b6f 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -26,14 +26,22 @@ case "$1" in libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + # Already existent files and directories are not removed. + # Users will need to explicitly remove them and (re-) configure this package. + + if test ! -e /usr/lib/nx/X11/Xinerama; then + install -d -m 755 /usr/lib/nx/X11/Xinerama + fi + if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi if test -e $libdir/libXext.so.6; then ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi + if test -e $libdir/libNX_Xinerama.so.1; then + ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm index 3fcd330e6..91105d0f8 100755 --- a/debian/libnx-xinerama1.prerm +++ b/debian/libnx-xinerama1.prerm @@ -1,37 +1,35 @@ #!/bin/sh -# postrm script for x2goserver-fmbindings +# prerm script for libnx-xinerama1 # # see: dh_installdeb(1) - -set -e - # summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +set -e + + case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + remove) + if test -d /usr/lib/nx/X11/Xinerama; then + rm -rf /usr/lib/nx/X11/Xinerama fi - ;; + ;; + deconfigure|upgrade|failed-upgrade) + : + ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "prerm called with unknown argument \`$1'" >&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically -- cgit v1.2.3 From a9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 30 Apr 2015 14:25:25 +0200 Subject: debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures. --- debian/libnx-xinerama1.postinst.in | 7 +------ debian/libnx-xinerama1.prerm | 13 ++++++++++++- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index 9b88c4b6f..c3706038c 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -26,13 +26,8 @@ case "$1" in libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - # Already existent files and directories are not removed. + # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. - - if test ! -e /usr/lib/nx/X11/Xinerama; then - install -d -m 755 /usr/lib/nx/X11/Xinerama - fi - if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm index 91105d0f8..8cca06c85 100755 --- a/debian/libnx-xinerama1.prerm +++ b/debian/libnx-xinerama1.prerm @@ -20,7 +20,18 @@ set -e case "$1" in remove) if test -d /usr/lib/nx/X11/Xinerama; then - rm -rf /usr/lib/nx/X11/Xinerama + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + + + if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then + rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi fi ;; deconfigure|upgrade|failed-upgrade) -- cgit v1.2.3 From e595613879bc4c4f2ebdd13150fc18303611cda7 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 30 Apr 2015 14:43:04 +0200 Subject: debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries. --- debian/changelog | 107 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 50 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dda68a4cd..016ee357a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,56 +29,6 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. Affects: - 0990_fix-DEBUG-and-TEST-builds.full.patch - - -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 - -nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - - [ Clemens Lang ] - * Use path discovery for finding makedepend. Remove old cruft. Adds: - - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch - * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. - Adds: - - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch - * Use the correct library naming scheme on OS X. It differs from other - UNIX-based systems. - Adds: - - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - [ Mihai Moldovan ] - * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail - if it is not available. - * Rename: - - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => - 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => - 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => - 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => - 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch - - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => - 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => - 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - => - 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - => - 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - * nx-libs.spec: - - Versioned libXcomp* should obsolete unversioned libXcomp*, not - libNX_Xcomp*. - - Add overlooked Obsolete: statement to libNX_Xfixes3. - * Mid-release fixup: - - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. * CVE patches were previously not included in release tarballs. Rename: - 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch => @@ -195,6 +145,13 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - Remove accidentally copied Dokuwiki syntax. * debian/keystrokes.cfg: fix whitespace errors. Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: also create libXinerama symlink in + libnx-xinerama1.postinst.postinst (and remove in + libnx-xinerama1.postinst.prerm.) + Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only + delete known files. Fixes RPM build failures. + Backported from Arctica GH 3.6.x branch. [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. @@ -214,6 +171,56 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch + -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 + +nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low + + [ Clemens Lang ] + * Use path discovery for finding makedepend. Remove old cruft. Adds: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + Adds: + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + * Use the correct library naming scheme on OS X. It differs from other + UNIX-based systems. + Adds: + - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + + [ Mihai Moldovan ] + * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail + if it is not available. + * Rename: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => + 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => + 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => + 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => + 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + * nx-libs.spec: + - Versioned libXcomp* should obsolete unversioned libXcomp*, not + libNX_Xcomp*. + - Add overlooked Obsolete: statement to libNX_Xfixes3. + * Mid-release fixup: + - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. + -- X2Go Release Manager Tue, 17 Mar 2015 18:48:06 +0100 nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low -- cgit v1.2.3 From 7ccbb073f83b7aa8d0f154b34693b1075e455bd8 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 30 Apr 2015 15:51:48 +0200 Subject: debian/changelog: sync with 3.5.0.x branch. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 016ee357a..ef9a1113a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -152,6 +152,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures. Backported from Arctica GH 3.6.x branch. + * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. + Backported from Arctica GH 3.6.x branch. [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. -- cgit v1.2.3 From 06aa41671963dac9fa4bf84a8fc996a5360c94b0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Apr 2015 16:08:06 +0200 Subject: library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826). --- debian/control | 55 ++++++++++++-------------------- debian/libnx-xdamage-dev.install.in | 2 -- debian/libnx-xdamage1.install.in | 1 - debian/libnx-xdamage1.symbols | 9 ------ debian/nx-x11proto-damage-dev.install.in | 2 -- debian/rules | 1 - 6 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 debian/libnx-xdamage-dev.install.in delete mode 100644 debian/libnx-xdamage1.install.in delete mode 100644 debian/libnx-xdamage1.symbols delete mode 100644 debian/nx-x11proto-damage-dev.install.in (limited to 'debian') diff --git a/debian/control b/debian/control index 4e4918999..0f575421f 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: libxpm-dev, libxfont-dev, libxdmcp-dev, + libxdamage-dev, autoconf, pkg-config, x11proto-core-dev, @@ -283,20 +284,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. + This package removes the obsoleted libNX_Xdamage.so.1 library. With + recent versions of NX, the system-wide installed libXdamage gets used. . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package can be safely removed. Package: libnx-xdamage-dev Provides: libnx-xdamage1-dev @@ -304,23 +301,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xdamage1 (= ${binary:Version}), - nx-x11proto-damage-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (development headers) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. - . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package removes the obsoleted headers for the libNX_Xdamage.so.1 + library. With recent versions of NX, the system-wide installed libXdamage + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-damage-dev Section: libdevel @@ -328,16 +319,16 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Damage extension wire protocol +Description: nx-X11 Damage extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the Damage extension in nx-X11, used to notify clients of changes - made to particular areas. + This package removes the obsoleted wire protocol headers for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. + . + This package can be safely removed. Package: libnx-xdamage1-dbg Architecture: any @@ -345,22 +336,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xdamage1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (debug package) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. - . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package removes the obsoleted debug symbols for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xdmcp6 Architecture: any diff --git a/debian/libnx-xdamage-dev.install.in b/debian/libnx-xdamage-dev.install.in deleted file mode 100644 index 068f3badd..000000000 --- a/debian/libnx-xdamage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xdamage.so -usr/include/*/nx/X11/extensions/Xdamage.h diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in deleted file mode 100644 index 42bd90874..000000000 --- a/debian/libnx-xdamage1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xdamage.so.* diff --git a/debian/libnx-xdamage1.symbols b/debian/libnx-xdamage1.symbols deleted file mode 100644 index 09310e69a..000000000 --- a/debian/libnx-xdamage1.symbols +++ /dev/null @@ -1,9 +0,0 @@ -libNX_Xdamage.so.1 libnx-xdamage1 #MINVER# - XDamageCreate@Base 3.5.0.29 - XDamageDestroy@Base 3.5.0.29 - XDamageExtensionInfo@Base 3.5.0.29 - XDamageExtensionName@Base 3.5.0.29 - XDamageFindDisplay@Base 3.5.0.29 - XDamageQueryExtension@Base 3.5.0.29 - XDamageQueryVersion@Base 3.5.0.29 - XDamageSubtract@Base 3.5.0.29 diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 949549f17..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/damageproto.h -usr/include/*/nx/X11/extensions/damagewire.h \ No newline at end of file diff --git a/debian/rules b/debian/rules index 0da6db71a..16a09fb3f 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,6 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg - dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg -- cgit v1.2.3 From b77b26f4acc3932c29a1e0788e22d24e29e091d5 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 5 May 2015 01:22:18 +0200 Subject: debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. --- debian/libnx-xinerama1.postinst.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index c3706038c..6d9ba36ef 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -28,13 +28,13 @@ case "$1" in # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. - if test -e $libdir/libX11.so.6; then + if ! test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi - if test -e $libdir/libXext.so.6; then + if ! test -e $libdir/libXext.so.6; then ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi - if test -e $libdir/libNX_Xinerama.so.1; then + if ! test -e $libdir/libNX_Xinerama.so.1; then ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 fi ;; -- cgit v1.2.3 From 998527ce5783a0eae405dabb087a20add9a0ef9f Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 5 May 2015 01:22:41 +0200 Subject: debian/changelog: add entry for last change. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ef9a1113a..ceb869c0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -154,6 +154,7 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Backported from Arctica GH 3.6.x branch. * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. -- cgit v1.2.3 From 027f593fc78ea5bb53b1d6372aa7bf37e49e59f7 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 5 May 2015 01:23:04 +0200 Subject: debian/changelog: merge with master branch. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ceb869c0a..e664e5b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -154,6 +154,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Backported from Arctica GH 3.6.x branch. * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. Backported from Arctica GH 3.6.x branch. + * debian/control: workaround missing dependencies of nxagent on Ubuntu for + now. * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. [ Bernard Cafarelli ] -- cgit v1.2.3 From e9dcab679cb686b25df921c2c233198cb9dcfbb8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 1 May 2015 15:57:02 +0200 Subject: library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr shared library. --- debian/control | 57 ++++++++++++--------------------- debian/libnx-xrandr-dev.install.in | 2 -- debian/libnx-xrandr2.install.in | 1 - debian/libnx-xrandr2.symbols | 23 ------------- debian/nx-x11proto-randr-dev.install.in | 2 -- debian/rules | 1 - 6 files changed, 21 insertions(+), 65 deletions(-) delete mode 100644 debian/libnx-xrandr-dev.install.in delete mode 100644 debian/libnx-xrandr2.install.in delete mode 100644 debian/libnx-xrandr2.symbols delete mode 100644 debian/nx-x11proto-randr-dev.install.in (limited to 'debian') diff --git a/debian/control b/debian/control index 0f575421f..485c6fe0e 100644 --- a/debian/control +++ b/debian/control @@ -18,12 +18,12 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxrandr-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-randr-dev, x11proto-record-dev, x11proto-xinerama-dev, Standards-Version: 3.9.6 @@ -714,20 +714,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. + This package removes the obsoleted libNX_Xrandr.so.2 library. With + recent versions of NX, the system-wide installed libXrandr gets used. . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package can be safely removed. Package: libnx-xrandr-dev Provides: libnx-xrandr2-dev @@ -735,41 +731,34 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), - nx-x11proto-randr-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (development headers) +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-randr-dev Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension wire protocol +Description: nx-X11 RandR extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the RandR extension, used to change display properties such as - resolution, rotation, reflection, et al, on the fly. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. + . + This package can be safely removed. Package: libnx-xrandr2-dbg Architecture: any @@ -777,22 +766,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (debug package) +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xrender1 Architecture: any diff --git a/debian/libnx-xrandr-dev.install.in b/debian/libnx-xrandr-dev.install.in deleted file mode 100644 index 4711b6a18..000000000 --- a/debian/libnx-xrandr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xrandr.so -usr/include/*/nx/X11/extensions/Xrandr.h \ No newline at end of file diff --git a/debian/libnx-xrandr2.install.in b/debian/libnx-xrandr2.install.in deleted file mode 100644 index f4d1b039f..000000000 --- a/debian/libnx-xrandr2.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xrandr.so.* diff --git a/debian/libnx-xrandr2.symbols b/debian/libnx-xrandr2.symbols deleted file mode 100644 index 7dc2fd1b9..000000000 --- a/debian/libnx-xrandr2.symbols +++ /dev/null @@ -1,23 +0,0 @@ -libNX_Xrandr.so.2 libnx-xrandr2 #MINVER# - XRRConfigCurrentConfiguration@Base 3.5.0.29 - XRRConfigCurrentRate@Base 3.5.0.29 - XRRConfigRates@Base 3.5.0.29 - XRRConfigRotations@Base 3.5.0.29 - XRRConfigSizes@Base 3.5.0.29 - XRRConfigTimes@Base 3.5.0.29 - XRRExtensionInfo@Base 3.5.0.29 - XRRExtensionName@Base 3.5.0.29 - XRRFindDisplay@Base 3.5.0.29 - XRRFreeScreenConfigInfo@Base 3.5.0.29 - XRRGetScreenInfo@Base 3.5.0.29 - XRRQueryExtension@Base 3.5.0.29 - XRRQueryVersion@Base 3.5.0.29 - XRRRates@Base 3.5.0.29 - XRRRootToScreen@Base 3.5.0.29 - XRRRotations@Base 3.5.0.29 - XRRSelectInput@Base 3.5.0.29 - XRRSetScreenConfig@Base 3.5.0.29 - XRRSetScreenConfigAndRate@Base 3.5.0.29 - XRRSizes@Base 3.5.0.29 - XRRTimes@Base 3.5.0.29 - XRRUpdateConfiguration@Base 3.5.0.29 diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index d92801663..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/randr.h -usr/include/*/nx/X11/extensions/randrproto.h diff --git a/debian/rules b/debian/rules index 16a09fb3f..682c5dab8 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,6 @@ override_dh_strip: dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg - dh_strip -plibnx-xrandr2 --dbg-package=libnx-xrandr2-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg -- cgit v1.2.3 From 167d09ed740529bc43c1b32a34e80be12c6eb257 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Tue, 2 Jun 2015 21:12:05 +0200 Subject: debian/changelog: sync with master/3.5.0.x branch. --- debian/changelog | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e664e5b0f..0d56a4b96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,48 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * debian/control: workaround missing dependencies of nxagent on Ubuntu for now. * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. + Backported from Arctica GH 3.6.x branch. + * Security fixes: + - X.Org CVE-2014-8100: + v3: port to NXrender.c rather than render.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1027-render-check-request-size-before-reading-it-CVE.full.patch + * Security fixes: + - X.Org CVE-2014-8100: + v3: port to NXrender.c rather than render.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch + * nxcomp/Misc.cpp: fix build failure introduced in + a27a8aae3ca7a3f70e05152ac3d347942e11159d. + Backported from Arctica GH 3.6.x branch. + Affects: + - 9900-dxpc-license-history.full+lite.patch + * Security fixes: + - X.Org CVE-2013-4396: + v2: Apply to NXdixfonts.c rather than dixfonts.c (Mike DePaulo) + v3: backport v2 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch + * Security fixes: + - X.Org CVE-2014-8092: + v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch + * Security fixes: + - X.Org CVE-2015-3418: + v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch + * Security fixes: + - X.Org CVE-2014-8099: + v3: port to NXxvdisp.c rather than xvdisp.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. @@ -175,6 +217,31 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nxcompshad: Prevent underlinking by linking to libNX_Xext. Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch + * Security fixes: + - X.Org CVE-2015-3418: + 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch + * debian/roll-tarball.sh: + + Make sure *.keyboard, debian/**, nx-libs.spec, .pc/** don't end up + in tarball (special focus on the nx-libs-lite tarball). + + Allow patch files names having a dash next to the four digits (i.e., + 1234-.). + + Support tarring up the HEAD of the current branch. + * debian/COPYING.full+lite: + + Replace content with GPL-2 license text, because that is the overall + (i.e., strictest) license we have to deal with in nx-libs. + * Add 9900-dxpc-license-history.full+lite.patch. Document license history of + DXPC (where nxcomp got forked from). + Backported from Arctica GH 3.6.x branch. + * nxcomp/README.on-retroactive-DXPC-license: Some layout and + interpunctuation fixes. + Backported from Arctica GH 3.6.x branch. + Affects: + - 9900-dxpc-license-history.full+lite.patch + + [ Nito Martinez ] + * nxcomp: fix DEBUG, TEST, DUMP, FLUSH, TOKEN, PING, MIXED et al builds. + Adds: + - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 -- cgit v1.2.3 From 4674a4ae46aec7c104aed2090e57fd36c2cbbef2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 19 Jun 2015 23:58:49 +0200 Subject: debian/control: Add Breaks:/Replaces: for qvd-libxcomp3 and qvd-nxproxy. --- debian/control | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 485c6fe0e..08e260a8b 100644 --- a/debian/control +++ b/debian/control @@ -1022,6 +1022,8 @@ Description: X2Go agent Package: nxproxy Architecture: any +Breaks: qvd-nxproxy +Replaces: qvd-nxproxy Multi-Arch: foreign Depends: ${shlibs:Depends}, @@ -1094,8 +1096,10 @@ Pre-Depends: Depends: ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxcomp (<= 3.5.1) -Replaces: nxcomp +Breaks: nxcomp (<= 3.5.1), + qvd-libxcomp3, +Replaces: nxcomp, + qvd-libxcomp3, Description: nx-X11 compression library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when -- cgit v1.2.3 From 701471e8e464558a05ff99eeeeb7b886c1a7cefa Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 13:29:27 +0200 Subject: debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-.). --- debian/roll-tarballs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 954986b5f..a060212f0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -81,7 +81,7 @@ mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" @@ -90,7 +90,7 @@ else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" -- cgit v1.2.3 From 895ee3b3b1f199dae2ed4da9c393d1ba575820a0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 13:33:43 +0200 Subject: debian/roll-tarball.sh: Support tarring up the HEAD of the current branch. --- debian/roll-tarballs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index a060212f0..ff777bd37 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -52,13 +52,13 @@ else fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="HEAD" + CHECKOUT=refs/heads/$(git rev-parse --abbrev-ref HEAD) fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." echo " Please specify one of the following releases:" - echo "HEAD" + echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u exit 1 fi -- cgit v1.2.3 From 47afc48ea312b3ab7a5138c15271942103ec3fee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:33:08 +0200 Subject: debian/roll-tarball.sh: Prevent several files/folders from ending up in nx-libs-lite tarball. * bin/{nxagent,nxauth,x2goagent} * etc/ * doc/nx-X11_vs_XOrg69_patches * README.keystrokes" * nx-libs.spec --- debian/roll-tarballs.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index ff777bd37..3e41092f8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -87,9 +87,13 @@ if [ "x$MODE" = "xfull" ]; then echo "${file##*/}" >> "doc/applied-patches/series" done else + rm -f "bin/"{nxagent,nxauth,x2goagent} rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* + rm -Rf "etc"* + rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -f "README.keystrokes" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" @@ -104,15 +108,16 @@ else echo "No patches applied at all. Very old release?" fi +# remove folders that we do not want to roll into the tarball +rm -Rf ".pc/" +rm -Rf "debian/" +rm -Rf "nx-libs.spec" + # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; done -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" - # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* -- cgit v1.2.3 From 7e1effbe782644ddf1ec30354224d56e7f3f24ff Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:49:40 +0200 Subject: debian/roll-tarball.sh: Rename README.md to README.NX-Development before moving it into doc/ folder. --- debian/roll-tarballs.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 3e41092f8..07e052268 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -113,6 +113,9 @@ rm -Rf ".pc/" rm -Rf "debian/" rm -Rf "nx-libs.spec" +# some file renamings +mv README.md README.NX-Development + # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; -- cgit v1.2.3 From 438f3df14cf12a423aae3ec1a17c1067191b8686 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:50:05 +0200 Subject: debian/roll-tarball.sh: Auto-generate ChangeLog from Git history. --- debian/roll-tarballs.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 07e052268..ecaeac2e0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -72,6 +72,7 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) +git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" echo "Created tarball for $CHECKOUT" -- cgit v1.2.3 From fa0286ed673c11777831de1f2297cef805954272 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 29 Jun 2015 03:40:58 +0200 Subject: debian/changelog: sync with master/3.5.0.x branch. --- debian/changelog | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d56a4b96..17820e3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,37 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Adds: - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch + [ Vadim Troshchinskiy ] + * nxcomp: fix "negotiation in stage 10" error. + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch + + [ Emanuele Giaquinta ] + * nx-X11: Fix alpha premultiplication in XRenderParseColor. + Fixes: #893. + v2: backport to nx-libs 3.6.x (Mike Gabriel) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0040_nx-X11_Fix-alpha-premultiplication-in-XRenderPa.full.patch + + [ Michael DePaulo ] + * {nx-X11,nxproxy}: correct manpages: --help -> -help + xorg-server does not follow the convention of using 2 dashes. + Note that --help does produce the help output. However, it + produces this additional output after it: + Error: Aborting session with 'Unrecognized option: --help'. + Session: Aborting session at 'Sun Jun 28 01:35:35 2015'. + Session: Session aborted at 'Sun Jun 28 01:35:35 2015'. + It also causes a return code of 1 rather than 0. + Therefore, we should instruct users to call -help instead. + + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Affects: + - 0009_nxagent_add-man-page.full.patch + - 0009_nxproxy_add-man-page.full+lite.patch + - 0209_x2goagent_add-man-page.full.patch + -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low -- cgit v1.2.3 From f4c07c07760c33bf7bc908e2d45aee4c4f73f088 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sat, 4 Jul 2015 06:46:29 +0200 Subject: debian/changelog: sync with master/3.5.0.x branch. --- debian/changelog | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 17820e3d9..2d977e181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,13 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 -nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low +nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low + + * Continue development + + -- X2Go Release Manager Sat, 04 Jul 2015 06:29:19 +0200 + +nx-libs (2:3.5.0.32-0x2go1) unstable; urgency=low [ Mihai Moldovan ] * Only use the first three numbers in the full version for current_version @@ -274,7 +280,76 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - 0009_nxproxy_add-man-page.full+lite.patch - 0209_x2goagent_add-man-page.full.patch - -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 + [ Ulrich Sibiller ] + * nx-X11: Bug 51375: Xorg doesn't set status for RRGetOutputInfo + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1250_nx-X11_Bug-51375-Xorg-doesn_t-set-status-for-RR.full.patch + * nx-X11: Drop a reference to user mode after create + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1251_nx-X11_Drop-a-reference-to-user-mode-after-crea.full.patch + * nx-X11: Free randr crtc and output pointer arrays + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1252_nx-X11_Free-randr-crtc-and-output-pointer-array.full.patch + * nx-X11: randr: check for virtual size limits before set crtc + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1253_nx-X11_randr-check-for-virtual-size-limits-befo.full.patch + * nx-X11: randr: fix server crash in RRGetScreenInfo + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch + * nx-X11: RRModeCreate: plug memory leak of newModes if AddResource fails + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch + * nx-X11: ProcRRGetScreenInfo: swap configTimestamp as well + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch + * nx-X11: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch + * nx-X11: randr: Clean up compiler warnings about unused and shadowing + variables + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1258_nx-X11_randr-Clean-up-compiler-warnings-about-u.full.patch + * nx-X11: Make RANDR 'set' timestamps follow client specified time. Bug 21987. + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1259_nx-X11_Make-RANDR-_set_-timestamps-follow-clien.full.patch + * nx-X11: xserver: Avoid sending uninitialized padding data over the network + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.6.x (Ulrich Sibiller) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 1260_nx-X11_xserver-Avoid-sending-uninitialized-padd.full.patch + + -- X2Go Release Manager Sat, 04 Jul 2015 04:44:00 +0200 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low -- cgit v1.2.3 From 931050cbe3ab6a880bef04aaba362fdf7155136e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 14:46:42 +0200 Subject: debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file into the corresponding development packages. --- debian/libxcomp-dev.install.in | 1 + debian/libxcompext-dev.install.in | 1 + debian/libxcompshad-dev.install.in | 1 + 3 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in index 7b7bbe591..f0faa49e3 100644 --- a/debian/libxcomp-dev.install.in +++ b/debian/libxcomp-dev.install.in @@ -7,3 +7,4 @@ usr/include/*/nx/NXproto.h usr/include/*/nx/NXrender.h usr/include/*/nx/NXvars.h usr/include/*/nx/MD5.h +usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install.in index 8be19251e..a31961b99 100644 --- a/debian/libxcompext-dev.install.in +++ b/debian/libxcompext-dev.install.in @@ -1,3 +1,4 @@ usr/lib/*/libXcompext.so usr/include/*/nx/NXlib.h usr/include/*/nx/NXlibint.h +usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in index fe11227df..31cc685d2 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install.in @@ -10,3 +10,4 @@ usr/include/*/nx/Shadow.h usr/include/*/nx/Updater.h usr/include/*/nx/Win.h usr/include/*/nx/X11.h +usr/lib/*/pkgconfig/nxcompshad.pc -- cgit v1.2.3 From c2761fb7c7dc497e48ba51b0943c7c369efef5e7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 20:39:58 +0200 Subject: roll-tarball.sh: Make sure symlinked files are included in tarballs. As the system a tarball gets extracted on may potentially be unable to handle symlinks, we ship symlinks as files in the rolled tarball. By transforming symlinks into real files, we also assure that all VERSION files/symlinks get shipped in the tarballs. Fixes ArcticaProject/nx-libs#27 --- debian/roll-tarballs.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index ecaeac2e0..2fba5a042 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -78,6 +78,20 @@ echo "Created tarball for $CHECKOUT" cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" +set -x +# Replace symlinks by copies of the linked target files +# Note: We don't have symlinked directories!!! +find . -type l | while read link; do + TARGET=$(readlink "$link") + cd $(dirname $link) + if [ -f "$TARGET" ]; then + rm -f $(basename $link) + cp ${TARGET} $(basename $link) + fi + cd - 1>/dev/null +done +set +x + mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball @@ -95,6 +109,7 @@ else rm -Rf "etc"* rm -Rf "doc/nx-X11_vs_XOrg69_patches"* rm -f "README.keystrokes" + rm -f "VERSION.x2goagent" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" @@ -114,9 +129,6 @@ rm -Rf ".pc/" rm -Rf "debian/" rm -Rf "nx-libs.spec" -# some file renamings -mv README.md README.NX-Development - # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; -- cgit v1.2.3 From 01ad7dad439f446c559e6da8411962c26d99e16a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 15 Jul 2015 09:30:29 +0200 Subject: roll-tarball.sh: more quotes (follow-up for previous commit), drop debug code --- debian/roll-tarballs.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 2fba5a042..0f9568aad 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -78,19 +78,17 @@ echo "Created tarball for $CHECKOUT" cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" -set -x # Replace symlinks by copies of the linked target files # Note: We don't have symlinked directories!!! find . -type l | while read link; do TARGET=$(readlink "$link") - cd $(dirname $link) + cd $(dirname "$link") if [ -f "$TARGET" ]; then - rm -f $(basename $link) - cp ${TARGET} $(basename $link) + rm -f $(basename "$link") + cp "${TARGET}" $(basename "$link") fi cd - 1>/dev/null done -set +x mkdir -p "doc/applied-patches" -- cgit v1.2.3 From 0606ec8149a087ebe5681012670f265c2f7e9adb Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Fri, 17 Jul 2015 17:48:44 +0200 Subject: debian/roll-tarballs.sh: more quotes, more curly braces, replace cd with pushd and pop. --- debian/roll-tarballs.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 0f9568aad..52c2090f0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -52,7 +52,7 @@ else fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT=refs/heads/$(git rev-parse --abbrev-ref HEAD) + CHECKOUT="refs/heads/$(git rev-parse --abbrev-ref HEAD)" fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then @@ -80,14 +80,14 @@ cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" # Replace symlinks by copies of the linked target files # Note: We don't have symlinked directories!!! -find . -type l | while read link; do - TARGET=$(readlink "$link") - cd $(dirname "$link") - if [ -f "$TARGET" ]; then - rm -f $(basename "$link") - cp "${TARGET}" $(basename "$link") +find . -type "l" | while read link; do + TARGET="$(readlink "${link}")" + pushd "$(dirname "${link}")" >/dev/null + if [ -f "${TARGET}" ]; then + rm -f "$(basename "${link}")" + cp "${TARGET}" "$(basename "${link}")" fi - cd - 1>/dev/null + popd >/dev/null done mkdir -p "doc/applied-patches" -- cgit v1.2.3 From 813d0cf137aa34d159342de5c6c3055c8d1fc984 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Fri, 17 Jul 2015 17:57:24 +0200 Subject: debian/control: add xkb-data to nxagent's Recommends. Cherry-picked from 3.5.0.x branch. --- debian/changelog | 4 +++- debian/control | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d977e181..2be4d2d22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,9 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low - * Continue development + [ Mihai Moldovan ] + * debian/control: + - Add xkb-data to nxagent's Recommends. -- X2Go Release Manager Sat, 04 Jul 2015 06:29:19 +0200 diff --git a/debian/control b/debian/control index 08e260a8b..8cbb4bc54 100644 --- a/debian/control +++ b/debian/control @@ -957,6 +957,7 @@ Depends: ${misc:Depends}, Recommends: xfonts-base, + xkb-data, Description: NX agent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when -- cgit v1.2.3 From edeb4e196d3ac084a1429b27b6ef87403073ee8c Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Fri, 17 Jul 2015 18:13:00 +0200 Subject: nx-libs.spec: add xkeyboard-config to nxagent's Requires. Should be a weak dependency, but RPM doesn't support that too well yet. Cherry-picked from 3.5.0.x branch. --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2be4d2d22..0a48e8635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low [ Mihai Moldovan ] * debian/control: - Add xkb-data to nxagent's Recommends. + * nx-libs.spec: + - Add xkeyboard-config to nxagent's Requires. Should be a weak dependency, + but RPM doesn't support that too well yet. -- X2Go Release Manager Sat, 04 Jul 2015 06:29:19 +0200 -- cgit v1.2.3 From 4db753eb79b86f1bd864654f51da34c38db222cc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 22 Sep 2015 15:02:22 +0200 Subject: Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks." This reverts commit b77b26f4acc3932c29a1e0788e22d24e29e091d5. --- debian/libnx-xinerama1.postinst.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index 6d9ba36ef..c3706038c 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -28,13 +28,13 @@ case "$1" in # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. - if ! test -e $libdir/libX11.so.6; then + if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi - if ! test -e $libdir/libXext.so.6; then + if test -e $libdir/libXext.so.6; then ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi - if ! test -e $libdir/libNX_Xinerama.so.1; then + if test -e $libdir/libNX_Xinerama.so.1; then ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 fi ;; -- cgit v1.2.3 From da6b89f7e89fcb0858e6e32188a2f72d1c75366d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 23 Sep 2015 12:15:06 +0200 Subject: debian/libnx-xinerama1.postinst.in: Enforce symlink creation for Xinerama support. --- debian/libnx-xinerama1.postinst.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index c3706038c..38cc415f4 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -29,13 +29,13 @@ case "$1" in # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. if test -e $libdir/libX11.so.6; then - ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi if test -e $libdir/libXext.so.6; then - ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi if test -e $libdir/libNX_Xinerama.so.1; then - ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 fi ;; -- cgit v1.2.3 From 0382b4018d96cfcc0c406231d294d9a6bff76902 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Sep 2015 08:10:59 +0200 Subject: debian/changelog: Drop unnecessary "~build1" from version string --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0a48e8635..802ba1b33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.0-0) UNRELEASED; urgency=medium * Version bump, continuing NX 3.x development.. Targeting NX 3.6.x.y some time. -- cgit v1.2.3 From 45983d13072020f5d210b9c613f0db5636dad6a3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Sep 2015 08:15:52 +0200 Subject: Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1). --- debian/libnx-xinerama1.postinst.in | 56 -------------------------------------- debian/libnx-xinerama1.prerm | 51 ---------------------------------- debian/nxagent.postinst.in | 56 ++++++++++++++++++++++++++++++++++++++ debian/nxagent.prerm | 51 ++++++++++++++++++++++++++++++++++ debian/rules | 6 ++-- 5 files changed, 110 insertions(+), 110 deletions(-) delete mode 100755 debian/libnx-xinerama1.postinst.in delete mode 100755 debian/libnx-xinerama1.prerm create mode 100755 debian/nxagent.postinst.in create mode 100755 debian/nxagent.prerm (limited to 'debian') diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in deleted file mode 100755 index 38cc415f4..000000000 --- a/debian/libnx-xinerama1.postinst.in +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# postinst script for libnx-x11 -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ### FIXME: this is a work-around while we have not implemented - ### multiarch support into the Debian source package of - ### nx-libs. - - libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - - # Already existent files are not removed. - # Users will need to explicitly remove them and (re-) configure this package. - if test -e $libdir/libX11.so.6; then - ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e $libdir/libXext.so.6; then - ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - if test -e $libdir/libNX_Xinerama.so.1; then - ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm deleted file mode 100755 index 8cca06c85..000000000 --- a/debian/libnx-xinerama1.prerm +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# prerm script for libnx-xinerama1 -# -# see: dh_installdeb(1) -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -set -e - - - -case "$1" in - remove) - if test -d /usr/lib/nx/X11/Xinerama; then - if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - - if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - - - if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then - rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - fi - fi - ;; - deconfigure|upgrade|failed-upgrade) - : - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/nxagent.postinst.in b/debian/nxagent.postinst.in new file mode 100755 index 000000000..4ad52a525 --- /dev/null +++ b/debian/nxagent.postinst.in @@ -0,0 +1,56 @@ +#!/bin/sh +# postinst script for nxagent +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ### FIXME: this is a work-around while we have not implemented + ### multiarch support into the Debian source package of + ### nx-libs. + + libdir=/usr/lib/#DEB_BUILD_MULTIARCH# + + # Already existent files are not removed. + # Users will need to explicitly remove them and (re-) configure this package. + if test -e $libdir/libX11.so.6; then + ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e $libdir/libXext.so.6; then + ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + if test -e $libdir/libNX_Xinerama.so.1; then + ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/nxagent.prerm b/debian/nxagent.prerm new file mode 100755 index 000000000..edc882a46 --- /dev/null +++ b/debian/nxagent.prerm @@ -0,0 +1,51 @@ +#!/bin/sh +# prerm script for nxagent +# +# see: dh_installdeb(1) +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +set -e + + + +case "$1" in + remove) + if test -d /usr/lib/nx/X11/Xinerama; then + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + + + if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then + rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi + fi + ;; + deconfigure|upgrade|failed-upgrade) + : + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 682c5dab8..b3060b36f 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -f debian/libnx-xinerama1.postinst + rm -f debian/nxagent.postinst rm -fR .preserve/ dh_clean @@ -72,8 +72,8 @@ override_dh_auto_install: override_dh_auto_build: - # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable - sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst + # let's prep the nxagent.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable + sed debian/nxagent.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/nxagent.postinst LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel -- cgit v1.2.3 From 81d92cd0fa293e44bbb063d373d9289ddc358c99 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Sep 2015 09:57:12 +0200 Subject: Xinerama symlinking: Create / remove folder containing Xinerama sylinks on installation/upgrade and removal. --- debian/nxagent.postinst.in | 1 + debian/nxagent.prerm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/nxagent.postinst.in b/debian/nxagent.postinst.in index 4ad52a525..95879b943 100755 --- a/debian/nxagent.postinst.in +++ b/debian/nxagent.postinst.in @@ -26,6 +26,7 @@ case "$1" in libdir=/usr/lib/#DEB_BUILD_MULTIARCH# + mkdir -p /usr/lib/nx/X11/Xinerama/ # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. if test -e $libdir/libX11.so.6; then diff --git a/debian/nxagent.prerm b/debian/nxagent.prerm index edc882a46..019284a16 100755 --- a/debian/nxagent.prerm +++ b/debian/nxagent.prerm @@ -28,10 +28,12 @@ case "$1" in rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi - if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 fi + + rmdir --ignore-fail-on-non-empty /usr/lib/nx/X11/Xinerama + fi ;; deconfigure|upgrade|failed-upgrade) -- cgit v1.2.3 From 433d8186588698ce6a435fbff5e9d40a37b78be9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Jul 2015 16:16:40 +0200 Subject: Clear header file namespace separation ( vs. ). In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process. --- debian/libnx-x11-dev.install.in | 28 ++++++------ debian/libnx-xau-dev.install.in | 2 +- debian/libnx-xcomposite-dev.install.in | 2 +- debian/libnx-xext-dev.install.in | 66 ++++++++++++++--------------- debian/libnx-xfixes-dev.install.in | 2 +- debian/libnx-xinerama-dev.install.in | 4 +- debian/libnx-xrender-dev.install.in | 2 +- debian/libnx-xtst-dev.install.in | 2 +- debian/nx-x11proto-composite-dev.install.in | 4 +- debian/nx-x11proto-core-dev.install.in | 46 ++++++++++---------- debian/nx-x11proto-render-dev.install.in | 4 +- debian/nx-x11proto-xext-dev.install.in | 8 ++-- debian/nx-x11proto-xfixes-dev.install.in | 4 +- debian/nx-x11proto-xinerama-dev.install.in | 2 +- debian/rules | 44 +++++++++---------- 15 files changed, 110 insertions(+), 110 deletions(-) (limited to 'debian') diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in index 331ec104f..13af54672 100644 --- a/debian/libnx-x11-dev.install.in +++ b/debian/libnx-x11-dev.install.in @@ -1,15 +1,15 @@ usr/lib/*/libNX_X11.so -usr/include/*/nx/X11/ImUtil.h -usr/include/*/nx/X11/XKBlib.h -usr/include/*/nx/X11/Xcms.h -usr/include/*/nx/X11/Xlib.h -usr/include/*/nx/X11/XlibConf.h -usr/include/*/nx/X11/Xlibint.h -usr/include/*/nx/X11/Xlocale.h -usr/include/*/nx/X11/Xregion.h -usr/include/*/nx/X11/Xresource.h -usr/include/*/nx/X11/Xutil.h -usr/include/*/nx/X11/cursorfont.h -usr/include/*/nx/X11/misc.h -usr/include/*/nx/X11/os.h -usr/include/*/nx/X11/X10.h +usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xcms.h +usr/include/*/nx-X11/Xlib.h +usr/include/*/nx-X11/XlibConf.h +usr/include/*/nx-X11/Xlibint.h +usr/include/*/nx-X11/Xlocale.h +usr/include/*/nx-X11/Xregion.h +usr/include/*/nx-X11/Xresource.h +usr/include/*/nx-X11/Xutil.h +usr/include/*/nx-X11/cursorfont.h +usr/include/*/nx-X11/misc.h +usr/include/*/nx-X11/os.h +usr/include/*/nx-X11/X10.h diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in index dd17a6054..1bf954c00 100644 --- a/debian/libnx-xau-dev.install.in +++ b/debian/libnx-xau-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xau.so -usr/include/*/nx/X11/Xauth.h +usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in index e7e3a33db..71451dbcc 100644 --- a/debian/libnx-xcomposite-dev.install.in +++ b/debian/libnx-xcomposite-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xcomposite.so -usr/include/*/nx/X11/extensions/Xcomposite.h +usr/include/*/nx-X11/extensions/Xcomposite.h diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in index 9f4f60551..0d1df8c08 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install.in @@ -1,34 +1,34 @@ usr/lib/*/libNX_Xext.so -usr/include/*/nx/X11/extensions/MITMisc.h -usr/include/*/nx/X11/extensions/XEVI.h -usr/include/*/nx/X11/extensions/XEVIstr.h -usr/include/*/nx/X11/extensions/Xevie.h -usr/include/*/nx/X11/extensions/Xeviestr.h -usr/include/*/nx/X11/extensions/XLbx.h -usr/include/*/nx/X11/extensions/XShm.h -usr/include/*/nx/X11/extensions/Xag.h -usr/include/*/nx/X11/extensions/Xagsrv.h -usr/include/*/nx/X11/extensions/Xagstr.h -usr/include/*/nx/X11/extensions/Xcup.h -usr/include/*/nx/X11/extensions/Xcupstr.h -usr/include/*/nx/X11/extensions/Xdbe.h -usr/include/*/nx/X11/extensions/Xdbeproto.h -usr/include/*/nx/X11/extensions/Xext.h -usr/include/*/nx/X11/extensions/dpms.h -usr/include/*/nx/X11/extensions/dpmsstr.h -usr/include/*/nx/X11/extensions/extutil.h -usr/include/*/nx/X11/extensions/lbxstr.h -usr/include/*/nx/X11/extensions/lbxbuf.h -usr/include/*/nx/X11/extensions/lbxdeltastr.h -usr/include/*/nx/X11/extensions/lbximage.h -usr/include/*/nx/X11/extensions/lbxbufstr.h -usr/include/*/nx/X11/extensions/lbxopts.h -usr/include/*/nx/X11/extensions/lbxzlib.h -usr/include/*/nx/X11/extensions/mitmiscstr.h -usr/include/*/nx/X11/extensions/multibuf.h -usr/include/*/nx/X11/extensions/multibufst.h -usr/include/*/nx/X11/extensions/security.h -usr/include/*/nx/X11/extensions/securstr.h -usr/include/*/nx/X11/extensions/shape.h -usr/include/*/nx/X11/extensions/sync.h -usr/include/*/nx/X11/extensions/xtestext1.h +usr/include/*/nx-X11/extensions/MITMisc.h +usr/include/*/nx-X11/extensions/XEVI.h +usr/include/*/nx-X11/extensions/XEVIstr.h +usr/include/*/nx-X11/extensions/Xevie.h +usr/include/*/nx-X11/extensions/Xeviestr.h +usr/include/*/nx-X11/extensions/XLbx.h +usr/include/*/nx-X11/extensions/XShm.h +usr/include/*/nx-X11/extensions/Xag.h +usr/include/*/nx-X11/extensions/Xagsrv.h +usr/include/*/nx-X11/extensions/Xagstr.h +usr/include/*/nx-X11/extensions/Xcup.h +usr/include/*/nx-X11/extensions/Xcupstr.h +usr/include/*/nx-X11/extensions/Xdbe.h +usr/include/*/nx-X11/extensions/Xdbeproto.h +usr/include/*/nx-X11/extensions/Xext.h +usr/include/*/nx-X11/extensions/dpms.h +usr/include/*/nx-X11/extensions/dpmsstr.h +usr/include/*/nx-X11/extensions/extutil.h +usr/include/*/nx-X11/extensions/lbxstr.h +usr/include/*/nx-X11/extensions/lbxbuf.h +usr/include/*/nx-X11/extensions/lbxdeltastr.h +usr/include/*/nx-X11/extensions/lbximage.h +usr/include/*/nx-X11/extensions/lbxbufstr.h +usr/include/*/nx-X11/extensions/lbxopts.h +usr/include/*/nx-X11/extensions/lbxzlib.h +usr/include/*/nx-X11/extensions/mitmiscstr.h +usr/include/*/nx-X11/extensions/multibuf.h +usr/include/*/nx-X11/extensions/multibufst.h +usr/include/*/nx-X11/extensions/security.h +usr/include/*/nx-X11/extensions/securstr.h +usr/include/*/nx-X11/extensions/shape.h +usr/include/*/nx-X11/extensions/sync.h +usr/include/*/nx-X11/extensions/xtestext1.h diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in index 96b6cf61c..475c78d0a 100644 --- a/debian/libnx-xfixes-dev.install.in +++ b/debian/libnx-xfixes-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xfixes.so -usr/include/*/nx/X11/extensions/Xfixes.h +usr/include/*/nx-X11/extensions/Xfixes.h diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in index 983784460..59c0456aa 100644 --- a/debian/libnx-xinerama-dev.install.in +++ b/debian/libnx-xinerama-dev.install.in @@ -1,3 +1,3 @@ usr/lib/*/libNX_Xinerama.so -usr/include/*/nx/X11/extensions/Xinerama.h -usr/include/*/nx/X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/Xinerama.h +usr/include/*/nx-X11/extensions/panoramiXext.h diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in index 392e20025..2aede35da 100644 --- a/debian/libnx-xrender-dev.install.in +++ b/debian/libnx-xrender-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xrender.so -usr/include/*/nx/X11/extensions/Xrender.h +usr/include/*/nx-X11/extensions/Xrender.h diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in index 9dd16a1db..5acca96cf 100644 --- a/debian/libnx-xtst-dev.install.in +++ b/debian/libnx-xtst-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xtst.so -usr/include/*/nx/X11/extensions/XTest.h +usr/include/*/nx-X11/extensions/XTest.h diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in index 609454a5e..cf2c77e36 100644 --- a/debian/nx-x11proto-composite-dev.install.in +++ b/debian/nx-x11proto-composite-dev.install.in @@ -1,2 +1,2 @@ -usr/include/*/nx/X11/extensions/composite.h -usr/include/*/nx/X11/extensions/compositeproto.h \ No newline at end of file +usr/include/*/nx-X11/extensions/composite.h +usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in index 92c529f41..2e99909a8 100644 --- a/debian/nx-x11proto-core-dev.install.in +++ b/debian/nx-x11proto-core-dev.install.in @@ -1,23 +1,23 @@ -usr/include/*/nx/X11/DECkeysym.h -usr/include/*/nx/X11/HPkeysym.h -usr/include/*/nx/X11/Sunkeysym.h -usr/include/*/nx/X11/X.h -usr/include/*/nx/X11/XF86keysym.h -usr/include/*/nx/X11/XWDFile.h -usr/include/*/nx/X11/Xalloca.h -usr/include/*/nx/X11/Xarch.h -usr/include/*/nx/X11/Xatom.h -usr/include/*/nx/X11/Xdefs.h -usr/include/*/nx/X11/Xfuncproto.h -usr/include/*/nx/X11/Xfuncs.h -usr/include/*/nx/X11/Xmd.h -usr/include/*/nx/X11/Xos.h -usr/include/*/nx/X11/Xos_r.h -usr/include/*/nx/X11/Xosdefs.h -usr/include/*/nx/X11/Xpoll.h -usr/include/*/nx/X11/Xproto.h -usr/include/*/nx/X11/Xprotostr.h -usr/include/*/nx/X11/Xthreads.h -usr/include/*/nx/X11/ap_keysym.h -usr/include/*/nx/X11/keysym.h -usr/include/*/nx/X11/keysymdef.h +usr/include/*/nx-X11/DECkeysym.h +usr/include/*/nx-X11/HPkeysym.h +usr/include/*/nx-X11/Sunkeysym.h +usr/include/*/nx-X11/X.h +usr/include/*/nx-X11/XF86keysym.h +usr/include/*/nx-X11/XWDFile.h +usr/include/*/nx-X11/Xalloca.h +usr/include/*/nx-X11/Xarch.h +usr/include/*/nx-X11/Xatom.h +usr/include/*/nx-X11/Xdefs.h +usr/include/*/nx-X11/Xfuncproto.h +usr/include/*/nx-X11/Xfuncs.h +usr/include/*/nx-X11/Xmd.h +usr/include/*/nx-X11/Xos.h +usr/include/*/nx-X11/Xos_r.h +usr/include/*/nx-X11/Xosdefs.h +usr/include/*/nx-X11/Xpoll.h +usr/include/*/nx-X11/Xproto.h +usr/include/*/nx-X11/Xprotostr.h +usr/include/*/nx-X11/Xthreads.h +usr/include/*/nx-X11/ap_keysym.h +usr/include/*/nx-X11/keysym.h +usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in index bf778716f..f2222d234 100644 --- a/debian/nx-x11proto-render-dev.install.in +++ b/debian/nx-x11proto-render-dev.install.in @@ -1,3 +1,3 @@ -usr/include/*/nx/X11/extensions/render.h -usr/include/*/nx/X11/extensions/renderproto.h +usr/include/*/nx-X11/extensions/render.h +usr/include/*/nx-X11/extensions/renderproto.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index 7e0ca507f..0d1f8699b 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -1,4 +1,4 @@ -usr/include/*/nx/X11/extensions/xteststr.h -usr/include/*/nx/X11/extensions/shapestr.h -usr/include/*/nx/X11/extensions/shmstr.h -usr/include/*/nx/X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/shapestr.h +usr/include/*/nx-X11/extensions/shmstr.h +usr/include/*/nx-X11/extensions/syncstr.h diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in index 4b614d6c1..91eae0306 100644 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ b/debian/nx-x11proto-xfixes-dev.install.in @@ -1,3 +1,3 @@ -usr/include/*/nx/X11/extensions/xfixeswire.h -usr/include/*/nx/X11/extensions/xfixesproto.h +usr/include/*/nx-X11/extensions/xfixeswire.h +usr/include/*/nx-X11/extensions/xfixesproto.h diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in index 36717e1f5..dca06ddee 100644 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ b/debian/nx-x11proto-xinerama-dev.install.in @@ -1 +1 @@ -usr/include/*/nx/X11/extensions/panoramiXproto.h \ No newline at end of file +usr/include/*/nx-X11/extensions/panoramiXproto.h \ No newline at end of file diff --git a/debian/rules b/debian/rules index b3060b36f..b78855033 100755 --- a/debian/rules +++ b/debian/rules @@ -42,28 +42,28 @@ override_dh_install: rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a # remove extras, GL, and other unneeded headers - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86misc.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dgastr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/ + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing -- cgit v1.2.3 From 27e06a5e2999e4c68d0292c3f4213c956625593d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Dec 2015 19:55:38 +0100 Subject: library clean-up: Don't build libNX_Xcomposite anymore. Use system's libXcomposite shared library. --- debian/control | 44 +++++++++++++--------------------- debian/libnx-xcomposite-dev.install.in | 2 -- debian/libnx-xcomposite1.install.in | 1 - debian/libnx-xcomposite1.symbols | 13 ---------- debian/rules | 1 - 5 files changed, 16 insertions(+), 45 deletions(-) delete mode 100644 debian/libnx-xcomposite-dev.install.in delete mode 100644 debian/libnx-xcomposite1.install.in delete mode 100644 debian/libnx-xcomposite1.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index 8cbb4bc54..ecfd5d82a 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxcomposite-dev, libxrandr-dev, autoconf, pkg-config, @@ -199,20 +200,17 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Composite extension library +Description: nx-X11 Composite extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xcomposite provides an X Window System client interface to the Composite - extension to the X protocol + This package removes the obsoleted libNX_Xcomposite.so.1 library. With + recent versions of NX, the system-wide installed libXcomposite gets + used. . - The Composite extension allows clients called compositing managers to control - the final drawing of the screen. Rendering is done into an off-screen buffer. + This package can be safely removed. Package: libnx-xcomposite-dev Provides: libnx-xcomposite1-dev @@ -220,23 +218,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xcomposite1 (= ${binary:Version}), - nx-x11proto-composite-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Composite extension library (development headers) +Description: nx-X11 Composite extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xcomposite provides an X Window System client interface to the Composite - extension to the X protocol - . - The Composite extension allows clients called compositing managers to control - the final drawing of the screen. Rendering is done into an off-screen buffer. + This package removes the obsoleted headers for the libNX_Xcomposite.so.1 + library. With recent versions of NX, the system-wide installed + libXcomposite gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-composite-dev Section: libdevel @@ -261,22 +253,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xcomposite1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Composite extension library (debug package) +Description: nx-X11 Composite extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xcomposite provides an X Window System client interface to the Composite - extension to the X protocol + This package removes the debug symbols for the obsoleted + libNX_Xcomposite.so.1 library. With recent versions of NX, the + system-wide installed libXcomposite gets used. . - The Composite extension allows clients called compositing managers to control - the final drawing of the screen. Rendering is done into an off-screen buffer. - . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xdamage1 Architecture: any diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in deleted file mode 100644 index 71451dbcc..000000000 --- a/debian/libnx-xcomposite-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xcomposite.so -usr/include/*/nx-X11/extensions/Xcomposite.h diff --git a/debian/libnx-xcomposite1.install.in b/debian/libnx-xcomposite1.install.in deleted file mode 100644 index ecc2f4237..000000000 --- a/debian/libnx-xcomposite1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xcomposite.so.* diff --git a/debian/libnx-xcomposite1.symbols b/debian/libnx-xcomposite1.symbols deleted file mode 100644 index 22ddc889f..000000000 --- a/debian/libnx-xcomposite1.symbols +++ /dev/null @@ -1,13 +0,0 @@ -libNX_Xcomposite.so.1 libnx-xcomposite1 #MINVER# - XCompositeCreateRegionFromBorderClip@Base 3.5.0.29 - XCompositeExtensionInfo@Base 3.5.0.29 - XCompositeExtensionName@Base 3.5.0.29 - XCompositeFindDisplay@Base 3.5.0.29 - XCompositeNameWindowPixmap@Base 3.5.0.29 - XCompositeQueryExtension@Base 3.5.0.29 - XCompositeQueryVersion@Base 3.5.0.29 - XCompositeRedirectSubwindows@Base 3.5.0.29 - XCompositeRedirectWindow@Base 3.5.0.29 - XCompositeUnredirectSubwindows@Base 3.5.0.29 - XCompositeUnredirectWindow@Base 3.5.0.29 - XCompositeVersion@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index b78855033..791b99cf3 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,6 @@ override_dh_auto_build: override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg - dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg -- cgit v1.2.3 From 6217812c8bf7a7806b776c6e2d28be082cd3e902 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Dec 2015 19:09:42 +0100 Subject: library clean-up: Don't build libNX_Xfixes anymore. Use system's libXfixes shared library. --- debian/control | 40 ++++++++++++++------------------------ debian/libnx-xfixes-dev.install.in | 2 -- debian/libnx-xfixes3.install.in | 1 - debian/libnx-xfixes3.symbols | 35 --------------------------------- debian/rules | 1 - 5 files changed, 15 insertions(+), 64 deletions(-) delete mode 100644 debian/libnx-xfixes-dev.install.in delete mode 100644 debian/libnx-xfixes3.install.in delete mode 100644 debian/libnx-xfixes3.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index ecfd5d82a..102d1535b 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Build-Depends: libxdamage-dev, libxcomposite-dev, libxrandr-dev, + libxfixes-dev, autoconf, pkg-config, x11proto-core-dev, @@ -477,19 +478,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 miscellaneous 'fixes' extension library +Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xfixes provides an X Window System client interface to the - 'XFIXES' extension to the X protocol. + This package removes the obsoleted libNX_Xfixes.so.3 library. With + recent versions of NX, the system-wide installed libXfixes gets used. . - It provides support for Region types, and some cursor functions. + This package can be safely removed. Package: libnx-xfixes-dev Provides: libnx-xfixes3-dev @@ -497,22 +495,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xfixes3 (= ${binary:Version}), - nx-x11proto-xfixes-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 miscellaneous 'fixes' extension library (development headers) +Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xfixes provides an X Window System client interface to the - 'XFIXES' extension to the X protocol. - . - It provides support for Region types, and some cursor functions. + This package removes the obsoleted headers for the libNX_Xfixes.so.3 + library. With recent versions of NX, the system-wide installed + libXfixes gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-xfixes-dev Section: libdevel @@ -536,21 +529,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xfixes3 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 miscellaneous 'fixes' extension library (debug package) +Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xfixes provides an X Window System client interface to the - 'XFIXES' extension to the X protocol. - . - It provides support for Region types, and some cursor functions. + This package removes the obsoleted debug symbols for the libNX_Xfixes.so.3 + library. With recent versions of NX, the system-wide installed libXfixes + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xinerama1 Architecture: any diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in deleted file mode 100644 index 475c78d0a..000000000 --- a/debian/libnx-xfixes-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xfixes.so -usr/include/*/nx-X11/extensions/Xfixes.h diff --git a/debian/libnx-xfixes3.install.in b/debian/libnx-xfixes3.install.in deleted file mode 100644 index b86ea4ae1..000000000 --- a/debian/libnx-xfixes3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xfixes.so.* diff --git a/debian/libnx-xfixes3.symbols b/debian/libnx-xfixes3.symbols deleted file mode 100644 index 2322e490e..000000000 --- a/debian/libnx-xfixes3.symbols +++ /dev/null @@ -1,35 +0,0 @@ -libNX_Xfixes.so.3 libnx-xfixes3 #MINVER# - XFixesChangeCursor@Base 3.5.0.29 - XFixesChangeCursorByName@Base 3.5.0.29 - XFixesChangeSaveSet@Base 3.5.0.29 - XFixesCopyRegion@Base 3.5.0.29 - XFixesCreateRegion@Base 3.5.0.29 - XFixesCreateRegionFromBitmap@Base 3.5.0.29 - XFixesCreateRegionFromGC@Base 3.5.0.29 - XFixesCreateRegionFromPicture@Base 3.5.0.29 - XFixesCreateRegionFromWindow@Base 3.5.0.29 - XFixesDestroyRegion@Base 3.5.0.29 - XFixesExpandRegion@Base 3.5.0.29 - XFixesExtensionInfo@Base 3.5.0.29 - XFixesExtensionName@Base 3.5.0.29 - XFixesFetchRegion@Base 3.5.0.29 - XFixesFetchRegionAndBounds@Base 3.5.0.29 - XFixesFindDisplay@Base 3.5.0.29 - XFixesGetCursorImage@Base 3.5.0.29 - XFixesGetCursorName@Base 3.5.0.29 - XFixesIntersectRegion@Base 3.5.0.29 - XFixesInvertRegion@Base 3.5.0.29 - XFixesQueryExtension@Base 3.5.0.29 - XFixesQueryVersion@Base 3.5.0.29 - XFixesRegionExtents@Base 3.5.0.29 - XFixesSelectCursorInput@Base 3.5.0.29 - XFixesSelectSelectionInput@Base 3.5.0.29 - XFixesSetCursorName@Base 3.5.0.29 - XFixesSetGCClipRegion@Base 3.5.0.29 - XFixesSetPictureClipRegion@Base 3.5.0.29 - XFixesSetRegion@Base 3.5.0.29 - XFixesSetWindowShapeRegion@Base 3.5.0.29 - XFixesSubtractRegion@Base 3.5.0.29 - XFixesTranslateRegion@Base 3.5.0.29 - XFixesUnionRegion@Base 3.5.0.29 - XFixesVersion@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index 791b99cf3..4fb1cf1bc 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,6 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg - dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg -- cgit v1.2.3 From b768e8124b8c76a7617a51fee56bc85c1d54e8c5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 29 Dec 2015 17:34:36 +0100 Subject: Fix for too overall Xdamage and Xrandr client lib removal: Bring back the nx-x11proto-{randr,damage} header files and use those at compile time. --- debian/nx-x11proto-damage-dev.install.in | 2 ++ debian/nx-x11proto-randr-dev.install.in | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 debian/nx-x11proto-damage-dev.install.in create mode 100644 debian/nx-x11proto-randr-dev.install.in (limited to 'debian') diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in new file mode 100644 index 000000000..1503260cf --- /dev/null +++ b/debian/nx-x11proto-damage-dev.install.in @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/damagewire.h +usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in new file mode 100644 index 000000000..3b30f71d0 --- /dev/null +++ b/debian/nx-x11proto-randr-dev.install.in @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/randr.h +usr/include/*/nx-X11/extensions/randrproto.h -- cgit v1.2.3 From bd592c2e7edb7cd3dd06dd6c13b559bd6c498596 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 21 Jun 2015 18:12:11 +0200 Subject: library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32). --- debian/control | 43 ++++++++++++---------------------- debian/libnx-xtst-dev.install.in | 2 -- debian/libnx-xtst6.install.in | 1 - debian/libnx-xtst6.symbols | 30 ------------------------ debian/nx-x11proto-xext-dev.install.in | 1 + 5 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 debian/libnx-xtst-dev.install.in delete mode 100644 debian/libnx-xtst6.install.in delete mode 100644 debian/libnx-xtst6.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index 102d1535b..946dd4b2a 100644 --- a/debian/control +++ b/debian/control @@ -21,12 +21,12 @@ Build-Depends: libxcomposite-dev, libxrandr-dev, libxfixes-dev, + libxtst-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-record-dev, x11proto-xinerama-dev, Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary @@ -851,20 +851,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. + This package removes the obsoleted libNX_Xtst.so.6 library. With + recent versions of NX, the system-wide installed libXtst gets used. . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package can be safely removed. Package: libnx-xtst-dev Provides: libnx-xtst6-dev @@ -872,22 +868,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xtst6 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library (development headers) +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package removes the obsoleted headers for the libNX_Xtst.so.6 + library. With recent versions of NX, the system-wide installed libXtst + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: libnx-xtst6-dbg Architecture: any @@ -895,22 +886,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xtst6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library (debug package) +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package removes the obsoleted wire protocol headers for the + libNX_Xtst.so.6 library. With recent versions of NX, the system-wide + installed libXtst gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-mesa-extras-dev Section: libdevel diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in deleted file mode 100644 index 5acca96cf..000000000 --- a/debian/libnx-xtst-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xtst.so -usr/include/*/nx-X11/extensions/XTest.h diff --git a/debian/libnx-xtst6.install.in b/debian/libnx-xtst6.install.in deleted file mode 100644 index 85350d830..000000000 --- a/debian/libnx-xtst6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xtst.so.* diff --git a/debian/libnx-xtst6.symbols b/debian/libnx-xtst6.symbols deleted file mode 100644 index a3f9bcc2d..000000000 --- a/debian/libnx-xtst6.symbols +++ /dev/null @@ -1,30 +0,0 @@ -libNX_Xtst.so.6 libnx-xtst6 #MINVER# - XRecordAllocRange@Base 3.5.0.29 - XRecordCreateContext@Base 3.5.0.29 - XRecordDisableContext@Base 3.5.0.29 - XRecordEnableContext@Base 3.5.0.29 - XRecordEnableContextAsync@Base 3.5.0.29 - XRecordFreeContext@Base 3.5.0.29 - XRecordFreeData@Base 3.5.0.29 - XRecordFreeState@Base 3.5.0.29 - XRecordGetContext@Base 3.5.0.29 - XRecordIdBaseMask@Base 3.5.0.29 - XRecordProcessReplies@Base 3.5.0.29 - XRecordQueryVersion@Base 3.5.0.29 - XRecordRegisterClients@Base 3.5.0.29 - XRecordUnregisterClients@Base 3.5.0.29 - XTestCompareCurrentCursorWithWindow@Base 3.5.0.29 - XTestCompareCursorWithWindow@Base 3.5.0.29 - XTestDiscard@Base 3.5.0.29 - XTestFakeButtonEvent@Base 3.5.0.29 - XTestFakeDeviceButtonEvent@Base 3.5.0.29 - XTestFakeDeviceKeyEvent@Base 3.5.0.29 - XTestFakeDeviceMotionEvent@Base 3.5.0.29 - XTestFakeKeyEvent@Base 3.5.0.29 - XTestFakeMotionEvent@Base 3.5.0.29 - XTestFakeProximityEvent@Base 3.5.0.29 - XTestFakeRelativeMotionEvent@Base 3.5.0.29 - XTestGrabControl@Base 3.5.0.29 - XTestQueryExtension@Base 3.5.0.29 - XTestSetGContextOfGC@Base 3.5.0.29 - XTestSetVisualIDOfVisual@Base 3.5.0.29 diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index 0d1f8699b..61829cf29 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -1,4 +1,5 @@ usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h -- cgit v1.2.3 From e4763fb4879ce8782e50c784ed9e7d8c5a1b7322 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 29 Dec 2015 22:34:04 +0100 Subject: debian/rules: Don't strips symbols from not-build-anymore libNX_Xtst.so. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 4fb1cf1bc..729a2c6f4 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,6 @@ override_dh_strip: dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg - dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg -- cgit v1.2.3 From 2d776b14fddc5ec70c97aa82672f3a7c9caef6a3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 May 2015 10:24:24 +0200 Subject: library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49). This commit goes along with a patch from Ulrich Sibiller who managed to move the Xinerama awareness for NX sessions into the Xserver code. This makes Xinerama support for NX in libNX_Xinerama.so obsolete. Fixes ArcticaProject/nx-libs#49 --- debian/control | 46 ++++++++---------------- debian/libnx-xinerama-dev.install.in | 3 -- debian/libnx-xinerama1.install.in | 1 - debian/libnx-xinerama1.symbols | 11 ------ debian/nx-x11-common.install | 1 - debian/nx-x11proto-xinerama-dev.install.in | 1 - debian/nxagent.postinst.in | 57 ------------------------------ debian/nxagent.prerm | 53 --------------------------- debian/rules | 5 --- 9 files changed, 15 insertions(+), 163 deletions(-) delete mode 100644 debian/libnx-xinerama-dev.install.in delete mode 100644 debian/libnx-xinerama1.install.in delete mode 100644 debian/libnx-xinerama1.symbols delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in delete mode 100755 debian/nxagent.postinst.in delete mode 100755 debian/nxagent.prerm (limited to 'debian') diff --git a/debian/control b/debian/control index 946dd4b2a..94aa64014 100644 --- a/debian/control +++ b/debian/control @@ -22,12 +22,11 @@ Build-Depends: libxrandr-dev, libxfixes-dev, libxtst-dev, + libxinerama-dev, autoconf, pkg-config, x11proto-core-dev, expat, -Build-Conflicts: - x11proto-xinerama-dev, Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Vcs-Git: git://code.x2go.org/nx-libs.git @@ -548,21 +547,17 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), Description: nx-X11 Xinerama extension library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xinerama provides an X Window System client interface to the XINERAMA - extension to the X protocol. + This package removes the obsoleted libNX_Xinerama.so.1 library. + Xinerama support in NX has been moved into nxagent whereas X-Clients + can now use the libXinerama library shipped with X.Org. . - The Xinerama (also known as panoramiX) extension allows for multiple screens - attached to a single display to be treated as belonging together, and to give - desktop applications a better idea of the monitor layout. + This package can be safely removed. Package: libnx-xinerama-dev Provides: libnx-xinerama1-dev @@ -570,24 +565,16 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xinerama1 (= ${binary:Version}), - nx-x11proto-xinerama-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), Description: nx-X11 Xinerama extension library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xinerama provides an X Window System client interface to the XINERAMA - extension to the X protocol. + This package removes the obsoleted headers for the libNX_Xinerama.so.1 + library. . - The Xinerama (also known as panoramiX) extension allows for multiple screens - attached to a single display to be treated as belonging together, and to give - desktop applications a better idea of the monitor layout. - . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-xinerama-dev Section: libdevel @@ -595,16 +582,15 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), Description: nx-X11 Xinerama extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the XINERAMA extension, used to use and manage a multiple-screen - display. + This package removes the obsoleted headers for the libNX_Xinerama.so.1 + library. + . + This package can be safely removed. Package: libnx-xinerama1-dbg Architecture: any @@ -624,12 +610,10 @@ Description: nx-X11 Xinerama extension library (debug package) libNX_Xinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. . - The Xinerama (also known as panoramiX) extension allows for multiple - screens attached to a single display to be treated as belonging - together, and to give desktop applications a better idea of the monitor - layout. + This package removes the obsoleted debug symbols for the libNX_Xinerama.so.1 + library. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xpm4 Architecture: any diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in deleted file mode 100644 index 59c0456aa..000000000 --- a/debian/libnx-xinerama-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libNX_Xinerama.so -usr/include/*/nx-X11/extensions/Xinerama.h -usr/include/*/nx-X11/extensions/panoramiXext.h diff --git a/debian/libnx-xinerama1.install.in b/debian/libnx-xinerama1.install.in deleted file mode 100644 index d53de9c4f..000000000 --- a/debian/libnx-xinerama1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xinerama.so.* diff --git a/debian/libnx-xinerama1.symbols b/debian/libnx-xinerama1.symbols deleted file mode 100644 index f8f73a3fd..000000000 --- a/debian/libnx-xinerama1.symbols +++ /dev/null @@ -1,11 +0,0 @@ -libNX_Xinerama.so.1 libnx-xinerama1 #MINVER# - XPanoramiXAllocInfo@Base 3.5.0.29 - XPanoramiXGetScreenCount@Base 3.5.0.29 - XPanoramiXGetScreenSize@Base 3.5.0.29 - XPanoramiXGetState@Base 3.5.0.29 - XPanoramiXQueryExtension@Base 3.5.0.29 - XPanoramiXQueryVersion@Base 3.5.0.29 - XineramaIsActive@Base 3.5.0.29 - XineramaQueryExtension@Base 3.5.0.29 - XineramaQueryScreens@Base 3.5.0.29 - XineramaQueryVersion@Base 3.5.0.29 diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install index 1131e7291..b6fc46613 100644 --- a/debian/nx-x11-common.install +++ b/debian/nx-x11-common.install @@ -1,2 +1 @@ usr/share/nx/SecurityPolicy -usr/lib/nx/X11/ diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index dca06ddee..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXproto.h \ No newline at end of file diff --git a/debian/nxagent.postinst.in b/debian/nxagent.postinst.in deleted file mode 100755 index 95879b943..000000000 --- a/debian/nxagent.postinst.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# postinst script for nxagent -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ### FIXME: this is a work-around while we have not implemented - ### multiarch support into the Debian source package of - ### nx-libs. - - libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - - mkdir -p /usr/lib/nx/X11/Xinerama/ - # Already existent files are not removed. - # Users will need to explicitly remove them and (re-) configure this package. - if test -e $libdir/libX11.so.6; then - ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e $libdir/libXext.so.6; then - ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - if test -e $libdir/libNX_Xinerama.so.1; then - ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/nxagent.prerm b/debian/nxagent.prerm deleted file mode 100755 index 019284a16..000000000 --- a/debian/nxagent.prerm +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# prerm script for nxagent -# -# see: dh_installdeb(1) -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -set -e - - - -case "$1" in - remove) - if test -d /usr/lib/nx/X11/Xinerama; then - if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - - if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - - if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then - rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - fi - - rmdir --ignore-fail-on-non-empty /usr/lib/nx/X11/Xinerama - - fi - ;; - deconfigure|upgrade|failed-upgrade) - : - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 729a2c6f4..c90bb6451 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,6 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -f debian/nxagent.postinst rm -fR .preserve/ dh_clean @@ -72,16 +71,12 @@ override_dh_auto_install: override_dh_auto_build: - # let's prep the nxagent.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable - sed debian/nxagent.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/nxagent.postinst - LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg - dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg -- cgit v1.2.3 From 522cf0089e4db707346c25d826c33e92ef09db8a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 7 Oct 2015 21:33:55 +0200 Subject: X2Go Agent: Add x2goagent.features file that informs X2Go clients about the new RandR based Xinerama feature. --- debian/x2goagent.install | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 9ef17d9c6..0603507ef 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -5,5 +5,6 @@ usr/share/x2go/rgb usr/share/man/man1/x2goagent.1* etc/x2go/rgb usr/share/x2go/versions/VERSION.x2goagent +usr/share/x2go/x2gofeature.d/x2goagent.features etc/x2go/keystrokes.cfg etc/x2go/x2goagent.keyboard -- cgit v1.2.3 From e794be341e7ca63ff9e0397c60e408c610d63067 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 2 Jan 2016 07:30:02 +0100 Subject: debian/nx-x11proto-xinerama-dev.install.in: Install PANORAMIX extension header files into its own nx-x11proto bin:package. (more Xinerama clean-up, fix FTBFS during dh_install). --- debian/nx-x11proto-xinerama-dev.install.in | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian') diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install.in @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.h -- cgit v1.2.3 From af923fba314b0f7336125758ec57f37401d824ee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 17 Mar 2016 16:46:13 +0100 Subject: debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch: Move into debian/patches-pending-evaluation/. --- ...sts-and-genericevent-extensions.full+lite.patch | 1870 ++++++++++++++++++++ 1 file changed, 1870 insertions(+) create mode 100644 debian/patches-pending-evaluation/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch (limited to 'debian') diff --git a/debian/patches-pending-evaluation/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch b/debian/patches-pending-evaluation/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch new file mode 100644 index 000000000..ab16864df --- /dev/null +++ b/debian/patches-pending-evaluation/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch @@ -0,0 +1,1870 @@ +--- a/nxcomp/ClientChannel.cpp ++++ b/nxcomp/ClientChannel.cpp +@@ -447,6 +447,26 @@ + } + } + ++ // Get other bits of the header, so will not need to refer to them again ++ unsigned char inputDataByte = inputMessage[1]; ++ unsigned int buffer2 = GetUINT(inputMessage + 2, bigEndian_); ++ unsigned int inputDataSize = buffer2 - 1; ++ if (buffer2 == 0) ++ { ++ // BIG-REQUESTS ++ inputMessage += 4; ++ inputLength -= 4; ++ inputDataSize = GetULONG(inputMessage, bigEndian_) - 2; ++ } ++ if (inputLength != (4 * (inputDataSize + 1))) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead: inputLength=" << inputLength ++ << " mismatch inputDataSize=" << inputDataSize ++ << ".\n" << logofs_flush; ++ #endif ++ } ++ + // + // Go to the message's specific encoding. + // +@@ -455,6 +475,11 @@ + { + case X_AllocColor: + { ++ #ifdef WARNING ++ if (inputLength < 14) ++ *logofs << "handleRead: X_AllocColor inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> colormapCache); + const unsigned char *nextSrc = inputMessage + 8; +@@ -476,6 +501,11 @@ + break; + case X_ReparentWindow: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_ReparentWindow inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), +@@ -486,6 +516,11 @@ + break; + case X_ChangeProperty: + { ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: X_ChangeProperty inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_ChangeProperty); + +@@ -501,8 +536,36 @@ + encodeBuffer.encodeCachedValue(format, 8, + clientCache_ -> changePropertyFormatCache); + unsigned int dataLength = GetULONG(inputMessage + 20, bigEndian_); ++ ++ // Self-preserving sanity check (otherwise we crash and dump core): ++ // some clients do this when not getting their beloved BIG-REQUESTS. ++ unsigned int maxLength = 0; ++ if (format == 8) ++ { ++ maxLength = inputLength - 24; ++ } ++ else if (format == 32) ++ { ++ maxLength = (inputLength - 24) >> 2; ++ } ++ else if (format == 16) ++ { ++ maxLength = (inputLength - 24) >> 1; ++ } ++ if (dataLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_ChangeProperty bogus dataLength=" << dataLength ++ << " set to " << maxLength ++ << " when format=" << (int)format ++ << " inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ dataLength = maxLength; ++ } ++ + encodeBuffer.encodeValue(dataLength, 32, 6); +- encodeBuffer.encodeValue(inputMessage[1], 2); ++ encodeBuffer.encodeValue(inputDataByte, 2); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29, +@@ -533,7 +596,7 @@ + nextSrc += 4; + } + } +- else ++ else if (format == 16) + { + for (unsigned int i = 0; i < dataLength; i++) + { +@@ -541,6 +604,13 @@ + nextSrc += 2; + } + } ++ else ++ { ++ #ifdef WARNING ++ *logofs << "ChangeProperty bogus format=" << (int)format ++ << ".\n" << logofs_flush; ++ #endif ++ } + } + break; + case X_SendEvent: +@@ -551,6 +621,11 @@ + // ratio. + // + ++ #ifdef WARNING ++ if (inputLength < 44) ++ *logofs << "handleRead: X_SendEvent inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_SendEvent); + +@@ -562,7 +637,7 @@ + break; + } + +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + unsigned int window = GetULONG(inputMessage + 4, bigEndian_); + + if (window == 0 || window == 1) +@@ -599,7 +674,12 @@ + break; + case X_ChangeWindowAttributes: + { +- encodeBuffer.encodeValue((inputLength - 12) >> 2, 4); ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_ChangeWindowAttributes inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeValue(inputDataSize - 2, 4); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + unsigned int bitmask = GetULONG(inputMessage + 8, bigEndian_); +@@ -621,6 +701,11 @@ + break; + case X_ClearArea: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_ClearArea inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -654,7 +739,7 @@ + break; + } + +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + const unsigned char *nextSrc = inputMessage + 8; +@@ -668,6 +753,11 @@ + break; + case X_CloseFont: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_CloseFont inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int font = GetULONG(inputMessage + 4, bigEndian_); + encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); + clientCache_ -> lastFont = font; +@@ -675,6 +765,11 @@ + break; + case X_ConfigureWindow: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_ConfigureWindow inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_ConfigureWindow); + +@@ -708,6 +803,11 @@ + break; + case X_ConvertSelection: + { ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: X_ConvertSelection inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> convertSelectionRequestorCache, 9); + const unsigned char* nextSrc = inputMessage + 8; +@@ -725,6 +825,11 @@ + break; + case X_CopyArea: + { ++ #ifdef WARNING ++ if (inputLength < 28) ++ *logofs << "handleRead: X_CopyArea inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -793,6 +898,11 @@ + break; + case X_CopyGC: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_CopyGC inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -814,6 +924,11 @@ + break; + case X_CopyPlane: + { ++ #ifdef WARNING ++ if (inputLength < 32) ++ *logofs << "handleRead: X_CopyPlane inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, +@@ -833,6 +948,11 @@ + break; + case X_CreateGC: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_CreateGC inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -917,6 +1037,11 @@ + break; + case X_ChangeGC: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_ChangeGC inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -998,14 +1123,19 @@ + break; + case X_CreatePixmap: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_CreatePixmap inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + +- *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputMessage[1] ++ *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputDataByte + << ", pixmap id " << GetULONG(inputMessage + 4, bigEndian_) + << ", drawable " << GetULONG(inputMessage + 8, bigEndian_) + << ", width " << GetUINT(inputMessage + 12, bigEndian_) + << ", height " << GetUINT(inputMessage + 14, bigEndian_) +- << ", size " << GetUINT(inputMessage + 2, bigEndian_) << 2 ++ << ", length " << inputLength + << ".\n" << logofs_flush; + + unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1042,6 +1172,11 @@ + break; + case X_CreateWindow: + { ++ #ifdef WARNING ++ if (inputLength < 32) ++ *logofs << "handleRead: X_CreateWindow inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1054,7 +1189,7 @@ + #endif + + unsigned bitmask = GetULONG(inputMessage + 28, bigEndian_); +- encodeBuffer.encodeCachedValue((unsigned int) inputMessage[1], 8, ++ encodeBuffer.encodeCachedValue((unsigned int) inputDataByte, 8, + clientCache_ -> depthCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), + clientCache_ -> windowCache); +@@ -1098,6 +1233,11 @@ + break; + case X_DeleteProperty: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_DeleteProperty inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9); +@@ -1105,6 +1245,11 @@ + break; + case X_FillPoly: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_FillPoly inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1138,7 +1283,7 @@ + break; + } + +- unsigned int numPoints = ((inputLength - 16) >> 2); ++ unsigned int numPoints = (inputDataSize - 3); + + if (control -> isProtoStep10() == 1) + { +@@ -1209,7 +1354,12 @@ + break; + case X_FreeColors: + { +- unsigned int numPixels = GetUINT(inputMessage + 2, bigEndian_) - 3; ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_FreeColors inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ unsigned int numPixels = inputDataSize - 2; + encodeBuffer.encodeValue(numPixels, 16, 4); + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> colormapCache); +@@ -1225,12 +1375,22 @@ + break; + case X_FreeCursor: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_FreeCursor inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), + 29, clientCache_ -> cursorCache, 9); + } + break; + case X_FreeGC: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_FreeGC inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1284,6 +1444,11 @@ + break; + case X_FreePixmap: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_FreePixmap inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1318,6 +1483,11 @@ + break; + case X_GetAtomName: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_GetAtomName inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 29, 9); + + sequenceQueue_.push(clientSequence_, inputOpcode); +@@ -1327,6 +1497,11 @@ + break; + case X_GetGeometry: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_GetGeometry inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> drawableCache); + +@@ -1351,6 +1526,11 @@ + break; + case X_GetKeyboardMapping: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_GetKeyboardMapping inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeValue((unsigned int) inputMessage[4], 8); + encodeBuffer.encodeValue((unsigned int) inputMessage[5], 8); + +@@ -1361,6 +1541,11 @@ + break; + case X_GetProperty: + { ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: X_GetProperty inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_GetProperty); + +@@ -1378,7 +1563,7 @@ + break; + } + +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + unsigned int property = GetULONG(inputMessage + 8, bigEndian_); +@@ -1394,6 +1579,11 @@ + break; + case X_GetSelectionOwner: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_GetSelectionOwner inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> getSelectionOwnerSelectionCache, 9); + +@@ -1404,7 +1594,12 @@ + break; + case X_GrabButton: + { +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: X_GrabButton inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, +@@ -1423,7 +1618,12 @@ + break; + case X_GrabPointer: + { +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: X_GrabPointer inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, +@@ -1448,7 +1648,12 @@ + break; + case X_GrabKeyboard: + { +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_GrabKeyboard inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> windowCache); + unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_); +@@ -1471,6 +1676,11 @@ + break; + case X_PolyText8: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_PolyText8 inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1555,6 +1765,11 @@ + break; + case X_PolyText16: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_PolyText16 inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1639,6 +1854,11 @@ + break; + case X_ImageText8: + { ++ #ifdef WARNING ++ if (inputLength < 16 + (unsigned int)inputDataByte) ++ *logofs << "handleRead: X_ImageText8 inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1673,7 +1893,7 @@ + break; + } + +- unsigned int textLength = (unsigned int) inputMessage[1]; ++ unsigned int textLength = (unsigned int) inputDataByte; + encodeBuffer.encodeCachedValue(textLength, 8, + clientCache_ -> imageTextLengthCache, 4); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, +@@ -1706,6 +1926,11 @@ + break; + case X_ImageText16: + { ++ #ifdef WARNING ++ if (inputLength < 16 + (unsigned int)inputDataByte) ++ *logofs << "handleRead: X_ImageText16 inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -1740,7 +1965,7 @@ + break; + } + +- unsigned int textLength = (unsigned int) inputMessage[1]; ++ unsigned int textLength = (unsigned int) inputDataByte; + encodeBuffer.encodeCachedValue(textLength, 8, + clientCache_ -> imageTextLengthCache, 4); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, +@@ -1773,6 +1998,11 @@ + break; + case X_InternAtom: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_InternAtom inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_InternAtom); + +@@ -1796,8 +2026,18 @@ + } + + unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_); ++ unsigned int maxLength = inputLength - 8; ++ if (nameLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ nameLength = maxLength; ++ } + encodeBuffer.encodeValue(nameLength, 16, 6); +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + const unsigned char *nextSrc = inputMessage + 8; + + if (control -> isProtoStep7() == 1) +@@ -1827,7 +2067,22 @@ + break; + case X_ListFonts: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_ListFonts inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int textLength = GetUINT(inputMessage + 6, bigEndian_); ++ unsigned int maxLength = inputLength - 8; ++ if (textLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_ListFonts bogus textLength=" << textLength ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ textLength = maxLength; ++ } + encodeBuffer.encodeValue(textLength, 16, 6); + encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6); + const unsigned char* nextSrc = inputMessage + 8; +@@ -1853,7 +2108,22 @@ + case X_LookupColor: + case X_AllocNamedColor: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_AllocNamedColor inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int textLength = GetUINT(inputMessage + 8, bigEndian_); ++ unsigned int maxLength = inputLength - 12; ++ if (textLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_AllocNamedColor bogus textLength=" << textLength ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ textLength = maxLength; ++ } + encodeBuffer.encodeValue(textLength, 16, 6); + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), + 29, clientCache_ -> colormapCache); +@@ -1886,6 +2156,11 @@ + case X_QueryPointer: + case X_QueryTree: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_MapWindow...X_QueryTree inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + if (inputOpcode == X_DestroyWindow) +@@ -1923,7 +2198,22 @@ + break; + case X_OpenFont: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_OpenFont inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_); ++ unsigned int maxLength = inputLength - 12; ++ if (nameLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ nameLength = maxLength; ++ } + encodeBuffer.encodeValue(nameLength, 16, 7); + unsigned int font = GetULONG(inputMessage + 4, bigEndian_); + encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); +@@ -1947,6 +2237,11 @@ + break; + case X_PolyFillRectangle: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyFillRectangle inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2034,6 +2329,11 @@ + break; + case X_PolyFillArc: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyFillArc inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2135,6 +2435,11 @@ + break; + case X_PolyArc: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyArc inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2236,6 +2541,11 @@ + break; + case X_PolyPoint: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyPoint inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2269,8 +2579,8 @@ + break; + } + +- encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4); +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeValue(inputDataSize - 2, 32, 4); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> drawableCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), +@@ -2303,6 +2613,11 @@ + break; + case X_PolyLine: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyLine inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2336,8 +2651,8 @@ + break; + } + +- encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4); +- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); ++ encodeBuffer.encodeValue(inputDataSize - 2, 32, 4); ++ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, +@@ -2370,8 +2685,12 @@ + break; + case X_PolyRectangle: + { +- encodeBuffer.encodeValue((GetUINT(inputMessage + 2, +- bigEndian_) - 3) >> 1, 16, 3); ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolyRectangle inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 3); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, +@@ -2391,6 +2710,11 @@ + break; + case X_PolySegment: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_PolySegment inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2424,8 +2748,7 @@ + break; + } + +- encodeBuffer.encodeValue((GetUINT(inputMessage + 2, +- bigEndian_) - 3) >> 1, 16, 4); ++ encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 4); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, +@@ -2491,6 +2814,11 @@ + break; + case X_PutImage: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_PutImage inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2522,7 +2850,12 @@ + break; + case X_QueryBestSize: + { +- encodeBuffer.encodeValue((unsigned int)inputMessage[1], 2); ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_QueryBestSize inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif ++ encodeBuffer.encodeValue((unsigned int)inputDataByte, 2); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); + encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8); +@@ -2535,10 +2868,15 @@ + break; + case X_QueryColors: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_QueryColors inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + // Differential encoding. + encodeBuffer.encodeBoolValue(1); + +- unsigned int numColors = ((inputLength - 8) >> 2); ++ unsigned int numColors = (inputDataSize - 1); + encodeBuffer.encodeValue(numColors, 16, 5); + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> colormapCache); +@@ -2567,15 +2905,20 @@ + break; + case X_QueryExtension: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_QueryExtension inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TEST + + char data[256]; + + int length = GetUINT(inputMessage + 4, bigEndian_); + +- if (length > 256) ++ if (length > 255) + { +- length = 256; ++ length = 255; + } + + strncpy(data, (char *) inputMessage + 8, length); +@@ -2588,6 +2931,16 @@ + #endif + + unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_); ++ unsigned int maxLength = inputLength - 8; ++ if (nameLength > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_QueryExtension bogus nameLength=" << nameLength ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ nameLength = maxLength; ++ } + encodeBuffer.encodeValue(nameLength, 16, 6); + const unsigned char *nextSrc = inputMessage + 8; + +@@ -2614,6 +2967,11 @@ + break; + case X_QueryFont: + { ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: X_QueryFont inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int font = GetULONG(inputMessage + 4, bigEndian_); + encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); + clientCache_ -> lastFont = font; +@@ -2625,6 +2983,11 @@ + break; + case X_SetClipRectangles: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_SetClipRectangles inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + MessageStore *messageStore = clientStore_ -> + getRequestStore(X_SetClipRectangles); + +@@ -2636,7 +2999,7 @@ + break; + } + +- unsigned int numRectangles = ((inputLength - 12) >> 3); ++ unsigned int numRectangles = ((inputDataSize - 2) >> 1); + + if (control -> isProtoStep9() == 1) + { +@@ -2647,7 +3010,7 @@ + encodeBuffer.encodeValue(numRectangles, 13, 4); + } + +- encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2); ++ encodeBuffer.encodeValue((unsigned int) inputDataByte, 2); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), + clientCache_ -> gcCache); + encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, +@@ -2668,7 +3031,22 @@ + break; + case X_SetDashes: + { ++ #ifdef WARNING ++ if (inputLength < 12) ++ *logofs << "handleRead: X_SetDashes inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + unsigned int numDashes = GetUINT(inputMessage + 10, bigEndian_); ++ unsigned int maxLength = inputLength - 12; ++ if (numDashes > maxLength) ++ { ++ #ifdef WARNING ++ *logofs << "handleRead X_SetDashes bogus numDashes=" << numDashes ++ << " set to " << maxLength ++ << ".\n" << logofs_flush; ++ #endif ++ numDashes = maxLength; ++ } + encodeBuffer.encodeCachedValue(numDashes, 16, + clientCache_ -> setDashesLengthCache, 5); + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), +@@ -2683,6 +3061,11 @@ + break; + case X_SetSelectionOwner: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_SetSelectionOwner inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, + clientCache_ -> setSelectionOwnerCache, 9); + encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29, +@@ -2693,6 +3076,11 @@ + break; + case X_TranslateCoords: + { ++ #ifdef WARNING ++ if (inputLength < 16) ++ *logofs << "handleRead: X_TranslateCoords inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2764,6 +3152,11 @@ + break; + case X_GetImage: + { ++ #ifdef WARNING ++ if (inputLength < 20) ++ *logofs << "handleRead: X_GetImage inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -2802,7 +3195,7 @@ + } + + // Format. +- encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2); ++ encodeBuffer.encodeValue((unsigned int) inputDataByte, 2); + // Drawable. + encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, + bigEndian_), clientCache_ -> drawableCache); +@@ -2869,6 +3262,11 @@ + } + else if (inputOpcode == opcodeStore_ -> putPackedImage) + { ++ #ifdef WARNING ++ if (inputLength < 24) ++ *logofs << "handleRead: putPackedImage inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + #ifdef TARGETS + + unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); +@@ -3004,7 +3402,7 @@ + << ".\n" << logofs_flush; + #endif + +- encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8, ++ encodeBuffer.encodeCachedValue(inputDataByte, 8, + clientCache_ -> resourceCache); + } + else if (inputOpcode == opcodeStore_ -> freeUnpack) +@@ -3015,7 +3413,7 @@ + << ".\n" << logofs_flush; + #endif + +- encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8, ++ encodeBuffer.encodeCachedValue(inputDataByte, 8, + clientCache_ -> resourceCache); + } + else if (inputOpcode == opcodeStore_ -> getControlParameters) +@@ -3130,6 +3528,11 @@ + // Enable or disable expose events + // coming from the real server. + // ++ #ifdef WARNING ++ if (inputLength < 8) ++ *logofs << "handleRead: setExposeParameters inputLength=" << inputLength ++ << ".\n" << logofs_flush; ++ #endif + + encodeBuffer.encodeBoolValue(*(inputMessage + 4)); + encodeBuffer.encodeBoolValue(*(inputMessage + 5)); +@@ -3198,10 +3601,10 @@ + { + if (hit) + { +- statistics -> addRenderCachedRequest(*(inputMessage + 1)); ++ statistics -> addRenderCachedRequest(inputDataByte); + } + +- statistics -> addRenderRequestBits(*(inputMessage + 1), inputLength << 3, bits); ++ statistics -> addRenderRequestBits(inputDataByte, inputLength << 3, bits); + } + + } // End if (firstRequest_)... else ... +@@ -4548,10 +4951,10 @@ + // + + /* +-FIXME: Recover the sequence number if the proxy ++Fixed as below? - FIXME: Recover the sequence number if the proxy + is not connected to an agent. + */ +- if (serverSequence_ > lastSequence_ || ++ if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_) || + control -> SessionMode != session_proxy) + { + #ifdef DEBUG +@@ -4564,7 +4967,7 @@ + lastSequence_ = serverSequence_; + } + #ifdef DEBUG +- else if (serverSequence_ < lastSequence_) ++ else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_)) + { + // + // Use our last auto-generated sequence. +@@ -5003,6 +5406,12 @@ + break; + default: + { ++ // BEWARE: not only inputOpcode == GenericEvent but also ++ // others not handled above, at least: ++ // GraphicsExpose 13 ++ // MapRequest 20 ++ // ConfigureRequest 23 ++ // and any beyond LASTEvent. + #ifdef TEST + *logofs << "handleWrite: Using generic event compression " + << "for OPCODE#" << (unsigned int) outputOpcode +@@ -5014,11 +5423,51 @@ + + for (unsigned int i = 0; i < 14; i++) + { +- decodeBuffer.decodeCachedValue(value, 16, +- *serverCache_ -> genericEventIntCache[i]); ++ //decodeBuffer.decodeCachedValue(value, 16, ++ // *serverCache_ -> genericEventIntCache[i]); ++ if ( ! (decodeBuffer.decodeCachedValue(value, 16, ++ *serverCache_ -> genericEventIntCache[i])) ) ++ { ++ #ifdef WARNING ++ *logofs << "decodeCachedValue failed for GenEvt:" ++ << " buffer length=" << length ++ << " i=" << i ++ << "\n" << logofs_flush; ++ #endif ++ break; ++ } + + PutUINT(value, outputMessage + i * 2 + 4, bigEndian_); + } ++ // Handle "X Generic Event Extension" ++ // Extra data is not cached... ++ if (outputOpcode == GenericEvent && *(outputMessage+1) != 0 && outputLength == 32) ++ { ++ unsigned int extraOutputLength = (GetULONG(outputMessage + 4, bigEndian_) << 2); ++ if (extraOutputLength > 0 && extraOutputLength < 100*1024*1024) ++ { ++ // Extend buffer for the extra data ++ outputMessage = writeBuffer_.addMessage(extraOutputLength); ++ // Decode data and write into buffer at new position ++ for (unsigned int i = 0; i < (extraOutputLength>>1); i++) ++ { ++ //decodeBuffer.decodeValue(value, 16); ++ if ( ! (decodeBuffer.decodeValue(value, 16)) ) ++ { ++ #ifdef WARNING ++ *logofs << "decodeValue failed for GenEvt:" ++ << " extraOutputLength=" << extraOutputLength ++ << " buffer length=" << length ++ << " i=" << i ++ << "\n" << logofs_flush; ++ #endif ++ break; ++ } ++ PutUINT(value, outputMessage + i * 2, bigEndian_); ++ } ++ } ++ } ++ + } + } // End of switch (outputOpcode)... + +@@ -6892,7 +7341,7 @@ + } + else + { +- if (serverSequence_ > lastSequence_) ++ if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_)) + { + #ifdef DEBUG + *logofs << "handleNotify: Updating last event's sequence " +@@ -6904,7 +7353,7 @@ + lastSequence_ = serverSequence_; + } + #ifdef DEBUG +- else if (serverSequence_ < lastSequence_) ++ else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_)) + { + // + // Use our last auto-generated sequence. +--- a/nxcomp/ClientReadBuffer.cpp ++++ b/nxcomp/ClientReadBuffer.cpp +@@ -119,15 +119,34 @@ + + dataLength = (GetUINT(start + 2, bigEndian_) << 2); + +- if (dataLength < 4) ++ if (dataLength == 0) // or equivalently (dataLength < 4) + { +- #ifdef TEST +- *logofs << "ClientReadBuffer: WARNING! Assuming length 4 " +- << "for suspicious message of length " << dataLength +- << ".\n" << logofs_flush; +- #endif ++ // BIG-REQUESTS extension ++ if (size < 8) ++ { ++ remaining_ = 8 - size; ++ return 0; ++ } + +- dataLength = 4; ++ dataLength = (GetULONG(start + 4, bigEndian_) << 2); ++ ++// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere ++// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE. ++ if (dataLength < 8 || dataLength > 100*1024*1024) ++ { ++ #ifdef WARNING ++ *logofs << "BIG-REQUESTS with unacceptable dataLength=" ++ << dataLength << ", now set to 8.\n" << logofs_flush; ++ #endif ++ dataLength = 8; ++ } ++ else if (dataLength < 4*64*1024) ++ { ++ #ifdef WARNING ++ *logofs << "BIG-REQUESTS with silly dataLength=" ++ << dataLength << ".\n" << logofs_flush; ++ #endif ++ } + } + } + +--- a/nxcomp/DecodeBuffer.cpp ++++ b/nxcomp/DecodeBuffer.cpp +@@ -78,34 +78,45 @@ + { + if (!endOkay) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [A] in decodeValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- // +- // Label "context" is just used to identify +- // the routine which detected the problem in +- // present source file. +- // +- +- cerr << "Error" << ": Failure decoding data in context [A].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //// ++ //// Label "context" is just used to identify ++ //// the routine which detected the problem in ++ //// present source file. ++ //// ++ //cerr << "Error" << ": Failure decoding data in context [A].\n"; ++ //HandleAbort(); + } + +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [B] in decodeValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [B].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [B].\n"; ++ //HandleAbort(); + } + + lastBit = (nextSrcChar & srcMask_); +@@ -134,28 +145,40 @@ + { + if (!endOkay) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [C] in decodeValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [C].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [C].\n"; ++ //HandleAbort(); + } + +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [D] in decodeValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [D].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [D].\n"; ++ //HandleAbort(); + } + + unsigned char moreData = (nextSrcChar & srcMask_); +@@ -212,16 +235,24 @@ + + if (nextSrc_ >= end_) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [E] in decodeCachedValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [E].\n"; +- +- HandleAbort(); ++ // Failed: return value 0 ++ value = 0; ++ // Failed: return 0, though our callers do not check that... ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [E].\n"; ++ //HandleAbort(); + } + + unsigned int index = 0; +@@ -237,30 +268,33 @@ + nextSrc_++; + if (nextSrc_ >= end_) + { +- if (!endOkay) +- { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] " +- << "in decodeCachedValue() nextSrc_ = " +- << (nextSrc_ - buffer_) << " end_ = " +- << (end_ - buffer_) << ".\n" << logofs_flush; +- #endif +- +- cerr << "Error" << ": Failure decoding data in context [F].\n"; +- +- HandleAbort(); +- } +- +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] " +- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) +- << " end_ = " << (end_ - buffer_) << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [G] in decodeCachedValue(), returning 0:" ++ << " nextSrc_ = " << (nextSrc_ - buffer_) ++ << " end_ = " << (end_ - buffer_) ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [G].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //if (!endOkay) ++ //{ ++ // #ifdef PANIC ++ // *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] " ++ // << "in decodeCachedValue() nextSrc_ = " ++ // << (nextSrc_ - buffer_) << " end_ = " ++ // << (end_ - buffer_) << ".\n" << logofs_flush; ++ // #endif ++ // cerr << "Error" << ": Failure decoding data in context [F].\n"; ++ // HandleAbort(); ++ //} ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] " ++ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) ++ // << " end_ = " << (end_ - buffer_) << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [G].\n"; ++ //HandleAbort(); + } + + nextSrcChar = *nextSrc_; +@@ -288,15 +322,20 @@ + return 1; + } + +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " +- << "in decodeCacheValue() with no value found.\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [H] in decodeCachedValue(), returning 0:" ++ << " no value found" ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [H].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " ++ // << "in decodeCacheValue() with no value found.\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [H].\n"; ++ //HandleAbort(); + } + else + { +@@ -323,15 +362,20 @@ + return 1; + } + +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " +- << "in decodeCacheValue() with no value found.\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [F] in decodeCachedValue(), returning 0:" ++ << " no value found" ++ << " .\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [H].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " ++ // << "in decodeCacheValue() with no value found.\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [H].\n"; ++ //HandleAbort(); + } + } + } +@@ -344,16 +388,22 @@ + + if (index > cache.getSize()) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] " +- << "in decodeCachedValue() index = " << index +- << " cache size = " << cache.getSize() << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [I] in decodeCachedValue(), returning 0:" ++ << " index = " << index ++ << " cache size = " << cache.getSize() ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [I].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] " ++ // << "in decodeCachedValue() index = " << index ++ // << " cache size = " << cache.getSize() << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [I].\n"; ++ //HandleAbort(); + } + + value = cache.get(index); +@@ -401,16 +451,22 @@ + { + if (!endOkay) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] " +- << "in decodeCachedValue() nextSrc_ " +- << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_) ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [K] in decodeCachedValue(), returning 0:" ++ << " nextSrc_ " << (nextSrc_ - buffer_) ++ << " end_ " << (end_ - buffer_) + << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [K].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] " ++ // << "in decodeCachedValue() nextSrc_ " ++ // << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_) ++ // << ".\n" << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [K].\n"; ++ //HandleAbort(); + } + + #ifdef TEST +@@ -446,15 +502,20 @@ + } + else + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] " +- << "in decodeValue() with index = 2.\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [M] in decodeCachedValue(), returning 0:" ++ << "with index = 2" ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [M].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] " ++ // << "in decodeValue() with index = 2.\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [M].\n"; ++ //HandleAbort(); + } + } + else +@@ -466,16 +527,22 @@ + + if (index > cache.getSize()) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] " +- << "in decodeCachedValue() " << "index = " << index +- << " cache size = " << cache.getSize() << ".\n" +- << logofs_flush; ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [N] in decodeCachedValue(), returning 0:" ++ << " index = " << index ++ << " cache size = " << cache.getSize() ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [N].\n"; +- +- HandleAbort(); ++ value = 0; ++ return 0; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] " ++ // << "in decodeCachedValue() " << "index = " << index ++ // << " cache size = " << cache.getSize() << ".\n" ++ // << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [N].\n"; ++ //HandleAbort(); + } + + value = cache.get(index); +@@ -538,16 +605,22 @@ + } + else if (end_ - nextSrc_ < (int) numBytes) + { +- #ifdef PANIC +- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] " +- << "in decodeMemory() " << "with length " << numBytes ++ #ifdef WARNING ++ *logofs << "DecodeBuffer: Error [P] in decodeMemory(), returning NULL:" ++ << " with length " << numBytes + << " and " << (end_ - nextSrc_) +- << " bytes remaining.\n" << logofs_flush; ++ << " bytes remaining" ++ << ".\n" << logofs_flush; + #endif +- +- cerr << "Error" << ": Failure decoding data in context [P].\n"; +- +- HandleAbort(); ++ return NULL; ++ //#ifdef PANIC ++ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] " ++ // << "in decodeMemory() " << "with length " << numBytes ++ // << " and " << (end_ - nextSrc_) ++ // << " bytes remaining.\n" << logofs_flush; ++ //#endif ++ //cerr << "Error" << ": Failure decoding data in context [P].\n"; ++ //HandleAbort(); + } + + nextSrc_ += numBytes; +--- a/nxcomp/DecodeBuffer.h ++++ b/nxcomp/DecodeBuffer.h +@@ -30,7 +30,8 @@ + #include "ActionCacheCompat.h" + #include "PositionCacheCompat.h" + +-#define DECODE_BUFFER_OVERFLOW_SIZE 4194304 ++// See WriteBuffer.h and EncodeBuffer.h ++#define DECODE_BUFFER_OVERFLOW_SIZE 104857600 + + #define DECODE_BUFFER_POSTFIX_SIZE 1 + +--- a/nxcomp/EncodeBuffer.h ++++ b/nxcomp/EncodeBuffer.h +@@ -33,10 +33,10 @@ + // + // This should match the maximum size of + // a single message added to write buffer +-// (see WriteBuffer.h). ++// (see WriteBuffer.h and DecodeBuffer.h). + // + +-#define ENCODE_BUFFER_OVERFLOW_SIZE 4194304 ++#define ENCODE_BUFFER_OVERFLOW_SIZE 104857600 + + // + // Adjust for the control messages and the +--- a/nxcomp/SequenceQueue.h ++++ b/nxcomp/SequenceQueue.h +@@ -18,6 +18,22 @@ + #ifndef SequenceQueue_H + #define SequenceQueue_H + ++inline int SequenceNumber_x_gt_y(unsigned int x, unsigned int y) ++{ ++ // For two sequence numbers x and y, determine whether (x > y). ++ // Sequence numbers are the trailing 16 bits of a bigger number: ++ // need to handle wraparound, e.g. 0 is 65536, just after 65535. ++ if (x != (x & 0x00ffff)) return 0; ++ if (y != (y & 0x00ffff)) return 0; ++ // Closeness when comparison makes sense: arbitrarily set at 16*1024 ++ if ((x > y) && ((x-y) < 16*1024)) return 1; ++ // Wrapped value ++ unsigned int w = x + 64*1024; ++ // We know that w>y but test left for symmetry ++ if ((w > y) && ((w-y) < 16*1024)) return 1; ++ return 0; ++} ++ + // + // List of outstanding request messages which + // are waiting for a reply. This class is used +--- a/nxcomp/ServerChannel.cpp ++++ b/nxcomp/ServerChannel.cpp +@@ -104,7 +104,8 @@ + // + + #define HIDE_MIT_SHM_EXTENSION +-#define HIDE_BIG_REQUESTS_EXTENSION ++// HIDE_BIG_REQUESTS_EXTENSION : No good to hide, some clients may send crap instead... ++#undef HIDE_BIG_REQUESTS_EXTENSION + #define HIDE_XFree86_Bigfont_EXTENSION + #undef HIDE_SHAPE_EXTENSION + #undef HIDE_XKEYBOARD_EXTENSION +@@ -1412,6 +1413,9 @@ + + unsigned int inputSequence = GetUINT(inputMessage + 2, bigEndian_); + ++ // Sometimes we get inputSequence=0 or =256 when inputOpcode=11=X_UnmapSubwindows ++ // Seems weird... but is "normal" and is to be accepted. ++ + // + // Check if this is an event which we can discard. + // +@@ -1905,6 +1909,12 @@ + break; + default: + { ++ // BEWARE: not only inputOpcode == GenericEvent but also ++ // others not handled above, at least: ++ // GraphicsExpose 13 ++ // MapRequest 20 ++ // ConfigureRequest 23 ++ // and any beyond LASTEvent. + #ifdef TEST + *logofs << "handleRead: Using generic event compression " + << "for OPCODE#" << (unsigned int) inputOpcode +@@ -1919,6 +1929,16 @@ + encodeBuffer.encodeCachedValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_), + 16, *serverCache_ -> genericEventIntCache[i]); + } ++ // Handle "X Generic Event Extension" ++ // Cannot cache extra data... ++// FIXME: BUG ALERT: is it OK to have the first 32 bytes cached, but not the rest? ++ if (inputOpcode == GenericEvent && inputLength > 32) ++ { ++ for (unsigned int i = 14; i < ((inputLength-4)>>1); i++) ++ { ++ encodeBuffer.encodeValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_), 16); ++ } ++ } + } + + } // switch (inputOpcode)... +@@ -3756,7 +3776,7 @@ + } + + unsigned int numPoints; +- decodeBuffer.decodeValue(numPoints, 16, 4); ++ decodeBuffer.decodeValue(numPoints, 32, 4); + outputLength = (numPoints << 2) + 12; + outputMessage = writeBuffer_.addMessage(outputLength); + unsigned int relativeCoordMode; +@@ -3802,7 +3822,7 @@ + } + + unsigned int numPoints; +- decodeBuffer.decodeValue(numPoints, 16, 4); ++ decodeBuffer.decodeValue(numPoints, 32, 4); + outputLength = (numPoints << 2) + 12; + outputMessage = writeBuffer_.addMessage(outputLength); + unsigned int relativeCoordMode; +@@ -3839,7 +3859,7 @@ + case X_PolyRectangle: + { + unsigned int numRectangles; +- decodeBuffer.decodeValue(numRectangles, 16, 3); ++ decodeBuffer.decodeValue(numRectangles, 32, 3); + outputLength = (numRectangles << 3) + 12; + outputMessage = writeBuffer_.addMessage(outputLength); + decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache); +@@ -3869,7 +3889,7 @@ + } + + unsigned int numSegments; +- decodeBuffer.decodeValue(numSegments, 16, 4); ++ decodeBuffer.decodeValue(numSegments, 32, 4); + outputLength = (numSegments << 3) + 12; + outputMessage = writeBuffer_.addMessage(outputLength); + decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache); +@@ -4590,7 +4610,29 @@ + + *outputMessage = (unsigned char) outputOpcode; + +- PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_); ++ if (outputLength < 4*64*1024) ++ PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_); ++ else ++ { ++ // Handle BIG-REQUESTS ++ PutUINT(0, outputMessage + 2, bigEndian_); ++// FIXME: BUG ALERT: following write may not work well, ++// particularly with un-flushed messages. ++if (outputMessage != writeBuffer_.getData()) ++{ ++*logofs << "PSz BUG handleWrite BIG-REQUESTS:" ++ << " have " << (unsigned int)(outputMessage - writeBuffer_.getData()) ++ << " bytes in buffer" ++ << ", write immediate of 4-byte header will not work well" ++ << "\n" << logofs_flush; ++} ++// But, it works well enough in my testing... ++ // Write first four bytes ++ if (transport_ -> write(write_immediate, outputMessage, 4) < 0) ++ return -1; ++ // Replace with new 4-byte length ++ PutULONG(1 + (outputLength >> 2), outputMessage, bigEndian_); ++ } + + #if defined(TEST) || defined(OPCODES) + *logofs << "handleWrite: Handled request OPCODE#" +@@ -5912,7 +5954,7 @@ + unsigned char opcode = *lastMotion_; + unsigned int size = 32; + +- if (GetUINT(buffer + 2, bigEndian_) < serverSequence_) ++ if (SequenceNumber_x_gt_y(serverSequence_, GetUINT(buffer + 2, bigEndian_))) + { + PutUINT(serverSequence_, (unsigned char *) buffer + 2, bigEndian_); + } +--- a/nxcomp/ServerReadBuffer.cpp ++++ b/nxcomp/ServerReadBuffer.cpp +@@ -108,14 +108,21 @@ + { + dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2); + } ++ else if (*start == GenericEvent && *(start+1) != 0) ++ { ++ // X Generic Event Extension ++ dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2); ++ } + else + { + dataLength = 32; + } + +- if (dataLength < 32) ++// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere ++// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE. ++ if (dataLength < 32 || dataLength > 100*1024*1024) + { +- #ifdef TEST ++ #ifdef WARNING + *logofs << "ServerReadBuffer: WARNING! Assuming length 32 " + << "for suspicious message of length " << dataLength + << ".\n" << logofs_flush; +--- a/nxcomp/WriteBuffer.h ++++ b/nxcomp/WriteBuffer.h +@@ -32,8 +32,14 @@ + // This is likely to be a reply to a X_ListFonts where + // user has a large amount of installed fonts. + // ++// Used also for messages sent, and should accommodate any BIG-REQUESTS. ++// Value was 4MB = 4194304, changed to 100MB = 104857600. ++// See also sanity check limits (set same, to 100*1024*1024) in ++// ClientReadBuffer.cpp ServerReadBuffer.cpp and ClientChannel.cpp, and ++// ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE elsewhere. ++// + +-#define WRITE_BUFFER_OVERFLOW_SIZE 4194304 ++#define WRITE_BUFFER_OVERFLOW_SIZE 104857600 + + class WriteBuffer + { -- cgit v1.2.3 From 134648169cd0a9359e1a8a31a5bb55a307b0a801 Mon Sep 17 00:00:00 2001 From: Fernando Carvajal Date: Tue, 12 Apr 2016 16:03:37 +0200 Subject: Remove obsolete compatibility files from nxcomp This commit removes obsolete compatibility files whose components were only used to handle compatibility with old protocol versions that are no longer supported. Refs: ArcticaProject/nx-libs#108 --- debian/copyright.in | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'debian') diff --git a/debian/copyright.in b/debian/copyright.in index 854ab4e73..8f85b292f 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -923,7 +923,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/Windows.h nxcomp/ActionCache.cpp nxcomp/ActionCache.h - nxcomp/ActionCacheCompat.h nxcomp/Agent.cpp nxcomp/Agent.h nxcomp/Alpha.cpp @@ -938,8 +937,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/BlockCacheSet.h nxcomp/ChangeGC.cpp nxcomp/ChangeGC.h - nxcomp/ChangeGCCompat.cpp - nxcomp/ChangeGCCompat.h nxcomp/ChangeProperty.cpp nxcomp/ChangeProperty.h nxcomp/Channel.cpp @@ -974,8 +971,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/CreateGC.h nxcomp/CreatePixmap.cpp nxcomp/CreatePixmap.h - nxcomp/CreatePixmapCompat.cpp - nxcomp/CreatePixmapCompat.h nxcomp/DecodeBuffer.cpp nxcomp/DecodeBuffer.h nxcomp/EncodeBuffer.cpp @@ -1053,8 +1048,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/PolyText16.h nxcomp/PolyText8.cpp nxcomp/PolyText8.h - nxcomp/PositionCacheCompat.cpp - nxcomp/PositionCacheCompat.h nxcomp/Proxy.cpp nxcomp/Proxy.h nxcomp/ProxyReadBuffer.cpp @@ -1073,20 +1066,12 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/RenderChangePicture.h nxcomp/RenderComposite.cpp nxcomp/RenderComposite.h - nxcomp/RenderCompositeCompat.cpp - nxcomp/RenderCompositeCompat.h nxcomp/RenderCompositeGlyphs.cpp nxcomp/RenderCompositeGlyphs.h - nxcomp/RenderCompositeGlyphsCompat.cpp - nxcomp/RenderCompositeGlyphsCompat.h nxcomp/RenderCreateGlyphSet.cpp nxcomp/RenderCreateGlyphSet.h - nxcomp/RenderCreateGlyphSetCompat.cpp - nxcomp/RenderCreateGlyphSetCompat.h nxcomp/RenderCreatePicture.cpp nxcomp/RenderCreatePicture.h - nxcomp/RenderCreatePictureCompat.cpp - nxcomp/RenderCreatePictureCompat.h nxcomp/RenderExtension.cpp nxcomp/RenderExtension.h nxcomp/RenderFillRectangles.cpp @@ -1095,8 +1080,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/RenderFreeGlyphSet.h nxcomp/RenderFreePicture.cpp nxcomp/RenderFreePicture.h - nxcomp/RenderFreePictureCompat.cpp - nxcomp/RenderFreePictureCompat.h nxcomp/RenderGenericRequest.cpp nxcomp/RenderGenericRequest.h nxcomp/RenderMinorExtensionHeaders.h @@ -1104,8 +1087,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/RenderMinorExtensionTags.h nxcomp/RenderPictureClip.cpp nxcomp/RenderPictureClip.h - nxcomp/RenderPictureClipCompat.cpp - nxcomp/RenderPictureClipCompat.h nxcomp/RenderPictureFilter.cpp nxcomp/RenderPictureFilter.h nxcomp/RenderPictureTransform.cpp @@ -1136,12 +1117,8 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/SetClipRectangles.h nxcomp/SetUnpackAlpha.cpp nxcomp/SetUnpackAlpha.h - nxcomp/SetUnpackAlphaCompat.cpp - nxcomp/SetUnpackAlphaCompat.h nxcomp/SetUnpackColormap.cpp nxcomp/SetUnpackColormap.h - nxcomp/SetUnpackColormapCompat.cpp - nxcomp/SetUnpackColormapCompat.h nxcomp/SetUnpackGeometry.cpp nxcomp/SetUnpackGeometry.h nxcomp/ShapeExtension.cpp -- cgit v1.2.3 From 5c495241069708e9b1bbf6e57fd49599be540b63 Mon Sep 17 00:00:00 2001 From: Fernando Carvajal Date: Fri, 15 Apr 2016 09:49:09 +0200 Subject: Remove TextCompressor class and files from nxcomp This commit removes TextCompressor class references from ClientCache and ServerCache as it's no longer used after removing old protocol's compatibility code from nxcomp. It also removes the attribute textCache from both classes as it's no longer used either. Finally the header and source files associated with the TextCompressor class are also deleted and removed from the compilation process. Refs: ArcticaProject/nx-libs#108 --- debian/copyright.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright.in b/debian/copyright.in index 8f85b292f..4ffde0ba0 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1131,8 +1131,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/StaticCompressor.h nxcomp/Statistics.cpp nxcomp/Statistics.h - nxcomp/TextCompressor.cpp - nxcomp/TextCompressor.h nxcomp/Timestamp.cpp nxcomp/Timestamp.h nxcomp/TranslateCoords.cpp -- cgit v1.2.3 From ebcb6a6e172bded13a13963ea03d279541978e8e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 25 Jun 2015 05:37:03 +0200 Subject: library-cleanup: Don't build libNX_Xrender anymore. Use system's libXrender shared library. --- debian/control | 60 ++++++++++++++----------------------- debian/libnx-xrender-dev.install.in | 2 -- debian/libnx-xrender1.install.in | 1 - debian/libnx-xrender1.symbols | 49 ------------------------------ debian/rules | 1 - 5 files changed, 22 insertions(+), 91 deletions(-) delete mode 100644 debian/libnx-xrender-dev.install.in delete mode 100644 debian/libnx-xrender1.install.in delete mode 100644 debian/libnx-xrender1.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index 94aa64014..83aee8e58 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: libxfixes-dev, libxtst-dev, libxinerama-dev, + libxrender-dev, autoconf, pkg-config, x11proto-core-dev, @@ -747,21 +748,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Rendering Extension client library +Description: nx-X11 Rendering Extension client library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted libNX_Xrender.so.1 library. With + recent versions of NX, the system-wide installed libXrender gets used. + . + This package can be safely removed. Package: libnx-xrender-dev Provides: libnx-xrender1-dev @@ -769,24 +765,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrender1 (= ${binary:Version}), - nx-x11proto-render-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Rendering Extension client library (development headers) +Description: nx-X11 Rendering Extension client library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted headers for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-render-dev Section: libdevel @@ -794,16 +783,16 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Render extension wire protocol +Description: nx-X11 Render extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the Render extension, used to implement Porter-Duff operations - within X. + This package removes the obsoleted headers for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. + . + This package can be safely removed. Package: libnx-xrender1-dbg Architecture: any @@ -811,23 +800,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xrender1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Rendering Extension client library (debug package) +Description: nx-X11 Rendering Extension client library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - The X Rendering Extension (Render) introduces digital image composition - as the foundation of a new rendering model within the X Window System. - Rendering geometric figures is accomplished by client-side tessellation - into either triangles or trapezoids. Text is drawn by loading glyphs - into the server and rendering sets of them. The Xrender library exposes - this extension to X clients. + This package removes the obsoleted debug symbols for the libNX_Xrender.so.1 + library. With recent versions of NX, the system-wide installed libXrender + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xtst6 Architecture: any diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in deleted file mode 100644 index 2aede35da..000000000 --- a/debian/libnx-xrender-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xrender.so -usr/include/*/nx-X11/extensions/Xrender.h diff --git a/debian/libnx-xrender1.install.in b/debian/libnx-xrender1.install.in deleted file mode 100644 index 371550abb..000000000 --- a/debian/libnx-xrender1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xrender.so.* diff --git a/debian/libnx-xrender1.symbols b/debian/libnx-xrender1.symbols deleted file mode 100644 index bb51b1a1f..000000000 --- a/debian/libnx-xrender1.symbols +++ /dev/null @@ -1,49 +0,0 @@ -libNX_Xrender.so.1 libnx-xrender1 #MINVER# - XRenderAddGlyphs@Base 3.5.0.29 - XRenderAddTraps@Base 3.5.0.29 - XRenderChangePicture@Base 3.5.0.29 - XRenderCleanGlyphs@Base 3.5.0.29 - XRenderComposite@Base 3.5.0.29 - XRenderCompositeDoublePoly@Base 3.5.0.29 - XRenderCompositeString16@Base 3.5.0.29 - XRenderCompositeString32@Base 3.5.0.29 - XRenderCompositeString8@Base 3.5.0.29 - XRenderCompositeText16@Base 3.5.0.29 - XRenderCompositeText32@Base 3.5.0.29 - XRenderCompositeText8@Base 3.5.0.29 - XRenderCompositeTrapezoids@Base 3.5.0.29 - XRenderCompositeTriFan@Base 3.5.0.29 - XRenderCompositeTriStrip@Base 3.5.0.29 - XRenderCompositeTriangles@Base 3.5.0.29 - XRenderCreateAnimCursor@Base 3.5.0.29 - XRenderCreateConicalGradient@Base 3.5.0.29 - XRenderCreateCursor@Base 3.5.0.29 - XRenderCreateGlyphSet@Base 3.5.0.29 - XRenderCreateLinearGradient@Base 3.5.0.29 - XRenderCreatePicture@Base 3.5.0.29 - XRenderCreateRadialGradient@Base 3.5.0.29 - XRenderCreateSolidFill@Base 3.5.0.29 - XRenderExtensionInfo@Base 3.5.0.29 - XRenderExtensionName@Base 3.5.0.29 - XRenderFillRectangle@Base 3.5.0.29 - XRenderFillRectangles@Base 3.5.0.29 - XRenderFindDisplay@Base 3.5.0.29 - XRenderFindFormat@Base 3.5.0.29 - XRenderFindStandardFormat@Base 3.5.0.29 - XRenderFindVisualFormat@Base 3.5.0.29 - XRenderFreeGlyphSet@Base 3.5.0.29 - XRenderFreeGlyphs@Base 3.5.0.29 - XRenderFreePicture@Base 3.5.0.29 - XRenderParseColor@Base 3.5.0.29 - XRenderQueryExtension@Base 3.5.0.29 - XRenderQueryFilters@Base 3.5.0.29 - XRenderQueryFormats@Base 3.5.0.29 - XRenderQueryPictIndexValues@Base 3.5.0.29 - XRenderQuerySubpixelOrder@Base 3.5.0.29 - XRenderQueryVersion@Base 3.5.0.29 - XRenderReferenceGlyphSet@Base 3.5.0.29 - XRenderSetPictureClipRectangles@Base 3.5.0.29 - XRenderSetPictureClipRegion@Base 3.5.0.29 - XRenderSetPictureFilter@Base 3.5.0.29 - XRenderSetPictureTransform@Base 3.5.0.29 - XRenderSetSubpixelOrder@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index c90bb6451..578fc84f8 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,6 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg - dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg -- cgit v1.2.3 From d9e7f6ae42b30e32619e1d0979598c2ba2288a3e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 18 Mar 2016 05:13:43 +0100 Subject: pixman-devel: Build against shared library pkg-config(pixman-1). --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 83aee8e58..3e1f45e5d 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Build-Depends: pkg-config, x11proto-core-dev, expat, + libpixman-1-dev, Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Vcs-Git: git://code.x2go.org/nx-libs.git -- cgit v1.2.3 From 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 1 Mar 2016 20:55:27 +0000 Subject: Drop X11 extensions not shipped with recent X.Org server versions anymore: include/extensions: Xag.h, Xagsrv.h, Xagstr.h Xserver/Xext: appgroup.c, appgroup.h lib/Xext: XAppgroup.c include/extensions: Xcup.h, Xcupstr.h, Xserver/Xext: cup.c lib/Xext: cup.c include/extensions: Xdbe.h Xserver/Xext: Xdbe.c Xserver/Xext: dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h include/extensions: Xevie.h, Xeviestr.h include/extensions: XEVI.h, XEVIstr.h Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c lib/Xext: XEVI.c include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h Xserver/Xext: fontcache.c include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h lib/Xext: XLbx.c include/extensions: multibuf.h, multibufst.h lib/Xext: XMultibuf.c Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c include/extensions: xf86vmode.h, xf86vmstr.h Xserver/Xext: vidmodeproc.h, xf86vmode.c lib/Xext: MITMisc.c Xserver/Xext: mitmisc.c Xserver/Xext: xf86misc.c, xf86miscproc.h Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h Fixes: ArcticaProject/nx-libs#116 X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01 Plus: Drop various Imake'ish defines where not needed anymore. --- debian/libnx-xext-dev.install.in | 23 ------ debian/libnx-xext6.symbols | 82 +++++++++++----------- debian/nx-x11proto-xext-dev.install.in | 1 + .../016_nx-X11_install-location.debian.patch | 2 +- debian/rules | 9 --- 5 files changed, 43 insertions(+), 74 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in index 0d1df8c08..4a571b9fd 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install.in @@ -1,32 +1,9 @@ usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/MITMisc.h -usr/include/*/nx-X11/extensions/XEVI.h -usr/include/*/nx-X11/extensions/XEVIstr.h -usr/include/*/nx-X11/extensions/Xevie.h -usr/include/*/nx-X11/extensions/Xeviestr.h -usr/include/*/nx-X11/extensions/XLbx.h usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xag.h -usr/include/*/nx-X11/extensions/Xagsrv.h -usr/include/*/nx-X11/extensions/Xagstr.h -usr/include/*/nx-X11/extensions/Xcup.h -usr/include/*/nx-X11/extensions/Xcupstr.h -usr/include/*/nx-X11/extensions/Xdbe.h -usr/include/*/nx-X11/extensions/Xdbeproto.h usr/include/*/nx-X11/extensions/Xext.h usr/include/*/nx-X11/extensions/dpms.h usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/lbxstr.h -usr/include/*/nx-X11/extensions/lbxbuf.h -usr/include/*/nx-X11/extensions/lbxdeltastr.h -usr/include/*/nx-X11/extensions/lbximage.h -usr/include/*/nx-X11/extensions/lbxbufstr.h -usr/include/*/nx-X11/extensions/lbxopts.h -usr/include/*/nx-X11/extensions/lbxzlib.h -usr/include/*/nx-X11/extensions/mitmiscstr.h -usr/include/*/nx-X11/extensions/multibuf.h -usr/include/*/nx-X11/extensions/multibufst.h usr/include/*/nx-X11/extensions/security.h usr/include/*/nx-X11/extensions/securstr.h usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext6.symbols b/debian/libnx-xext6.symbols index 28f4c4fed..e48ae4968 100644 --- a/debian/libnx-xext6.symbols +++ b/debian/libnx-xext6.symbols @@ -8,12 +8,12 @@ libNX_Xext.so.6 libnx-xext6 #MINVER# DPMSInfo@Base 3.5.0.29 DPMSQueryExtension@Base 3.5.0.29 DPMSSetTimeouts@Base 3.5.0.29 - XLbxGetEventBase@Base 3.5.0.29 - XLbxQueryExtension@Base 3.5.0.29 - XLbxQueryVersion@Base 3.5.0.29 - XMITMiscGetBugMode@Base 3.5.0.29 - XMITMiscQueryExtension@Base 3.5.0.29 - XMITMiscSetBugMode@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29 XMissingExtension@Base 3.5.0.29 XSecurityAllocXauth@Base 3.5.0.29 XSecurityFreeXauth@Base 3.5.0.29 @@ -85,44 +85,44 @@ libNX_Xext.so.6 libnx-xext6 #MINVER# XTestQueryInputSize@Base 3.5.0.29 XTestReset@Base 3.5.0.29 XTestStopInput@Base 3.5.0.29 - XagCreateAssociation@Base 3.5.0.29 - XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 - XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 - XagDestroyApplicationGroup@Base 3.5.0.29 - XagDestroyAssociation@Base 3.5.0.29 - XagGetApplicationGroupAttributes@Base 3.5.0.29 - XagQueryApplicationGroup@Base 3.5.0.29 - XagQueryVersion@Base 3.5.0.29 - XcupGetReservedColormapEntries@Base 3.5.0.29 - XcupQueryVersion@Base 3.5.0.29 - XcupStoreColors@Base 3.5.0.29 - XdbeAllocateBackBufferName@Base 3.5.0.29 - XdbeBeginIdiom@Base 3.5.0.29 - XdbeDeallocateBackBufferName@Base 3.5.0.29 - XdbeEndIdiom@Base 3.5.0.29 - XdbeFreeVisualInfo@Base 3.5.0.29 - XdbeGetBackBufferAttributes@Base 3.5.0.29 - XdbeGetVisualInfo@Base 3.5.0.29 - XdbeQueryExtension@Base 3.5.0.29 - XdbeSwapBuffers@Base 3.5.0.29 - XeviGetVisualInfo@Base 3.5.0.29 - XeviQueryExtension@Base 3.5.0.29 - XeviQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29 XextAddDisplay@Base 3.5.0.29 XextCreateExtension@Base 3.5.0.29 XextDestroyExtension@Base 3.5.0.29 XextFindDisplay@Base 3.5.0.29 XextRemoveDisplay@Base 3.5.0.29 - XmbufChangeBufferAttributes@Base 3.5.0.29 - XmbufChangeWindowAttributes@Base 3.5.0.29 - XmbufClearBufferArea@Base 3.5.0.29 - XmbufCreateBuffers@Base 3.5.0.29 - XmbufCreateStereoWindow@Base 3.5.0.29 - XmbufDestroyBuffers@Base 3.5.0.29 - XmbufDisplayBuffers@Base 3.5.0.29 - XmbufGetBufferAttributes@Base 3.5.0.29 - XmbufGetScreenInfo@Base 3.5.0.29 - XmbufGetVersion@Base 3.5.0.29 - XmbufGetWindowAttributes@Base 3.5.0.29 - XmbufQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29 _XExtensionErrorFunction@Base 3.5.0.29 diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index 61829cf29..f0dfd211e 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -3,3 +3,4 @@ usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index 94e2cb075..89c78f985 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -6,7 +6,7 @@ Author: Mike Gabriel Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -829,7 +829,7 @@ +@@ -776,7 +776,7 @@ #define AlternateUsrLibDir YES #endif #else diff --git a/debian/rules b/debian/rules index 578fc84f8..9fc39464c 100755 --- a/debian/rules +++ b/debian/rules @@ -45,17 +45,8 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h -- cgit v1.2.3 From f55249dc6e3f01d4c9970af090884cab346ad9b4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Apr 2016 14:20:24 +0200 Subject: nxcomshad/Makefile.in: Only install Shadow.h as publicly available header file. * Also adapt debian/libxcompshad-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly. --- debian/libxcompshad-dev.install.in | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'debian') diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in index 31cc685d2..2010f5950 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install.in @@ -1,13 +1,3 @@ usr/lib/*/libXcompshad.so -usr/include/*/nx/Core.h -usr/include/*/nx/Input.h -usr/include/*/nx/Logger.h -usr/include/*/nx/Manager.h -usr/include/*/nx/Misc.h -usr/include/*/nx/Poller.h -usr/include/*/nx/Regions.h usr/include/*/nx/Shadow.h -usr/include/*/nx/Updater.h -usr/include/*/nx/Win.h -usr/include/*/nx/X11.h usr/lib/*/pkgconfig/nxcompshad.pc -- cgit v1.2.3 From 2f706cbeb5f077c9d1f01256bdf978a58769db43 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Apr 2016 14:29:02 +0200 Subject: nxcomp/Makefile.in: Only install MD5.h, NX.h, NXalert.h, NXpack.h, NXproto.h and NXvars.h as publicly available header files. * Also adapt debian/libxcomp-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly. --- debian/libxcomp-dev.install.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in index f0faa49e3..e27e6ecf0 100644 --- a/debian/libxcomp-dev.install.in +++ b/debian/libxcomp-dev.install.in @@ -1,10 +1,8 @@ usr/lib/*/libXcomp.so usr/include/*/nx/NX.h usr/include/*/nx/NXalert.h -usr/include/*/nx/NXmitshm.h usr/include/*/nx/NXpack.h usr/include/*/nx/NXproto.h -usr/include/*/nx/NXrender.h usr/include/*/nx/NXvars.h usr/include/*/nx/MD5.h usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file -- cgit v1.2.3 From e3838817425e6cd06b6ecd2109397178fd9a3c93 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Jun 2016 12:21:39 +0200 Subject: debian/patches-pending-evaluation: Adapt fix-icon-and-clipboard.patch to removal of the WindowTable array. --- debian/patches-pending-evaluation/fix-icon-and-clipboard.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch index e4faef051..d6ecf8f19 100644 --- a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch +++ b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch @@ -323,7 +323,7 @@ index 862f75a..5405568 100644 x.u.u.type = SelectionRequest; x.u.selectionRequest.time = GetTimeInMillis(); x.u.selectionRequest.owner = lastOwnerWindow; - x.u.selectionRequest.requestor = WindowTable[0]->drawable.id; + x.u.selectionRequest.requestor = screenInfo.screens[0]->root->drawable.id; - x.u.selectionRequest.selection = XA_PRIMARY; +/* My changes */ +/* -- cgit v1.2.3 From 3f4e503d6171859e52ac2d256ca7076227d9ed7d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Jun 2016 15:50:05 +0200 Subject: nx-libs.spec, debian/control: versioned B-R / B-D: pixman-1 (>= 0.13.2). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3e1f45e5d..d7e6f9a2c 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: pkg-config, x11proto-core-dev, expat, - libpixman-1-dev, + libpixman-1-dev (>= 0.13.2), Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Vcs-Git: git://code.x2go.org/nx-libs.git -- cgit v1.2.3 From 4c8fc6be8f530d3bc84d1097bd2cb6a4af6c77fc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Jun 2016 17:21:33 +0200 Subject: debian/patches: Update 102_xserver-xext_set-securitypolicy-path.debian.patch. --- debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch index 0d11f2f0a..cc95c8153 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch @@ -8,7 +8,7 @@ Author: Mike Gabriel Last-Update: 2012-01-12 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -86,7 +86,7 @@ +@@ -78,7 +78,7 @@ #ifdef NXAGENT_SERVER -- cgit v1.2.3 From d595125a10f886064fafc28ae8cd93dfed08cabe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 28 Jun 2016 12:05:01 +0000 Subject: fix wrong bin:package for Xext proto headers: Move dpmsstr.h and securstr.h from Xext devel package into proto header package. --- debian/control | 1 + debian/libnx-xext-dev.install.in | 2 -- debian/nx-x11proto-xext-dev.install.in | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index d7e6f9a2c..a621bddd7 100644 --- a/debian/control +++ b/debian/control @@ -444,6 +444,7 @@ Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-xext-dev (<< 2:3.5.99.0~), Description: nx-X11 miscellaneous extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in index 4a571b9fd..eb77a30b7 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install.in @@ -2,10 +2,8 @@ usr/lib/*/libNX_Xext.so usr/include/*/nx-X11/extensions/XShm.h usr/include/*/nx-X11/extensions/Xext.h usr/include/*/nx-X11/extensions/dpms.h -usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/extutil.h usr/include/*/nx-X11/extensions/security.h -usr/include/*/nx-X11/extensions/securstr.h usr/include/*/nx-X11/extensions/shape.h usr/include/*/nx-X11/extensions/sync.h usr/include/*/nx-X11/extensions/xtestext1.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index f0dfd211e..f34e66519 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -1,5 +1,7 @@ +usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xtestconst.h +usr/include/*/nx-X11/extensions/securstr.h usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h -- cgit v1.2.3 From f051b7a2d3c150c819d44c7ee648108755f71c85 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 28 Jun 2016 12:20:00 +0000 Subject: libNX_Xext: Drop unused extensions: DPMS, XTestExt1, XSync, XSecurity. --- debian/libnx-xext-dev.install.in | 4 - debian/libnx-xext6.symbols | 182 +++++++++++++++++++-------------------- debian/rules | 4 + 3 files changed, 95 insertions(+), 95 deletions(-) (limited to 'debian') diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in index eb77a30b7..819c82013 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install.in @@ -1,9 +1,5 @@ usr/lib/*/libNX_Xext.so usr/include/*/nx-X11/extensions/XShm.h usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/dpms.h usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/security.h usr/include/*/nx-X11/extensions/shape.h -usr/include/*/nx-X11/extensions/sync.h -usr/include/*/nx-X11/extensions/xtestext1.h diff --git a/debian/libnx-xext6.symbols b/debian/libnx-xext6.symbols index e48ae4968..a548baf57 100644 --- a/debian/libnx-xext6.symbols +++ b/debian/libnx-xext6.symbols @@ -1,25 +1,25 @@ libNX_Xext.so.6 libnx-xext6 #MINVER# - DPMSCapable@Base 3.5.0.29 - DPMSDisable@Base 3.5.0.29 - DPMSEnable@Base 3.5.0.29 - DPMSForceLevel@Base 3.5.0.29 - DPMSGetTimeouts@Base 3.5.0.29 - DPMSGetVersion@Base 3.5.0.29 - DPMSInfo@Base 3.5.0.29 - DPMSQueryExtension@Base 3.5.0.29 - DPMSSetTimeouts@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSCapable@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSDisable@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSEnable@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSForceLevel@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSGetTimeouts@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSGetVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# DPMSSetTimeouts@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29 XMissingExtension@Base 3.5.0.29 - XSecurityAllocXauth@Base 3.5.0.29 - XSecurityFreeXauth@Base 3.5.0.29 - XSecurityGenerateAuthorization@Base 3.5.0.29 - XSecurityQueryExtension@Base 3.5.0.29 - XSecurityRevokeAuthorization@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSecurityAllocXauth@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSecurityFreeXauth@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSecurityGenerateAuthorization@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSecurityQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSecurityRevokeAuthorization@Base 3.5.0.29 XSetExtensionErrorHandler@Base 3.5.0.29 XShapeCombineMask@Base 3.5.0.29 XShapeCombineRectangles@Base 3.5.0.29 @@ -42,69 +42,69 @@ libNX_Xext.so.6 libnx-xext6 #MINVER# XShmPutImage@Base 3.5.0.29 XShmQueryExtension@Base 3.5.0.29 XShmQueryVersion@Base 3.5.0.29 - XSyncAwait@Base 3.5.0.29 - XSyncChangeAlarm@Base 3.5.0.29 - XSyncChangeCounter@Base 3.5.0.29 - XSyncCreateAlarm@Base 3.5.0.29 - XSyncCreateCounter@Base 3.5.0.29 - XSyncDestroyAlarm@Base 3.5.0.29 - XSyncDestroyCounter@Base 3.5.0.29 - XSyncFreeSystemCounterList@Base 3.5.0.29 - XSyncGetPriority@Base 3.5.0.29 - XSyncInitialize@Base 3.5.0.29 - XSyncIntToValue@Base 3.5.0.29 - XSyncIntsToValue@Base 3.5.0.29 - XSyncListSystemCounters@Base 3.5.0.29 - XSyncMaxValue@Base 3.5.0.29 - XSyncMinValue@Base 3.5.0.29 - XSyncQueryAlarm@Base 3.5.0.29 - XSyncQueryCounter@Base 3.5.0.29 - XSyncQueryExtension@Base 3.5.0.29 - XSyncSetCounter@Base 3.5.0.29 - XSyncSetPriority@Base 3.5.0.29 - XSyncValueAdd@Base 3.5.0.29 - XSyncValueEqual@Base 3.5.0.29 - XSyncValueGreaterOrEqual@Base 3.5.0.29 - XSyncValueGreaterThan@Base 3.5.0.29 - XSyncValueHigh32@Base 3.5.0.29 - XSyncValueIsNegative@Base 3.5.0.29 - XSyncValueIsPositive@Base 3.5.0.29 - XSyncValueIsZero@Base 3.5.0.29 - XSyncValueLessOrEqual@Base 3.5.0.29 - XSyncValueLessThan@Base 3.5.0.29 - XSyncValueLow32@Base 3.5.0.29 - XSyncValueSubtract@Base 3.5.0.29 - XTestFakeAckType@Base 3.5.0.29 - XTestFakeInput@Base 3.5.0.29 - XTestFlush@Base 3.5.0.29 - XTestGetInput@Base 3.5.0.29 - XTestInputActionType@Base 3.5.0.29 - XTestMovePointer@Base 3.5.0.29 - XTestPressButton@Base 3.5.0.29 - XTestPressKey@Base 3.5.0.29 - XTestQueryInputSize@Base 3.5.0.29 - XTestReset@Base 3.5.0.29 - XTestStopInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncAwait@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncChangeAlarm@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncChangeCounter@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncCreateAlarm@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncCreateCounter@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncDestroyAlarm@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncDestroyCounter@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncFreeSystemCounterList@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncGetPriority@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncInitialize@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncIntToValue@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncIntsToValue@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncListSystemCounters@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncMaxValue@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncMinValue@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncQueryAlarm@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncQueryCounter@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncSetCounter@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncSetPriority@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueAdd@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueEqual@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueGreaterOrEqual@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueGreaterThan@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueHigh32@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueIsNegative@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueIsPositive@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueIsZero@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueLessOrEqual@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueLessThan@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueLow32@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XSyncValueSubtract@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestFakeAckType@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestFakeInput@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestFlush@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestGetInput@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestInputActionType@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestMovePointer@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestPressButton@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestPressKey@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestQueryInputSize@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestReset@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XTestStopInput@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29 #MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29 @@ -113,16 +113,16 @@ libNX_Xext.so.6 libnx-xext6 #MINVER# XextDestroyExtension@Base 3.5.0.29 XextFindDisplay@Base 3.5.0.29 XextRemoveDisplay@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29 _XExtensionErrorFunction@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index 9fc39464c..a37478c21 100755 --- a/debian/rules +++ b/debian/rules @@ -53,6 +53,10 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/dpms.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/security.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/sync.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtestext1.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing -- cgit v1.2.3 From c355dc91d35c74234c24dfbf013dfac98110d352 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 08:16:35 +0200 Subject: Makefile,debian/*,nx-libs.spec,: Drop references to X2Go Project, esp. drop x2goagent. The x2goagent package is being replaced by an x2goserver bin:package named x2goserver-x2goagent. This x2goserver-x2goagent bin:package will be maintained in the X2Go Project's namespace and basically wraps around nxagent. Furthermore, declare Arctica Project as upstream source for nx-libs. --- debian/README.source | 29 +++--------------- debian/control | 77 +++++++++++++++++------------------------------- debian/nxagent.install | 1 + debian/nxproxy.install | 1 + debian/roll-tarballs.sh | 3 +- debian/watch | 3 ++ debian/watch.nx-X11 | 3 -- debian/watch.nxagent | 3 -- debian/watch.nxauth | 3 -- debian/watch.nxcomp | 3 -- debian/watch.nxcompext | 3 -- debian/watch.nxcompshad | 3 -- debian/watch.nxproxy | 3 -- debian/x2goagent.dirs | 3 -- debian/x2goagent.install | 10 ------- 15 files changed, 37 insertions(+), 111 deletions(-) create mode 100644 debian/watch delete mode 100644 debian/watch.nx-X11 delete mode 100644 debian/watch.nxagent delete mode 100644 debian/watch.nxauth delete mode 100644 debian/watch.nxcomp delete mode 100644 debian/watch.nxcompext delete mode 100644 debian/watch.nxcompshad delete mode 100644 debian/watch.nxproxy delete mode 100644 debian/x2goagent.dirs delete mode 100644 debian/x2goagent.install (limited to 'debian') diff --git a/debian/README.source b/debian/README.source index 800a55d8a..a43fa1de5 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,12 +1,12 @@ UPSTREAM SOURCES ---------------- -The current upstream source for this package is NoMachine. -http://www.nomachine.com/sources.php +The current upstream source for this package is the Arctica Project. +https://github.com/ArcticaProject/nx-libs PACKAGE SOURCE TREE ------------------- -This package pulls in 7 source tarballs from NoMachine: +This package originally pulled in 7 source tarballs from NoMachine: nx-X11 nxagent @@ -16,26 +16,5 @@ This package pulls in 7 source tarballs from NoMachine: nxcompext nxproxy -Intensive tests with X2Go/FreeNX on Debian squeeze+ systems showed an extreme -instability of nxagent when the named sources had been built separately against the -distribution's Xorg & co. libraries. -The recommended build method by NoMachine is placing the above projects into one -big source tree and build them in one go. When this build method is chosen, -the instability issues of nxagent (and x2goagent) disappear. - -Unfortunately, so far we could not track down the exact problem of building the -above sources in separate packages. - - -PATCH SYSTEM ------------- -This package uses quilt to manage all modifications to the upstream source. -Changes are stored in the source package as diffs in debian/patches and -applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. - - - -X2Go Packaging Team / Mike Gabriel (20111231) \ No newline at end of file +Arctica Project / Mike Gabriel (2016-06-22) \ No newline at end of file diff --git a/debian/control b/debian/control index a621bddd7..2344dd37f 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: nx-libs Section: x11 Priority: extra -Maintainer: X2Go Developers +Maintainer: Artica Project Uploaders: - Reinhard Tartler , Mike Gabriel , - Oleksandr Shneyder , + Mihai Moldovan Build-Depends: debhelper (>= 7.0.50~), libpng-dev, @@ -30,9 +29,9 @@ Build-Depends: expat, libpixman-1-dev (>= 0.13.2), Standards-Version: 3.9.6 -Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary -Vcs-Git: git://code.x2go.org/nx-libs.git -Vcs-Browser: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary +Homepage: https://github.com/ArcticaProject/nx-libs/ +Vcs-Git: https://github.com/ArcticaProject/nx-libs/ +Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all @@ -40,8 +39,8 @@ Multi-Arch: foreign Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), - nxagent (<< 2:3.5.0.29-0x2go2~), + libnx-x11 (<< 2:3.5.0.29-1~), + nxagent (<< 2:3.5.0.29-1~), Description: nx-X11 (common files) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -55,7 +54,7 @@ Architecture: any Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), Description: nx-X11 core wire protocol and auxiliary headers NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -89,7 +88,7 @@ Depends: ${misc:Depends}, nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), + libnx-x11 (<< 2:3.5.0.29-1~), Replaces: nxlibs, Description: nx-X11 client-side library NX is a software suite which implements very efficient @@ -125,7 +124,7 @@ Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Replaces: nx-x11-dbg, Description: nx-X11 client-side library (debug package) NX is a software suite which implements very efficient @@ -144,7 +143,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), + libnx-x11 (<< 2:3.5.0.29-1~), Description: nx-X11 authorisation library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -163,7 +162,7 @@ Depends: libnx-xau6 (= ${binary:Version}), ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), Description: nx-X11 authorisation library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -184,7 +183,7 @@ Depends: libnx-xau6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 authorisation library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -239,7 +238,7 @@ Multi-Arch: same Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), Description: nx-X11 Composite extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -402,7 +401,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), + libnx-x11 (<< 2:3.5.0.29-1~), Description: nx-X11 miscellaneous extension library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -424,7 +423,7 @@ Depends: nx-x11proto-xext-dev (= ${binary:Version}), ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), Description: nx-X11 miscellaneous extension library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -443,7 +442,7 @@ Depends: libnx-xext6 (= ${binary:Version}), ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), libnx-xext-dev (<< 2:3.5.99.0~), Description: nx-X11 miscellaneous extension wire protocol NX is a software suite which implements very efficient @@ -463,7 +462,7 @@ Depends: libnx-xext6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 miscellaneous extension library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -516,7 +515,7 @@ Multi-Arch: same Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), + libnx-x11-dev (<< 2:3.5.0.29-1~), Description: nx-X11 'xfixes' extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -604,7 +603,7 @@ Depends: libnx-xinerama1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 Xinerama extension library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -661,7 +660,7 @@ Pre-Depends: Depends: ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 pixmap library (debug package, dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -919,7 +918,7 @@ Multi-Arch: foreign Depends: nxagent (= ${binary:Version}), ${misc:Depends}, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: NX agent (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -934,28 +933,6 @@ Description: NX agent (debug package) helpful backtraces. You can safely remove it if you do not intend to debug NX packages on this system. -Package: x2goagent -Architecture: all -Depends: - nxagent (>= ${source:Version}), nxagent (<< ${source:Version}.1), - ${misc:Depends}, -Suggests: - x2goserver -Description: X2Go agent - X2Go is a software suite that uses NX technology for remote desktop - computing. - . - NX technology implements a very efficient compression of the X11 protocol. - This increases performance when using X applications over a network, - especially a slow one. - . - X2Go agent functionality has been completely incorporated into NX agent's - code base. If the nxagent binary is executed under the name of `x2goagent', - the X2Go functionalities get activated. - . - The x2goagent package is a wrapper that activates X2Go branding in nxagent. - Please refer to the nxagent package's description for more information on NX. - Package: nxproxy Architecture: any Breaks: qvd-nxproxy @@ -980,7 +957,7 @@ Depends: ${misc:Depends}, Suggests: libxcomp3-dbg, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: NX proxy (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -1012,7 +989,7 @@ Multi-Arch: foreign Depends: nxauth (= ${binary:Version}), ${misc:Depends}, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: NX auth (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -1070,7 +1047,7 @@ Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 compression library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -1125,7 +1102,7 @@ Depends: libxcompext3 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 protocol compression extensions library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -1179,7 +1156,7 @@ Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), Description: nx-X11 shadowing library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when diff --git a/debian/nxagent.install b/debian/nxagent.install index eaaa847e9..123971a7c 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,7 @@ etc/nxagent/keystrokes.cfg etc/nxagent/rgb usr/share/nx/rgb +usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/nx/bin/nxagent usr/bin/nxagent diff --git a/debian/nxproxy.install b/debian/nxproxy.install index 5a55a9825..ab7c97d58 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,3 +1,4 @@ usr/lib/nx/bin/nxproxy usr/bin/nxproxy usr/share/man/man1/nxproxy.1* +usr/share/nx/VERSION.nxproxy diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 52c2090f0..24f7b07b0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -100,14 +100,13 @@ if [ "x$MODE" = "xfull" ]; then echo "${file##*/}" >> "doc/applied-patches/series" done else - rm -f "bin/"{nxagent,nxauth,x2goagent} + rm -f "bin/"{nxagent,nxauth} rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* rm -Rf "etc"* rm -Rf "doc/nx-X11_vs_XOrg69_patches"* rm -f "README.keystrokes" - rm -f "VERSION.x2goagent" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..4ca027c1b --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/nx-libs-$1.tar.gz/ \ +https://github.com/ArcticaProject/nx-libs/tags .*/archive/.*?([\d\.]+).tar.gz diff --git a/debian/watch.nx-X11 b/debian/watch.nx-X11 deleted file mode 100644 index dfe41c643..000000000 --- a/debian/watch.nx-X11 +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nx-X11-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxagent b/debian/watch.nxagent deleted file mode 100644 index 7f22764b3..000000000 --- a/debian/watch.nxagent +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxagent-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxauth b/debian/watch.nxauth deleted file mode 100644 index b505077c0..000000000 --- a/debian/watch.nxauth +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxauth-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxcomp b/debian/watch.nxcomp deleted file mode 100644 index 75f24916b..000000000 --- a/debian/watch.nxcomp +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxcomp-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxcompext b/debian/watch.nxcompext deleted file mode 100644 index 67883630e..000000000 --- a/debian/watch.nxcompext +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxcompext-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxcompshad b/debian/watch.nxcompshad deleted file mode 100644 index 43e2e528a..000000000 --- a/debian/watch.nxcompshad +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxcompshad-([\d\.-]*)\.tar\.gz diff --git a/debian/watch.nxproxy b/debian/watch.nxproxy deleted file mode 100644 index bbf27fd2f..000000000 --- a/debian/watch.nxproxy +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.nomachine.com/sources.php \ - http://[^"]*/nxproxy-([\d\.-]*)\.tar\.gz diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs deleted file mode 100644 index 548ecdfc7..000000000 --- a/debian/x2goagent.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/pixmaps -usr/share/x2go diff --git a/debian/x2goagent.install b/debian/x2goagent.install deleted file mode 100644 index 0603507ef..000000000 --- a/debian/x2goagent.install +++ /dev/null @@ -1,10 +0,0 @@ -usr/bin/x2goagent -usr/lib/x2go/bin/x2goagent -usr/share/pixmaps/x2go.xpm -usr/share/x2go/rgb -usr/share/man/man1/x2goagent.1* -etc/x2go/rgb -usr/share/x2go/versions/VERSION.x2goagent -usr/share/x2go/x2gofeature.d/x2goagent.features -etc/x2go/keystrokes.cfg -etc/x2go/x2goagent.keyboard -- cgit v1.2.3 From 2f3d394e87c61369ed1308c6b3bc53cf0295146c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:41:50 +0200 Subject: nx-X11/config/{imake,makedepend}: Use system-wide available imake and makedepend tools. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 2344dd37f..e9e7f7d18 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Build-Depends: x11proto-core-dev, expat, libpixman-1-dev (>= 0.13.2), + xutils-dev, Standards-Version: 3.9.6 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ -- cgit v1.2.3 From 4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 30 Jun 2016 22:41:00 +0200 Subject: debian/libnx-x11-6.symbols: Update symbols (added: _XEatDataWords@Base 3.5.99.0, _XGetRequest@Base 3.5.99.0). --- debian/libnx-x11-6.symbols | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index b9ab97120..cba229cac 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -825,6 +825,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XDeqAsyncHandler@Base 3.5.0.29 _XDisconnectDisplay@Base 3.5.0.29 _XEatData@Base 3.5.0.29 + _XEatDataWords@Base 3.5.99.0 _XEnq@Base 3.5.0.29 _XError@Base 3.5.0.29 _XErrorFunction@Base 3.5.0.29 @@ -845,6 +846,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XGetBitsPerPixel@Base 3.5.0.29 _XGetHostname@Base 3.5.0.29 _XGetLCValues@Base 3.5.0.29 + _XGetRequest@Base 3.5.99.0 _XGetScanlinePad@Base 3.5.0.29 _XGetWindowAttributes@Base 3.5.0.29 _XHeadOfDisplayList@Base 3.5.0.29 -- cgit v1.2.3 From d650a0b47eadeb675e2d2cf03ad10a4dbc564971 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 14:27:15 +0200 Subject: OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index a37478c21..275956c9a 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ override_dh_auto_install: override_dh_auto_build: - LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel + PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From f0bf303c8f97c05dc4c2e6479bbf97e2b17d8cab Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 09:58:54 +0200 Subject: nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent. --- debian/libnx-x11-dev.install.in | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in index 13af54672..83e2def0e 100644 --- a/debian/libnx-x11-dev.install.in +++ b/debian/libnx-x11-dev.install.in @@ -12,4 +12,3 @@ usr/include/*/nx-X11/Xutil.h usr/include/*/nx-X11/cursorfont.h usr/include/*/nx-X11/misc.h usr/include/*/nx-X11/os.h -usr/include/*/nx-X11/X10.h -- cgit v1.2.3 From 3983b111a414c9cc88ef7653da4f91cef0ff0482 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:04:16 +0200 Subject: debian/*: Drop not-use-anymore CODE-REDUCTION_* files. --- debian/CODE-REDUCTION_CLEANUP-BACKUPFILES | 0 debian/CODE-REDUCTION_CLEANUP-BRUTAL | 0 debian/CODE-REDUCTION_CLEANUP-UNUSED | 0 debian/CODE-REDUCTION_PRESERVE-INCLUDED | 0 debian/CODE-REDUCTION_PRESERVE-NEEDED | 0 debian/CODE-REDUCTION_PRESERVE-SYMLINKED | 0 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 debian/CODE-REDUCTION_CLEANUP-BACKUPFILES delete mode 100644 debian/CODE-REDUCTION_CLEANUP-BRUTAL delete mode 100644 debian/CODE-REDUCTION_CLEANUP-UNUSED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-INCLUDED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-NEEDED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-SYMLINKED (limited to 'debian') diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From 593e15ca1c93c83ae5629de450c2c92f7ca3ab56 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:09:17 +0200 Subject: debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). --- debian/libnx-x11-6.install | 1 + debian/libnx-x11-6.install.in | 1 - debian/libnx-x11-dev.install | 14 ++++++++++++++ debian/libnx-x11-dev.install.in | 14 -------------- debian/libnx-xau-dev.install | 2 ++ debian/libnx-xau-dev.install.in | 2 -- debian/libnx-xau6.install | 1 + debian/libnx-xau6.install.in | 1 - debian/libnx-xext-dev.install | 5 +++++ debian/libnx-xext-dev.install.in | 5 ----- debian/libnx-xext6.install | 1 + debian/libnx-xext6.install.in | 1 - debian/libxcomp-dev.install | 8 ++++++++ debian/libxcomp-dev.install.in | 8 -------- debian/libxcomp3.install | 1 + debian/libxcomp3.install.in | 1 - debian/libxcompext-dev.install | 4 ++++ debian/libxcompext-dev.install.in | 4 ---- debian/libxcompext3.install | 1 + debian/libxcompext3.install.in | 1 - debian/libxcompshad-dev.install | 3 +++ debian/libxcompshad-dev.install.in | 3 --- debian/libxcompshad3.install | 1 + debian/libxcompshad3.install.in | 1 - debian/nx-x11proto-composite-dev.install | 2 ++ debian/nx-x11proto-composite-dev.install.in | 2 -- debian/nx-x11proto-core-dev.install | 23 +++++++++++++++++++++++ debian/nx-x11proto-core-dev.install.in | 23 ----------------------- debian/nx-x11proto-damage-dev.install | 2 ++ debian/nx-x11proto-damage-dev.install.in | 2 -- debian/nx-x11proto-randr-dev.install | 2 ++ debian/nx-x11proto-randr-dev.install.in | 2 -- debian/nx-x11proto-render-dev.install | 3 +++ debian/nx-x11proto-render-dev.install.in | 3 --- debian/nx-x11proto-xext-dev.install | 8 ++++++++ debian/nx-x11proto-xext-dev.install.in | 8 -------- debian/nx-x11proto-xfixes-dev.install | 3 +++ debian/nx-x11proto-xfixes-dev.install.in | 3 --- debian/nx-x11proto-xinerama-dev.install | 2 ++ debian/nx-x11proto-xinerama-dev.install.in | 2 -- debian/rules | 12 ------------ 41 files changed, 87 insertions(+), 99 deletions(-) create mode 100644 debian/libnx-x11-6.install delete mode 100644 debian/libnx-x11-6.install.in create mode 100644 debian/libnx-x11-dev.install delete mode 100644 debian/libnx-x11-dev.install.in create mode 100644 debian/libnx-xau-dev.install delete mode 100644 debian/libnx-xau-dev.install.in create mode 100644 debian/libnx-xau6.install delete mode 100644 debian/libnx-xau6.install.in create mode 100644 debian/libnx-xext-dev.install delete mode 100644 debian/libnx-xext-dev.install.in create mode 100644 debian/libnx-xext6.install delete mode 100644 debian/libnx-xext6.install.in create mode 100644 debian/libxcomp-dev.install delete mode 100644 debian/libxcomp-dev.install.in create mode 100644 debian/libxcomp3.install delete mode 100644 debian/libxcomp3.install.in create mode 100644 debian/libxcompext-dev.install delete mode 100644 debian/libxcompext-dev.install.in create mode 100644 debian/libxcompext3.install delete mode 100644 debian/libxcompext3.install.in create mode 100644 debian/libxcompshad-dev.install delete mode 100644 debian/libxcompshad-dev.install.in create mode 100644 debian/libxcompshad3.install delete mode 100644 debian/libxcompshad3.install.in create mode 100644 debian/nx-x11proto-composite-dev.install delete mode 100644 debian/nx-x11proto-composite-dev.install.in create mode 100644 debian/nx-x11proto-core-dev.install delete mode 100644 debian/nx-x11proto-core-dev.install.in create mode 100644 debian/nx-x11proto-damage-dev.install delete mode 100644 debian/nx-x11proto-damage-dev.install.in create mode 100644 debian/nx-x11proto-randr-dev.install delete mode 100644 debian/nx-x11proto-randr-dev.install.in create mode 100644 debian/nx-x11proto-render-dev.install delete mode 100644 debian/nx-x11proto-render-dev.install.in create mode 100644 debian/nx-x11proto-xext-dev.install delete mode 100644 debian/nx-x11proto-xext-dev.install.in create mode 100644 debian/nx-x11proto-xfixes-dev.install delete mode 100644 debian/nx-x11proto-xfixes-dev.install.in create mode 100644 debian/nx-x11proto-xinerama-dev.install delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian') diff --git a/debian/libnx-x11-6.install b/debian/libnx-x11-6.install new file mode 100644 index 000000000..4912d749f --- /dev/null +++ b/debian/libnx-x11-6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install.in deleted file mode 100644 index 4912d749f..000000000 --- a/debian/libnx-x11-6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install new file mode 100644 index 000000000..83e2def0e --- /dev/null +++ b/debian/libnx-x11-dev.install @@ -0,0 +1,14 @@ +usr/lib/*/libNX_X11.so +usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xcms.h +usr/include/*/nx-X11/Xlib.h +usr/include/*/nx-X11/XlibConf.h +usr/include/*/nx-X11/Xlibint.h +usr/include/*/nx-X11/Xlocale.h +usr/include/*/nx-X11/Xregion.h +usr/include/*/nx-X11/Xresource.h +usr/include/*/nx-X11/Xutil.h +usr/include/*/nx-X11/cursorfont.h +usr/include/*/nx-X11/misc.h +usr/include/*/nx-X11/os.h diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in deleted file mode 100644 index 83e2def0e..000000000 --- a/debian/libnx-x11-dev.install.in +++ /dev/null @@ -1,14 +0,0 @@ -usr/lib/*/libNX_X11.so -usr/include/*/nx-X11/ImUtil.h -usr/include/*/nx-X11/XKBlib.h -usr/include/*/nx-X11/Xcms.h -usr/include/*/nx-X11/Xlib.h -usr/include/*/nx-X11/XlibConf.h -usr/include/*/nx-X11/Xlibint.h -usr/include/*/nx-X11/Xlocale.h -usr/include/*/nx-X11/Xregion.h -usr/include/*/nx-X11/Xresource.h -usr/include/*/nx-X11/Xutil.h -usr/include/*/nx-X11/cursorfont.h -usr/include/*/nx-X11/misc.h -usr/include/*/nx-X11/os.h diff --git a/debian/libnx-xau-dev.install b/debian/libnx-xau-dev.install new file mode 100644 index 000000000..1bf954c00 --- /dev/null +++ b/debian/libnx-xau-dev.install @@ -0,0 +1,2 @@ +usr/lib/*/libNX_Xau.so +usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in deleted file mode 100644 index 1bf954c00..000000000 --- a/debian/libnx-xau-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xau.so -usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau6.install b/debian/libnx-xau6.install new file mode 100644 index 000000000..246377f12 --- /dev/null +++ b/debian/libnx-xau6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install.in deleted file mode 100644 index 246377f12..000000000 --- a/debian/libnx-xau6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install new file mode 100644 index 000000000..819c82013 --- /dev/null +++ b/debian/libnx-xext-dev.install @@ -0,0 +1,5 @@ +usr/lib/*/libNX_Xext.so +usr/include/*/nx-X11/extensions/XShm.h +usr/include/*/nx-X11/extensions/Xext.h +usr/include/*/nx-X11/extensions/extutil.h +usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in deleted file mode 100644 index 819c82013..000000000 --- a/debian/libnx-xext-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext6.install b/debian/libnx-xext6.install new file mode 100644 index 000000000..361d951f5 --- /dev/null +++ b/debian/libnx-xext6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xext.so.* diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install.in deleted file mode 100644 index 361d951f5..000000000 --- a/debian/libnx-xext6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xext.so.* diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install new file mode 100644 index 000000000..e27e6ecf0 --- /dev/null +++ b/debian/libxcomp-dev.install @@ -0,0 +1,8 @@ +usr/lib/*/libXcomp.so +usr/include/*/nx/NX.h +usr/include/*/nx/NXalert.h +usr/include/*/nx/NXpack.h +usr/include/*/nx/NXproto.h +usr/include/*/nx/NXvars.h +usr/include/*/nx/MD5.h +usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in deleted file mode 100644 index e27e6ecf0..000000000 --- a/debian/libxcomp-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/*/libXcomp.so -usr/include/*/nx/NX.h -usr/include/*/nx/NXalert.h -usr/include/*/nx/NXpack.h -usr/include/*/nx/NXproto.h -usr/include/*/nx/NXvars.h -usr/include/*/nx/MD5.h -usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file diff --git a/debian/libxcomp3.install b/debian/libxcomp3.install new file mode 100644 index 000000000..9b8fa9f15 --- /dev/null +++ b/debian/libxcomp3.install @@ -0,0 +1 @@ +usr/lib/*/libXcomp.so.* diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install.in deleted file mode 100644 index 9b8fa9f15..000000000 --- a/debian/libxcomp3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcomp.so.* diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install new file mode 100644 index 000000000..a31961b99 --- /dev/null +++ b/debian/libxcompext-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libXcompext.so +usr/include/*/nx/NXlib.h +usr/include/*/nx/NXlibint.h +usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install.in deleted file mode 100644 index a31961b99..000000000 --- a/debian/libxcompext-dev.install.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/*/libXcompext.so -usr/include/*/nx/NXlib.h -usr/include/*/nx/NXlibint.h -usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install new file mode 100644 index 000000000..b9ac8ebb9 --- /dev/null +++ b/debian/libxcompext3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install.in deleted file mode 100644 index b9ac8ebb9..000000000 --- a/debian/libxcompext3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install new file mode 100644 index 000000000..2010f5950 --- /dev/null +++ b/debian/libxcompshad-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libXcompshad.so +usr/include/*/nx/Shadow.h +usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in deleted file mode 100644 index 2010f5950..000000000 --- a/debian/libxcompshad-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libXcompshad.so -usr/include/*/nx/Shadow.h -usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad3.install b/debian/libxcompshad3.install new file mode 100644 index 000000000..6b452b2bd --- /dev/null +++ b/debian/libxcompshad3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompshad*.so.* diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install.in deleted file mode 100644 index 6b452b2bd..000000000 --- a/debian/libxcompshad3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompshad*.so.* diff --git a/debian/nx-x11proto-composite-dev.install b/debian/nx-x11proto-composite-dev.install new file mode 100644 index 000000000..cf2c77e36 --- /dev/null +++ b/debian/nx-x11proto-composite-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/composite.h +usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in deleted file mode 100644 index cf2c77e36..000000000 --- a/debian/nx-x11proto-composite-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/composite.h -usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install new file mode 100644 index 000000000..2e99909a8 --- /dev/null +++ b/debian/nx-x11proto-core-dev.install @@ -0,0 +1,23 @@ +usr/include/*/nx-X11/DECkeysym.h +usr/include/*/nx-X11/HPkeysym.h +usr/include/*/nx-X11/Sunkeysym.h +usr/include/*/nx-X11/X.h +usr/include/*/nx-X11/XF86keysym.h +usr/include/*/nx-X11/XWDFile.h +usr/include/*/nx-X11/Xalloca.h +usr/include/*/nx-X11/Xarch.h +usr/include/*/nx-X11/Xatom.h +usr/include/*/nx-X11/Xdefs.h +usr/include/*/nx-X11/Xfuncproto.h +usr/include/*/nx-X11/Xfuncs.h +usr/include/*/nx-X11/Xmd.h +usr/include/*/nx-X11/Xos.h +usr/include/*/nx-X11/Xos_r.h +usr/include/*/nx-X11/Xosdefs.h +usr/include/*/nx-X11/Xpoll.h +usr/include/*/nx-X11/Xproto.h +usr/include/*/nx-X11/Xprotostr.h +usr/include/*/nx-X11/Xthreads.h +usr/include/*/nx-X11/ap_keysym.h +usr/include/*/nx-X11/keysym.h +usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in deleted file mode 100644 index 2e99909a8..000000000 --- a/debian/nx-x11proto-core-dev.install.in +++ /dev/null @@ -1,23 +0,0 @@ -usr/include/*/nx-X11/DECkeysym.h -usr/include/*/nx-X11/HPkeysym.h -usr/include/*/nx-X11/Sunkeysym.h -usr/include/*/nx-X11/X.h -usr/include/*/nx-X11/XF86keysym.h -usr/include/*/nx-X11/XWDFile.h -usr/include/*/nx-X11/Xalloca.h -usr/include/*/nx-X11/Xarch.h -usr/include/*/nx-X11/Xatom.h -usr/include/*/nx-X11/Xdefs.h -usr/include/*/nx-X11/Xfuncproto.h -usr/include/*/nx-X11/Xfuncs.h -usr/include/*/nx-X11/Xmd.h -usr/include/*/nx-X11/Xos.h -usr/include/*/nx-X11/Xos_r.h -usr/include/*/nx-X11/Xosdefs.h -usr/include/*/nx-X11/Xpoll.h -usr/include/*/nx-X11/Xproto.h -usr/include/*/nx-X11/Xprotostr.h -usr/include/*/nx-X11/Xthreads.h -usr/include/*/nx-X11/ap_keysym.h -usr/include/*/nx-X11/keysym.h -usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-damage-dev.install b/debian/nx-x11proto-damage-dev.install new file mode 100644 index 000000000..1503260cf --- /dev/null +++ b/debian/nx-x11proto-damage-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/damagewire.h +usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 1503260cf..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/damagewire.h -usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-randr-dev.install b/debian/nx-x11proto-randr-dev.install new file mode 100644 index 000000000..3b30f71d0 --- /dev/null +++ b/debian/nx-x11proto-randr-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/randr.h +usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index 3b30f71d0..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/randr.h -usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-render-dev.install b/debian/nx-x11proto-render-dev.install new file mode 100644 index 000000000..f2222d234 --- /dev/null +++ b/debian/nx-x11proto-render-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/render.h +usr/include/*/nx-X11/extensions/renderproto.h + diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in deleted file mode 100644 index f2222d234..000000000 --- a/debian/nx-x11proto-render-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/render.h -usr/include/*/nx-X11/extensions/renderproto.h - diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install new file mode 100644 index 000000000..f34e66519 --- /dev/null +++ b/debian/nx-x11proto-xext-dev.install @@ -0,0 +1,8 @@ +usr/include/*/nx-X11/extensions/dpmsstr.h +usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/xtestconst.h +usr/include/*/nx-X11/extensions/securstr.h +usr/include/*/nx-X11/extensions/shapestr.h +usr/include/*/nx-X11/extensions/shmstr.h +usr/include/*/nx-X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in deleted file mode 100644 index f34e66519..000000000 --- a/debian/nx-x11proto-xext-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/include/*/nx-X11/extensions/dpmsstr.h -usr/include/*/nx-X11/extensions/xteststr.h -usr/include/*/nx-X11/extensions/xtestconst.h -usr/include/*/nx-X11/extensions/securstr.h -usr/include/*/nx-X11/extensions/shapestr.h -usr/include/*/nx-X11/extensions/shmstr.h -usr/include/*/nx-X11/extensions/syncstr.h -usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xfixes-dev.install b/debian/nx-x11proto-xfixes-dev.install new file mode 100644 index 000000000..91eae0306 --- /dev/null +++ b/debian/nx-x11proto-xfixes-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/xfixeswire.h +usr/include/*/nx-X11/extensions/xfixesproto.h + diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in deleted file mode 100644 index 91eae0306..000000000 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/xfixeswire.h -usr/include/*/nx-X11/extensions/xfixesproto.h - diff --git a/debian/nx-x11proto-xinerama-dev.install b/debian/nx-x11proto-xinerama-dev.install new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index 2e1efbc63..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXext.h -usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/rules b/debian/rules index 275956c9a..f8bec8fc0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,23 +19,11 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR .preserve/ dh_clean override_dh_install: - # handle builds for Debian squeeze (non multi-arch) - . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \ - find debian/*.install.in | while read file; do \ - cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ - done; \ - else \ - find debian/*.install.in | while read file; do \ - cat $$file > $$(string_rep $$file .install.in .install); \ - done; \ - fi - # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a -- cgit v1.2.3 From 908b930c9e0cb336e6f18d2c8ff7d19f52f7accc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:10:49 +0200 Subject: debian/rules: Don't attempt at removing $(CURDIR)/.preserve/. Not needed anymore since we removed the CODE-REDUCTION_* hacks from debian/rules. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index f8bec8fc0..ec7616f7a 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - rm -fR .preserve/ dh_clean override_dh_install: -- cgit v1.2.3 From 6b423eefd68f54927e59b4dd25a1b73a7f662461 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:12:33 +0200 Subject: roll-tarball.sh: Don't ship doc/X11-symbols/ in the lite (proxy-only) tarball derived from the nx-libs code tree. --- debian/roll-tarballs.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 24f7b07b0..e735e8913 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -106,6 +106,7 @@ else rm -Rf "nx-X11"* rm -Rf "etc"* rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -Rf "doc/X11-symbols"* rm -f "README.keystrokes" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do -- cgit v1.2.3 From b4d7b9989aab4aa4c47baa785a9ecbe23eaef63b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:26:15 +0200 Subject: debian/control: Drop various not-used-anymore libNX_* related packages. Add B:/R: to libnx-x11-{6,dev,6-dbg) to uninstall those package when upgrading to nx-libs 3.6.x. --- debian/control | 560 ++++++--------------------------------------------------- 1 file changed, 54 insertions(+), 506 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e9e7f7d18..5fe9eceb8 100644 --- a/debian/control +++ b/debian/control @@ -65,20 +65,6 @@ Description: nx-X11 core wire protocol and auxiliary headers for the core nx-X11 protocol, and also provides a number of utility headers, used to abstract OS-specific functions. -Package: libnx-x11 -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, - libnx-x11-6 (>= ${source:Version}), libnx-x11-6 (<< ${source:Version}.1), -Description: nx-X11 client-side library (transitional dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package is a transitional dummy package and can be safely removed - (inducing transition of libnx-x11 to libnx-x11-6). - Package: libnx-x11-6 Architecture: any Multi-Arch: same @@ -90,7 +76,25 @@ Depends: nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xcomposite1 (<< 2:3.6.0.0), + libnx-xdamage1 (<< 2:3.6.0.0), + libnx-xdmcp6 (<< 2:3.6.0.0), + libnx-xfixes3 (<< 2:3.6.0.0), + libnx-xinerama1 (<< 2:3.6.0.0), + libnx-xpm4 (<< 2:3.6.0.0), + libnx-xrandr2 (<< 2:3.6.0.0), + libnx-xrender1 (<< 2:3.6.0.0), + libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xcomposite1, + libnx-xdamage1, + libnx-xdmcp6, + libnx-xfixes3, + libnx-xinerama1, + libnx-xpm4, + libnx-xrandr2, + libnx-xrender1, + libnx-xtst6, Description: nx-X11 client-side library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -104,7 +108,25 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xcomposite-dev (<< 2:3.6.0.0), + libnx-xdamage-dev (<< 2:3.6.0.0), + libnx-xdmcp-dev (<< 2:3.6.0.0), + libnx-xfixes-dev (<< 2:3.6.0.0), + libnx-xinerama-dev (<< 2:3.6.0.0), + libnx-xpm-dev (<< 2:3.6.0.0), + libnx-xrandr-dev (<< 2:3.6.0.0), + libnx-xrender-dev (<< 2:3.6.0.0), + libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xcomposite-dev, + libnx-xdamage-dev, + libnx-xdmcp-dev, + libnx-xfixes-dev, + libnx-xinerama-dev, + libnx-xpm-dev, + libnx-xrandr-dev, + libnx-xrender-dev, + libnx-xtst-dev, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, @@ -126,7 +148,25 @@ Depends: ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xcomposite1-dbg (<< 2:3.6.0.0), + libnx-xdamage1-dbg (<< 2:3.6.0.0), + libnx-xdmcp6-dbg (<< 2:3.6.0.0), + libnx-xfixes3-dbg (<< 2:3.6.0.0), + libnx-xinerama1-dbg (<< 2:3.6.0.0), + libnx-xpm4-dbg (<< 2:3.6.0.0), + libnx-xrandr2-dbg (<< 2:3.6.0.0), + libnx-xrender1-dbg (<< 2:3.6.0.0), + libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xcomposite1-dbg, + libnx-xdamage1-dbg, + libnx-xdmcp6-dbg, + libnx-xfixes3-dbg, + libnx-xinerama1-dbg, + libnx-xpm4-dbg, + libnx-xrandr2-dbg, + libnx-xrender1-dbg, + libnx-xtst6-dbg, Description: nx-X11 client-side library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -196,42 +236,6 @@ Description: nx-X11 authorisation library (debug package) . This package contains debug symbols for this library. -Package: libnx-xcomposite1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xcomposite.so.1 library. With - recent versions of NX, the system-wide installed libXcomposite gets - used. - . - This package can be safely removed. - -Package: libnx-xcomposite-dev -Provides: libnx-xcomposite1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xcomposite.so.1 - library. With recent versions of NX, the system-wide installed - libXcomposite gets used. - . - This package can be safely removed. - Package: nx-x11proto-composite-dev Section: libdevel Architecture: any @@ -249,60 +253,6 @@ Description: nx-X11 Composite extension wire protocol for the Composite extension in nx-X11, used to let arbitrary client programs control drawing of the final image. -Package: libnx-xcomposite1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the debug symbols for the obsoleted - libNX_Xcomposite.so.1 library. With recent versions of NX, the - system-wide installed libXcomposite gets used. - . - This package can be safely removed. - -Package: libnx-xdamage1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xdamage.so.1 library. With - recent versions of NX, the system-wide installed libXdamage gets used. - . - This package can be safely removed. - -Package: libnx-xdamage-dev -Provides: libnx-xdamage1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xdamage.so.1 - library. With recent versions of NX, the system-wide installed libXdamage - gets used. - . - This package can be safely removed. - Package: nx-x11proto-damage-dev Section: libdevel Architecture: any @@ -320,79 +270,6 @@ Description: nx-X11 Damage extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xdamage1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the - libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide - installed libXdamage gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xdmcp.so.6 library. With - recent versions of NX, the system-wide installed libXdmcp gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp-dev -Provides: libnx-xdmcp6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - Package: libnx-xext6 Architecture: any Multi-Arch: same @@ -474,41 +351,6 @@ Description: nx-X11 miscellaneous extension library (debug package) . This package contains debug symbols for this library. -Package: libnx-xfixes3 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xfixes.so.3 library. With - recent versions of NX, the system-wide installed libXfixes gets used. - . - This package can be safely removed. - -Package: libnx-xfixes-dev -Provides: libnx-xfixes3-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed - libXfixes gets used. - . - This package can be safely removed. - Package: nx-x11proto-xfixes-dev Section: libdevel Architecture: any @@ -525,60 +367,6 @@ Description: nx-X11 'xfixes' extension wire protocol This package provides development headers describing the wire protocol for the XFIXES extension. -Package: libnx-xfixes3-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed libXfixes - gets used. - . - This package can be safely removed. - -Package: libnx-xinerama1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xinerama.so.1 library. - Xinerama support in NX has been moved into nxagent whereas X-Clients - can now use the libXinerama library shipped with X.Org. - . - This package can be safely removed. - -Package: libnx-xinerama-dev -Provides: libnx-xinerama1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library (development headers) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - Package: nx-x11proto-xinerama-dev Section: libdevel Architecture: any @@ -595,119 +383,6 @@ Description: nx-X11 Xinerama extension wire protocol . This package can be safely removed. -Package: libnx-xinerama1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - libnx-xinerama1 (= ${binary:Version}), - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 Xinerama extension library (debug package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - libNX_Xinerama provides an X Window System client interface to the XINERAMA - extension to the X protocol. - . - This package removes the obsoleted debug symbols for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - -Package: libnx-xpm4 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xpm.so.4 library. With - recent versions of NX, the system-wide installed libXpm gets used. - . - This package can be safely removed. - -Package: libnx-xpm-dev -Provides: libnx-xpm4-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap library (development headers, dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xpm4-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 pixmap library (debug package, dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xrandr2 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xrandr.so.2 library. With - recent versions of NX, the system-wide installed libXrandr gets used. - . - This package can be safely removed. - -Package: libnx-xrandr-dev -Provides: libnx-xrandr2-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - Package: nx-x11proto-randr-dev Section: libdevel Architecture: any @@ -725,60 +400,6 @@ Description: nx-X11 RandR extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrandr2-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - -Package: libnx-xrender1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xrender.so.1 library. With - recent versions of NX, the system-wide installed libXrender gets used. - . - This package can be safely removed. - -Package: libnx-xrender-dev -Provides: libnx-xrender1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - Package: nx-x11proto-render-dev Section: libdevel Architecture: any @@ -796,79 +417,6 @@ Description: nx-X11 Render extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrender1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xtst.so.6 library. With - recent versions of NX, the system-wide installed libXtst gets used. - . - This package can be safely removed. - -Package: libnx-xtst-dev -Provides: libnx-xtst6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xtst.so.6 - library. With recent versions of NX, the system-wide installed libXtst - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted wire protocol headers for the - libNX_Xtst.so.6 library. With recent versions of NX, the system-wide - installed libXtst gets used. - . - This package can be safely removed. - Package: libnx-mesa-extras-dev Section: libdevel Architecture: any -- cgit v1.2.3 From 24ff7db2bf5ba74afbb268a57a70de9157c261d9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:08:35 +0200 Subject: debian/changelog: Suppress warnings from lintian about -0 revision in version string. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 802ba1b33..e97d3cb01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.99.0-0) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.0-0.1) UNRELEASED; urgency=medium * Version bump, continuing NX 3.x development.. Targeting NX 3.6.x.y some time. -- cgit v1.2.3 From 2e1ec618110ed0685fbd54e4adc4689a708581c9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:08:49 +0200 Subject: debian/control: Use my DD address in Uploaders: field. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 5fe9eceb8..b3bf1cb8a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: extra Maintainer: Artica Project Uploaders: - Mike Gabriel , + Mike Gabriel , Mihai Moldovan Build-Depends: debhelper (>= 7.0.50~), -- cgit v1.2.3 From 87ce9b4b059607dcaccc2c6b512bbf9fe39fc4ee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:13:23 +0200 Subject: debian/{control,compat}: Bump to DH compat level 9. --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index b3bf1cb8a..2664f0428 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mike Gabriel , Mihai Moldovan Build-Depends: - debhelper (>= 7.0.50~), + debhelper (>= 9), libpng-dev, libjpeg-dev, zlib1g-dev, -- cgit v1.2.3 From 9663b1ce2fd1ec307ec03dec5ff113166fe24f14 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:14:00 +0200 Subject: debian/control: Bump Standards: to 3.9.8. (Various changes were needed). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 2664f0428..310f6e1ee 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: expat, libpixman-1-dev (>= 0.13.2), xutils-dev, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ -- cgit v1.2.3 From 2a2d7f0e2e3403ea0f8a5544bfc5a9c02ab3eeb8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 15:45:33 +0200 Subject: debian/control: Remove all Pre-Depends: fields from all bin:pkgs. --- debian/control | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 310f6e1ee..4c8ba15a0 100644 --- a/debian/control +++ b/debian/control @@ -68,8 +68,6 @@ Description: nx-X11 core wire protocol and auxiliary headers Package: libnx-x11-6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -141,8 +139,6 @@ Description: nx-X11 client-side library (development headers) Package: libnx-x11-6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, @@ -178,8 +174,6 @@ Description: nx-X11 client-side library (debug package) Package: libnx-xau6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -218,8 +212,6 @@ Description: nx-X11 authorisation library (development headers) Package: libnx-xau6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xau6 (= ${binary:Version}), ${misc:Depends}, @@ -273,8 +265,6 @@ Description: nx-X11 Damage extension wire protocol (dummy package) Package: libnx-xext6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -334,8 +324,6 @@ Description: nx-X11 miscellaneous extension wire protocol Package: libnx-xext6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xext6 (= ${binary:Version}), ${misc:Depends}, @@ -553,8 +541,6 @@ Description: NX auth (debug package) Package: libxcomp3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -590,8 +576,6 @@ Description: nx-X11 compression library (development headers) Package: libxcomp3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends}, @@ -609,8 +593,6 @@ Description: nx-X11 compression library (debug package) Package: libxcompext3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -645,8 +627,6 @@ Description: nx-X11 protocol compression extensions library (development headers Package: libxcompext3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompext3 (= ${binary:Version}), ${misc:Depends}, @@ -664,8 +644,6 @@ Description: nx-X11 protocol compression extensions library (debug package) Package: libxcompshad3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -699,8 +677,6 @@ Description: nx-X11 shadowing library (development headers) Package: libxcompshad3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends}, -- cgit v1.2.3 From 56f776ced32538d5a33c637f20dfc9cb76a17f90 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:08:47 +0200 Subject: debian/control: Versioned B-D: dpkg-dev (>= 1.16.1.1). --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 4c8ba15a0..1a58cf6a7 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Uploaders: Mihai Moldovan Build-Depends: debhelper (>= 9), + dpkg-dev (>= 1.16.1.1), libpng-dev, libjpeg-dev, zlib1g-dev, -- cgit v1.2.3 From 7d66941aebf923a3311a07671e69160487c3f8f0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:09:19 +0200 Subject: debian/rules: Use buildflags.mk from dpkg-dev. Enable bindnow hardening flag. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index ec7616f7a..e41f97c81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- cgit v1.2.3 From 82a8d595ddfd324991793a19936cc8f1539a9ed7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:28:42 +0200 Subject: debian/libxcompext3.symbols: Add symbols file for libXcompext3. --- debian/libxcompext3.symbols | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 debian/libxcompext3.symbols (limited to 'debian') diff --git a/debian/libxcompext3.symbols b/debian/libxcompext3.symbols new file mode 100644 index 000000000..0ca6ec6b8 --- /dev/null +++ b/debian/libxcompext3.symbols @@ -0,0 +1,103 @@ +libXcompext.so.3 libxcompext3 #MINVER# + AlphaCompressData@Base 3.5.0.29 + BitmapCompressData@Base 3.5.0.29 + CleanXYImage@Base 3.5.0.29 + CleanZImage@Base 3.5.0.29 + ColormapCompressData@Base 3.5.0.29 + CopyAndCleanImage@Base 3.5.0.29 + FindLSB@Base 3.5.0.29 + JpegCompressData@Base 3.5.0.29 + MaskImage@Base 3.5.0.29 + MaskInPlaceImage@Base 3.5.0.29 + NXAbortSplit@Base 3.5.0.29 + NXAllocColors@Base 3.5.0.29 + NXAllocSplit@Base 3.5.0.29 + NXAllocUnpack@Base 3.5.0.29 + NXCacheAddImage@Base 3.5.0.29 + NXCacheFindImage@Base 3.5.0.29 + NXCleanImage@Base 3.5.0.29 + NXCollectGrabPointer@Base 3.5.0.29 + NXCollectImage@Base 3.5.0.29 + NXCollectInputFocus@Base 3.5.0.29 + NXCollectProperty@Base 3.5.0.29 + NXCommitSplit@Base 3.5.0.29 + NXCreatePackedImage@Base 3.5.0.29 + NXCreatePalette16@Base 3.5.0.29 + NXCreatePalette32@Base 3.5.0.29 + NXDestroyPackedImage@Base 3.5.0.29 + NXDisplayCongestion@Base 3.5.0.29 + NXDisplayError@Base 3.5.0.29 + NXDisplayFlushable@Base 3.5.0.29 + NXDisplayReadable@Base 3.5.0.29 + NXEncodeAlpha@Base 3.5.0.29 + NXEncodeBitmap@Base 3.5.0.29 + NXEncodeColormap@Base 3.5.0.29 + NXEncodeColors@Base 3.5.0.29 + NXEncodeJpeg@Base 3.5.0.29 + NXEncodePng@Base 3.5.0.29 + NXEncodeRgb@Base 3.5.0.29 + NXEncodeRle@Base 3.5.0.29 + NXEndSplit@Base 3.5.0.29 + NXFinishSplit@Base 3.5.0.29 + NXFlushDisplay@Base 3.5.0.29 + NXForceDisplayError@Base 3.5.0.29 + NXFreeCache@Base 3.5.0.29 + NXFreeSplit@Base 3.5.0.29 + NXFreeUnpack@Base 3.5.0.29 + NXGetCollectGrabPointerResource@Base 3.5.0.29 + NXGetCollectImageResource@Base 3.5.0.29 + NXGetCollectInputFocusResource@Base 3.5.0.29 + NXGetCollectPropertyResource@Base 3.5.0.29 + NXGetCollectedGrabPointer@Base 3.5.0.29 + NXGetCollectedImage@Base 3.5.0.29 + NXGetCollectedInputFocus@Base 3.5.0.29 + NXGetCollectedProperty@Base 3.5.0.29 + NXGetControlParameters@Base 3.5.0.29 + NXGetFontParameters@Base 3.5.0.29 + NXGetShmemParameters@Base 3.5.0.29 + NXGetUnpackParameters@Base 3.5.0.29 + NXHandleDisplayError@Base 3.5.0.29 + NXImageCache@Base 3.5.0.29 + NXImageCacheHits@Base 3.5.0.29 + NXImageCacheOps@Base 3.5.0.29 + NXImageCacheSize@Base 3.5.0.29 + NXInPlacePackImage@Base 3.5.0.29 + NXInitCache@Base 3.5.0.29 + NXInitDisplay@Base 3.5.0.29 + NXMaskImage@Base 3.5.0.29 + NXPackImage@Base 3.5.0.29 + NXPutPackedImage@Base 3.5.0.29 + NXResetDisplay@Base 3.5.0.29 + NXSetCacheParameters@Base 3.5.0.29 + NXSetDisplayBlockHandler@Base 3.5.0.29 + NXSetDisplayBuffer@Base 3.5.0.29 + NXSetDisplayErrorPredicate@Base 3.5.0.29 + NXSetDisplayFlushHandler@Base 3.5.0.29 + NXSetDisplayPolicy@Base 3.5.0.29 + NXSetDisplayStatisticsHandler@Base 3.5.0.29 + NXSetDisplayWriteHandler@Base 3.5.0.29 + NXSetExposeParameters@Base 3.5.0.29 + NXSetLostSequenceHandler@Base 3.5.0.29 + NXSetUnpackAlpha@Base 3.5.0.29 + NXSetUnpackAlphaCompat@Base 3.5.0.29 + NXSetUnpackColormap@Base 3.5.0.29 + NXSetUnpackColormapCompat@Base 3.5.0.29 + NXSetUnpackGeometry@Base 3.5.0.29 + NXStartSplit@Base 3.5.0.29 + NXUnsetLibraryPath@Base 3.5.0.29 + PackImage@Base 3.5.0.29 + PngCompareColorTable@Base 3.5.0.29 + PngCompressData@Base 3.5.0.29 + RgbCompressData@Base 3.5.0.29 + RleCompressData@Base 3.5.0.29 + ZCompressData@Base 3.5.0.29 + ZInitEncoder@Base 3.5.0.29 + ZResetEncoder@Base 3.5.0.29 + _NXInternalInitEncoders@Base 3.5.0.29 + _NXInternalInitResources@Base 3.5.0.29 + _NXInternalResetEncoders@Base 3.5.0.29 + _NXInternalResetResources@Base 3.5.0.29 + color_type@Base 3.5.0.29 + info_ptr@Base 3.5.0.29 + palette@Base 3.5.0.29 + png_ptr@Base 3.5.0.29 -- cgit v1.2.3 From 2d016f826adbb816de012ac0c57e7efd226dbb3f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:33:23 +0200 Subject: roll-tarball.sh: Move out of debian/ folder into project's base folder. --- debian/roll-tarballs.sh | 157 ------------------------------------------------ 1 file changed, 157 deletions(-) delete mode 100755 debian/roll-tarballs.sh (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh deleted file mode 100755 index e735e8913..000000000 --- a/debian/roll-tarballs.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011 by Mike Gabriel -# Copyright (C) 2012 by Reinhard Tartler -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# Thanks to Jonas Smedegaard for inspiration... - -# Formatting/cleanups by siretart in December 2012 - -set -e - -usage() { - echo "To be called at the project root of an nx-libs checkout" - echo "usage: $(basename "$0") {,HEAD} {server|client}" - exit 1 -} - -PROJECT="nx-libs" -NULL="" - -test -d ".git" || usage -RELEASE="$1" -test -n "${RELEASE}" || usage -CHECKOUT="$2" -test -n "$CHECKOUT" || usage - -if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then - MODE="full" - CHECKOUT="redist-server/${RELEASE}" - RELEASE_SUFFIX='-full' -elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then - MODE="lite" - CHECKOUT="redist-client/${RELEASE}" - RELEASE_SUFFIX='-lite' -else - usage -fi - -if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="refs/heads/$(git rev-parse --abbrev-ref HEAD)" -fi - -if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then - echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." - echo " Please specify one of the following releases:" - echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" - git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u - exit 1 -fi - -TARGETDIR=".." - -MANIFEST="$(mktemp)" -TEMP_DIR="$(mktemp -d)" - -trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 - -# create local copy of Git project at temp location -git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) -git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" - -echo "Created tarball for $CHECKOUT" - -cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" - -# Replace symlinks by copies of the linked target files -# Note: We don't have symlinked directories!!! -find . -type "l" | while read link; do - TARGET="$(readlink "${link}")" - pushd "$(dirname "${link}")" >/dev/null - if [ -f "${TARGET}" ]; then - rm -f "$(basename "${link}")" - cp "${TARGET}" "$(basename "${link}")" - fi - popd >/dev/null -done - -mkdir -p "doc/applied-patches" - -# prepare patches for lite and full tarball -if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -else - rm -f "bin/"{nxagent,nxauth} - rm -Rf "nxcompshad"* - rm -Rf "nxcompext"* - rm -Rf "nx-X11"* - rm -Rf "etc"* - rm -Rf "doc/nx-X11_vs_XOrg69_patches"* - rm -Rf "doc/X11-symbols"* - rm -f "README.keystrokes" - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -fi - -# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -if [ -s "doc/applied-patches/series" ]; then - QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q -else - echo "No patches applied at all. Very old release?" -fi - -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" -rm -Rf "nx-libs.spec" - -# very old release did not add any README -for f in $(ls README* 2>/dev/null); do - mv -v "$f" "doc/"; -done - -# remove files, that we do not want in the tarballs (build cruft) -rm -Rf nx*/configure nx*/autom4te.cache* - -cd "$OLDPWD" - -# create target location for tarball -mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" - -# roll the ball... -cd "$TEMP_DIR" -find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" -cd "$OLDPWD" - -tar c -C "$TEMP_DIR" \ - --owner 0 \ - --group 0 \ - --numeric-owner \ - --no-recursion \ - --files-from "$MANIFEST" \ - --gzip \ - > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" - -echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" -- cgit v1.2.3 From 12ca29bf5418f0a7c4d7de57c5cd34c9151adac3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 1 Jul 2016 00:00:29 +0200 Subject: debian/*.dirs: Don't create directories in the Debian package. All handled well by the upstream Makefile. --- debian/nxagent.dirs | 3 --- debian/nxproxy.dirs | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 debian/nxagent.dirs delete mode 100644 debian/nxproxy.dirs (limited to 'debian') diff --git a/debian/nxagent.dirs b/debian/nxagent.dirs deleted file mode 100644 index 544d2fa34..000000000 --- a/debian/nxagent.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib/nx/bin -usr/share/nx \ No newline at end of file diff --git a/debian/nxproxy.dirs b/debian/nxproxy.dirs deleted file mode 100644 index 7c8e1505c..000000000 --- a/debian/nxproxy.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/lib/nx/bin -- cgit v1.2.3 From b214c73b5a0c6b9d94671bc08e08049441bf9bc6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 10:27:37 +0200 Subject: nxauth: Drop nxauth tool completely, xauth can be successfully used with nxagent / nxproxy instead. --- debian/README.source | 2 +- debian/control | 44 ++++++++++---------------------------------- debian/nxauth.dirs | 2 -- debian/nxauth.install | 3 --- debian/rules | 1 - 5 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 debian/nxauth.dirs delete mode 100644 debian/nxauth.install (limited to 'debian') diff --git a/debian/README.source b/debian/README.source index a43fa1de5..71cc0c2b2 100644 --- a/debian/README.source +++ b/debian/README.source @@ -10,7 +10,7 @@ This package originally pulled in 7 source tarballs from NoMachine: nx-X11 nxagent - nxauth + nxauth (discontinued in nx-libs) nxcomp nxcompshad nxcompext diff --git a/debian/control b/debian/control index 1a58cf6a7..be1e1b2f2 100644 --- a/debian/control +++ b/debian/control @@ -430,6 +430,10 @@ Depends: Recommends: xfonts-base, xkb-data, +Breaks: + nxauth, +Replaces: + nxauth, Description: NX agent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -473,12 +477,16 @@ Description: NX agent (debug package) Package: nxproxy Architecture: any -Breaks: qvd-nxproxy -Replaces: qvd-nxproxy Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, +Breaks: + qvd-nxproxy, + nxauth, +Replaces: + qvd-nxproxy, + nxauth, Description: NX proxy NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -507,38 +515,6 @@ Description: NX proxy (debug package) helpful backtraces. You can safely remove it if you do not intend to debug NX packages on this system. -Package: nxauth -Architecture: any -Multi-Arch: foreign -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Description: NX xauth - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package provides the NX xauth binary. - -Package: nxauth-dbg -Section: debug -Architecture: any -Multi-Arch: foreign -Depends: - nxauth (= ${binary:Version}), - ${misc:Depends}, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: NX auth (debug package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package provides the NX auth binary. - . - This package contains detached debug symbols that help generating more - helpful backtraces. You can safely remove it if you do not intend to - debug NX packages on this system. - Package: libxcomp3 Architecture: any Multi-Arch: same diff --git a/debian/nxauth.dirs b/debian/nxauth.dirs deleted file mode 100644 index 7c8e1505c..000000000 --- a/debian/nxauth.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/lib/nx/bin diff --git a/debian/nxauth.install b/debian/nxauth.install deleted file mode 100644 index eefba46b9..000000000 --- a/debian/nxauth.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/nx/bin/nxauth -usr/bin/nxauth -usr/share/man/man1/nxauth.1* diff --git a/debian/rules b/debian/rules index e41f97c81..a3979b0fe 100755 --- a/debian/rules +++ b/debian/rules @@ -63,5 +63,4 @@ override_dh_strip: dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg dh_strip -pnxagent --dbg-package=nxagent-dbg dh_strip -pnxproxy --dbg-package=nxproxy-dbg - dh_strip -pnxauth --dbg-package=nxauth-dbg -- cgit v1.2.3 From 26bf48bab8f6ca72d20f5375a4cbc02dbefcb359 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 10:31:42 +0200 Subject: library-cleanup: Don't build libNX_Xau anymore. Use system's libXau shared library. --- debian/control | 63 +++++--------------------------------------- debian/libnx-x11-dev.install | 1 + debian/libnx-xau-dev.install | 2 -- debian/libnx-xau6.install | 1 - debian/libnx-xau6.symbols | 9 ------- debian/rules | 2 -- 6 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 debian/libnx-xau-dev.install delete mode 100644 debian/libnx-xau6.install delete mode 100644 debian/libnx-xau6.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index be1e1b2f2..c7e36f50c 100644 --- a/debian/control +++ b/debian/control @@ -75,6 +75,7 @@ Depends: nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xau6 (<< 2:3.6.0.0), libnx-xcomposite1 (<< 2:3.6.0.0), libnx-xdamage1 (<< 2:3.6.0.0), libnx-xdmcp6 (<< 2:3.6.0.0), @@ -85,6 +86,7 @@ Breaks: nxlibs (<= 3.5.1), libnx-xrender1 (<< 2:3.6.0.0), libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xau6, libnx-xcomposite1, libnx-xdamage1, libnx-xdmcp6, @@ -107,6 +109,7 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xau-dev (<< 2:3.6.0.0), libnx-xcomposite-dev (<< 2:3.6.0.0), libnx-xdamage-dev (<< 2:3.6.0.0), libnx-xdmcp-dev (<< 2:3.6.0.0), @@ -117,6 +120,7 @@ Breaks: nxlibs-dev (<=3.5.1), libnx-xrender-dev (<< 2:3.6.0.0), libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xau-dev, libnx-xcomposite-dev, libnx-xdamage-dev, libnx-xdmcp-dev, @@ -145,6 +149,7 @@ Depends: ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xau6-dbg (<< 2:3.6.0.0), libnx-xcomposite1-dbg (<< 2:3.6.0.0), libnx-xdamage1-dbg (<< 2:3.6.0.0), libnx-xdmcp6-dbg (<< 2:3.6.0.0), @@ -155,6 +160,7 @@ Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), libnx-xrender1-dbg (<< 2:3.6.0.0), libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xau6-dbg, libnx-xcomposite1-dbg, libnx-xdamage1-dbg, libnx-xdmcp6-dbg, @@ -172,63 +178,6 @@ Description: nx-X11 client-side library (debug package) This package contains debug symbols for the core nx-X11 libraries customized for nxagent. -Package: libnx-xau6 -Architecture: any -Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-1~), -Description: nx-X11 authorisation library - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package provides the main interface to the nx-X11 authorisation handling, - which controls authorisation for X connections, both client-side and - server-side. - -Package: libnx-xau-dev -Provides: libnx-xau6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - libnx-xau6 (= ${binary:Version}), - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), -Description: nx-X11 authorisation library (development headers) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package provides the main interface to the nx-X11 authorisation handling, - which controls authorisation for X connections, both client-side and - server-side. - . - This package contains the development headers for this library. - -Package: libnx-xau6-dbg -Architecture: any -Multi-Arch: same -Depends: - libnx-xau6 (= ${binary:Version}), - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 authorisation library (debug package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package provides the main interface to the nx-X11 authorisation handling, - which controls authorisation for X connections, both client-side and - server-side. - . - This package contains debug symbols for this library. - Package: nx-x11proto-composite-dev Section: libdevel Architecture: any diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 83e2def0e..5f9590cbc 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,5 +1,6 @@ usr/lib/*/libNX_X11.so usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/Xauth.h usr/include/*/nx-X11/XKBlib.h usr/include/*/nx-X11/Xcms.h usr/include/*/nx-X11/Xlib.h diff --git a/debian/libnx-xau-dev.install b/debian/libnx-xau-dev.install deleted file mode 100644 index 1bf954c00..000000000 --- a/debian/libnx-xau-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xau.so -usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau6.install b/debian/libnx-xau6.install deleted file mode 100644 index 246377f12..000000000 --- a/debian/libnx-xau6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xau6.symbols b/debian/libnx-xau6.symbols deleted file mode 100644 index 03eeee753..000000000 --- a/debian/libnx-xau6.symbols +++ /dev/null @@ -1,9 +0,0 @@ -libNX_Xau.so.6 libnx-xau6 #MINVER# - XauDisposeAuth@Base 3.5.0.29 - XauFileName@Base 3.5.0.29 - XauGetAuthByAddr@Base 3.5.0.29 - XauGetBestAuthByAddr@Base 3.5.0.29 - XauLockAuth@Base 3.5.0.29 - XauReadAuth@Base 3.5.0.29 - XauUnlockAuth@Base 3.5.0.29 - XauWriteAuth@Base 3.5.0.29 diff --git a/debian/rules b/debian/rules index a3979b0fe..2395f43e5 100755 --- a/debian/rules +++ b/debian/rules @@ -56,11 +56,9 @@ override_dh_auto_build: override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg - dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg dh_strip -pnxagent --dbg-package=nxagent-dbg dh_strip -pnxproxy --dbg-package=nxproxy-dbg - -- cgit v1.2.3 From e77e37ff0f97a5845fa0c634e978361541d7991f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 00:05:30 +0200 Subject: remove XShape code from libNX_Xext use system libXext instead --- debian/copyright.in | 2 -- debian/libnx-xext-dev.install | 1 - debian/nx-x11proto-xext-dev.install | 1 - 3 files changed, 4 deletions(-) (limited to 'debian') diff --git a/debian/copyright.in b/debian/copyright.in index 4ffde0ba0..8d6f30208 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -47,8 +47,6 @@ Files: nx-X11/config/imake/ccimake.c nx-X11/include/extensions/multibufst.h nx-X11/include/extensions/security.h nx-X11/include/extensions/securstr.h - nx-X11/include/extensions/shape.h - nx-X11/include/extensions/shapestr.h nx-X11/include/extensions/shmstr.h nx-X11/include/extensions/xcmiscstr.h nx-X11/include/extensions/xteststr.h diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install index 819c82013..5b88215e0 100644 --- a/debian/libnx-xext-dev.install +++ b/debian/libnx-xext-dev.install @@ -2,4 +2,3 @@ usr/lib/*/libNX_Xext.so usr/include/*/nx-X11/extensions/XShm.h usr/include/*/nx-X11/extensions/Xext.h usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install index f34e66519..ae415e6ca 100644 --- a/debian/nx-x11proto-xext-dev.install +++ b/debian/nx-x11proto-xext-dev.install @@ -2,7 +2,6 @@ usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/securstr.h -usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h usr/include/*/nx-X11/extensions/Xdbeproto.h -- cgit v1.2.3 From 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 13:54:11 +0200 Subject: finally drop libNX_Xext --- debian/control | 98 +++++++-------------------- debian/libnx-xext-dev.install | 4 -- debian/libnx-xext6.install | 1 - debian/libnx-xext6.symbols | 128 ------------------------------------ debian/nx-x11proto-xext-dev.install | 1 - debian/rules | 1 - 6 files changed, 23 insertions(+), 210 deletions(-) delete mode 100644 debian/libnx-xext-dev.install delete mode 100644 debian/libnx-xext6.install delete mode 100644 debian/libnx-xext6.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index c7e36f50c..4d9fcbddf 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxext-dev, libxcomposite-dev, libxrandr-dev, libxfixes-dev, @@ -75,6 +76,7 @@ Depends: nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xext6 (<< 2:3.6.0.0), libnx-xau6 (<< 2:3.6.0.0), libnx-xcomposite1 (<< 2:3.6.0.0), libnx-xdamage1 (<< 2:3.6.0.0), @@ -86,6 +88,7 @@ Breaks: nxlibs (<= 3.5.1), libnx-xrender1 (<< 2:3.6.0.0), libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xext6, libnx-xau6, libnx-xcomposite1, libnx-xdamage1, @@ -109,6 +112,7 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xext-dev (<< 2:3.6.0.0), libnx-xau-dev (<< 2:3.6.0.0), libnx-xcomposite-dev (<< 2:3.6.0.0), libnx-xdamage-dev (<< 2:3.6.0.0), @@ -120,6 +124,7 @@ Breaks: nxlibs-dev (<=3.5.1), libnx-xrender-dev (<< 2:3.6.0.0), libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xext-dev, libnx-xau-dev, libnx-xcomposite-dev, libnx-xdamage-dev, @@ -149,6 +154,7 @@ Depends: ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xext6-dbg (<< 2:3.6.0.0), libnx-xau6-dbg (<< 2:3.6.0.0), libnx-xcomposite1-dbg (<< 2:3.6.0.0), libnx-xdamage1-dbg (<< 2:3.6.0.0), @@ -160,6 +166,7 @@ Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), libnx-xrender1-dbg (<< 2:3.6.0.0), libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xext6-dbg, libnx-xau6-dbg, libnx-xcomposite1-dbg, libnx-xdamage1-dbg, @@ -178,7 +185,7 @@ Description: nx-X11 client-side library (debug package) This package contains debug symbols for the core nx-X11 libraries customized for nxagent. -Package: nx-x11proto-composite-dev +Package: nx-x11proto-xext-dev Section: libdevel Architecture: any Multi-Arch: same @@ -186,108 +193,49 @@ Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), libnx-x11-dev (<< 2:3.5.0.29-1~), -Description: nx-X11 Composite extension wire protocol + libnx-xext-dev (<< 2:3.5.99.0~), +Description: nx-X11 miscellaneous extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . This package provides development headers describing the wire protocol - for the Composite extension in nx-X11, used to let arbitrary client - programs control drawing of the final image. - -Package: nx-x11proto-damage-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Damage extension wire protocol (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted wire protocol headers for the - libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide - installed libXdamage gets used. - . - This package can be safely removed. - -Package: libnx-xext6 -Architecture: any -Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension library - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. - . - libnx_Xext also provides a small set of utility functions to aid authors - of client APIs for X protocol extensions. - -Package: libnx-xext-dev -Provides: libnx-xext6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - libnx-xext6 (= ${binary:Version}), - nx-x11proto-xext-dev (= ${binary:Version}), - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension library (development headers) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. - . - This package contains the development headers for this library. + for various extensions, the client-side libraries of which are provided + in the Xext library. -Package: nx-x11proto-xext-dev +Package: nx-x11proto-composite-dev Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xext6 (= ${binary:Version}), ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), libnx-x11-dev (<< 2:3.5.0.29-1~), - libnx-xext-dev (<< 2:3.5.99.0~), -Description: nx-X11 miscellaneous extension wire protocol +Description: nx-X11 Composite extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . This package provides development headers describing the wire protocol - for various extensions, the client-side libraries of which are provided - in the Xext library. + for the Composite extension in nx-X11, used to let arbitrary client + programs control drawing of the final image. -Package: libnx-xext6-dbg +Package: nx-x11proto-damage-dev +Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xext6 (= ${binary:Version}), ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 miscellaneous extension library (debug package) +Description: nx-X11 Damage extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xext provides an X Window System client interface to several - extensions to the X protocol. + This package removes the obsoleted wire protocol headers for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: nx-x11proto-xfixes-dev Section: libdevel diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install deleted file mode 100644 index 5b88215e0..000000000 --- a/debian/libnx-xext-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/extutil.h diff --git a/debian/libnx-xext6.install b/debian/libnx-xext6.install deleted file mode 100644 index 361d951f5..000000000 --- a/debian/libnx-xext6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xext.so.* diff --git a/debian/libnx-xext6.symbols b/debian/libnx-xext6.symbols deleted file mode 100644 index a548baf57..000000000 --- a/debian/libnx-xext6.symbols +++ /dev/null @@ -1,128 +0,0 @@ -libNX_Xext.so.6 libnx-xext6 #MINVER# -#MISSING: 2:3.5.99.0-0# DPMSCapable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSDisable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSEnable@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSForceLevel@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSGetTimeouts@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSGetVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# DPMSSetTimeouts@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29 - XMissingExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityAllocXauth@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityFreeXauth@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityGenerateAuthorization@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSecurityRevokeAuthorization@Base 3.5.0.29 - XSetExtensionErrorHandler@Base 3.5.0.29 - XShapeCombineMask@Base 3.5.0.29 - XShapeCombineRectangles@Base 3.5.0.29 - XShapeCombineRegion@Base 3.5.0.29 - XShapeCombineShape@Base 3.5.0.29 - XShapeGetRectangles@Base 3.5.0.29 - XShapeInputSelected@Base 3.5.0.29 - XShapeOffsetShape@Base 3.5.0.29 - XShapeQueryExtension@Base 3.5.0.29 - XShapeQueryExtents@Base 3.5.0.29 - XShapeQueryVersion@Base 3.5.0.29 - XShapeSelectInput@Base 3.5.0.29 - XShmAttach@Base 3.5.0.29 - XShmCreateImage@Base 3.5.0.29 - XShmCreatePixmap@Base 3.5.0.29 - XShmDetach@Base 3.5.0.29 - XShmGetEventBase@Base 3.5.0.29 - XShmGetImage@Base 3.5.0.29 - XShmPixmapFormat@Base 3.5.0.29 - XShmPutImage@Base 3.5.0.29 - XShmQueryExtension@Base 3.5.0.29 - XShmQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncAwait@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncChangeAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncChangeCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncCreateAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncCreateCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncDestroyAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncDestroyCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncFreeSystemCounterList@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncGetPriority@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncInitialize@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncIntToValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncIntsToValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncListSystemCounters@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncMaxValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncMinValue@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryAlarm@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncSetCounter@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncSetPriority@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueAdd@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueGreaterOrEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueGreaterThan@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueHigh32@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsNegative@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsPositive@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueIsZero@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLessOrEqual@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLessThan@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueLow32@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XSyncValueSubtract@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFakeAckType@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFakeInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestFlush@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestGetInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestInputActionType@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestMovePointer@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestPressButton@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestPressKey@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestQueryInputSize@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestReset@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XTestStopInput@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29 - XextAddDisplay@Base 3.5.0.29 - XextCreateExtension@Base 3.5.0.29 - XextDestroyExtension@Base 3.5.0.29 - XextFindDisplay@Base 3.5.0.29 - XextRemoveDisplay@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29 - _XExtensionErrorFunction@Base 3.5.0.29 diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install index ae415e6ca..dff1fb037 100644 --- a/debian/nx-x11proto-xext-dev.install +++ b/debian/nx-x11proto-xext-dev.install @@ -2,6 +2,5 @@ usr/include/*/nx-X11/extensions/dpmsstr.h usr/include/*/nx-X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/securstr.h -usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/rules b/debian/rules index 2395f43e5..766042fee 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,6 @@ override_dh_auto_build: override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg - dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg -- cgit v1.2.3 From 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 30 Jun 2016 23:50:12 +0200 Subject: Rework nxagent and nxproxy wrapper scripts. o Install nxagent/nxproxy executables into multi-arch path. o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*. o Allow injecting different $NXAPP containing the executable name. o For e.g. x2goagent this requires the following changes: - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to $LIBDIR/nx/bin/x2goagent - Replace /usr/bin/x2goagent by a two-liner... ``` #!/bin/sh export NXAPP=x2goagent nxagent ``` --- debian/nxagent.install | 3 ++- debian/nxproxy.install | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/nxagent.install b/debian/nxagent.install index 123971a7c..75e72fcde 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -3,7 +3,8 @@ etc/nxagent/rgb usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* -usr/lib/nx/bin/nxagent +usr/lib/*/nx/bin/nxagent +usr/lib/*/nx-X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard diff --git a/debian/nxproxy.install b/debian/nxproxy.install index ab7c97d58..8ade77d6d 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,4 +1,4 @@ -usr/lib/nx/bin/nxproxy +usr/lib/*/nx/bin/nxproxy usr/bin/nxproxy usr/share/man/man1/nxproxy.1* usr/share/nx/VERSION.nxproxy -- cgit v1.2.3 From e85808245810d0cc6918104deef25213d5f9e06c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Jun 2016 12:53:03 +0200 Subject: debian/patches: Refresh patches after changes in upstream code. --- debian/patches/016_nx-X11_install-location.debian.patch | 2 +- debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index 89c78f985..ddd92eeb3 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -6,7 +6,7 @@ Author: Mike Gabriel Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -776,7 +776,7 @@ +@@ -749,7 +749,7 @@ #define AlternateUsrLibDir YES #endif #else diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch index cc95c8153..c51bba413 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch @@ -8,7 +8,7 @@ Author: Mike Gabriel Last-Update: 2012-01-12 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ #ifdef NXAGENT_SERVER -- cgit v1.2.3 From 1bd2463a2b76340ae356364dff944deba9774cfe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 28 Jun 2016 20:30:42 +0200 Subject: libNX_X11 data files: Install libNX_X11 related data files. - Update XErrorDB to latest X.org version. - Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/. - Assure that libNX_X11 finds those files at the named location. - Update debian/ packaging files. - Update nx-libs.spec packaging file. Fixes ArcticaProject/nx-libs#153 --- debian/nx-x11-common.install | 3 +++ .../patches/016_nx-X11_install-location.debian.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'debian') diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install index b6fc46613..d3f7b4c3b 100644 --- a/debian/nx-x11-common.install +++ b/debian/nx-x11-common.install @@ -1 +1,4 @@ usr/share/nx/SecurityPolicy +usr/share/nx/XErrorDB +usr/share/nx/XKeysymDB +usr/share/nx/Xcms.txt diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index ddd92eeb3..ee5bb66cf 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -15,3 +15,23 @@ Last-Update: 2012-12-31 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif +@@ -767,7 +767,7 @@ + #define AlternateUsrDataDir YES + #endif + #else +-#define UsrDataDir Concat4(/usr/local,/,share,/nx) ++#define UsrDataDir Concat4(/usr,/,share,/nx) + #ifndef AlternateUsrDataDir + #define AlternateUsrDataDir NO + #endif +--- a/nx-X11/config/cf/site.def ++++ b/nx-X11/config/cf/site.def +@@ -72,7 +72,7 @@ + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/local ++#define ProjectRoot /usr + #endif + + /* -- cgit v1.2.3 From a1a7b1aab10093f869bac49f6bf20531fcb0ed0a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 09:46:45 +0200 Subject: debian/control: Add some hard and exact-versioned dependencies for our bin:packages. Assure that no old share lib packages with the same set of symbols remain on the system when upgrading. --- debian/control | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 4d9fcbddf..633ab784b 100644 --- a/debian/control +++ b/debian/control @@ -74,6 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), + libxcomp3 (= ${binary:Version}), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), libnx-xext6 (<< 2:3.6.0.0), @@ -324,6 +325,10 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, + libxcomp3 (= ${binary:Version}), + libxcompext3 (= ${binary:Version}), + libxcompshad3 (= ${binary:Version}), + libnx-x11-6 (= ${binary:Version}), Recommends: xfonts-base, xkb-data, @@ -378,6 +383,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, + libxcomp3 (= ${binary:Version}), Breaks: qvd-nxproxy, nxauth, @@ -470,6 +476,7 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, + libnx-x11-6 (= ${binary:Version}), Breaks: nxcompext (<=3.5.1) Replaces: nxcompext Description: nx-X11 protocol compression extensions library @@ -521,6 +528,7 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, + libnx-x11-6 (= ${binary:Version}), Breaks: nxcompshad (<=3.5.1) Replaces: nxcompshad Description: nx-X11 shadowing library -- cgit v1.2.3 From 3ec3f6162f0304a48dc3125d37554d03f906def0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 21:48:27 +0200 Subject: debian/nxproxy.docs: Fix FTBFS due to missing documentation files (moved out of the way with recent commits). --- debian/nxproxy.docs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs index 2243d21ac..22afdfc34 100644 --- a/debian/nxproxy.docs +++ b/debian/nxproxy.docs @@ -1,3 +1 @@ -nxproxy/README -nxproxy/README-IPAQ -nxproxy/README-VALGRIND +doc/nxproxy/README-VALGRIND -- cgit v1.2.3 From cd9a6b9dd69364a9ba001d95c82bdbbb5d1514fd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 21:57:45 +0200 Subject: debian/libxcomp3.docs: Install libxcomp3 documentation files into bin:package. --- debian/libxcomp3.docs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/libxcomp3.docs (limited to 'debian') diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs new file mode 100644 index 000000000..8861756ba --- /dev/null +++ b/debian/libxcomp3.docs @@ -0,0 +1,2 @@ +doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf +doc/nxcomp/README.on-retroactive-DXPC-license -- cgit v1.2.3 From 754d33d81590ffe5831b28312ee16d9db7ef7db8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 22:17:51 +0200 Subject: README.keystrokes: Move from base folder to doc/nxagent/. --- debian/nxagent.docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/nxagent.docs b/debian/nxagent.docs index 5d7d87aed..adb5f1bb3 100644 --- a/debian/nxagent.docs +++ b/debian/nxagent.docs @@ -1 +1 @@ -README.keystrokes \ No newline at end of file +doc/nxagent/README.keystrokes \ No newline at end of file -- cgit v1.2.3 From f397f3a42c157fdb41281c86609262ba11fe16d0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 22:18:40 +0200 Subject: debian/nxagent.docs: whitespace only --- debian/nxagent.docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/nxagent.docs b/debian/nxagent.docs index adb5f1bb3..df722e2b4 100644 --- a/debian/nxagent.docs +++ b/debian/nxagent.docs @@ -1 +1 @@ -doc/nxagent/README.keystrokes \ No newline at end of file +doc/nxagent/README.keystrokes -- cgit v1.2.3 From 67f937c4a614aa789754af51515388d30278da81 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 23:47:49 +0200 Subject: debian/rules: Enable -fPIE / -pie hardening support for nxagent and nxproxy. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 766042fee..219cd0b6c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ NULL = -export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -52,7 +52,7 @@ override_dh_auto_install: override_dh_auto_build: - PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" + PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' SHLIBDIR="$(LIBDIR)" override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From 8ec78a0c3fe857b72e3e7b3981e93ea0d21e96a7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 6 Jul 2016 00:25:06 +0200 Subject: debian/*.doc-base: Add .doc-base files for bin:packages containing documentation. --- debian/libxcomp3.doc-base | 9 +++++++++ debian/nxagent.doc-base | 6 ++++++ debian/nxproxy.doc-base | 6 ++++++ 3 files changed, 21 insertions(+) create mode 100644 debian/libxcomp3.doc-base create mode 100644 debian/nxagent.doc-base create mode 100644 debian/nxproxy.doc-base (limited to 'debian') diff --git a/debian/libxcomp3.doc-base b/debian/libxcomp3.doc-base new file mode 100644 index 000000000..a7f8eb70f --- /dev/null +++ b/debian/libxcomp3.doc-base @@ -0,0 +1,9 @@ +Document: libxcomp3 +Title: NX compression library +Section: Screen + +Format: Text +Files: /usr/share/doc/libxcomp3/README.on-retroactive-DXPC-license.gz + +Format: PDF +Files: /usr/share/doc/libxcomp3/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf.gz diff --git a/debian/nxagent.doc-base b/debian/nxagent.doc-base new file mode 100644 index 000000000..c54a7f5d8 --- /dev/null +++ b/debian/nxagent.doc-base @@ -0,0 +1,6 @@ +Document: nxagent +Title: nx-X11 Agent (Xserver) +Section: Screen + +Format: Text +Files: /usr/share/doc/nxagent/README.keystrokes.gz diff --git a/debian/nxproxy.doc-base b/debian/nxproxy.doc-base new file mode 100644 index 000000000..931a52ca7 --- /dev/null +++ b/debian/nxproxy.doc-base @@ -0,0 +1,6 @@ +Document: nxproxy +Title: NX compression tool +Section: Screen + +Format: Text +Files: /usr/share/doc/nxproxy/README-VALGRIND -- cgit v1.2.3 From 470611e02ccb0aba1800da36130dc8824a6862e1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 6 Jul 2016 10:38:25 +0200 Subject: release 3.5.99.0 --- debian/changelog | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e97d3cb01..ede7503ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,9 @@ -nx-libs (2:3.5.99.0-0.1) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.0-0.1) unstable; urgency=medium - * Version bump, continuing NX 3.x development.. - Targeting NX 3.6.x.y some time. + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. - [ Paul Szabo ] - * DISABLED:0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. - Enable support for the X11 big requests extension and the generic events - extension. - - -- Mike Gabriel Sat, 14 Feb 2015 14:27:25 +0100 + -- Mike Gabriel Wed, 06 Jul 2016 10:37:23 +0200 nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low -- cgit v1.2.3 From 43f135be01f520ddcebae94723d5cbbe74259526 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 13 Sep 2016 15:45:03 +0200 Subject: release 3.5.99.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ede7503ff..fa96b62ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.1-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Tue, 13 Sep 2016 15:44:10 +0200 + nx-libs (2:3.5.99.0-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 0006fc04b23a10e0c29602a6524a90ae7852a03e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Oct 2016 14:17:55 +0200 Subject: debian/libnx-x11-6.symbols: Update symbols for new backports in libNX_X11 API. --- debian/libnx-x11-6.symbols | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index cba229cac..4d7003aac 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -134,6 +134,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XEHeadOfExtensionList@Base 3.5.0.29 XESetBeforeFlush@Base 3.5.0.29 XESetCloseDisplay@Base 3.5.0.29 + XESetCopyEventCookie@Base 2:3.5.99.2 XESetCopyGC@Base 3.5.0.29 XESetCreateFont@Base 3.5.0.29 XESetCreateGC@Base 3.5.0.29 @@ -146,6 +147,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XESetPrintErrorValues@Base 3.5.0.29 XESetWireToError@Base 3.5.0.29 XESetWireToEvent@Base 3.5.0.29 + XESetWireToEventCookie@Base 2:3.5.99.2 XEmptyRegion@Base 3.5.0.29 XEnableAccessControl@Base 3.5.0.29 XEqualRegion@Base 3.5.0.29 @@ -172,6 +174,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XFreeColormap@Base 3.5.0.29 XFreeColors@Base 3.5.0.29 XFreeCursor@Base 3.5.0.29 + XFreeEventData@Base 2:3.5.99.2 XFreeExtensionList@Base 3.5.0.29 XFreeFont@Base 3.5.0.29 XFreeFontInfo@Base 3.5.0.29 @@ -191,6 +194,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XGetDefault@Base 3.5.0.29 XGetErrorDatabaseText@Base 3.5.0.29 XGetErrorText@Base 3.5.0.29 + XGetEventData@Base 2:3.5.99.2 XGetFontPath@Base 3.5.0.29 XGetFontProperty@Base 3.5.0.29 XGetGCValues@Base 3.5.0.29 @@ -815,6 +819,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XCloseLC@Base 3.5.0.29 _XColor_to_XcmsRGB@Base 3.5.0.29 _XConnectDisplay@Base 3.5.0.29 + _XCopyEventCookie@Base 2:3.5.99.2 _XCopyToArg@Base 3.5.0.29 _XCreateMutex_fn@Base 3.5.0.29 (arch=amd64 ia64 alpha ppc64 arm64)_XData32@Base 3.5.0.29 @@ -833,11 +838,13 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XEventsQueued@Base 3.5.0.29 _XF86BigfontFreeFontMetrics@Base 3.5.0.29 _XF86LoadQueryLocaleFont@Base 3.5.0.29 + _XFetchEventCookie@Base 2:3.5.99.2 _XFlush@Base 3.5.0.29 _XFlushGCCache@Base 3.5.0.29 _XFreeAtomTable@Base 3.5.0.29 _XFreeDisplayLock_fn@Base 3.5.0.29 _XFreeDisplayStructure@Base 3.5.0.29 + _XFreeEventCookies@Base 2:3.5.99.2 _XFreeExtData@Base 3.5.0.29 _XFreeMutex_fn@Base 3.5.0.29 _XFreeTemp@Base 3.5.0.29 @@ -850,6 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XGetScanlinePad@Base 3.5.0.29 _XGetWindowAttributes@Base 3.5.0.29 _XHeadOfDisplayList@Base 3.5.0.29 + _XIDHandler@Base 2:3.5.99.2 _XIMCompileResourceList@Base 3.5.0.29 _XIOError@Base 3.5.0.29 _XIOErrorFunction@Base 3.5.0.29 @@ -858,6 +866,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XInitImageFuncPtrs@Base 3.5.0.29 _XInitKeysymDB@Base 3.5.0.29 _XInitOM@Base 3.5.0.29 + _XIsEventCookie@Base 2:3.5.99.2 _XKeyInitialize@Base 3.5.0.29 _XKeycodeToKeysym@Base 3.5.0.29 _XKeysymToKeycode@Base 3.5.0.29 @@ -872,6 +881,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XPollfdCacheAdd@Base 3.5.0.29 _XPollfdCacheDel@Base 3.5.0.29 _XPollfdCacheInit@Base 3.5.0.29 + _XProcessInternalConnection@Base 2:3.5.99.2 _XProcessWindowAttributes@Base 3.5.0.29 _XPutBackEvent@Base 3.5.0.29 (arch=amd64 ia64 alpha ppc64 arm64)_XRead32@Base 3.5.0.29 @@ -888,16 +898,22 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XSelect@Base 3.5.0.29 _XSend@Base 3.5.0.29 _XSendClientPrefix@Base 3.5.0.29 + _XSeqSyncFunction@Base 2:3.5.99.2 _XSetClipRectangles@Base 3.5.0.29 _XSetImage@Base 3.5.0.29 _XSetLastRequestRead@Base 3.5.0.29 + _XSetPrivSyncFunction@Base 2:3.5.99.2 + _XSetSeqSyncFunction@Base 2:3.5.99.2 + _XStoreEventCookie@Base 2:3.5.99.2 _XTextHeight16@Base 3.5.0.29 _XTextHeight@Base 3.5.0.29 _XTranslateKey@Base 3.5.0.29 _XTranslateKeySym@Base 3.5.0.29 _XTryShapeBitmapCursor@Base 3.5.0.29 + _XUnknownCopyEventCookie@Base 2:3.5.99.2 _XUnknownNativeEvent@Base 3.5.0.29 _XUnknownWireEvent@Base 3.5.0.29 + _XUnknownWireEventCookie@Base 2:3.5.99.2 _XUnlockMutex_fn@Base 3.5.0.29 _XUnregisterFilter@Base 3.5.0.29 _XUnregisterInternalConnection@Base 3.5.0.29 @@ -1001,6 +1017,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XimGetICValueData@Base 3.5.0.29 _XimGetIMValueData@Base 3.5.0.29 _XimGetLocaleCode@Base 3.5.0.29 + _XimGetMyEndian@Base 2:3.5.99.2 _XimGetResourceListRec@Base 3.5.0.29 _XimGetResourceListRecByQuark@Base 3.5.0.29 _XimGetWindowEventmask@Base 3.5.0.29 @@ -1139,6 +1156,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XkeyTable@Base 3.5.0.29 _XlcAddCT@Base 3.5.0.29 _XlcAddCharSet@Base 3.5.0.29 + _XlcAddGB18030LocaleConverters@Base 2:3.5.99.2 _XlcAddLoader@Base 3.5.0.29 _XlcAddUtf8Converters@Base 3.5.0.29 _XlcAddUtf8LocaleConverters@Base 3.5.0.29 @@ -1171,6 +1189,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XlcInitCTInfo@Base 3.5.0.29 _XlcInitLoader@Base 3.5.0.29 _XlcLocaleDirName@Base 3.5.0.29 + _XlcLocaleLibDirName@Base 2:3.5.99.2 _XlcMapOSLocaleName@Base 3.5.0.29 _XlcNCompareISOLatin1@Base 3.5.0.29 _XlcOpenConverter@Base 3.5.0.29 @@ -1252,3 +1271,4 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _qfree@Base 3.5.0.29 in6addr_any@Base 3.5.0.29 read_EncodingInfo@Base 3.5.0.29 + xlocaledir@Base 2:3.5.99.2 -- cgit v1.2.3 From 440c675c2608ff06e4140b88750136a8588d4db7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Oct 2016 15:05:31 +0200 Subject: debian/rules: Don't modify/create post{inst,rm} scripts during dh_makeshlibs. This avoids adding ldconfig calls to such scripts. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 219cd0b6c..2dfc65144 100755 --- a/debian/rules +++ b/debian/rules @@ -61,3 +61,6 @@ override_dh_strip: dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg dh_strip -pnxagent --dbg-package=nxagent-dbg dh_strip -pnxproxy --dbg-package=nxproxy-dbg + +override_dh_makeshlibs: + dh_makeshlibs -n -- cgit v1.2.3 From 64aa45a61086f5a90012ecf8736a512c8723c98b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Oct 2016 15:05:37 +0200 Subject: debian/*.triggers: Call ldconfig via a trigger for all shared libraries. --- debian/libnx-x11-6.triggers | 1 + debian/libxcomp3.triggers | 1 + debian/libxcompext3.triggers | 1 + debian/libxcompshad3.triggers | 1 + 4 files changed, 4 insertions(+) create mode 100644 debian/libnx-x11-6.triggers create mode 100644 debian/libxcomp3.triggers create mode 100644 debian/libxcompext3.triggers create mode 100644 debian/libxcompshad3.triggers (limited to 'debian') diff --git a/debian/libnx-x11-6.triggers b/debian/libnx-x11-6.triggers new file mode 100644 index 000000000..dd8660367 --- /dev/null +++ b/debian/libnx-x11-6.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/debian/libxcomp3.triggers b/debian/libxcomp3.triggers new file mode 100644 index 000000000..dd8660367 --- /dev/null +++ b/debian/libxcomp3.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/debian/libxcompext3.triggers b/debian/libxcompext3.triggers new file mode 100644 index 000000000..dd8660367 --- /dev/null +++ b/debian/libxcompext3.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/debian/libxcompshad3.triggers b/debian/libxcompshad3.triggers new file mode 100644 index 000000000..dd8660367 --- /dev/null +++ b/debian/libxcompshad3.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig -- cgit v1.2.3 From 29e29342ee73fcd52d3b67bebb4fc7e84df898fd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Oct 2016 14:10:28 +0200 Subject: release 3.5.99.2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fa96b62ce..f42fc6e77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.2-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Thu, 13 Oct 2016 14:09:42 +0200 + nx-libs (2:3.5.99.1-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 6c303d9e4ffd162b8c7f59a4b135e592d923a656 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Oct 2016 16:49:08 +0200 Subject: debian/rules: Don't use -pie -fPIE at build time for 3.5.99.2 as it causes nxagent to segfault. Investigating the reasons behind it is in process... --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 2dfc65144..047839c2f 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ NULL = -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -- cgit v1.2.3 From 1078f97706b77ab93fb30204acf270cfb652c900 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 7 Oct 2016 21:00:20 +0200 Subject: rename xf86bigfstr.h to xf86bigfproto.h --- debian/copyright.in | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright.in b/debian/copyright.in index 8d6f30208..7e11780ea 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -3446,7 +3446,7 @@ License: Expat FIXME Files: nx-X11/include/extensions/xf86bigfont.h - nx-X11/include/extensions/xf86bigfstr.h + nx-X11/include/extensions/xf86bigfproto.h nx-X11/programs/Xserver/Xext/xf86bigfont.c Copyright: 1999-2000, Bruno Haible 1999-2000, The XFree86 Project, Inc diff --git a/debian/rules b/debian/rules index 047839c2f..5f8ba75ac 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/dpms.h -- cgit v1.2.3 From a559592dc2702d12c6a50b7308fcb0423106260b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 20 Oct 2016 09:52:45 +0200 Subject: XKeysymDB: ... got removed. --- debian/nx-x11-common.install | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install index d3f7b4c3b..00880c3d7 100644 --- a/debian/nx-x11-common.install +++ b/debian/nx-x11-common.install @@ -1,4 +1,3 @@ usr/share/nx/SecurityPolicy usr/share/nx/XErrorDB -usr/share/nx/XKeysymDB usr/share/nx/Xcms.txt -- cgit v1.2.3 From 44c76cacfa44a4bed487f84672899aa569ab5d52 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 20 Oct 2016 09:58:37 +0200 Subject: debian/libnx-x11-6.symbols: Update symbols list. --- debian/libnx-x11-6.symbols | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 4d7003aac..2f27ecd94 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -857,7 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XGetScanlinePad@Base 3.5.0.29 _XGetWindowAttributes@Base 3.5.0.29 _XHeadOfDisplayList@Base 3.5.0.29 - _XIDHandler@Base 2:3.5.99.2 +#MISSING: 2:3.5.99.2-0.1# _XIDHandler@Base 2:3.5.99.2 _XIMCompileResourceList@Base 3.5.0.29 _XIOError@Base 3.5.0.29 _XIOErrorFunction@Base 3.5.0.29 @@ -898,12 +898,12 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XSelect@Base 3.5.0.29 _XSend@Base 3.5.0.29 _XSendClientPrefix@Base 3.5.0.29 - _XSeqSyncFunction@Base 2:3.5.99.2 +#MISSING: 2:3.5.99.2-0.1# _XSeqSyncFunction@Base 2:3.5.99.2 _XSetClipRectangles@Base 3.5.0.29 _XSetImage@Base 3.5.0.29 _XSetLastRequestRead@Base 3.5.0.29 - _XSetPrivSyncFunction@Base 2:3.5.99.2 - _XSetSeqSyncFunction@Base 2:3.5.99.2 +#MISSING: 2:3.5.99.2-0.1# _XSetPrivSyncFunction@Base 2:3.5.99.2 +#MISSING: 2:3.5.99.2-0.1# _XSetSeqSyncFunction@Base 2:3.5.99.2 _XStoreEventCookie@Base 2:3.5.99.2 _XTextHeight16@Base 3.5.0.29 _XTextHeight@Base 3.5.0.29 -- cgit v1.2.3 From 5d4a7e071ac1c0f4badda89d7356a51a7f74ac2d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 20 Oct 2016 22:56:41 +0200 Subject: debian/rules: Re-enable (+pie) hardening flags again when building .deb packages. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 5f8ba75ac..08db3e79d 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ NULL = -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -- cgit v1.2.3 From 4cdcd91456a524899cd655f4e4a71a0b256d5746 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 28 Oct 2016 14:51:52 +0200 Subject: debian/patches: Rebase 102_xserver-xext_set-securitypolicy-path.debian.patch. --- debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch index c51bba413..b3186a9b4 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch @@ -8,7 +8,7 @@ Author: Mike Gabriel Last-Update: 2012-01-12 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -79,7 +79,7 @@ +@@ -84,7 +84,7 @@ #ifdef NXAGENT_SERVER -- cgit v1.2.3 From 1ddbe39ade8abfaf028c2f7a87121954fdfaff0f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 30 Oct 2016 13:11:38 +0100 Subject: nxcompext: Drop (nowadays) no-op file NXlibint.h. Fixes ArcticaProject/nx-libs#255. --- debian/libxcompext-dev.install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install index a31961b99..52f22918d 100644 --- a/debian/libxcompext-dev.install +++ b/debian/libxcompext-dev.install @@ -1,4 +1,3 @@ usr/lib/*/libXcompext.so usr/include/*/nx/NXlib.h -usr/include/*/nx/NXlibint.h -usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file +usr/lib/*/pkgconfig/nxcompext.pc -- cgit v1.2.3 From 903d5ce8a9b3e4b08a1a3be6a19a478dbe1297d8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 30 Oct 2016 17:58:59 +0100 Subject: drop ap_keysym.h was unused --- debian/nx-x11proto-core-dev.install | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install index 2e99909a8..16228d84e 100644 --- a/debian/nx-x11proto-core-dev.install +++ b/debian/nx-x11proto-core-dev.install @@ -18,6 +18,5 @@ usr/include/*/nx-X11/Xpoll.h usr/include/*/nx-X11/Xproto.h usr/include/*/nx-X11/Xprotostr.h usr/include/*/nx-X11/Xthreads.h -usr/include/*/nx-X11/ap_keysym.h usr/include/*/nx-X11/keysym.h usr/include/*/nx-X11/keysymdef.h -- cgit v1.2.3 From 89f9212ef4a3d198ee45cf4c1cd3fe8968976fb4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 30 Oct 2016 18:43:38 +0100 Subject: remove unused XInput.h --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 08db3e79d..4b49ad27d 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,6 @@ override_dh_install: # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h -- cgit v1.2.3 From 8dc0d18c15f003703f09124e0fe6fd497f388683 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 2 Nov 2016 19:59:23 +0100 Subject: debian/libnx-x11-6.symbols: Update after upgrade of xtrans library files. --- debian/libnx-x11-6.symbols | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 2f27ecd94..0724aac2f 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -551,7 +551,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XcmsTekHVCWhiteShiftColors@Base 3.5.0.29 XcmsUNDEFINEDColorSpace@Base 3.5.0.29 XcmsVisualOfCCC@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0~build1# XdmcpWrap@Base 3.5.0.29 +#MISSING: 3.5.99.0# XdmcpWrap@Base 3.5.0.29 XkbAddDeviceLedInfo@Base 3.5.0.29 XkbAddGeomColor@Base 3.5.0.29 XkbAddGeomDoodad@Base 3.5.0.29 @@ -798,7 +798,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _X11TransGetMyAddr@Base 3.5.0.29 _X11TransGetPeerAddr@Base 3.5.0.29 _X11TransIsLocal@Base 3.5.0.29 - _X11TransOpenCLTSClient@Base 3.5.0.29 +#MISSING: 3.5.99.2# _X11TransOpenCLTSClient@Base 3.5.0.29 _X11TransOpenCOTSClient@Base 3.5.0.29 _X11TransRead@Base 3.5.0.29 _X11TransReadv@Base 3.5.0.29 @@ -857,7 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XGetScanlinePad@Base 3.5.0.29 _XGetWindowAttributes@Base 3.5.0.29 _XHeadOfDisplayList@Base 3.5.0.29 -#MISSING: 2:3.5.99.2-0.1# _XIDHandler@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XIDHandler@Base 2:3.5.99.2 _XIMCompileResourceList@Base 3.5.0.29 _XIOError@Base 3.5.0.29 _XIOErrorFunction@Base 3.5.0.29 @@ -898,12 +898,12 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XSelect@Base 3.5.0.29 _XSend@Base 3.5.0.29 _XSendClientPrefix@Base 3.5.0.29 -#MISSING: 2:3.5.99.2-0.1# _XSeqSyncFunction@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 2:3.5.99.2 _XSetClipRectangles@Base 3.5.0.29 _XSetImage@Base 3.5.0.29 _XSetLastRequestRead@Base 3.5.0.29 -#MISSING: 2:3.5.99.2-0.1# _XSetPrivSyncFunction@Base 2:3.5.99.2 -#MISSING: 2:3.5.99.2-0.1# _XSetSeqSyncFunction@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 2:3.5.99.2 _XStoreEventCookie@Base 2:3.5.99.2 _XTextHeight16@Base 3.5.0.29 _XTextHeight@Base 3.5.0.29 @@ -974,9 +974,9 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XcmsTekHVC_prefix@Base 3.5.0.29 _XcmsUnresolveColor@Base 3.5.0.29 _Xdebug@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthDoIt@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthSetup@Base 3.5.0.29 -#MISSING: 2:3.5.99.0-0~build1# _XdmcpWrapperToOddParity@Base 3.5.0.29 +#MISSING: 3.5.99.0# _XdmcpAuthDoIt@Base 3.5.0.29 +#MISSING: 3.5.99.0# _XdmcpAuthSetup@Base 3.5.0.29 +#MISSING: 3.5.99.0# _XdmcpWrapperToOddParity@Base 3.5.0.29 _Xevent_to_mask@Base 3.5.0.29 _Xglobal_lock@Base 3.5.0.29 _Xi18n_lock@Base 3.5.0.29 @@ -1111,10 +1111,10 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XimXTransFreeConnInfo@Base 3.5.0.29 _XimXTransGetConnectionNumber@Base 3.5.0.29 _XimXTransGetHostname@Base 3.5.0.29 - _XimXTransGetMyAddr@Base 3.5.0.29 +#MISSING: 3.5.99.2# _XimXTransGetMyAddr@Base 3.5.0.29 _XimXTransGetPeerAddr@Base 3.5.0.29 _XimXTransIsLocal@Base 3.5.0.29 - _XimXTransOpenCLTSClient@Base 3.5.0.29 +#MISSING: 3.5.99.2# _XimXTransOpenCLTSClient@Base 3.5.0.29 _XimXTransOpenCOTSClient@Base 3.5.0.29 _XimXTransRead@Base 3.5.0.29 _XimXTransReadv@Base 3.5.0.29 @@ -1269,6 +1269,6 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _Xwcstombs@Base 3.5.0.29 _Xwctomb@Base 3.5.0.29 _qfree@Base 3.5.0.29 - in6addr_any@Base 3.5.0.29 +#MISSING: 3.5.99.2# in6addr_any@Base 3.5.0.29 read_EncodingInfo@Base 3.5.0.29 xlocaledir@Base 2:3.5.99.2 -- cgit v1.2.3 From 80b5de3f55fd493ee85f2a78b731ff05e6363e43 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Nov 2016 00:19:26 +0100 Subject: nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver includes at build time. Fixes ArcticaProject/nx-libs#276. --- debian/control | 55 +--------------------- debian/libxcompext-dev.install | 3 -- debian/libxcompext-dev.links | 1 - debian/libxcompext3.install | 1 - debian/libxcompext3.symbols | 103 ----------------------------------------- debian/libxcompext3.triggers | 1 - debian/rules | 1 - 7 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644 debian/libxcompext-dev.install delete mode 100644 debian/libxcompext-dev.links delete mode 100644 debian/libxcompext3.install delete mode 100644 debian/libxcompext3.symbols delete mode 100644 debian/libxcompext3.triggers (limited to 'debian') diff --git a/debian/control b/debian/control index 633ab784b..6898cdb81 100644 --- a/debian/control +++ b/debian/control @@ -326,7 +326,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomp3 (= ${binary:Version}), - libxcompext3 (= ${binary:Version}), libxcompshad3 (= ${binary:Version}), libnx-x11-6 (= ${binary:Version}), Recommends: @@ -334,8 +333,10 @@ Recommends: xkb-data, Breaks: nxauth, + libxcompext3 (<< 2:3.5.99.3~), Replaces: nxauth, + libxcompext3, Description: NX agent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -470,58 +471,6 @@ Description: nx-X11 compression library (debug package) . This package contains debug symbols for this library. -Package: libxcompext3 -Architecture: any -Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libnx-x11-6 (= ${binary:Version}), -Breaks: nxcompext (<=3.5.1) -Replaces: nxcompext -Description: nx-X11 protocol compression extensions library - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package extends the core NX library with additional features. - -Package: libxcompext-dev -Provides: libxcompext3-dev -Architecture: any -Section: libdevel -Depends: - libxcompext3 (= ${binary:Version}), - ${misc:Depends}, - libxcomp-dev, -Breaks: nxcompext-dev (<=3.5.1), -Replaces: nxcompext-dev, -Description: nx-X11 protocol compression extensions library (development headers) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package extends the core NX library with additional features. - . - This package contains the development headers for this library. - -Package: libxcompext3-dbg -Architecture: any -Multi-Arch: same -Depends: - libxcompext3 (= ${binary:Version}), - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 protocol compression extensions library (debug package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package extends the core NX library with additional features. - . - This package contains debug symbols for this library. - Package: libxcompshad3 Architecture: any Multi-Arch: same diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install deleted file mode 100644 index 52f22918d..000000000 --- a/debian/libxcompext-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libXcompext.so -usr/include/*/nx/NXlib.h -usr/lib/*/pkgconfig/nxcompext.pc diff --git a/debian/libxcompext-dev.links b/debian/libxcompext-dev.links deleted file mode 100644 index 2346289d9..000000000 --- a/debian/libxcompext-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/libxcompext3 usr/share/doc/libxcompext3-dev diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install deleted file mode 100644 index b9ac8ebb9..000000000 --- a/debian/libxcompext3.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompext3.symbols b/debian/libxcompext3.symbols deleted file mode 100644 index 0ca6ec6b8..000000000 --- a/debian/libxcompext3.symbols +++ /dev/null @@ -1,103 +0,0 @@ -libXcompext.so.3 libxcompext3 #MINVER# - AlphaCompressData@Base 3.5.0.29 - BitmapCompressData@Base 3.5.0.29 - CleanXYImage@Base 3.5.0.29 - CleanZImage@Base 3.5.0.29 - ColormapCompressData@Base 3.5.0.29 - CopyAndCleanImage@Base 3.5.0.29 - FindLSB@Base 3.5.0.29 - JpegCompressData@Base 3.5.0.29 - MaskImage@Base 3.5.0.29 - MaskInPlaceImage@Base 3.5.0.29 - NXAbortSplit@Base 3.5.0.29 - NXAllocColors@Base 3.5.0.29 - NXAllocSplit@Base 3.5.0.29 - NXAllocUnpack@Base 3.5.0.29 - NXCacheAddImage@Base 3.5.0.29 - NXCacheFindImage@Base 3.5.0.29 - NXCleanImage@Base 3.5.0.29 - NXCollectGrabPointer@Base 3.5.0.29 - NXCollectImage@Base 3.5.0.29 - NXCollectInputFocus@Base 3.5.0.29 - NXCollectProperty@Base 3.5.0.29 - NXCommitSplit@Base 3.5.0.29 - NXCreatePackedImage@Base 3.5.0.29 - NXCreatePalette16@Base 3.5.0.29 - NXCreatePalette32@Base 3.5.0.29 - NXDestroyPackedImage@Base 3.5.0.29 - NXDisplayCongestion@Base 3.5.0.29 - NXDisplayError@Base 3.5.0.29 - NXDisplayFlushable@Base 3.5.0.29 - NXDisplayReadable@Base 3.5.0.29 - NXEncodeAlpha@Base 3.5.0.29 - NXEncodeBitmap@Base 3.5.0.29 - NXEncodeColormap@Base 3.5.0.29 - NXEncodeColors@Base 3.5.0.29 - NXEncodeJpeg@Base 3.5.0.29 - NXEncodePng@Base 3.5.0.29 - NXEncodeRgb@Base 3.5.0.29 - NXEncodeRle@Base 3.5.0.29 - NXEndSplit@Base 3.5.0.29 - NXFinishSplit@Base 3.5.0.29 - NXFlushDisplay@Base 3.5.0.29 - NXForceDisplayError@Base 3.5.0.29 - NXFreeCache@Base 3.5.0.29 - NXFreeSplit@Base 3.5.0.29 - NXFreeUnpack@Base 3.5.0.29 - NXGetCollectGrabPointerResource@Base 3.5.0.29 - NXGetCollectImageResource@Base 3.5.0.29 - NXGetCollectInputFocusResource@Base 3.5.0.29 - NXGetCollectPropertyResource@Base 3.5.0.29 - NXGetCollectedGrabPointer@Base 3.5.0.29 - NXGetCollectedImage@Base 3.5.0.29 - NXGetCollectedInputFocus@Base 3.5.0.29 - NXGetCollectedProperty@Base 3.5.0.29 - NXGetControlParameters@Base 3.5.0.29 - NXGetFontParameters@Base 3.5.0.29 - NXGetShmemParameters@Base 3.5.0.29 - NXGetUnpackParameters@Base 3.5.0.29 - NXHandleDisplayError@Base 3.5.0.29 - NXImageCache@Base 3.5.0.29 - NXImageCacheHits@Base 3.5.0.29 - NXImageCacheOps@Base 3.5.0.29 - NXImageCacheSize@Base 3.5.0.29 - NXInPlacePackImage@Base 3.5.0.29 - NXInitCache@Base 3.5.0.29 - NXInitDisplay@Base 3.5.0.29 - NXMaskImage@Base 3.5.0.29 - NXPackImage@Base 3.5.0.29 - NXPutPackedImage@Base 3.5.0.29 - NXResetDisplay@Base 3.5.0.29 - NXSetCacheParameters@Base 3.5.0.29 - NXSetDisplayBlockHandler@Base 3.5.0.29 - NXSetDisplayBuffer@Base 3.5.0.29 - NXSetDisplayErrorPredicate@Base 3.5.0.29 - NXSetDisplayFlushHandler@Base 3.5.0.29 - NXSetDisplayPolicy@Base 3.5.0.29 - NXSetDisplayStatisticsHandler@Base 3.5.0.29 - NXSetDisplayWriteHandler@Base 3.5.0.29 - NXSetExposeParameters@Base 3.5.0.29 - NXSetLostSequenceHandler@Base 3.5.0.29 - NXSetUnpackAlpha@Base 3.5.0.29 - NXSetUnpackAlphaCompat@Base 3.5.0.29 - NXSetUnpackColormap@Base 3.5.0.29 - NXSetUnpackColormapCompat@Base 3.5.0.29 - NXSetUnpackGeometry@Base 3.5.0.29 - NXStartSplit@Base 3.5.0.29 - NXUnsetLibraryPath@Base 3.5.0.29 - PackImage@Base 3.5.0.29 - PngCompareColorTable@Base 3.5.0.29 - PngCompressData@Base 3.5.0.29 - RgbCompressData@Base 3.5.0.29 - RleCompressData@Base 3.5.0.29 - ZCompressData@Base 3.5.0.29 - ZInitEncoder@Base 3.5.0.29 - ZResetEncoder@Base 3.5.0.29 - _NXInternalInitEncoders@Base 3.5.0.29 - _NXInternalInitResources@Base 3.5.0.29 - _NXInternalResetEncoders@Base 3.5.0.29 - _NXInternalResetResources@Base 3.5.0.29 - color_type@Base 3.5.0.29 - info_ptr@Base 3.5.0.29 - palette@Base 3.5.0.29 - png_ptr@Base 3.5.0.29 diff --git a/debian/libxcompext3.triggers b/debian/libxcompext3.triggers deleted file mode 100644 index dd8660367..000000000 --- a/debian/libxcompext3.triggers +++ /dev/null @@ -1 +0,0 @@ -activate-noawait ldconfig diff --git a/debian/rules b/debian/rules index 4b49ad27d..d30574c07 100755 --- a/debian/rules +++ b/debian/rules @@ -57,7 +57,6 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg - dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg dh_strip -pnxagent --dbg-package=nxagent-dbg dh_strip -pnxproxy --dbg-package=nxproxy-dbg -- cgit v1.2.3 From a0a429cc7da5eb8083a9120986d0740412e37207 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 30 Nov 2016 08:13:54 +0100 Subject: Update auto-generated debian/copyright.in. Fixes ArcticaProject/nx-libs#188. --- debian/copyright.in | 4208 ++++++++++++++------------------------------------- 1 file changed, 1178 insertions(+), 3030 deletions(-) (limited to 'debian') diff --git a/debian/copyright.in b/debian/copyright.in index 7e11780ea..4e828ccc9 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -4,867 +4,6 @@ Upstream-Contact: FIXME Source: FIXME Disclaimer: Autogenerated by CDBS -Files: nx-X11/config/imake/ccimake.c - nx-X11/config/imake/imake.c - nx-X11/config/imake/imakemdep.h - nx-X11/config/makedepend/cppsetup.c - nx-X11/config/makedepend/def.h - nx-X11/config/makedepend/include.c - nx-X11/config/makedepend/main.c - nx-X11/config/makedepend/parse.c - nx-X11/config/makedepend/pr.c - nx-X11/config/util/checktree.c - nx-X11/config/util/chownxterm.c - nx-X11/config/util/lndir.c - nx-X11/config/util/makestrs.c - nx-X11/config/util/mergelib.cpp - nx-X11/config/util/mkdirhier.c - nx-X11/include/XWDFile.h - nx-X11/include/Xalloca.h - nx-X11/include/Xfuncproto.h - nx-X11/include/Xfuncs.h - nx-X11/include/Xos.h - nx-X11/include/Xos_r.h - nx-X11/include/Xosdefs.h - nx-X11/include/Xthreads.h - nx-X11/include/Xwindows.h - nx-X11/include/Xwinsock.h - nx-X11/include/extensions/MITMisc.h - nx-X11/include/extensions/XShm.h - nx-X11/include/extensions/XTest.h - nx-X11/include/extensions/Xag.h - nx-X11/include/extensions/Xagsrv.h - nx-X11/include/extensions/Xagstr.h - nx-X11/include/extensions/Xcup.h - nx-X11/include/extensions/Xcupstr.h - nx-X11/include/extensions/Xext.h - nx-X11/include/extensions/Xinerama.h - nx-X11/include/extensions/bigreqstr.h - nx-X11/include/extensions/extutil.h - nx-X11/include/extensions/lbximage.h - nx-X11/include/extensions/mitmiscstr.h - nx-X11/include/extensions/multibuf.h - nx-X11/include/extensions/multibufst.h - nx-X11/include/extensions/security.h - nx-X11/include/extensions/securstr.h - nx-X11/include/extensions/shmstr.h - nx-X11/include/extensions/xcmiscstr.h - nx-X11/include/extensions/xteststr.h - nx-X11/lib/X11/AllCells.c - nx-X11/lib/X11/AllPlanes.c - nx-X11/lib/X11/AllowEv.c - nx-X11/lib/X11/AutoRep.c - nx-X11/lib/X11/Backgnd.c - nx-X11/lib/X11/BdrWidth.c - nx-X11/lib/X11/Bell.c - nx-X11/lib/X11/Border.c - nx-X11/lib/X11/ChAccCon.c - nx-X11/lib/X11/ChActPGb.c - nx-X11/lib/X11/ChClMode.c - nx-X11/lib/X11/ChCmap.c - nx-X11/lib/X11/ChGC.c - nx-X11/lib/X11/ChKeyCon.c - nx-X11/lib/X11/ChPntCon.c - nx-X11/lib/X11/ChProp.c - nx-X11/lib/X11/ChSaveSet.c - nx-X11/lib/X11/ChWAttrs.c - nx-X11/lib/X11/ChWindow.c - nx-X11/lib/X11/ChkIfEv.c - nx-X11/lib/X11/ChkMaskEv.c - nx-X11/lib/X11/ChkTypEv.c - nx-X11/lib/X11/ChkTypWEv.c - nx-X11/lib/X11/ChkWinEv.c - nx-X11/lib/X11/CirWin.c - nx-X11/lib/X11/CirWinDn.c - nx-X11/lib/X11/CirWinUp.c - nx-X11/lib/X11/ClDisplay.c - nx-X11/lib/X11/Clear.c - nx-X11/lib/X11/ClearArea.c - nx-X11/lib/X11/ConfWind.c - nx-X11/lib/X11/ConvSel.c - nx-X11/lib/X11/CopyArea.c - nx-X11/lib/X11/CopyCmap.c - nx-X11/lib/X11/CopyGC.c - nx-X11/lib/X11/CopyPlane.c - nx-X11/lib/X11/CrBFData.c - nx-X11/lib/X11/CrCmap.c - nx-X11/lib/X11/CrCursor.c - nx-X11/lib/X11/CrGC.c - nx-X11/lib/X11/CrGlCur.c - nx-X11/lib/X11/CrPFBData.c - nx-X11/lib/X11/CrPixmap.c - nx-X11/lib/X11/CrWindow.c - nx-X11/lib/X11/Cursor.c - nx-X11/lib/X11/DefCursor.c - nx-X11/lib/X11/DelProp.c - nx-X11/lib/X11/Depths.c - nx-X11/lib/X11/DestSubs.c - nx-X11/lib/X11/DestWind.c - nx-X11/lib/X11/DisName.c - nx-X11/lib/X11/DrArc.c - nx-X11/lib/X11/DrArcs.c - nx-X11/lib/X11/DrLine.c - nx-X11/lib/X11/DrLines.c - nx-X11/lib/X11/DrPoint.c - nx-X11/lib/X11/DrPoints.c - nx-X11/lib/X11/DrRect.c - nx-X11/lib/X11/DrRects.c - nx-X11/lib/X11/DrSegs.c - nx-X11/lib/X11/ErrHndlr.c - nx-X11/lib/X11/EvToWire.c - nx-X11/lib/X11/FSSaver.c - nx-X11/lib/X11/FetchName.c - nx-X11/lib/X11/FillArc.c - nx-X11/lib/X11/FillArcs.c - nx-X11/lib/X11/FillPoly.c - nx-X11/lib/X11/FillRct.c - nx-X11/lib/X11/FillRcts.c - nx-X11/lib/X11/Flush.c - nx-X11/lib/X11/FontInfo.c - nx-X11/lib/X11/FontNames.c - nx-X11/lib/X11/FreeCmap.c - nx-X11/lib/X11/FreeCols.c - nx-X11/lib/X11/FreeCurs.c - nx-X11/lib/X11/FreeEData.c - nx-X11/lib/X11/FreeGC.c - nx-X11/lib/X11/FreePix.c - nx-X11/lib/X11/GCMisc.c - nx-X11/lib/X11/Geom.c - nx-X11/lib/X11/GetAtomNm.c - nx-X11/lib/X11/GetColor.c - nx-X11/lib/X11/GetFPath.c - nx-X11/lib/X11/GetFProp.c - nx-X11/lib/X11/GetGCVals.c - nx-X11/lib/X11/GetGeom.c - nx-X11/lib/X11/GetHColor.c - nx-X11/lib/X11/GetIFocus.c - nx-X11/lib/X11/GetImage.c - nx-X11/lib/X11/GetKCnt.c - nx-X11/lib/X11/GetMoEv.c - nx-X11/lib/X11/GetPCnt.c - nx-X11/lib/X11/GetPntMap.c - nx-X11/lib/X11/GetProp.c - nx-X11/lib/X11/GetRGBCMap.c - nx-X11/lib/X11/GetSOwner.c - nx-X11/lib/X11/GetSSaver.c - nx-X11/lib/X11/GetWAttrs.c - nx-X11/lib/X11/GrButton.c - nx-X11/lib/X11/GrKey.c - nx-X11/lib/X11/GrKeybd.c - nx-X11/lib/X11/GrPointer.c - nx-X11/lib/X11/GrServer.c - nx-X11/lib/X11/IfEvent.c - nx-X11/lib/X11/ImText.c - nx-X11/lib/X11/ImText16.c - nx-X11/lib/X11/ImUtil.c - nx-X11/lib/X11/InitExt.c - nx-X11/lib/X11/InsCmap.c - nx-X11/lib/X11/IntAtom.c - nx-X11/lib/X11/KeyBind.c - nx-X11/lib/X11/KeysymStr.c - nx-X11/lib/X11/KillCl.c - nx-X11/lib/X11/LiICmaps.c - nx-X11/lib/X11/LiProps.c - nx-X11/lib/X11/ListExt.c - nx-X11/lib/X11/LoadFont.c - nx-X11/lib/X11/LockDis.c - nx-X11/lib/X11/LookupCol.c - nx-X11/lib/X11/LowerWin.c - nx-X11/lib/X11/Macros.c - nx-X11/lib/X11/MapRaised.c - nx-X11/lib/X11/MapSubs.c - nx-X11/lib/X11/MapWindow.c - nx-X11/lib/X11/MaskEvent.c - nx-X11/lib/X11/Misc.c - nx-X11/lib/X11/ModMap.c - nx-X11/lib/X11/MoveWin.c - nx-X11/lib/X11/NextEvent.c - nx-X11/lib/X11/ParseCol.c - nx-X11/lib/X11/ParseGeom.c - nx-X11/lib/X11/PeekEvent.c - nx-X11/lib/X11/PeekIfEv.c - nx-X11/lib/X11/Pending.c - nx-X11/lib/X11/PixFormats.c - nx-X11/lib/X11/PmapBgnd.c - nx-X11/lib/X11/PmapBord.c - nx-X11/lib/X11/PolyTxt.c - nx-X11/lib/X11/PolyTxt16.c - nx-X11/lib/X11/PropAlloc.c - nx-X11/lib/X11/PutBEvent.c - nx-X11/lib/X11/PutImage.c - nx-X11/lib/X11/QuBest.c - nx-X11/lib/X11/QuColor.c - nx-X11/lib/X11/QuColors.c - nx-X11/lib/X11/QuCurShp.c - nx-X11/lib/X11/QuExt.c - nx-X11/lib/X11/QuKeybd.c - nx-X11/lib/X11/QuPntr.c - nx-X11/lib/X11/QuStipShp.c - nx-X11/lib/X11/QuTextE16.c - nx-X11/lib/X11/QuTextExt.c - nx-X11/lib/X11/QuTileShp.c - nx-X11/lib/X11/QuTree.c - nx-X11/lib/X11/RaiseWin.c - nx-X11/lib/X11/RdBitF.c - nx-X11/lib/X11/RecolorC.c - nx-X11/lib/X11/ReconfWM.c - nx-X11/lib/X11/ReconfWin.c - nx-X11/lib/X11/RepWindow.c - nx-X11/lib/X11/RestackWs.c - nx-X11/lib/X11/RotProp.c - nx-X11/lib/X11/ScrResStr.c - nx-X11/lib/X11/SelInput.c - nx-X11/lib/X11/SendEvent.c - nx-X11/lib/X11/SetBack.c - nx-X11/lib/X11/SetCRects.c - nx-X11/lib/X11/SetClMask.c - nx-X11/lib/X11/SetClOrig.c - nx-X11/lib/X11/SetDashes.c - nx-X11/lib/X11/SetFPath.c - nx-X11/lib/X11/SetFont.c - nx-X11/lib/X11/SetFore.c - nx-X11/lib/X11/SetFunc.c - nx-X11/lib/X11/SetIFocus.c - nx-X11/lib/X11/SetLStyle.c - nx-X11/lib/X11/SetPMask.c - nx-X11/lib/X11/SetPntMap.c - nx-X11/lib/X11/SetRGBCMap.c - nx-X11/lib/X11/SetSOwner.c - nx-X11/lib/X11/SetSSaver.c - nx-X11/lib/X11/SetState.c - nx-X11/lib/X11/SetStip.c - nx-X11/lib/X11/SetTSOrig.c - nx-X11/lib/X11/SetTile.c - nx-X11/lib/X11/StBytes.c - nx-X11/lib/X11/StColor.c - nx-X11/lib/X11/StColors.c - nx-X11/lib/X11/StNColor.c - nx-X11/lib/X11/StName.c - nx-X11/lib/X11/StrKeysym.c - nx-X11/lib/X11/StrToText.c - nx-X11/lib/X11/Sync.c - nx-X11/lib/X11/Synchro.c - nx-X11/lib/X11/Text.c - nx-X11/lib/X11/Text16.c - nx-X11/lib/X11/TextToStr.c - nx-X11/lib/X11/TrCoords.c - nx-X11/lib/X11/UndefCurs.c - nx-X11/lib/X11/UngrabBut.c - nx-X11/lib/X11/UngrabKbd.c - nx-X11/lib/X11/UngrabKey.c - nx-X11/lib/X11/UngrabPtr.c - nx-X11/lib/X11/UngrabSvr.c - nx-X11/lib/X11/UninsCmap.c - nx-X11/lib/X11/UnldFont.c - nx-X11/lib/X11/UnmapSubs.c - nx-X11/lib/X11/UnmapWin.c - nx-X11/lib/X11/VisUtil.c - nx-X11/lib/X11/WMGeom.c - nx-X11/lib/X11/WarpPtr.c - nx-X11/lib/X11/WinEvent.c - nx-X11/lib/X11/Window.c - nx-X11/lib/X11/WrBitF.c - nx-X11/lib/X11/XKBBind.c - nx-X11/lib/X11/XKBCvt.c - nx-X11/lib/X11/Xlib.h - nx-X11/lib/X11/Xlocale.h - nx-X11/lib/X11/XrmI.h - nx-X11/lib/X11/cmsMath.c - nx-X11/lib/X11/cursorfont.h - nx-X11/lib/X11/evtomask.c - nx-X11/lib/X11/globals.c - nx-X11/lib/X11/locking.c - nx-X11/lib/X11/locking.h - nx-X11/lib/X11/mbWMProps.c - nx-X11/lib/X11/util/makekeys.c - nx-X11/lib/Xau/AuDispose.c - nx-X11/lib/Xau/AuFileName.c - nx-X11/lib/Xau/AuGetAddr.c - nx-X11/lib/Xau/AuGetBest.c - nx-X11/lib/Xau/AuLock.c - nx-X11/lib/Xau/AuRead.c - nx-X11/lib/Xau/AuUnlock.c - nx-X11/lib/Xau/AuWrite.c - nx-X11/lib/Xau/Autest.c - nx-X11/lib/Xau/Xauth.h - nx-X11/lib/Xau/k5encode.c - nx-X11/lib/Xdmcp/A8Eq.c - nx-X11/lib/Xdmcp/AA16.c - nx-X11/lib/Xdmcp/AA32.c - nx-X11/lib/Xdmcp/AA8.c - nx-X11/lib/Xdmcp/Alloc.c - nx-X11/lib/Xdmcp/AofA8.c - nx-X11/lib/Xdmcp/CA8.c - nx-X11/lib/Xdmcp/CmpKey.c - nx-X11/lib/Xdmcp/DA16.c - nx-X11/lib/Xdmcp/DA32.c - nx-X11/lib/Xdmcp/DA8.c - nx-X11/lib/Xdmcp/DAofA8.c - nx-X11/lib/Xdmcp/DecKey.c - nx-X11/lib/Xdmcp/Fill.c - nx-X11/lib/Xdmcp/Flush.c - nx-X11/lib/Xdmcp/GenKey.c - nx-X11/lib/Xdmcp/IncKey.c - nx-X11/lib/Xdmcp/RA16.c - nx-X11/lib/Xdmcp/RA32.c - nx-X11/lib/Xdmcp/RA8.c - nx-X11/lib/Xdmcp/RAofA8.c - nx-X11/lib/Xdmcp/RC16.c - nx-X11/lib/Xdmcp/RC32.c - nx-X11/lib/Xdmcp/RC8.c - nx-X11/lib/Xdmcp/RHead.c - nx-X11/lib/Xdmcp/RR.c - nx-X11/lib/Xdmcp/RaA16.c - nx-X11/lib/Xdmcp/RaA32.c - nx-X11/lib/Xdmcp/RaA8.c - nx-X11/lib/Xdmcp/RaAoA8.c - nx-X11/lib/Xdmcp/Unwrap.c - nx-X11/lib/Xdmcp/WA16.c - nx-X11/lib/Xdmcp/WA32.c - nx-X11/lib/Xdmcp/WA8.c - nx-X11/lib/Xdmcp/WAofA8.c - nx-X11/lib/Xdmcp/WC16.c - nx-X11/lib/Xdmcp/WC32.c - nx-X11/lib/Xdmcp/WC8.c - nx-X11/lib/Xdmcp/Whead.c - nx-X11/lib/Xdmcp/Wrap.c - nx-X11/lib/Xext/MITMisc.c - nx-X11/lib/Xext/XAppgroup.c - nx-X11/lib/Xext/XMultibuf.c - nx-X11/lib/Xext/XSecurity.c - nx-X11/lib/Xext/XShape.c - nx-X11/lib/Xext/XShm.c - nx-X11/lib/Xext/Xcup.c - nx-X11/lib/Xext/extutil.c - nx-X11/lib/Xext/globals.c - nx-X11/lib/font/Speedo/bics-iso.h - nx-X11/lib/font/Speedo/useropt.h - nx-X11/lib/font/Type1/minimain.c - nx-X11/lib/font/bitmap/bdfint.h - nx-X11/lib/font/bitmap/bitmap.c - nx-X11/lib/font/bitmap/bitmapfunc.c - nx-X11/lib/font/bitmap/bitmaputil.c - nx-X11/lib/font/bitmap/bitscale.c - nx-X11/lib/font/bitmap/fontink.c - nx-X11/lib/font/bitmap/pcf.h - nx-X11/lib/font/bitmap/pcfread.c - nx-X11/lib/font/bitmap/pcfwrite.c - nx-X11/lib/font/fontfile/bitsource.c - nx-X11/lib/font/fontfile/bufio.c - nx-X11/lib/font/fontfile/defaults.c - nx-X11/lib/font/fontfile/dirfile.c - nx-X11/lib/font/fontfile/ffcheck.c - nx-X11/lib/font/fontfile/fileio.c - nx-X11/lib/font/fontfile/filewr.c - nx-X11/lib/font/fontfile/fontdir.c - nx-X11/lib/font/fontfile/fontfile.c - nx-X11/lib/font/fontfile/fontscale.c - nx-X11/lib/font/fontfile/printerfont.c - nx-X11/lib/font/fontfile/register.c - nx-X11/lib/font/fontfile/renderers.c - nx-X11/lib/font/include/bitmap.h - nx-X11/lib/font/include/bufio.h - nx-X11/lib/font/include/fntfil.h - nx-X11/lib/font/include/fntfilio.h - nx-X11/lib/font/include/fntfilst.h - nx-X11/lib/font/include/fontmisc.h - nx-X11/lib/font/include/fontshow.h - nx-X11/lib/font/include/fontxlfd.h - nx-X11/lib/font/util/atom.c - nx-X11/lib/font/util/fontaccel.c - nx-X11/lib/font/util/fontnames.c - nx-X11/lib/font/util/fontutil.c - nx-X11/lib/font/util/fontxlfd.c - nx-X11/lib/font/util/miscutil.c - nx-X11/lib/font/util/patcache.c - nx-X11/lib/font/util/private.c - nx-X11/lib/font/util/utilbitmap.c - nx-X11/lib/oldX/X10.h - nx-X11/lib/oldX/XCrAssoc.c - nx-X11/lib/oldX/XDelAssoc.c - nx-X11/lib/oldX/XDestAssoc.c - nx-X11/lib/oldX/XLookAssoc.c - nx-X11/lib/oldX/XMakeAssoc.c - nx-X11/programs/Xserver/Xext/appgroup.c - nx-X11/programs/Xserver/Xext/bigreq.c - nx-X11/programs/Xserver/Xext/cup.c - nx-X11/programs/Xserver/Xext/mbuf.c - nx-X11/programs/Xserver/Xext/mbufbf.c - nx-X11/programs/Xserver/Xext/mbufpx.c - nx-X11/programs/Xserver/Xext/mitmisc.c - nx-X11/programs/Xserver/Xext/shape.c - nx-X11/programs/Xserver/Xext/shm.c - nx-X11/programs/Xserver/Xext/sleepuntil.c - nx-X11/programs/Xserver/Xext/xcmisc.c - nx-X11/programs/Xserver/Xext/xtest.c - nx-X11/programs/Xserver/Xi/queryst.c - nx-X11/programs/Xserver/dix/ffs.c - nx-X11/programs/Xserver/dix/pixmap.c - nx-X11/programs/Xserver/dix/privates.c - nx-X11/programs/Xserver/dix/xpstubs.c - nx-X11/programs/Xserver/hw/nxagent/NXshm.c - nx-X11/programs/Xserver/include/closestr.h - nx-X11/programs/Xserver/include/opaque.h - nx-X11/programs/Xserver/include/validate.h - nx-X11/programs/Xserver/mi/cbrt.c - nx-X11/programs/Xserver/mi/mibstorest.h - nx-X11/programs/Xserver/mi/miclipn.c - nx-X11/programs/Xserver/mi/midispcur.c - nx-X11/programs/Xserver/mi/mieq.c - nx-X11/programs/Xserver/mi/mifillarc.c - nx-X11/programs/Xserver/mi/mifillarc.h - nx-X11/programs/Xserver/mi/migc.c - nx-X11/programs/Xserver/mi/migc.h - nx-X11/programs/Xserver/mi/miline.h - nx-X11/programs/Xserver/mi/mipointer.c - nx-X11/programs/Xserver/mi/mipointer.h - nx-X11/programs/Xserver/mi/mipointrst.h - nx-X11/programs/Xserver/mi/mipoly.h - nx-X11/programs/Xserver/mi/miscanfill.h - nx-X11/programs/Xserver/mi/miscrinit.c - nx-X11/programs/Xserver/mi/misprite.c - nx-X11/programs/Xserver/mi/misprite.h - nx-X11/programs/Xserver/mi/mispritest.h - nx-X11/programs/Xserver/mi/mivalidate.h - nx-X11/programs/Xserver/mi/miwideline.c - nx-X11/programs/Xserver/mi/miwideline.h - nx-X11/programs/Xserver/mi/mizerarc.c - nx-X11/programs/Xserver/mi/mizerarc.h - nx-X11/programs/Xserver/os/k5auth.c - nx-X11/programs/Xserver/os/mitauth.c - nx-X11/programs/Xserver/os/rpcauth.c - nx-X11/programs/Xserver/os/secauth.c - nx-X11/programs/Xserver/os/xdmauth.c - nx-X11/programs/Xserver/record/record.c - nx-X11/programs/Xserver/record/set.c - nx-X11/programs/Xserver/record/set.h - nx-X11/programs/nxauth/gethost.c - nx-X11/programs/nxauth/xauth.h -Copyright: 1985, 1987, 1990, 1998 The Open Group - 1985, 1987, 1994, 1998 The Open Group - 1985, 1987, 1998, The Open Group - 1985, 1990, 1998, The Open Group - 1985, 1998 The Open Group - 1985-1986, 1998 The Open Group - 1985-1987, 1991, 1998, The Open Group - 1985-1987, 1998 The Open Group - 1985-1987,1998, The Open Group - 1986, 1990, 1998, The Open Group - 1986, 1998 The Open Group - 1986,1998, The Open Group - 1986-1987, 1998 The Open Group - 1987, 1998 The Open Group - 1987-1988, 1998 The Open Group - 1988, 1998 The Open Group - 1988-1989, 1998 The Open Group - 1989, 1991, 1998, The Open Group - 1989, 1998 The Open Group - 1990, 1994, 1998, The Open Group - 1990, 1998 The Open Group - 1991, 1994, 1998, The Open Group - 1991, 1998 The Open Group - 1992, 1998 The Open Group - 1993, 1998 The Open Group - 1993-1994, 1998 The Open Group - 1994, 1998 The Open Group - 1995, 1998 The Open Group - 1996, 1998 The Open Group - 1996, 1998, 2001, The Open Group - 1997-1998, The Open Group - 1998, 1998 The Open Group - 2003, The Open Group -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/include/GL/amesa.h - nx-X11/extras/Mesa/include/GL/gl.h - nx-X11/extras/Mesa/include/GL/glfbdev.h - nx-X11/extras/Mesa/include/GL/glx.h - nx-X11/extras/Mesa/include/GL/mesa_wgl.h - nx-X11/extras/Mesa/include/GL/miniglx.h - nx-X11/extras/Mesa/include/GL/osmesa.h - nx-X11/extras/Mesa/include/GL/xmesa.h - nx-X11/extras/Mesa/src/glx/mini/miniglx.c - nx-X11/extras/Mesa/src/glx/mini/miniglx_events.c - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h - nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c - nx-X11/extras/Mesa/src/mesa/array_cache/acache.h - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/fb/fb_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_native_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_native_vbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_vbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_vbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/x11/x11_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/fbdev/glfbdev.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxapi.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxdd.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxddspan.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxddtex.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxdrv.h - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxglidew.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxglidew.h - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxsetup.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxsetup.h - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxtexman.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxtris.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxvb.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxvbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/osmesa/osmesa.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/fakeglx.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxapi.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxapi.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/realglx.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/realglx.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/xfonts.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h - nx-X11/extras/Mesa/src/mesa/glapi/glapi.c - nx-X11/extras/Mesa/src/mesa/glapi/glapi.h - nx-X11/extras/Mesa/src/mesa/glapi/glthread.c - nx-X11/extras/Mesa/src/mesa/glapi/glthread.h - nx-X11/extras/Mesa/src/mesa/glapi/mesadef.py - nx-X11/extras/Mesa/src/mesa/main/accum.c - nx-X11/extras/Mesa/src/mesa/main/accum.h - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h - nx-X11/extras/Mesa/src/mesa/main/api_eval.h - nx-X11/extras/Mesa/src/mesa/main/api_loopback.c - nx-X11/extras/Mesa/src/mesa/main/api_loopback.h - nx-X11/extras/Mesa/src/mesa/main/api_noop.c - nx-X11/extras/Mesa/src/mesa/main/api_noop.h - nx-X11/extras/Mesa/src/mesa/main/api_validate.c - nx-X11/extras/Mesa/src/mesa/main/api_validate.h - nx-X11/extras/Mesa/src/mesa/main/attrib.c - nx-X11/extras/Mesa/src/mesa/main/attrib.h - nx-X11/extras/Mesa/src/mesa/main/blend.c - nx-X11/extras/Mesa/src/mesa/main/blend.h - nx-X11/extras/Mesa/src/mesa/main/bufferobj.c - nx-X11/extras/Mesa/src/mesa/main/bufferobj.h - nx-X11/extras/Mesa/src/mesa/main/buffers.c - nx-X11/extras/Mesa/src/mesa/main/buffers.h - nx-X11/extras/Mesa/src/mesa/main/clip.c - nx-X11/extras/Mesa/src/mesa/main/clip.h - nx-X11/extras/Mesa/src/mesa/main/colormac.h - nx-X11/extras/Mesa/src/mesa/main/colortab.c - nx-X11/extras/Mesa/src/mesa/main/colortab.h - nx-X11/extras/Mesa/src/mesa/main/config.h - nx-X11/extras/Mesa/src/mesa/main/context.c - nx-X11/extras/Mesa/src/mesa/main/context.h - nx-X11/extras/Mesa/src/mesa/main/convolve.c - nx-X11/extras/Mesa/src/mesa/main/convolve.h - nx-X11/extras/Mesa/src/mesa/main/dd.h - nx-X11/extras/Mesa/src/mesa/main/debug.c - nx-X11/extras/Mesa/src/mesa/main/debug.h - nx-X11/extras/Mesa/src/mesa/main/depth.c - nx-X11/extras/Mesa/src/mesa/main/depth.h - nx-X11/extras/Mesa/src/mesa/main/dispatch.c - nx-X11/extras/Mesa/src/mesa/main/dlist.c - nx-X11/extras/Mesa/src/mesa/main/dlist.h - nx-X11/extras/Mesa/src/mesa/main/drawpix.c - nx-X11/extras/Mesa/src/mesa/main/drawpix.h - nx-X11/extras/Mesa/src/mesa/main/enable.c - nx-X11/extras/Mesa/src/mesa/main/enable.h - nx-X11/extras/Mesa/src/mesa/main/enums.c - nx-X11/extras/Mesa/src/mesa/main/enums.h - nx-X11/extras/Mesa/src/mesa/main/eval.c - nx-X11/extras/Mesa/src/mesa/main/eval.h - nx-X11/extras/Mesa/src/mesa/main/execmem.c - nx-X11/extras/Mesa/src/mesa/main/extensions.c - nx-X11/extras/Mesa/src/mesa/main/extensions.h - nx-X11/extras/Mesa/src/mesa/main/fbobject.c - nx-X11/extras/Mesa/src/mesa/main/fbobject.h - nx-X11/extras/Mesa/src/mesa/main/feedback.c - nx-X11/extras/Mesa/src/mesa/main/feedback.h - nx-X11/extras/Mesa/src/mesa/main/fog.c - nx-X11/extras/Mesa/src/mesa/main/fog.h - nx-X11/extras/Mesa/src/mesa/main/framebuffer.c - nx-X11/extras/Mesa/src/mesa/main/framebuffer.h - nx-X11/extras/Mesa/src/mesa/main/get.h - nx-X11/extras/Mesa/src/mesa/main/get_gen.py - nx-X11/extras/Mesa/src/mesa/main/getstring.c - nx-X11/extras/Mesa/src/mesa/main/glheader.h - nx-X11/extras/Mesa/src/mesa/main/hash.c - nx-X11/extras/Mesa/src/mesa/main/hash.h - nx-X11/extras/Mesa/src/mesa/main/hint.c - nx-X11/extras/Mesa/src/mesa/main/hint.h - nx-X11/extras/Mesa/src/mesa/main/histogram.c - nx-X11/extras/Mesa/src/mesa/main/histogram.h - nx-X11/extras/Mesa/src/mesa/main/image.c - nx-X11/extras/Mesa/src/mesa/main/image.h - nx-X11/extras/Mesa/src/mesa/main/imports.c - nx-X11/extras/Mesa/src/mesa/main/imports.h - nx-X11/extras/Mesa/src/mesa/main/light.c - nx-X11/extras/Mesa/src/mesa/main/light.h - nx-X11/extras/Mesa/src/mesa/main/lines.c - nx-X11/extras/Mesa/src/mesa/main/lines.h - nx-X11/extras/Mesa/src/mesa/main/macros.h - nx-X11/extras/Mesa/src/mesa/main/matrix.c - nx-X11/extras/Mesa/src/mesa/main/matrix.h - nx-X11/extras/Mesa/src/mesa/main/mtypes.h - nx-X11/extras/Mesa/src/mesa/main/occlude.c - nx-X11/extras/Mesa/src/mesa/main/occlude.h - nx-X11/extras/Mesa/src/mesa/main/pixel.c - nx-X11/extras/Mesa/src/mesa/main/pixel.h - nx-X11/extras/Mesa/src/mesa/main/points.c - nx-X11/extras/Mesa/src/mesa/main/points.h - nx-X11/extras/Mesa/src/mesa/main/polygon.c - nx-X11/extras/Mesa/src/mesa/main/polygon.h - nx-X11/extras/Mesa/src/mesa/main/rastpos.c - nx-X11/extras/Mesa/src/mesa/main/rastpos.h - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h - nx-X11/extras/Mesa/src/mesa/main/state.c - nx-X11/extras/Mesa/src/mesa/main/state.h - nx-X11/extras/Mesa/src/mesa/main/stencil.c - nx-X11/extras/Mesa/src/mesa/main/stencil.h - nx-X11/extras/Mesa/src/mesa/main/texcompress.c - nx-X11/extras/Mesa/src/mesa/main/texcompress.h - nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c - nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h - nx-X11/extras/Mesa/src/mesa/main/texformat.c - nx-X11/extras/Mesa/src/mesa/main/texformat.h - nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h - nx-X11/extras/Mesa/src/mesa/main/teximage.c - nx-X11/extras/Mesa/src/mesa/main/teximage.h - nx-X11/extras/Mesa/src/mesa/main/texobj.c - nx-X11/extras/Mesa/src/mesa/main/texobj.h - nx-X11/extras/Mesa/src/mesa/main/texstate.c - nx-X11/extras/Mesa/src/mesa/main/texstate.h - nx-X11/extras/Mesa/src/mesa/main/texstore.c - nx-X11/extras/Mesa/src/mesa/main/texstore.h - nx-X11/extras/Mesa/src/mesa/main/varray.c - nx-X11/extras/Mesa/src/mesa/main/varray.h - nx-X11/extras/Mesa/src/mesa/main/version.h - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h - nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_debug.h - nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c - nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c - nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h - nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c - nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_eval.c - nx-X11/extras/Mesa/src/mesa/math/m_eval.h - nx-X11/extras/Mesa/src/mesa/math/m_matrix.c - nx-X11/extras/Mesa/src/mesa/math/m_matrix.h - nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_translate.c - nx-X11/extras/Mesa/src/mesa/math/m_translate.h - nx-X11/extras/Mesa/src/mesa/math/m_vector.c - nx-X11/extras/Mesa/src/mesa/math/m_vector.h - nx-X11/extras/Mesa/src/mesa/math/m_xform.c - nx-X11/extras/Mesa/src/mesa/math/m_xform.h - nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h - nx-X11/extras/Mesa/src/mesa/math/mathmod.h - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h - nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h - nx-X11/extras/Mesa/src/mesa/shader/program.c - nx-X11/extras/Mesa/src/mesa/shader/program.h - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_string.py - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_mesa.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h - nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h - nx-X11/extras/Mesa/src/mesa/sparc/sparc.c - nx-X11/extras/Mesa/src/mesa/sparc/sparc.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h - nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h - nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c - nx-X11/extras/Mesa/src/mesa/swrast/s_context.c - nx-X11/extras/Mesa/src/mesa/swrast/s_context.h - nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h - nx-X11/extras/Mesa/src/mesa/swrast/s_fragprog_to_c.c - nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h - nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h - nx-X11/extras/Mesa/src/mesa/swrast/s_points.c - nx-X11/extras/Mesa/src/mesa/swrast/s_points.h - nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_span.c - nx-X11/extras/Mesa/src/mesa/swrast/s_span.h - nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h - nx-X11/extras/Mesa/src/mesa/swrast/s_tcc.c - nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h - nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h - nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h - nx-X11/extras/Mesa/src/mesa/swrast/swrast.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_vb.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h - nx-X11/extras/Mesa/src/mesa/tnl/t_context.c - nx-X11/extras/Mesa/src/mesa/tnl/t_context.h - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h - nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c - nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c - nx-X11/extras/Mesa/src/mesa/tnl/tnl.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_capi.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_napi.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_tapi.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vapi.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vb.c - nx-X11/extras/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd.c - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_dmatmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_dmatmp2.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_rendertmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_tritmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_unfilled.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_vb.c - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_vbtmp.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_vertex.h - nx-X11/extras/Mesa/src/mesa/x86-64/x86-64.c - nx-X11/extras/Mesa/src/mesa/x86-64/x86-64.h - nx-X11/extras/Mesa/src/mesa/x86/3dnow.c - nx-X11/extras/Mesa/src/mesa/x86/3dnow.h - nx-X11/extras/Mesa/src/mesa/x86/clip_args.h - nx-X11/extras/Mesa/src/mesa/x86/common_x86.c - nx-X11/extras/Mesa/src/mesa/x86/common_x86_asm.h - nx-X11/extras/Mesa/src/mesa/x86/common_x86_features.h - nx-X11/extras/Mesa/src/mesa/x86/common_x86_macros.h - nx-X11/extras/Mesa/src/mesa/x86/gen_matypes.c - nx-X11/extras/Mesa/src/mesa/x86/mmx.h - nx-X11/extras/Mesa/src/mesa/x86/norm_args.h - nx-X11/extras/Mesa/src/mesa/x86/sse.c - nx-X11/extras/Mesa/src/mesa/x86/sse.h - nx-X11/extras/Mesa/src/mesa/x86/x86.c - nx-X11/extras/Mesa/src/mesa/x86/x86.h - nx-X11/extras/Mesa/src/mesa/x86/xform_args.h -Copyright: 1999, Brian Paul - 1999-2000, Brian Paul - 1999-2001, Brian Paul - 1999-2002, Brian Paul - 1999-2003, Brian Paul - 1999-2004, Brian Paul - 1999-2005, Brian Paul - 2004-2005, Brian Paul - 2005, Brian Paul -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -919,6 +58,28 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/Utils.h nx-X11/programs/Xserver/hw/nxagent/Window.c nx-X11/programs/Xserver/hw/nxagent/Windows.h + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.c + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.h + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.h + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.h + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.c + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.h + nx-X11/programs/Xserver/hw/nxagent/compext/Png.c + nx-X11/programs/Xserver/hw/nxagent/compext/Png.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h + nx-X11/programs/Xserver/hw/nxagent/compext/Z.c + nx-X11/programs/Xserver/hw/nxagent/compext/Z.h nxcomp/ActionCache.cpp nxcomp/ActionCache.h nxcomp/Agent.cpp @@ -941,6 +102,8 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/Channel.h nxcomp/ChannelCache.cpp nxcomp/ChannelCache.h + nxcomp/ChannelEndPoint.cpp + nxcomp/ChannelEndPoint.h nxcomp/ChannelStore.h nxcomp/CharCache.cpp nxcomp/CharCache.h @@ -1138,7 +301,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/Types.h nxcomp/Unpack.cpp nxcomp/Unpack.h - nxcomp/Utils.cpp nxcomp/Vars.c nxcomp/WriteBuffer.cpp nxcomp/WriteBuffer.h @@ -1146,29 +308,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/XidCache.h nxcomp/Z.cpp nxcomp/Z.h - nxcompext/Alpha.c - nxcompext/Alpha.h - nxcompext/Bitmap.c - nxcompext/Bitmap.h - nxcompext/Clean.c - nxcompext/Clean.h - nxcompext/Colormap.c - nxcompext/Colormap.h - nxcompext/Jpeg.c - nxcompext/Jpeg.h - nxcompext/Mask.c - nxcompext/Mask.h - nxcompext/NXlib.c - nxcompext/NXlib.h - nxcompext/NXlibint.h - nxcompext/Pgn.c - nxcompext/Pgn.h - nxcompext/Rgb.c - nxcompext/Rgb.h - nxcompext/Rle.c - nxcompext/Rle.h - nxcompext/Z.c - nxcompext/Z.h nxcompshad/Core.cpp nxcompshad/Core.h nxcompshad/Input.cpp @@ -1188,147 +327,655 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcompshad/Win.h nxcompshad/X11.cpp nxcompshad/X11.h - nxproxy/Main.c -Copyright: 2001, 2007 NoMachine, http://www.nomachine.com/. */ - 2001, 2010 NoMachine, http://www.nomachine.com/. */ - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + +Files: nx-X11/extras/Mesa/include/GL/gl.h + nx-X11/extras/Mesa/include/GL/osmesa.h + nx-X11/extras/Mesa/include/GL/xmesa.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c + nx-X11/extras/Mesa/src/mesa/array_cache/acache.h + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h + nx-X11/extras/Mesa/src/mesa/glapi/glapi.c + nx-X11/extras/Mesa/src/mesa/glapi/glapi.h + nx-X11/extras/Mesa/src/mesa/glapi/glthread.c + nx-X11/extras/Mesa/src/mesa/glapi/glthread.h + nx-X11/extras/Mesa/src/mesa/main/accum.c + nx-X11/extras/Mesa/src/mesa/main/accum.h + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h + nx-X11/extras/Mesa/src/mesa/main/api_eval.h + nx-X11/extras/Mesa/src/mesa/main/api_loopback.c + nx-X11/extras/Mesa/src/mesa/main/api_loopback.h + nx-X11/extras/Mesa/src/mesa/main/api_noop.c + nx-X11/extras/Mesa/src/mesa/main/api_noop.h + nx-X11/extras/Mesa/src/mesa/main/api_validate.c + nx-X11/extras/Mesa/src/mesa/main/api_validate.h + nx-X11/extras/Mesa/src/mesa/main/attrib.c + nx-X11/extras/Mesa/src/mesa/main/attrib.h + nx-X11/extras/Mesa/src/mesa/main/blend.c + nx-X11/extras/Mesa/src/mesa/main/blend.h + nx-X11/extras/Mesa/src/mesa/main/bufferobj.c + nx-X11/extras/Mesa/src/mesa/main/bufferobj.h + nx-X11/extras/Mesa/src/mesa/main/buffers.c + nx-X11/extras/Mesa/src/mesa/main/buffers.h + nx-X11/extras/Mesa/src/mesa/main/clip.c + nx-X11/extras/Mesa/src/mesa/main/clip.h + nx-X11/extras/Mesa/src/mesa/main/colormac.h + nx-X11/extras/Mesa/src/mesa/main/colortab.c + nx-X11/extras/Mesa/src/mesa/main/colortab.h + nx-X11/extras/Mesa/src/mesa/main/config.h + nx-X11/extras/Mesa/src/mesa/main/context.c + nx-X11/extras/Mesa/src/mesa/main/context.h + nx-X11/extras/Mesa/src/mesa/main/convolve.c + nx-X11/extras/Mesa/src/mesa/main/convolve.h + nx-X11/extras/Mesa/src/mesa/main/dd.h + nx-X11/extras/Mesa/src/mesa/main/debug.c + nx-X11/extras/Mesa/src/mesa/main/debug.h + nx-X11/extras/Mesa/src/mesa/main/depth.c + nx-X11/extras/Mesa/src/mesa/main/depth.h + nx-X11/extras/Mesa/src/mesa/main/dispatch.c + nx-X11/extras/Mesa/src/mesa/main/dlist.c + nx-X11/extras/Mesa/src/mesa/main/dlist.h + nx-X11/extras/Mesa/src/mesa/main/drawpix.c + nx-X11/extras/Mesa/src/mesa/main/drawpix.h + nx-X11/extras/Mesa/src/mesa/main/enable.c + nx-X11/extras/Mesa/src/mesa/main/enable.h + nx-X11/extras/Mesa/src/mesa/main/enums.c + nx-X11/extras/Mesa/src/mesa/main/enums.h + nx-X11/extras/Mesa/src/mesa/main/eval.c + nx-X11/extras/Mesa/src/mesa/main/eval.h + nx-X11/extras/Mesa/src/mesa/main/execmem.c + nx-X11/extras/Mesa/src/mesa/main/extensions.c + nx-X11/extras/Mesa/src/mesa/main/extensions.h + nx-X11/extras/Mesa/src/mesa/main/fbobject.c + nx-X11/extras/Mesa/src/mesa/main/fbobject.h + nx-X11/extras/Mesa/src/mesa/main/feedback.c + nx-X11/extras/Mesa/src/mesa/main/feedback.h + nx-X11/extras/Mesa/src/mesa/main/fog.c + nx-X11/extras/Mesa/src/mesa/main/fog.h + nx-X11/extras/Mesa/src/mesa/main/framebuffer.c + nx-X11/extras/Mesa/src/mesa/main/framebuffer.h + nx-X11/extras/Mesa/src/mesa/main/get.h + nx-X11/extras/Mesa/src/mesa/main/getstring.c + nx-X11/extras/Mesa/src/mesa/main/glheader.h + nx-X11/extras/Mesa/src/mesa/main/hash.c + nx-X11/extras/Mesa/src/mesa/main/hash.h + nx-X11/extras/Mesa/src/mesa/main/hint.c + nx-X11/extras/Mesa/src/mesa/main/hint.h + nx-X11/extras/Mesa/src/mesa/main/histogram.c + nx-X11/extras/Mesa/src/mesa/main/histogram.h + nx-X11/extras/Mesa/src/mesa/main/image.c + nx-X11/extras/Mesa/src/mesa/main/image.h + nx-X11/extras/Mesa/src/mesa/main/imports.c + nx-X11/extras/Mesa/src/mesa/main/imports.h + nx-X11/extras/Mesa/src/mesa/main/light.c + nx-X11/extras/Mesa/src/mesa/main/light.h + nx-X11/extras/Mesa/src/mesa/main/lines.c + nx-X11/extras/Mesa/src/mesa/main/lines.h + nx-X11/extras/Mesa/src/mesa/main/macros.h + nx-X11/extras/Mesa/src/mesa/main/matrix.c + nx-X11/extras/Mesa/src/mesa/main/matrix.h + nx-X11/extras/Mesa/src/mesa/main/mtypes.h + nx-X11/extras/Mesa/src/mesa/main/occlude.c + nx-X11/extras/Mesa/src/mesa/main/occlude.h + nx-X11/extras/Mesa/src/mesa/main/pixel.c + nx-X11/extras/Mesa/src/mesa/main/pixel.h + nx-X11/extras/Mesa/src/mesa/main/points.c + nx-X11/extras/Mesa/src/mesa/main/points.h + nx-X11/extras/Mesa/src/mesa/main/polygon.c + nx-X11/extras/Mesa/src/mesa/main/polygon.h + nx-X11/extras/Mesa/src/mesa/main/rastpos.c + nx-X11/extras/Mesa/src/mesa/main/rastpos.h + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h + nx-X11/extras/Mesa/src/mesa/main/state.c + nx-X11/extras/Mesa/src/mesa/main/state.h + nx-X11/extras/Mesa/src/mesa/main/stencil.c + nx-X11/extras/Mesa/src/mesa/main/stencil.h + nx-X11/extras/Mesa/src/mesa/main/texcompress.c + nx-X11/extras/Mesa/src/mesa/main/texcompress.h + nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c + nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c + nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h + nx-X11/extras/Mesa/src/mesa/main/texformat.c + nx-X11/extras/Mesa/src/mesa/main/texformat.h + nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h + nx-X11/extras/Mesa/src/mesa/main/teximage.c + nx-X11/extras/Mesa/src/mesa/main/teximage.h + nx-X11/extras/Mesa/src/mesa/main/texobj.c + nx-X11/extras/Mesa/src/mesa/main/texobj.h + nx-X11/extras/Mesa/src/mesa/main/texstate.c + nx-X11/extras/Mesa/src/mesa/main/texstate.h + nx-X11/extras/Mesa/src/mesa/main/texstore.c + nx-X11/extras/Mesa/src/mesa/main/texstore.h + nx-X11/extras/Mesa/src/mesa/main/varray.c + nx-X11/extras/Mesa/src/mesa/main/varray.h + nx-X11/extras/Mesa/src/mesa/main/version.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_debug.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_eval.c + nx-X11/extras/Mesa/src/mesa/math/m_eval.h + nx-X11/extras/Mesa/src/mesa/math/m_matrix.c + nx-X11/extras/Mesa/src/mesa/math/m_matrix.h + nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_translate.c + nx-X11/extras/Mesa/src/mesa/math/m_translate.h + nx-X11/extras/Mesa/src/mesa/math/m_vector.c + nx-X11/extras/Mesa/src/mesa/math/m_vector.h + nx-X11/extras/Mesa/src/mesa/math/m_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_xform.h + nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h + nx-X11/extras/Mesa/src/mesa/math/mathmod.h + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h + nx-X11/extras/Mesa/src/mesa/shader/program.c + nx-X11/extras/Mesa/src/mesa/shader/program.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h + nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h + nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h + nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.h + nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h + nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h + nx-X11/extras/Mesa/src/mesa/swrast/s_points.c + nx-X11/extras/Mesa/src/mesa/swrast/s_points.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.h + nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h + nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h + nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h + nx-X11/extras/Mesa/src/mesa/swrast/swrast.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h + nx-X11/extras/Mesa/src/mesa/tnl/t_context.c + nx-X11/extras/Mesa/src/mesa/tnl/t_context.h + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h + nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c + nx-X11/extras/Mesa/src/mesa/tnl/tnl.h +Copyright: 1999-2001, Brian Paul + 1999-2002, Brian Paul + 1999-2003, Brian Paul + 1999-2004, Brian Paul + 1999-2005, Brian Paul + 2004-2005, Brian Paul + 2005, Brian Paul +License: Expat + FIXME + +Files: nx-X11/include/XWDFile.h + nx-X11/include/Xalloca.h + nx-X11/include/Xauth.h + nx-X11/include/Xfuncproto.h + nx-X11/include/Xfuncs.h + nx-X11/include/Xos.h + nx-X11/include/Xos_r.h + nx-X11/include/Xosdefs.h + nx-X11/include/Xthreads.h + nx-X11/include/Xwindows.h + nx-X11/include/Xwinsock.h + nx-X11/include/extensions/bigreqstr.h + nx-X11/include/extensions/security.h + nx-X11/include/extensions/securstr.h + nx-X11/include/extensions/xcmiscstr.h + nx-X11/include/extensions/xtestconst.h + nx-X11/include/extensions/xteststr.h + nx-X11/lib/X11/AllCells.c + nx-X11/lib/X11/AllPlanes.c + nx-X11/lib/X11/AllowEv.c + nx-X11/lib/X11/AuDispose.c + nx-X11/lib/X11/AuFileName.c + nx-X11/lib/X11/AuGetBest.c + nx-X11/lib/X11/AuRead.c + nx-X11/lib/X11/AutoRep.c + nx-X11/lib/X11/Backgnd.c + nx-X11/lib/X11/BdrWidth.c + nx-X11/lib/X11/Bell.c + nx-X11/lib/X11/Border.c + nx-X11/lib/X11/ChAccCon.c + nx-X11/lib/X11/ChActPGb.c + nx-X11/lib/X11/ChClMode.c + nx-X11/lib/X11/ChCmap.c + nx-X11/lib/X11/ChGC.c + nx-X11/lib/X11/ChKeyCon.c + nx-X11/lib/X11/ChPntCon.c + nx-X11/lib/X11/ChProp.c + nx-X11/lib/X11/ChSaveSet.c + nx-X11/lib/X11/ChWAttrs.c + nx-X11/lib/X11/ChWindow.c + nx-X11/lib/X11/ChkIfEv.c + nx-X11/lib/X11/ChkMaskEv.c + nx-X11/lib/X11/ChkTypEv.c + nx-X11/lib/X11/ChkTypWEv.c + nx-X11/lib/X11/ChkWinEv.c + nx-X11/lib/X11/CirWin.c + nx-X11/lib/X11/CirWinDn.c + nx-X11/lib/X11/CirWinUp.c + nx-X11/lib/X11/ClDisplay.c + nx-X11/lib/X11/Clear.c + nx-X11/lib/X11/ClearArea.c + nx-X11/lib/X11/ConfWind.c + nx-X11/lib/X11/ConvSel.c + nx-X11/lib/X11/CopyArea.c + nx-X11/lib/X11/CopyCmap.c + nx-X11/lib/X11/CopyGC.c + nx-X11/lib/X11/CopyPlane.c + nx-X11/lib/X11/CrBFData.c + nx-X11/lib/X11/CrCmap.c + nx-X11/lib/X11/CrCursor.c + nx-X11/lib/X11/CrGC.c + nx-X11/lib/X11/CrGlCur.c + nx-X11/lib/X11/CrPFBData.c + nx-X11/lib/X11/CrPixmap.c + nx-X11/lib/X11/CrWindow.c + nx-X11/lib/X11/Cursor.c + nx-X11/lib/X11/DefCursor.c + nx-X11/lib/X11/DelProp.c + nx-X11/lib/X11/Depths.c + nx-X11/lib/X11/DestSubs.c + nx-X11/lib/X11/DestWind.c + nx-X11/lib/X11/DisName.c + nx-X11/lib/X11/DrArc.c + nx-X11/lib/X11/DrArcs.c + nx-X11/lib/X11/DrLine.c + nx-X11/lib/X11/DrLines.c + nx-X11/lib/X11/DrPoint.c + nx-X11/lib/X11/DrPoints.c + nx-X11/lib/X11/DrRect.c + nx-X11/lib/X11/DrRects.c + nx-X11/lib/X11/DrSegs.c + nx-X11/lib/X11/ErrHndlr.c + nx-X11/lib/X11/EvToWire.c + nx-X11/lib/X11/FSSaver.c + nx-X11/lib/X11/FetchName.c + nx-X11/lib/X11/FillArc.c + nx-X11/lib/X11/FillArcs.c + nx-X11/lib/X11/FillPoly.c + nx-X11/lib/X11/FillRct.c + nx-X11/lib/X11/FillRcts.c + nx-X11/lib/X11/Flush.c + nx-X11/lib/X11/FontInfo.c + nx-X11/lib/X11/FontNames.c + nx-X11/lib/X11/FreeCmap.c + nx-X11/lib/X11/FreeCols.c + nx-X11/lib/X11/FreeCurs.c + nx-X11/lib/X11/FreeEData.c + nx-X11/lib/X11/FreeGC.c + nx-X11/lib/X11/FreePix.c + nx-X11/lib/X11/GCMisc.c + nx-X11/lib/X11/Geom.c + nx-X11/lib/X11/GetAtomNm.c + nx-X11/lib/X11/GetColor.c + nx-X11/lib/X11/GetFPath.c + nx-X11/lib/X11/GetFProp.c + nx-X11/lib/X11/GetGCVals.c + nx-X11/lib/X11/GetGeom.c + nx-X11/lib/X11/GetHColor.c + nx-X11/lib/X11/GetIFocus.c + nx-X11/lib/X11/GetImage.c + nx-X11/lib/X11/GetKCnt.c + nx-X11/lib/X11/GetMoEv.c + nx-X11/lib/X11/GetPCnt.c + nx-X11/lib/X11/GetPntMap.c + nx-X11/lib/X11/GetProp.c + nx-X11/lib/X11/GetRGBCMap.c + nx-X11/lib/X11/GetSOwner.c + nx-X11/lib/X11/GetSSaver.c + nx-X11/lib/X11/GetWAttrs.c + nx-X11/lib/X11/GrButton.c + nx-X11/lib/X11/GrKey.c + nx-X11/lib/X11/GrKeybd.c + nx-X11/lib/X11/GrPointer.c + nx-X11/lib/X11/GrServer.c + nx-X11/lib/X11/IfEvent.c + nx-X11/lib/X11/ImText.c + nx-X11/lib/X11/ImText16.c + nx-X11/lib/X11/ImUtil.c + nx-X11/lib/X11/InitExt.c + nx-X11/lib/X11/InsCmap.c + nx-X11/lib/X11/IntAtom.c + nx-X11/lib/X11/KeyBind.c + nx-X11/lib/X11/KeysymStr.c + nx-X11/lib/X11/KillCl.c + nx-X11/lib/X11/LiICmaps.c + nx-X11/lib/X11/LiProps.c + nx-X11/lib/X11/ListExt.c + nx-X11/lib/X11/LoadFont.c + nx-X11/lib/X11/LockDis.c + nx-X11/lib/X11/LookupCol.c + nx-X11/lib/X11/LowerWin.c + nx-X11/lib/X11/Macros.c + nx-X11/lib/X11/MapRaised.c + nx-X11/lib/X11/MapSubs.c + nx-X11/lib/X11/MapWindow.c + nx-X11/lib/X11/MaskEvent.c + nx-X11/lib/X11/Misc.c + nx-X11/lib/X11/ModMap.c + nx-X11/lib/X11/MoveWin.c + nx-X11/lib/X11/NextEvent.c + nx-X11/lib/X11/ParseCol.c + nx-X11/lib/X11/ParseGeom.c + nx-X11/lib/X11/PeekEvent.c + nx-X11/lib/X11/PeekIfEv.c + nx-X11/lib/X11/Pending.c + nx-X11/lib/X11/PixFormats.c + nx-X11/lib/X11/PmapBgnd.c + nx-X11/lib/X11/PmapBord.c + nx-X11/lib/X11/PolyTxt.c + nx-X11/lib/X11/PolyTxt16.c + nx-X11/lib/X11/PropAlloc.c + nx-X11/lib/X11/PutBEvent.c + nx-X11/lib/X11/PutImage.c + nx-X11/lib/X11/QuBest.c + nx-X11/lib/X11/QuColor.c + nx-X11/lib/X11/QuColors.c + nx-X11/lib/X11/QuCurShp.c + nx-X11/lib/X11/QuExt.c + nx-X11/lib/X11/QuKeybd.c + nx-X11/lib/X11/QuPntr.c + nx-X11/lib/X11/QuStipShp.c + nx-X11/lib/X11/QuTextE16.c + nx-X11/lib/X11/QuTextExt.c + nx-X11/lib/X11/QuTileShp.c + nx-X11/lib/X11/QuTree.c + nx-X11/lib/X11/RaiseWin.c + nx-X11/lib/X11/RdBitF.c + nx-X11/lib/X11/RecolorC.c + nx-X11/lib/X11/ReconfWM.c + nx-X11/lib/X11/ReconfWin.c + nx-X11/lib/X11/RepWindow.c + nx-X11/lib/X11/RestackWs.c + nx-X11/lib/X11/RotProp.c + nx-X11/lib/X11/ScrResStr.c + nx-X11/lib/X11/SelInput.c + nx-X11/lib/X11/SendEvent.c + nx-X11/lib/X11/SetBack.c + nx-X11/lib/X11/SetCRects.c + nx-X11/lib/X11/SetClMask.c + nx-X11/lib/X11/SetClOrig.c + nx-X11/lib/X11/SetDashes.c + nx-X11/lib/X11/SetFPath.c + nx-X11/lib/X11/SetFont.c + nx-X11/lib/X11/SetFore.c + nx-X11/lib/X11/SetFunc.c + nx-X11/lib/X11/SetIFocus.c + nx-X11/lib/X11/SetLStyle.c + nx-X11/lib/X11/SetPMask.c + nx-X11/lib/X11/SetPntMap.c + nx-X11/lib/X11/SetRGBCMap.c + nx-X11/lib/X11/SetSOwner.c + nx-X11/lib/X11/SetSSaver.c + nx-X11/lib/X11/SetState.c + nx-X11/lib/X11/SetStip.c + nx-X11/lib/X11/SetTSOrig.c + nx-X11/lib/X11/SetTile.c + nx-X11/lib/X11/StBytes.c + nx-X11/lib/X11/StColor.c + nx-X11/lib/X11/StColors.c + nx-X11/lib/X11/StNColor.c + nx-X11/lib/X11/StName.c + nx-X11/lib/X11/StrKeysym.c + nx-X11/lib/X11/StrToText.c + nx-X11/lib/X11/Sync.c + nx-X11/lib/X11/Synchro.c + nx-X11/lib/X11/Text.c + nx-X11/lib/X11/Text16.c + nx-X11/lib/X11/TextToStr.c + nx-X11/lib/X11/TrCoords.c + nx-X11/lib/X11/UndefCurs.c + nx-X11/lib/X11/UngrabBut.c + nx-X11/lib/X11/UngrabKbd.c + nx-X11/lib/X11/UngrabKey.c + nx-X11/lib/X11/UngrabPtr.c + nx-X11/lib/X11/UngrabSvr.c + nx-X11/lib/X11/UninsCmap.c + nx-X11/lib/X11/UnldFont.c + nx-X11/lib/X11/UnmapSubs.c + nx-X11/lib/X11/UnmapWin.c + nx-X11/lib/X11/VisUtil.c + nx-X11/lib/X11/WMGeom.c + nx-X11/lib/X11/WarpPtr.c + nx-X11/lib/X11/WinEvent.c + nx-X11/lib/X11/Window.c + nx-X11/lib/X11/WrBitF.c + nx-X11/lib/X11/XKBBind.c + nx-X11/lib/X11/XKBCvt.c + nx-X11/lib/X11/Xlib.h + nx-X11/lib/X11/Xlocale.h + nx-X11/lib/X11/cmsMath.c + nx-X11/lib/X11/cursorfont.h + nx-X11/lib/X11/evtomask.c + nx-X11/lib/X11/globals.c + nx-X11/lib/X11/locking.c + nx-X11/lib/X11/locking.h + nx-X11/lib/X11/mbWMProps.c + nx-X11/lib/X11/util/makekeys.c + nx-X11/programs/Xserver/Xext/bigreq.c + nx-X11/programs/Xserver/Xext/shape.c + nx-X11/programs/Xserver/Xext/shm.c + nx-X11/programs/Xserver/Xext/sleepuntil.c + nx-X11/programs/Xserver/Xext/xcmisc.c + nx-X11/programs/Xserver/Xext/xtest.c + nx-X11/programs/Xserver/Xi/queryst.c + nx-X11/programs/Xserver/dix/ffs.c + nx-X11/programs/Xserver/dix/pixmap.c + nx-X11/programs/Xserver/dix/privates.c + nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h + nx-X11/programs/Xserver/include/closestr.h + nx-X11/programs/Xserver/include/opaque.h + nx-X11/programs/Xserver/include/validate.h + nx-X11/programs/Xserver/mi/cbrt.c + nx-X11/programs/Xserver/mi/mibstorest.h + nx-X11/programs/Xserver/mi/miclipn.c + nx-X11/programs/Xserver/mi/midispcur.c + nx-X11/programs/Xserver/mi/mieq.c + nx-X11/programs/Xserver/mi/mifillarc.c + nx-X11/programs/Xserver/mi/mifillarc.h + nx-X11/programs/Xserver/mi/migc.c + nx-X11/programs/Xserver/mi/migc.h + nx-X11/programs/Xserver/mi/miline.h + nx-X11/programs/Xserver/mi/mipointer.c + nx-X11/programs/Xserver/mi/mipointer.h + nx-X11/programs/Xserver/mi/mipointrst.h + nx-X11/programs/Xserver/mi/mipoly.h + nx-X11/programs/Xserver/mi/miscanfill.h + nx-X11/programs/Xserver/mi/miscrinit.c + nx-X11/programs/Xserver/mi/misprite.c + nx-X11/programs/Xserver/mi/misprite.h + nx-X11/programs/Xserver/mi/mispritest.h + nx-X11/programs/Xserver/mi/mivalidate.h + nx-X11/programs/Xserver/mi/miwideline.c + nx-X11/programs/Xserver/mi/miwideline.h + nx-X11/programs/Xserver/mi/mizerarc.c + nx-X11/programs/Xserver/mi/mizerarc.h + nx-X11/programs/Xserver/os/mitauth.c + nx-X11/programs/Xserver/os/rpcauth.c + nx-X11/programs/Xserver/os/secauth.c + nx-X11/programs/Xserver/os/xdmauth.c + nx-X11/programs/Xserver/record/record.c + nx-X11/programs/Xserver/record/set.c + nx-X11/programs/Xserver/record/set.h + nxcompshad/X11/include/XTest_nxcompshad.h +Copyright: 1985, 1987, 1990, 1998 The Open Group + 1985, 1987, 1994, 1998 The Open Group + 1985, 1987, 1998, The Open Group + 1985, 1990, 1998, The Open Group + 1985, 1998 The Open Group + 1985-1986, 1998 The Open Group + 1985-1987, 1991, 1998, The Open Group + 1985-1987, 1998 The Open Group + 1985-1987,1998, The Open Group + 1986, 1990, 1998, The Open Group + 1986, 1998 The Open Group + 1986,1998, The Open Group + 1986-1987, 1998 The Open Group + 1987, 1998 The Open Group + 1988, 1998 The Open Group + 1988-1989, 1998 The Open Group + 1989, 1991, 1998, The Open Group + 1989, 1998 The Open Group + 1990, 1998 The Open Group + 1991, 1998 The Open Group + 1992, 1998 The Open Group + 1993, 1998 The Open Group + 1993-1994, 1998 The Open Group + 1994, 1998 The Open Group + 1995, 1998 The Open Group + 1996, 1998 The Open Group + 1998, 1998 The Open Group + 2003, The Open Group License: UNKNOWN FIXME -Files: nx-X11/config/util/aminstall.sh - nx-X11/config/util/bsdinst.sh - nx-X11/config/util/crayar.sh - nx-X11/config/util/gccmdep.cpp - nx-X11/config/util/install.sh - nx-X11/config/util/makeg.sh - nx-X11/config/util/mdepend.cpp - nx-X11/config/util/mkdirhier.sh - nx-X11/config/util/mkshadow/wildmat.c - nx-X11/config/util/printver.c - nx-X11/config/util/syminst.sh - nx-X11/config/util/x11mf.sh - nx-X11/config/util/xmkmf.cpp - nx-X11/extras/Mesa/include/GL/gl_mangle.h - nx-X11/extras/Mesa/include/GL/vms_x_fix.h - nx-X11/extras/Mesa/include/GLES/egltypes.h - nx-X11/extras/Mesa/src/glx/mini/miniglxP.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/depthtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/drirenderbuffer.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/drirenderbuffer.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/memops.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/mmx.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/stenciltmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py - nx-X11/extras/Mesa/src/mesa/drivers/dri/fb/fb_egl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_bitmap.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_clear.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_depth.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_fifo.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_fog.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_lines.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_linetmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_points.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_pointtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_rendertmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_stencil.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_tritmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vbtmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vtxfmt.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_xmesa.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/server/ffb_drishare.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_tritmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810_3d_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_3d_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/server/i830_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/server/i830_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga_bios.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga_macros.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/pci_ids.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_maos.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_sanity.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/pixel_shader.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_sanity.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_emit.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_fixed_pipelines.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_fragprog.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_shader.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_texprog.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_texprog.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/vertex_shader.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_maos.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_sanity.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon_egl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_common.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_inithw.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_macros.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_regs.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_tritmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_vb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3v_xmesa.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/s3v/s3virgetri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/server/sis_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/X86/fx_3dnow_fasttmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_glide.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via_priv.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/x11/x11_dri.h - nx-X11/extras/Mesa/src/mesa/glapi/gl_API.dtd +Files: make-changelog.sh nx-X11/extras/Mesa/src/mesa/main/get.c nx-X11/extras/Mesa/src/mesa/main/texrender.c nx-X11/extras/Mesa/src/mesa/main/texrender.h nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.c - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_crt.h nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/unistd.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/gc_to_bin.c nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h @@ -1339,42 +986,16 @@ Files: nx-X11/config/util/aminstall.sh nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h - nx-X11/extras/Mesa/src/mesa/sparc/sparc_matrix.h - nx-X11/extras/Mesa/src/mesa/tnl_dd/t_dd_triemit.h - nx-X11/extras/Mesa/src/mesa/x86/mmx_blendtmp.h - nx-X11/extras/Mesa/src/mesa/x86/rtasm/x86sse.c - nx-X11/extras/Mesa/src/mesa/x86/rtasm/x86sse.h - nx-X11/extras/Xpm/lib/Xpm-def.cpp nx-X11/include/XF86keysym.h nx-X11/include/Xatom.h nx-X11/include/Xw32defs.h nx-X11/include/extensions/XvMC.h - nx-X11/include/extensions/XvMClib.h nx-X11/include/extensions/XvMCproto.h - nx-X11/lib/GL/GL/GL-def.cpp - nx-X11/lib/GL/mesa/Imakefile.inc - nx-X11/lib/GL/mesa/array_cache/Imakefile.inc - nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc - nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp - nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc - nx-X11/lib/GL/mesa/main/Imakefile.inc - nx-X11/lib/GL/mesa/math/Imakefile.inc - nx-X11/lib/GL/mesa/shader/Imakefile.inc - nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc - nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc - nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc - nx-X11/lib/GL/mesa/sparc/Imakefile.inc - nx-X11/lib/GL/mesa/swrast/Imakefile.inc - nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc - nx-X11/lib/GL/mesa/tnl/Imakefile.inc - nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc - nx-X11/lib/GL/mesa/x86/Imakefile.inc nx-X11/lib/X11/Cmap.h nx-X11/lib/X11/Cr.h nx-X11/lib/X11/Cv.h nx-X11/lib/X11/ImUtil.h nx-X11/lib/X11/Key.h - nx-X11/lib/X11/X11-def.cpp nx-X11/lib/X11/Xintatom.h nx-X11/lib/X11/Xintconn.h nx-X11/lib/X11/XlibConf.h @@ -1385,12 +1006,14 @@ Files: nx-X11/config/util/aminstall.sh nx-X11/lib/X11/lcUniConv/ascii.h nx-X11/lib/X11/lcUniConv/big5.h nx-X11/lib/X11/lcUniConv/big5_emacs.h + nx-X11/lib/X11/lcUniConv/big5hkscs.h nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c nx-X11/lib/X11/lcUniConv/cp1133.h nx-X11/lib/X11/lcUniConv/cp1251.h nx-X11/lib/X11/lcUniConv/cp1255.h nx-X11/lib/X11/lcUniConv/cp1256.h nx-X11/lib/X11/lcUniConv/gb2312.h + nx-X11/lib/X11/lcUniConv/gbk.h nx-X11/lib/X11/lcUniConv/georgian_academy.h nx-X11/lib/X11/lcUniConv/georgian_ps.h nx-X11/lib/X11/lcUniConv/iso8859_1.h @@ -1423,85 +1046,36 @@ Files: nx-X11/config/util/aminstall.sh nx-X11/lib/X11/lcUniConv/ucs2be.h nx-X11/lib/X11/lcUniConv/utf8.h nx-X11/lib/X11/lcUniConv/viscii.h - nx-X11/lib/X11/util/mkks.sh - nx-X11/lib/XRes/XRes-def.cpp - nx-X11/lib/XTrap/XTrap-def.cpp - nx-X11/lib/Xcomposite/autogen.sh - nx-X11/lib/Xcursor/Xcursor-def.cpp - nx-X11/lib/Xcursor/autogen.sh - nx-X11/lib/Xcursor/config.h - nx-X11/lib/Xdamage/autogen.sh - nx-X11/lib/Xdmcp/Wrap.h - nx-X11/lib/Xdmcp/Wraphelp.c - nx-X11/lib/Xext/Xext-def.cpp - nx-X11/lib/Xfixes/Xfixes-def.cpp - nx-X11/lib/Xfixes/autogen.sh - nx-X11/lib/Xinerama/Xinerama-def.cpp - nx-X11/lib/Xpm/Xpm-def.cpp - nx-X11/lib/Xrandr/Xrandr-def.cpp - nx-X11/lib/Xrandr/test.c - nx-X11/lib/Xrender/Xrender-def.cpp - nx-X11/lib/Xrender/autogen.sh - nx-X11/lib/Xrender/config.h - nx-X11/lib/Xtst/Xtst-def.cpp - nx-X11/lib/font/Speedo/adobe-iso.h - nx-X11/lib/font/Speedo/bics-unicode.h - nx-X11/lib/font/fontfile/gunzip.c - nx-X11/lib/font/include/fontmod.h - nx-X11/lib/font/include/fontutil.h - nx-X11/lib/font/stubs/cauthgen.c - nx-X11/lib/font/stubs/csignal.c - nx-X11/lib/font/stubs/delfntcid.c - nx-X11/lib/font/stubs/errorf.c - nx-X11/lib/font/stubs/fatalerror.c - nx-X11/lib/font/stubs/findoldfnt.c - nx-X11/lib/font/stubs/getcres.c - nx-X11/lib/font/stubs/getdefptsize.c - nx-X11/lib/font/stubs/getnewfntcid.c - nx-X11/lib/font/stubs/gettime.c - nx-X11/lib/font/stubs/initfshdl.c - nx-X11/lib/font/stubs/regfpefunc.c - nx-X11/lib/font/stubs/rmfshdl.c - nx-X11/lib/font/stubs/servclient.c - nx-X11/lib/font/stubs/setfntauth.c - nx-X11/lib/font/stubs/stfntcfnt.c - nx-X11/lib/font/stubs/stubs.h - nx-X11/lib/font/stubs/xpstubs.c - nx-X11/lib/oldX/oldX-def.cpp - nx-X11/lib/xkbfile/xkbfile-def.cpp - nx-X11/lib/xkbui/xkbui-def.cpp - nx-X11/programs/Xserver/GL/glx/glx-def.cpp - nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp - nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c - nx-X11/programs/Xserver/Xext/appgroup.h - nx-X11/programs/Xserver/Xext/dgaproc.h + nx-X11/programs/Xserver/GL/mesa/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc nx-X11/programs/Xserver/Xext/dpmsproc.h - nx-X11/programs/Xserver/Xext/extmod/modinit.h nx-X11/programs/Xserver/Xext/panoramiXh.h nx-X11/programs/Xserver/Xext/panoramiXsrv.h - nx-X11/programs/Xserver/Xext/vidmodeproc.h - nx-X11/programs/Xserver/Xext/xf86dgaext.h - nx-X11/programs/Xserver/Xext/xf86miscproc.h nx-X11/programs/Xserver/Xext/xvdisp.h nx-X11/programs/Xserver/Xext/xvmc.c nx-X11/programs/Xserver/Xext/xvmcext.h - nx-X11/programs/Xserver/Xext/xvmod.c - nx-X11/programs/Xserver/Xext/xvmodproc.h - nx-X11/programs/Xserver/dbe/dbemodule.c nx-X11/programs/Xserver/dix/initatoms.c - nx-X11/programs/Xserver/fb/fbpseudocolor.c - nx-X11/programs/Xserver/fb/fbpseudocolor.h - nx-X11/programs/Xserver/hw/nxagent/NXdamage.c nx-X11/programs/Xserver/include/globals.h nx-X11/programs/Xserver/mi/micmap.h nx-X11/programs/Xserver/mi/mioverlay.c nx-X11/programs/Xserver/mi/mioverlay.h - nx-X11/programs/Xserver/randr/registry.h - nx-X11/programs/Xserver/record/recordmod.c + nx-X11/programs/Xserver/os/xstrans.c nx-X11/programs/Xserver/xkb/ddxPrivate.c nx-X11/programs/Xserver/xkb/xkb.h nx-X11/programs/Xserver/xkb/xkbDflts.h - nx-X11/xf86Date.h + nx-X11/x-indent-all.sh + nx-X11/x-indent.sh + regenerate-symbol-docs.sh replace.sh Copyright: *No copyright* License: UNKNOWN @@ -1536,12 +1110,8 @@ Files: nx-X11/include/DECkeysym.h nx-X11/lib/X11/Xresource.h nx-X11/lib/X11/Xutil.h nx-X11/lib/X11/imThaiFlt.c + nx-X11/lib/X11/pathmax.h nx-X11/lib/X11/poly.h - nx-X11/lib/Xext/XSync.c - nx-X11/lib/font/bitmap/bdfread.c - nx-X11/lib/font/bitmap/bdfutils.c - nx-X11/lib/font/bitmap/snfread.c - nx-X11/lib/font/bitmap/snfstr.h nx-X11/programs/Xserver/Xext/sync.c nx-X11/programs/Xserver/dix/atom.c nx-X11/programs/Xserver/dix/colormap.c @@ -1556,9 +1126,6 @@ Files: nx-X11/include/DECkeysym.h nx-X11/programs/Xserver/dix/swaprep.c nx-X11/programs/Xserver/dix/swapreq.c nx-X11/programs/Xserver/dix/tables.c - nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c - nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c - nx-X11/programs/Xserver/hw/nxagent/NXresource.c nx-X11/programs/Xserver/include/closure.h nx-X11/programs/Xserver/include/colormap.h nx-X11/programs/Xserver/include/colormapst.h @@ -1615,7 +1182,6 @@ Files: nx-X11/include/DECkeysym.h nx-X11/programs/Xserver/mi/mizerline.c nx-X11/programs/Xserver/os/connection.c nx-X11/programs/Xserver/os/io.c - nx-X11/programs/Xserver/os/lbxio.c nx-X11/programs/Xserver/os/oscolor.c nx-X11/programs/Xserver/os/osdep.h nx-X11/programs/Xserver/os/osinit.c @@ -1636,8 +1202,6 @@ Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts 1991,1993, Digital Equipment Corporation, Maynard, Massachusetts 1993, 1998 The Open Group 1993, Digital Equipment Corporation, Maynard, Massachusetts - 1994, 1998 The Open Group - 1996, 1998 The Open Group License: UNKNOWN FIXME @@ -1645,27 +1209,8 @@ Files: nx-X11/include/extensions/composite.h nx-X11/include/extensions/compositeproto.h nx-X11/include/extensions/damageproto.h nx-X11/include/extensions/damagewire.h - nx-X11/lib/Xcomposite/Xcomposite.c - nx-X11/lib/Xcomposite/Xcomposite.h - nx-X11/lib/Xcomposite/xcompositeint.h - nx-X11/lib/Xcursor/Xcursor.h - nx-X11/lib/Xcursor/cursor.c - nx-X11/lib/Xcursor/display.c - nx-X11/lib/Xcursor/file.c - nx-X11/lib/Xcursor/library.c - nx-X11/lib/Xcursor/xcursorint.h - nx-X11/lib/Xcursor/xlib.c - nx-X11/lib/Xdamage/Xdamage.c - nx-X11/lib/Xdamage/Xdamage.h - nx-X11/lib/Xdamage/xdamageint.h - nx-X11/lib/Xfixes/Region.c - nx-X11/lib/Xrender/AddTrap.c - nx-X11/lib/Xrender/Color.c - nx-X11/lib/Xrender/Cursor.c - nx-X11/lib/Xrender/Filter.c - nx-X11/lib/Xrender/Poly.c - nx-X11/lib/Xrender/Trap.c - nx-X11/lib/Xrender/Tri.c + nx-X11/lib/X11/x11_trans.c + nx-X11/lib/X11/xim_trans.c nx-X11/programs/Xserver/composite/compalloc.c nx-X11/programs/Xserver/composite/compext.c nx-X11/programs/Xserver/composite/compinit.c @@ -1706,21 +1251,20 @@ Files: nx-X11/include/extensions/composite.h nx-X11/programs/Xserver/fb/fbtrap.c nx-X11/programs/Xserver/fb/fbutil.c nx-X11/programs/Xserver/fb/fbwindow.c - nx-X11/programs/Xserver/hw/nxagent/NXcomposite.c - nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h - nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h - nx-X11/programs/Xserver/hw/nxagent/NXcompositeint.h - nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h nx-X11/programs/Xserver/miext/damage/damage.c nx-X11/programs/Xserver/miext/damage/damage.h nx-X11/programs/Xserver/miext/damage/damagestr.h nx-X11/programs/Xserver/randr/rrdispatch.c nx-X11/programs/Xserver/randr/rrinfo.c - nx-X11/programs/Xserver/randr/rroutput.c + nx-X11/programs/Xserver/randr/rrmonitor.c nx-X11/programs/Xserver/randr/rrpointer.c nx-X11/programs/Xserver/randr/rrproperty.c + nx-X11/programs/Xserver/randr/rrproviderproperty.c nx-X11/programs/Xserver/randr/rrsdispatch.c + nx-X11/programs/Xserver/randr/rrtransform.c + nx-X11/programs/Xserver/randr/rrtransform.h nx-X11/programs/Xserver/render/filter.c + nx-X11/programs/Xserver/render/matrix.c nx-X11/programs/Xserver/render/mipict.c nx-X11/programs/Xserver/render/renderedge.c nx-X11/programs/Xserver/render/renderedge.h @@ -1731,22 +1275,28 @@ Files: nx-X11/include/extensions/composite.h nx-X11/programs/Xserver/xfixes/xfixes.c nx-X11/programs/Xserver/xfixes/xfixes.h nx-X11/programs/Xserver/xfixes/xfixesint.h + nxcompshad/X11/include/Xdamage_nxcompshad.h Copyright: 1998, Keith Packard 1999, Keith Packard 2002, Keith Packard 2003, Keith Packard 2004, Keith Packard 2006, Keith Packard + 2007, Keith Packard + 2014, Keith Packard License: UNKNOWN FIXME -Files: nx-X11/include/extensions/XEVI.h - nx-X11/include/extensions/XEVIstr.h - nx-X11/include/extensions/XKB.h +Files: nx-X11/include/extensions/XKB.h + nx-X11/include/extensions/XKBconfig.h + nx-X11/include/extensions/XKBfile.h nx-X11/include/extensions/XKBgeom.h nx-X11/include/extensions/XKBproto.h + nx-X11/include/extensions/XKBrules.h nx-X11/include/extensions/XKBsrv.h nx-X11/include/extensions/XKBstr.h + nx-X11/include/extensions/XKM.h + nx-X11/include/extensions/XKMformat.h nx-X11/lib/X11/XKB.c nx-X11/lib/X11/XKBAlloc.c nx-X11/lib/X11/XKBBell.c @@ -1768,32 +1318,14 @@ Files: nx-X11/include/extensions/XEVI.h nx-X11/lib/X11/XKBleds.c nx-X11/lib/X11/XKBlib.h nx-X11/lib/X11/XKBlibint.h - nx-X11/lib/Xext/XEVI.c - nx-X11/lib/xkbfile/XKBbells.h - nx-X11/lib/xkbfile/XKBconfig.h - nx-X11/lib/xkbfile/XKBfile.h - nx-X11/lib/xkbfile/XKBfileInt.h - nx-X11/lib/xkbfile/XKBrules.h - nx-X11/lib/xkbfile/XKM.h - nx-X11/lib/xkbfile/XKMformat.h - nx-X11/lib/xkbfile/cout.c - nx-X11/lib/xkbfile/maprules.c - nx-X11/lib/xkbfile/srvmisc.c - nx-X11/lib/xkbfile/xkbbells.c - nx-X11/lib/xkbfile/xkbconfig.c - nx-X11/lib/xkbfile/xkbdraw.c - nx-X11/lib/xkbfile/xkberrs.c - nx-X11/lib/xkbfile/xkbmisc.c - nx-X11/lib/xkbfile/xkbout.c - nx-X11/lib/xkbfile/xkbtext.c - nx-X11/lib/xkbfile/xkmout.c - nx-X11/lib/xkbfile/xkmread.c - nx-X11/lib/xkbui/XKBui.c - nx-X11/lib/xkbui/XKBui.h - nx-X11/lib/xkbui/XKBuiPriv.h - nx-X11/programs/Xserver/Xext/EVI.c - nx-X11/programs/Xserver/Xext/EVIstruct.h - nx-X11/programs/Xserver/Xext/sampleEVI.c + nx-X11/programs/Xserver/include/xkbfile.h + nx-X11/programs/Xserver/include/xkbrules.h + nx-X11/programs/Xserver/include/xkbsrv.h + nx-X11/programs/Xserver/include/xkbstr.h + nx-X11/programs/Xserver/xkb/XKBAlloc.c + nx-X11/programs/Xserver/xkb/XKBGAlloc.c + nx-X11/programs/Xserver/xkb/XKBMAlloc.c + nx-X11/programs/Xserver/xkb/XKBMisc.c nx-X11/programs/Xserver/xkb/ddxBeep.c nx-X11/programs/Xserver/xkb/ddxConfig.c nx-X11/programs/Xserver/xkb/ddxCtrls.c @@ -1807,6 +1339,7 @@ Files: nx-X11/include/extensions/XEVI.h nx-X11/programs/Xserver/xkb/ddxList.c nx-X11/programs/Xserver/xkb/ddxLoad.c nx-X11/programs/Xserver/xkb/ddxVT.c + nx-X11/programs/Xserver/xkb/maprules.c nx-X11/programs/Xserver/xkb/xkb.c nx-X11/programs/Xserver/xkb/xkbAccessX.c nx-X11/programs/Xserver/xkb/xkbActions.c @@ -1817,86 +1350,17 @@ Files: nx-X11/include/extensions/XEVI.h nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c nx-X11/programs/Xserver/xkb/xkbSwap.c nx-X11/programs/Xserver/xkb/xkbUtils.c + nx-X11/programs/Xserver/xkb/xkbconfig.c + nx-X11/programs/Xserver/xkb/xkberrs.c + nx-X11/programs/Xserver/xkb/xkbfmisc.c + nx-X11/programs/Xserver/xkb/xkbgeom.h + nx-X11/programs/Xserver/xkb/xkbout.c + nx-X11/programs/Xserver/xkb/xkbtext.c + nx-X11/programs/Xserver/xkb/xkmread.c Copyright: 1993, Silicon Graphics Computer Systems, Inc 1994, Silicon Graphics Computer Systems, Inc 1995, Silicon Graphics Computer Systems, Inc 1996, Silicon Graphics Computer Systems, Inc - 1997, Silicon Graphics Computer Systems, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/include/GL/glext.h - nx-X11/extras/Mesa/include/GL/glu.h - nx-X11/extras/Mesa/include/GL/glxext.h - nx-X11/extras/Mesa/include/GL/internal/glcore.h - nx-X11/extras/Mesa/include/GLES/egl.h - nx-X11/extras/Mesa/src/glx/x11/clientattrib.c - nx-X11/extras/Mesa/src/glx/x11/compsize.c - nx-X11/extras/Mesa/src/glx/x11/eval.c - nx-X11/extras/Mesa/src/glx/x11/glxclient.h - nx-X11/extras/Mesa/src/glx/x11/glxcmds.c - nx-X11/extras/Mesa/src/glx/x11/glxext.c - nx-X11/extras/Mesa/src/glx/x11/packrender.h - nx-X11/extras/Mesa/src/glx/x11/packsingle.h - nx-X11/extras/Mesa/src/glx/x11/pixel.c - nx-X11/extras/Mesa/src/glx/x11/pixelstore.c - nx-X11/extras/Mesa/src/glx/x11/render2.c - nx-X11/extras/Mesa/src/glx/x11/single2.c - nx-X11/extras/Mesa/src/glx/x11/singlepix.c - nx-X11/extras/Mesa/src/glx/x11/vertarr.c - nx-X11/include/GL/glu.h - nx-X11/include/GL/glx.h - nx-X11/include/GL/glxmd.h - nx-X11/include/GL/glxproto.h - nx-X11/include/GL/glxtokens.h - nx-X11/programs/Xserver/GL/glx/g_disptab.c - nx-X11/programs/Xserver/GL/glx/g_disptab.h - nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c - nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h - nx-X11/programs/Xserver/GL/glx/g_render.c - nx-X11/programs/Xserver/GL/glx/g_renderswap.c - nx-X11/programs/Xserver/GL/glx/g_single.c - nx-X11/programs/Xserver/GL/glx/g_singleswap.c - nx-X11/programs/Xserver/GL/glx/global.c - nx-X11/programs/Xserver/GL/glx/glxbuf.c - nx-X11/programs/Xserver/GL/glx/glxbuf.h - nx-X11/programs/Xserver/GL/glx/glxcmds.c - nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c - nx-X11/programs/Xserver/GL/glx/glxcontext.h - nx-X11/programs/Xserver/GL/glx/glxdrawable.h - nx-X11/programs/Xserver/GL/glx/glxerror.h - nx-X11/programs/Xserver/GL/glx/glxext.h - nx-X11/programs/Xserver/GL/glx/glxfb.c - nx-X11/programs/Xserver/GL/glx/glxfb.h - nx-X11/programs/Xserver/GL/glx/glximports.c - nx-X11/programs/Xserver/GL/glx/glximports.h - nx-X11/programs/Xserver/GL/glx/glxmem.c - nx-X11/programs/Xserver/GL/glx/glxmem.h - nx-X11/programs/Xserver/GL/glx/glxpix.c - nx-X11/programs/Xserver/GL/glx/glxpix.h - nx-X11/programs/Xserver/GL/glx/glxscreens.c - nx-X11/programs/Xserver/GL/glx/glxscreens.h - nx-X11/programs/Xserver/GL/glx/glxserver.h - nx-X11/programs/Xserver/GL/glx/glxutil.c - nx-X11/programs/Xserver/GL/glx/glxutil.h - nx-X11/programs/Xserver/GL/glx/impsize.h - nx-X11/programs/Xserver/GL/glx/render2.c - nx-X11/programs/Xserver/GL/glx/render2swap.c - nx-X11/programs/Xserver/GL/glx/renderpix.c - nx-X11/programs/Xserver/GL/glx/renderpixswap.c - nx-X11/programs/Xserver/GL/glx/rensize.c - nx-X11/programs/Xserver/GL/glx/rensizetab.c - nx-X11/programs/Xserver/GL/glx/single2.c - nx-X11/programs/Xserver/GL/glx/single2swap.c - nx-X11/programs/Xserver/GL/glx/singlepix.c - nx-X11/programs/Xserver/GL/glx/singlepixswap.c - nx-X11/programs/Xserver/GL/glx/singlesize.c - nx-X11/programs/Xserver/GL/glx/singlesize.h - nx-X11/programs/Xserver/GL/glx/unpack.h - nx-X11/programs/Xserver/GL/glx/xfont.c - nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h -Copyright: 1991-2000, Silicon Graphics, Inc - 1991-2004, Silicon Graphics, Inc License: UNKNOWN FIXME @@ -1967,67 +1431,63 @@ Copyright: 1990, 1991 Tektronix, Inc License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_cmdbuf.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_maos.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_maos_arrays.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_pixel.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_pixel.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_state_init.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_c.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_tcl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r200_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_cmdbuf.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_cmdbuf.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_maos.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_maos.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_state.c -Copyright: The Weather Channel, Inc. 2002. -License: Expat +Files: nx-X11/extras/Mesa/include/GL/glext.h + nx-X11/extras/Mesa/include/GL/glxext.h + nx-X11/extras/Mesa/include/GL/internal/glcore.h + nx-X11/extras/Mesa/src/glx/x11/compsize.c + nx-X11/include/GL/glx.h + nx-X11/include/GL/glxmd.h + nx-X11/include/GL/glxproto.h + nx-X11/include/GL/glxtokens.h + nx-X11/programs/Xserver/GL/glx/g_disptab.c + nx-X11/programs/Xserver/GL/glx/g_disptab.h + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h + nx-X11/programs/Xserver/GL/glx/g_render.c + nx-X11/programs/Xserver/GL/glx/g_renderswap.c + nx-X11/programs/Xserver/GL/glx/g_single.c + nx-X11/programs/Xserver/GL/glx/g_singleswap.c + nx-X11/programs/Xserver/GL/glx/global.c + nx-X11/programs/Xserver/GL/glx/glxbuf.c + nx-X11/programs/Xserver/GL/glx/glxbuf.h + nx-X11/programs/Xserver/GL/glx/glxcmds.c + nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c + nx-X11/programs/Xserver/GL/glx/glxcontext.h + nx-X11/programs/Xserver/GL/glx/glxdrawable.h + nx-X11/programs/Xserver/GL/glx/glxerror.h + nx-X11/programs/Xserver/GL/glx/glxext.h + nx-X11/programs/Xserver/GL/glx/glxfb.c + nx-X11/programs/Xserver/GL/glx/glxfb.h + nx-X11/programs/Xserver/GL/glx/glximports.c + nx-X11/programs/Xserver/GL/glx/glximports.h + nx-X11/programs/Xserver/GL/glx/glxmem.c + nx-X11/programs/Xserver/GL/glx/glxmem.h + nx-X11/programs/Xserver/GL/glx/glxpix.c + nx-X11/programs/Xserver/GL/glx/glxpix.h + nx-X11/programs/Xserver/GL/glx/glxscreens.c + nx-X11/programs/Xserver/GL/glx/glxscreens.h + nx-X11/programs/Xserver/GL/glx/glxserver.h + nx-X11/programs/Xserver/GL/glx/glxutil.c + nx-X11/programs/Xserver/GL/glx/glxutil.h + nx-X11/programs/Xserver/GL/glx/impsize.h + nx-X11/programs/Xserver/GL/glx/render2.c + nx-X11/programs/Xserver/GL/glx/render2swap.c + nx-X11/programs/Xserver/GL/glx/renderpix.c + nx-X11/programs/Xserver/GL/glx/renderpixswap.c + nx-X11/programs/Xserver/GL/glx/rensize.c + nx-X11/programs/Xserver/GL/glx/rensizetab.c + nx-X11/programs/Xserver/GL/glx/single2.c + nx-X11/programs/Xserver/GL/glx/single2swap.c + nx-X11/programs/Xserver/GL/glx/singlepix.c + nx-X11/programs/Xserver/GL/glx/singlepixswap.c + nx-X11/programs/Xserver/GL/glx/singlesize.c + nx-X11/programs/Xserver/GL/glx/singlesize.h + nx-X11/programs/Xserver/GL/glx/unpack.h + nx-X11/programs/Xserver/GL/glx/xfont.c + nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h +Copyright: 1991-2000, Silicon Graphics, Inc + 1991-2004, Silicon Graphics, Inc +License: UNKNOWN FIXME Files: nx-X11/programs/Xserver/Xext/xtest1dd.h @@ -2079,56 +1539,7 @@ Copyright: 1996, Thomas E. Dickey License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/server/glint_common.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/server/i810_common.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_metaops.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_texblend.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_debug.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_metaops.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/i915_vtbl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_batchbuffer.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_batchbuffer.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_pixel.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/intel_tris.h - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c -Copyright: 2002, Tungsten Graphics, Inc., Cedar Park, Texas - 2003, Tungsten Graphics, Inc., Cedar Park, Texas -License: Expat - FIXME - Files: nx-X11/include/extensions/XI.h - nx-X11/include/extensions/XInput.h nx-X11/include/extensions/XIproto.h nx-X11/programs/Xserver/Xi/allowev.c nx-X11/programs/Xserver/Xi/chgdctl.c @@ -2155,295 +1566,23 @@ Files: nx-X11/include/extensions/XI.h nx-X11/programs/Xserver/Xi/grabdevk.c nx-X11/programs/Xserver/Xi/gtmotion.c nx-X11/programs/Xserver/Xi/listdev.c - nx-X11/programs/Xserver/Xi/opendev.c - nx-X11/programs/Xserver/Xi/selectev.c - nx-X11/programs/Xserver/Xi/sendexev.c - nx-X11/programs/Xserver/Xi/setbmap.c - nx-X11/programs/Xserver/Xi/setdval.c - nx-X11/programs/Xserver/Xi/setfocus.c - nx-X11/programs/Xserver/Xi/setmmap.c - nx-X11/programs/Xserver/Xi/setmode.c - nx-X11/programs/Xserver/Xi/stubs.c - nx-X11/programs/Xserver/Xi/ungrdev.c - nx-X11/programs/Xserver/Xi/ungrdevb.c - nx-X11/programs/Xserver/Xi/ungrdevk.c -Copyright: 1989, 1998 The Open Group - 1989, Hewlett-Packard Company, Palo Alto, California -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/shader/slang/Include/BaseTypes.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Common.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ConstantUnion.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeGlobals.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InitializeParseContext.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/PoolAlloc.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ResourceLimits.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/ShHandle.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/Types.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Include/intermediate.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/InfoSink.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Initialize.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/MMap.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ParseHelper.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/QualifierAlive.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/RemoveTree.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/SymbolTable.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/intermOut.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/localintermediate.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/parseConst.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h - nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/osinclude.h - nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Linux/ossource.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/osinclude.h - nx-X11/extras/Mesa/src/mesa/shader/slang/OSDependent/Windows/ossource.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLang.h - nx-X11/extras/Mesa/src/mesa/shader/slang/Public/ShaderLangExt.h -Copyright: 2002-2004, 3Dlabs Inc. Ltd - 2002-2005, 3Dlabs Inc. Ltd -License: BSD-3-clause - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savage_3d_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savage_bci.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savage_init.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savage_xmesa.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagecontext.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagedd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagedd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savageioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savageioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagespan.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagespan.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagestate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagestate.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagetex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagetex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/server/savage_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via_driver.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/server/via_regs.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_3d_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_fb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_fb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_tris.h -Copyright: 1998-2003, VIA Technologies, Inc. - 2001-2003, S3 Graphics, Inc. -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_lighting.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_state_init.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/dri_glide.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_dd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_pixels.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_pixels.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_render.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texman.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texman.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_texstate.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tris.h -Copyright: 2000, VA Linux Systems Inc., Fremont, California - 2000-2001, VA Linux Systems Inc., Fremont, California - 2001, VA Linux Systems Inc., Fremont, California -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgarender.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_sanity.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_compat.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_maos.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_maos_verts.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_sanity.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagetris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagetris.h -Copyright: 2000-2001, ATI Technologies Inc., Ontario, Canada, and - 2002, ATI Technologies Inc., Ontario, Canada, and -License: Expat - FIXME - -Files: nx-X11/extras/Xpm/lib/Attrib.c - nx-X11/extras/Xpm/lib/CrBufFrI.c - nx-X11/extras/Xpm/lib/CrBufFrP.c - nx-X11/extras/Xpm/lib/CrDatFrI.c - nx-X11/extras/Xpm/lib/CrDatFrP.c - nx-X11/extras/Xpm/lib/CrIFrBuf.c - nx-X11/extras/Xpm/lib/CrIFrDat.c - nx-X11/extras/Xpm/lib/CrIFrP.c - nx-X11/extras/Xpm/lib/CrPFrBuf.c - nx-X11/extras/Xpm/lib/CrPFrDat.c - nx-X11/extras/Xpm/lib/CrPFrI.c - nx-X11/extras/Xpm/lib/Image.c - nx-X11/extras/Xpm/lib/Info.c - nx-X11/extras/Xpm/lib/RdFToBuf.c - nx-X11/extras/Xpm/lib/RdFToDat.c - nx-X11/extras/Xpm/lib/RdFToI.c - nx-X11/extras/Xpm/lib/RdFToP.c - nx-X11/extras/Xpm/lib/WrFFrBuf.c - nx-X11/extras/Xpm/lib/WrFFrDat.c - nx-X11/extras/Xpm/lib/WrFFrI.c - nx-X11/extras/Xpm/lib/WrFFrP.c - nx-X11/extras/Xpm/lib/XpmI.h - nx-X11/extras/Xpm/lib/create.c - nx-X11/extras/Xpm/lib/data.c - nx-X11/extras/Xpm/lib/hashtab.c - nx-X11/extras/Xpm/lib/misc.c - nx-X11/extras/Xpm/lib/parse.c - nx-X11/extras/Xpm/lib/rgb.c - nx-X11/extras/Xpm/lib/rgbtab.h - nx-X11/extras/Xpm/lib/scan.c - nx-X11/extras/Xpm/lib/simx.c - nx-X11/extras/Xpm/lib/simx.h - nx-X11/extras/Xpm/lib/xpm.h - nx-X11/extras/Xpm/sxpm/sxpm.c -Copyright: 1989-95 GROUPE BULL -License: Expat - FIXME - -Files: nx-X11/include/extensions/render.h - nx-X11/include/extensions/renderproto.h - nx-X11/lib/Xrender/Composite.c - nx-X11/lib/Xrender/FillRect.c - nx-X11/lib/Xrender/FillRects.c - nx-X11/lib/Xrender/Glyph.c - nx-X11/lib/Xrender/Picture.c - nx-X11/lib/Xrender/Xrender.c - nx-X11/lib/Xrender/Xrender.h - nx-X11/lib/Xrender/Xrenderint.h - nx-X11/lib/font/builtins/builtin.h - nx-X11/lib/font/builtins/dir.c - nx-X11/lib/font/builtins/file.c - nx-X11/lib/font/builtins/fonts.c - nx-X11/lib/font/builtins/fpe.c - nx-X11/lib/font/builtins/render.c - nx-X11/programs/Xserver/fb/fb24_32.c - nx-X11/programs/Xserver/fb/fb24_32.h - nx-X11/programs/Xserver/fb/fboverlay.c - nx-X11/programs/Xserver/fb/fboverlay.h - nx-X11/programs/Xserver/fb/fbpict.c - nx-X11/programs/Xserver/render/glyph.c - nx-X11/programs/Xserver/render/glyphstr.h - nx-X11/programs/Xserver/render/miglyph.c - nx-X11/programs/Xserver/render/mipict.h - nx-X11/programs/Xserver/render/picture.c - nx-X11/programs/Xserver/render/picture.h - nx-X11/programs/Xserver/render/picturestr.h - nx-X11/programs/Xserver/render/render.c -Copyright: 1999, SuSE, Inc - 2000, SuSE, Inc + nx-X11/programs/Xserver/Xi/opendev.c + nx-X11/programs/Xserver/Xi/selectev.c + nx-X11/programs/Xserver/Xi/sendexev.c + nx-X11/programs/Xserver/Xi/setbmap.c + nx-X11/programs/Xserver/Xi/setdval.c + nx-X11/programs/Xserver/Xi/setfocus.c + nx-X11/programs/Xserver/Xi/setmmap.c + nx-X11/programs/Xserver/Xi/setmode.c + nx-X11/programs/Xserver/Xi/stubs.c + nx-X11/programs/Xserver/Xi/ungrdev.c + nx-X11/programs/Xserver/Xi/ungrdevb.c + nx-X11/programs/Xserver/Xi/ungrdevk.c +Copyright: 1989, 1998 The Open Group + 1989, Hewlett-Packard Company, Palo Alto, California License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/include/GL/xmesa_x.h - nx-X11/extras/Mesa/include/GL/xmesa_xf86.h - nx-X11/extras/Mesa/src/glx/mini/dispatch.c - nx-X11/extras/Mesa/src/glx/mini/driver.h - nx-X11/extras/Mesa/src/glx/x11/dri_glx.c - nx-X11/extras/Mesa/src/glx/x11/dri_glx.h - nx-X11/extras/Mesa/src/glx/x11/indirect_init.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/dri_util.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_client.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_macros.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_regs.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/server/glint_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/server/i810_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_screen.h - nx-X11/programs/Xserver/GL/glxmodule.c - nx-X11/programs/Xserver/GL/include/GL/xf86glx.h - nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas - 1999, Precision Insight, Inc., Cedar Park, Texas -License: Expat - FIXME - Files: nx-X11/programs/Xserver/hw/nxagent/Args.c nx-X11/programs/Xserver/hw/nxagent/Args.h nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -2470,144 +1609,42 @@ Files: nx-X11/programs/Xserver/hw/nxagent/Args.c nx-X11/programs/Xserver/hw/nxagent/Visual.c nx-X11/programs/Xserver/hw/nxagent/Visual.h Copyright: 1993, Davor Matic - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_dd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_vb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/server/mach64_dri.h -Copyright: 2000, Gareth Hughes -License: Expat - FIXME - -Files: nx-X11/include/DPS/ColorSB.h - nx-X11/include/DPS/ColorSBP.h - nx-X11/include/DPS/DPSScrollW.h - nx-X11/include/DPS/DPSScrollWP.h - nx-X11/include/DPS/FontCreatP.h - nx-X11/include/DPS/FontCreato.h - nx-X11/include/DPS/FontSB.h - nx-X11/include/DPS/FontSBP.h - nx-X11/include/DPS/FontSamplP.h - nx-X11/include/DPS/FontSample.h - nx-X11/include/DPS/PSres.h - nx-X11/include/DPS/dpsNXargs.h - nx-X11/include/DPS/dpsXclient.h - nx-X11/include/DPS/dpsXcommon.h - nx-X11/include/DPS/dpsXpreview.h - nx-X11/include/DPS/dpsXshare.h - nx-X11/include/DPS/dpsXuserpath.h - nx-X11/include/DPS/dpsclient.h - nx-X11/include/DPS/dpsconfig.h - nx-X11/include/DPS/dpsexcept.h - nx-X11/include/DPS/dpsfriends.h -Copyright: 1984-1994, Adobe Systems Incorporated - 1988-1994, Adobe Systems Incorporated - 1989-1994, Adobe Systems Incorporated - 1990-1994, Adobe Systems Incorporated - 1991-1994, Adobe Systems Incorporated - 1992-1994, Adobe Systems Incorporated - 1993-1994, Adobe Systems Incorporated +Files: nx-X11/include/extensions/render.h + nx-X11/include/extensions/renderproto.h + nx-X11/programs/Xserver/fb/fb24_32.c + nx-X11/programs/Xserver/fb/fboverlay.c + nx-X11/programs/Xserver/fb/fboverlay.h + nx-X11/programs/Xserver/fb/fbpict.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrender_nxagent.h + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h + nx-X11/programs/Xserver/render/glyph.c + nx-X11/programs/Xserver/render/glyphstr.h + nx-X11/programs/Xserver/render/miglyph.c + nx-X11/programs/Xserver/render/mipict.h + nx-X11/programs/Xserver/render/picture.c + nx-X11/programs/Xserver/render/picture.h + nx-X11/programs/Xserver/render/picturestr.h + nx-X11/programs/Xserver/render/render.c +Copyright: 2000, SuSE, Inc License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mach64/mach64_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_dd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_texobj.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/r128_texstate.c -Copyright: 1999-2000, ATI Technologies Inc. and Precision Insight, Inc. -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mga_xmesa.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgacontext.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgadd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgadd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgaioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgaioctl.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgaspan.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgaspan.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgastate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgastate.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgatex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgatex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgatexmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgatris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgatris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgavb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgavb.h -Copyright: 2000-2001, VA Linux Systems, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h -Copyright: 2002, NVIDIA Corporation - 2002-2005, 3Dlabs Inc. Ltd. */ -License: BSD-3-clause - FIXME - Files: nx-X11/lib/X11/OCWrap.c nx-X11/lib/X11/OMWrap.c nx-X11/lib/X11/XlcPubI.h nx-X11/lib/X11/lcCharSet.c nx-X11/lib/X11/lcConv.c nx-X11/lib/X11/lcDefConv.c - nx-X11/lib/X11/lcJis.c nx-X11/lib/X11/lcPrTxt.c nx-X11/lib/X11/lcPubWrap.c nx-X11/lib/X11/lcPublic.c @@ -2622,141 +1659,10 @@ Copyright: 1992-1993, TOSHIBA Corp License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_bitmap.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_clear.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_dd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_depth.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_lines.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_points.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_stencil.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_vtxfmt.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_xmesa.c -Copyright: 2000, David S. Miller - 2000-2001, David S. Miller - 2001, David S. Miller -License: Expat - FIXME - -Files: nx-X11/lib/font/Speedo/do_char.c - nx-X11/lib/font/Speedo/do_trns.c - nx-X11/lib/font/Speedo/htest.c - nx-X11/lib/font/Speedo/iface.c - nx-X11/lib/font/Speedo/keys.h - nx-X11/lib/font/Speedo/nsample.c - nx-X11/lib/font/Speedo/out_bl2d.c - nx-X11/lib/font/Speedo/out_blk.c - nx-X11/lib/font/Speedo/out_outl.c - nx-X11/lib/font/Speedo/out_scrn.c - nx-X11/lib/font/Speedo/out_util.c - nx-X11/lib/font/Speedo/reset.c - nx-X11/lib/font/Speedo/set_spcs.c - nx-X11/lib/font/Speedo/set_trns.c - nx-X11/lib/font/Speedo/spdo_prv.h - nx-X11/lib/font/Speedo/speedo.h -Copyright: 1989-1991, Bitstream Inc., Cambridge, MA -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c - nx-X11/programs/Xserver/hw/nxagent/NXevents.c - nx-X11/programs/Xserver/hw/nxagent/NXextension.c - nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c - nx-X11/programs/Xserver/hw/nxagent/NXproperty.c - nx-X11/programs/Xserver/hw/nxagent/NXwindow.c - nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c - nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c - nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c - nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c - nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c - nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c - nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c - nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c - nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c - nx-X11/programs/Xserver/os/WaitFor.c -Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts - 1987, 1989, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/font/Type1/cluts.h - nx-X11/lib/font/Type1/digit.h - nx-X11/lib/font/Type1/fonts.h - nx-X11/lib/font/Type1/hdigit.h - nx-X11/lib/font/Type1/pictures.h - nx-X11/lib/font/Type1/strokes.h - nx-X11/lib/font/Type1/t1hdigit.h - nx-X11/lib/font/Type1/t1imager.h - nx-X11/lib/font/Type1/t1snap.c - nx-X11/lib/font/Type1/t1stdio.h - nx-X11/lib/font/Type1/t1stub.c - nx-X11/lib/font/Type1/t1test.c - nx-X11/lib/font/Type1/token.c - nx-X11/lib/font/Type1/token.h - nx-X11/lib/font/Type1/tokst.h - nx-X11/lib/font/Type1/trig.h -Copyright: International Business Machines,Corp. 1991 -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xfixesproto.h - nx-X11/include/extensions/xfixeswire.h - nx-X11/lib/Xfixes/Cursor.c - nx-X11/lib/Xfixes/SaveSet.c - nx-X11/lib/Xfixes/Selection.c - nx-X11/lib/Xfixes/Xfixes.c - nx-X11/lib/Xfixes/Xfixes.h - nx-X11/lib/Xfixes/Xfixesint.h - nx-X11/programs/Xserver/fb/fbcompose.c - nx-X11/programs/Xserver/fb/fbpict.h - nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c - nx-X11/programs/Xserver/render/animcur.c - nx-X11/programs/Xserver/render/miindex.c - nx-X11/programs/Xserver/render/mirect.c - nx-X11/programs/Xserver/render/mitrap.c - nx-X11/programs/Xserver/render/mitri.c -Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc - 2001, Keith Packard, member of The XFree86 Project, Inc - 2002, Keith Packard, member of The XFree86 Project, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_vb.h - nx-X11/extras/Mesa/src/mesa/main/mm.h -Copyright: 1999, Keith Whitwell - 1999-2000, Keith Whitwell -License: Expat - FIXME - Files: nx-X11/include/extensions/dpms.h nx-X11/include/extensions/dpmsstr.h nx-X11/include/extensions/panoramiXext.h nx-X11/include/extensions/panoramiXproto.h - nx-X11/lib/Xext/DPMS.c - nx-X11/lib/Xinerama/Xinerama.c nx-X11/programs/Xserver/Xext/dpms.c nx-X11/programs/Xserver/Xext/dpmsstubs.c nx-X11/programs/Xserver/Xext/panoramiX.c @@ -2771,153 +1677,6 @@ Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts License: Expat FIXME -Files: nx-X11/include/fonts/FS.h - nx-X11/include/fonts/FSproto.h - nx-X11/include/fonts/fsmasks.h - nx-X11/lib/font/Speedo/spencode.c - nx-X11/lib/font/Speedo/sperr.c - nx-X11/lib/font/Speedo/spfile.c - nx-X11/lib/font/Speedo/spfont.c - nx-X11/lib/font/Speedo/spfuncs.c - nx-X11/lib/font/Speedo/spglyph.c - nx-X11/lib/font/Speedo/spinfo.c - nx-X11/lib/font/Speedo/spint.h - nx-X11/lib/font/Speedo/sptobdf.c - nx-X11/lib/font/fc/fslibos.h - nx-X11/lib/font/util/format.c -Copyright: 1987, 1994, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation - 1990, Network Computing Devices; - 1990-1991, 1998 The Open Group - 1990-1991, Network Computing Devices; - 1994, 1998 The Open Group -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_alloc.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_clear.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_fog.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_lock.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_span.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_stencil.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_texstate.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_tris.c -Copyright: 2000, Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan - 2003, Eric Anholt -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/glx/x11/glx_pbuffer.c - nx-X11/extras/Mesa/src/glx/x11/glx_query.c - nx-X11/extras/Mesa/src/glx/x11/glx_texture_compression.c - nx-X11/extras/Mesa/src/glx/x11/indirect_size.c - nx-X11/extras/Mesa/src/glx/x11/indirect_size.h - nx-X11/extras/Mesa/src/glx/x11/indirect_transpose_matrix.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/mmio.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_texcombine.c - nx-X11/extras/Mesa/src/mesa/glapi/license.py - nx-X11/extras/Mesa/src/mesa/glapi/next_available_offset.sh - nx-X11/extras/Mesa/src/mesa/ppc/common_ppc.c - nx-X11/extras/Mesa/src/mesa/ppc/common_ppc_features.h - nx-X11/extras/Mesa/src/mesa/x86/read_rgba_span_x86.h -Copyright: IBM Corporation 2004 -License: Expat - FIXME - -Files: nx-X11/include/extensions/Xv.h - nx-X11/include/extensions/Xvlib.h - nx-X11/include/extensions/Xvproto.h - nx-X11/include/fonts/font.h - nx-X11/include/fonts/fontstruct.h - nx-X11/lib/X11/imEvToWire.c - nx-X11/programs/Xserver/Xext/xvdisp.c - nx-X11/programs/Xserver/Xext/xvdix.h - nx-X11/programs/Xserver/Xext/xvmain.c - nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c - nx-X11/programs/Xserver/include/dixfont.h - nx-X11/programs/Xserver/include/dixfontstr.h - nx-X11/programs/Xserver/include/dixstruct.h -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, Digital Equipment Corporation, Maynard, Massachusetts - 1993, Digital Equipment Corporation, Maynard, Massachusetts -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_alloc.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_dd.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_lock.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_screen.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_span.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_state.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_stencil.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_tex.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_tritmp.h -Copyright: 2003, Eric Anholt -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_inithw.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_render.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_screen.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_tris.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_vb.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_vb.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/gamma/gamma_xmesa.c -Copyright: 2001, Alan Hourihane -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/XLbx.h - nx-X11/include/extensions/lbxdeltastr.h - nx-X11/include/extensions/lbxstr.h - nx-X11/include/extensions/lbxzlib.h - nx-X11/include/extensions/record.h - nx-X11/include/extensions/recordstr.h - nx-X11/lib/Xext/XLbx.c - nx-X11/lib/font/fc/fsconvert.c - nx-X11/lib/font/fc/fserve.h - nx-X11/lib/font/fc/fservestr.h - nx-X11/lib/font/fc/fsio.c - nx-X11/lib/font/fc/fsio.h -Copyright: 1990, Network Computing Devices - 1992, Network Computing Devices - 1993, Network Computing Devices - 1995, Network Computing Devices -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c - nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h - nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c - nx-X11/programs/Xserver/hw/nxagent/NXpicture.c - nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h - nx-X11/programs/Xserver/hw/nxagent/NXrender.c - nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c - nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h - nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c - nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c - nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h - nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c -Copyright: 2000, SuSE, Inc - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/XimImSw.h nx-X11/lib/X11/XimProto.h nx-X11/lib/X11/imDefFlt.c @@ -2952,150 +1711,98 @@ Copyright: 1992-1993, TOSHIBA Corp License: UNKNOWN FIXME +Files: nx-X11/include/extensions/Xv.h + nx-X11/include/extensions/Xvproto.h + nx-X11/lib/X11/imEvToWire.c + nx-X11/programs/Xserver/Xext/xvdisp.c + nx-X11/programs/Xserver/Xext/xvdix.h + nx-X11/programs/Xserver/Xext/xvmain.c + nx-X11/programs/Xserver/include/dixfont.h + nx-X11/programs/Xserver/include/dixfontstr.h + nx-X11/programs/Xserver/include/dixstruct.h +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, Digital Equipment Corporation, Maynard, Massachusetts + 1993, Digital Equipment Corporation, Maynard, Massachusetts +License: UNKNOWN + FIXME + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c + nx-X11/programs/Xserver/hw/nxagent/NXevents.c + nx-X11/programs/Xserver/hw/nxagent/NXextension.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c + nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c + nx-X11/programs/Xserver/hw/nxagent/NXproperty.c + nx-X11/programs/Xserver/hw/nxagent/NXresource.c + nx-X11/programs/Xserver/hw/nxagent/NXwindow.c + nx-X11/programs/Xserver/os/WaitFor.c +Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998 The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + +Files: nx-X11/include/extensions/xfixesproto.h + nx-X11/include/extensions/xfixeswire.h + nx-X11/programs/Xserver/fb/fbcompose.c + nx-X11/programs/Xserver/fb/fbpict.h + nx-X11/programs/Xserver/render/animcur.c + nx-X11/programs/Xserver/render/miindex.c + nx-X11/programs/Xserver/render/mirect.c + nx-X11/programs/Xserver/render/mitrap.c + nx-X11/programs/Xserver/render/mitri.c +Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc + 2001, Keith Packard, member of The XFree86 Project, Inc + 2002, Keith Packard, member of The XFree86 Project, Inc +License: UNKNOWN + FIXME + +Files: nx-X11/include/Sunkeysym.h + nx-X11/lib/X11/Host.c + nx-X11/lib/X11/LiHosts.c + nx-X11/lib/X11/XDefaultIMIF.c + nx-X11/lib/X11/XDefaultOMIF.c + nx-X11/lib/X11/XlcDL.c + nx-X11/lib/X11/XlcSL.c + nx-X11/lib/X11/lcInit.c +Copyright: 1985-1987, 1991, 1998, The Open Group + 1986, 1998 The Open Group + 1991, 1998 The Open Group + 1991, Oracle and/or its affiliates. + 2000, Oracle and/or its affiliates. + 2004, Oracle and/or its affiliates. +License: Expat + FIXME + Files: nx-X11/lib/X11/ConnDis.c nx-X11/lib/X11/OpenDis.c nx-X11/lib/X11/XlibAsync.c nx-X11/lib/X11/XlibInt.c nx-X11/lib/X11/Xlibint.h nx-X11/programs/Xserver/Xext/security.c - nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c + nx-X11/programs/Xserver/hw/nxagent/NXshm.c nx-X11/programs/Xserver/os/auth.c - nx-X11/programs/nxauth/parsedpy.c - nx-X11/programs/nxauth/process.c - nx-X11/programs/nxauth/xauth.c Copyright: 1984-1985, 1987, 1989, 1998 The Open Group 1985-1986, 1998 The Open Group 1985-1987, 1998 The Open Group 1988, 1998 The Open Group 1989, 1998 The Open Group - 1989,1998, The Open Group 1992, 1998 The Open Group 1996, 1998 The Open Group - 2001, 2010 NoMachine, http://www.nomachine.com/. */ - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/glx/x11/indirect.c - nx-X11/extras/Mesa/src/glx/x11/indirect_va_private.h - nx-X11/extras/Mesa/src/glx/x11/indirect_vertex_array.c - nx-X11/extras/Mesa/src/glx/x11/indirect_vertex_array.h - nx-X11/extras/Mesa/src/mesa/glapi/glX_XML.py - nx-X11/extras/Mesa/src/mesa/glapi/glX_doc.py - nx-X11/extras/Mesa/src/mesa/glapi/glX_proto_common.py - nx-X11/extras/Mesa/src/mesa/glapi/glX_proto_send.py - nx-X11/extras/Mesa/src/mesa/glapi/glX_proto_size.py - nx-X11/extras/Mesa/src/mesa/glapi/gl_XML.py -Copyright: IBM Corporation 2004-2005 -License: Expat - FIXME - -Files: nx-X11/lib/font/Type1/arith.h - nx-X11/lib/font/Type1/curves.h - nx-X11/lib/font/Type1/lines.c - nx-X11/lib/font/Type1/lines.h - nx-X11/lib/font/Type1/paths.c - nx-X11/lib/font/Type1/paths.h - nx-X11/lib/font/Type1/regions.c - nx-X11/lib/font/Type1/spaces.h - nx-X11/lib/font/Type1/t1malloc.c -Copyright: International Business Machines, Corp. 1991 - Lexmark International, Inc. 1991, -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/Xdbe.h - nx-X11/include/extensions/Xdbeproto.h - nx-X11/lib/Xext/Xdbe.c - nx-X11/programs/Xserver/dbe/dbe.c - nx-X11/programs/Xserver/dbe/dbestruct.h - nx-X11/programs/Xserver/dbe/midbe.c - nx-X11/programs/Xserver/dbe/midbe.h - nx-X11/programs/Xserver/dbe/midbestr.h -Copyright: 1994-1995, Hewlett-Packard Company -License: Expat - FIXME - -Files: nx-X11/lib/font/Speedo/bics-unicode.c - nx-X11/lib/font/Type1/t1unicode.c - nx-X11/lib/font/Type1/t1unicode.h - nx-X11/lib/font/fontfile/encparse.c - nx-X11/lib/font/fontfile/fontenc.c - nx-X11/lib/font/fontfile/fontencI.h - nx-X11/lib/font/fontfile/fontencc.c - nx-X11/lib/font/include/fontencc.h -Copyright: 1998, Juliusz Chroboczek - 1998-2001, Juliusz Chroboczek -License: Expat - FIXME - -Files: nx-X11/include/extensions/xtrapdi.h - nx-X11/include/extensions/xtrapemacros.h - nx-X11/include/extensions/xtraplib.h - nx-X11/include/extensions/xtraplibp.h - nx-X11/lib/XTrap/XEConTxt.c - nx-X11/lib/XTrap/XEPrInfo.c - nx-X11/lib/XTrap/XEStrMap.c - nx-X11/lib/XTrap/XETrapInit.c -Copyright: 1987-1991, 1994 Digital Equipment Corp. - 1987-1992, 1994 Digital Equipment Corp. - 1987-1992, Digital Equipment Corp. -License: UNKNOWN - FIXME - -Files: nx-X11/lib/xtrans/Xtrans.c - nx-X11/lib/xtrans/Xtrans.h - nx-X11/lib/xtrans/Xtransdnet.c - nx-X11/lib/xtrans/Xtransint.h - nx-X11/lib/xtrans/Xtranslcl.c - nx-X11/lib/xtrans/Xtranstli.c - nx-X11/lib/xtrans/Xtransutil.c - nx-X11/lib/xtrans/transport.c -Copyright: 1993-1994, 1998 The Open Group - 1993-1994, NCR Corporation - Dayton, Ohio, USA -License: UNKNOWN - FIXME - -Files: nx-X11/config/util/cleanlinks.sh - nx-X11/config/util/revpath.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/server/mga_reg.h - nx-X11/include/extensions/xf86misc.h - nx-X11/include/extensions/xf86mscstr.h - nx-X11/programs/Xserver/Xext/xf86misc.c - nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h -Copyright: 1995-1996, The XFree86 Project, Inc - 1996, The XFree86 Project, Inc - 1997-2003, The XFree86 Project, Inc - 1999, The XFree86 Project, Inc - 2000, 2003 The XFree86 Project, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/lib/oldX/XDraw.c - nx-X11/programs/Xserver/dix/dispatch.c - nx-X11/programs/Xserver/dix/events.c - nx-X11/programs/Xserver/dix/main.c - nx-X11/programs/Xserver/dix/resource.c - nx-X11/programs/Xserver/dix/window.c - nx-X11/programs/Xserver/mi/miexpose.c -Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts - 1987, 1989, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts -License: Expat - FIXME - -Files: nx-X11/include/extensions/xtrapddmi.h - nx-X11/include/extensions/xtrapproto.h - nx-X11/lib/XTrap/XECallBcks.c - nx-X11/lib/XTrap/XEDsptch.c - nx-X11/lib/XTrap/XERqsts.c - nx-X11/programs/Xserver/XTrap/xtrapddmi.c - nx-X11/programs/Xserver/XTrap/xtrapditbl.c -Copyright: 1987-1991, Digital Equipment Corp., Maynard, MA + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -3106,55 +1813,62 @@ Files: nx-X11/lib/X11/XimTrInt.h nx-X11/lib/X11/imTrX.c nx-X11/lib/X11/imTrans.c nx-X11/lib/X11/imTransR.c -Copyright: 1991-1992, Sun Microsystems, Inc - 1992, Sun Microsystems, Inc +Copyright: 1991-1992, Oracle and/or its affiliates. + 1992, Oracle and/or its affiliates. 1992-1994, FUJITSU LIMITED 1993-1994, FUJITSU LIMITED -License: UNKNOWN +License: Expat FIXME - -Files: nx-X11/include/GL/glxint.h - nx-X11/lib/font/Type1/AFM.h - nx-X11/lib/font/Type1/afm.c - nx-X11/lib/font/Type1/cidchar.c - nx-X11/lib/font/Type1/range.h - nx-X11/programs/Xserver/GL/glx/glxext.c - nx-X11/programs/Xserver/hw/nxagent/NXglxext.c -Copyright: 1991-9 Silicon Graphics, Inc. - 1994-1999, Silicon Graphics, Inc. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h + nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h + nx-X11/programs/Xserver/hw/nxagent/NXrender.c +Copyright: 2000, SuSE, Inc + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlpool.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlpool/options.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlpool/t_options.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/savage/savagerender.c -Copyright: 2003, Felix Kuehling - 2005, Felix Kuehling +Files: nx-X11/programs/Xserver/dix/dispatch.c + nx-X11/programs/Xserver/dix/events.c + nx-X11/programs/Xserver/dix/main.c + nx-X11/programs/Xserver/dix/resource.c + nx-X11/programs/Xserver/dix/window.c + nx-X11/programs/Xserver/mi/miexpose.c +Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998 The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts License: Expat FIXME -Files: nx-X11/extras/Mesa/src/glx/x11/indirect_vertex_program.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/extension_helper.h - nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h - nx-X11/extras/Mesa/src/mesa/glapi/extension_helper.py - nx-X11/extras/Mesa/src/mesa/glapi/gl_x86-64_asm.py - nx-X11/extras/Mesa/src/mesa/glapi/typeexpr.py -Copyright: IBM Corporation 2005 +Files: nx-X11/include/extensions/Xdbeproto.h + nx-X11/programs/Xserver/dbe/dbe.c + nx-X11/programs/Xserver/dbe/dbestruct.h + nx-X11/programs/Xserver/dbe/midbe.c + nx-X11/programs/Xserver/dbe/midbe.h + nx-X11/programs/Xserver/dbe/midbestr.h +Copyright: 1994-1995, Hewlett-Packard Company License: Expat FIXME -Files: nx-X11/lib/font/Speedo/module/speedomod.c - nx-X11/lib/font/Type1/module/type1mod.c - nx-X11/lib/font/bitmap/module/bitmapmod.c - nx-X11/programs/Xserver/Xext/sleepuntil.h - nx-X11/programs/Xserver/fb/fbmodule.c - nx-X11/programs/Xserver/mi/micoord.h -Copyright: 1998, The XFree86 Project, Inc. - 2000, The XFree86 Project, Inc. - 2001, The XFree86 Project, Inc. +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/include/GL/xf86glx.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas License: Expat FIXME @@ -3169,69 +1883,17 @@ Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_debug.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_debug.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_tex.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/i830_texstate.c -Copyright: 2001, 2d3d Inc., Delray Beach, FL -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/include/GL/foomesa.h - nx-X11/extras/Mesa/include/GL/fxmesa.h - nx-X11/extras/Mesa/include/GL/glu_mangle.h - nx-X11/extras/Mesa/include/GL/glx_mangle.h - nx-X11/extras/Mesa/include/GL/svgamesa.h - nx-X11/extras/Mesa/include/GL/wmesa.h -Copyright: 1995-1998, Brian Paul - 1995-2001, Brian Paul -License: LGPL-2+ - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_context.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_context.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_state.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_tris.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/trident/trident_vb.c -Copyright: 2002, Alan Hourihane, Sychdyn, North Wales, UK -License: UNKNOWN - FIXME - -Files: nx-X11/lib/font/Type1/arith.c - nx-X11/lib/font/Type1/hints.c - nx-X11/lib/font/Type1/hints.h - nx-X11/lib/font/Type1/objects.c - nx-X11/lib/font/Type1/regions.h - nx-X11/lib/font/Type1/spaces.c -Copyright: International Business Machines, Corp. 1991, - Lexmark International, Inc. 1991 -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/glw/GLwDrawA.c - nx-X11/extras/Mesa/src/glw/GLwDrawA.h - nx-X11/extras/Mesa/src/glw/GLwDrawAP.h - nx-X11/extras/Mesa/src/glw/GLwMDrawA.c - nx-X11/extras/Mesa/src/glw/GLwMDrawA.h - nx-X11/extras/Mesa/src/glw/GLwMDrawAP.h -Copyright: 1993, Silicon Graphics, Inc - laws of the +Files: nx-X11/lib/xtrans/Xtrans.c + nx-X11/lib/xtrans/Xtrans.h + nx-X11/lib/xtrans/Xtransint.h + nx-X11/lib/xtrans/Xtranslcl.c + nx-X11/lib/xtrans/Xtransutil.c + nx-X11/lib/xtrans/transport.c +Copyright: 1993-1994, 1998 The Open Group + 1993-1994, NCR Corporation - Dayton, Ohio, USA License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128_dri.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128_dri.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128_reg.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon_dri.h -Copyright: 1999-2000, ATI Technologies Inc., Markham, Ontario - 2000, ATI Technologies Inc., Markham, Ontario -License: Expat - FIXME - Files: nx-X11/lib/X11/XimintL.h nx-X11/lib/X11/imImSw.c nx-X11/lib/X11/imLcIm.c @@ -3244,71 +1906,6 @@ Copyright: 1991-1994, FUJITSU LIMITED License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/server/sis_common.h - nx-X11/programs/Xserver/miext/cw/cw.c - nx-X11/programs/Xserver/miext/cw/cw.h - nx-X11/programs/Xserver/miext/cw/cw_ops.c - nx-X11/programs/Xserver/miext/cw/cw_render.c -Copyright: 2003, Eric Anholt - 2004, Eric Anholt -License: UNKNOWN - FIXME - -Files: nx-X11/config/makedepend/ifparser.c - nx-X11/config/makedepend/ifparser.h - nx-X11/include/extensions/lbxbuf.h - nx-X11/include/extensions/lbxbufstr.h - nx-X11/include/extensions/lbxopts.h -Copyright: 1988-1990, 1994 Network Computing Devices, Inc - 1992, Network Computing Devices, Inc - 1994, Network Computing Devices, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/XRes.h - nx-X11/include/extensions/XResproto.h - nx-X11/include/extensions/xf86dga.h - nx-X11/lib/XRes/XRes.c - nx-X11/programs/Xserver/Xext/xres.c -Copyright: 1999, XFree86 Inc - 2002, XFree86 Inc -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128_macros.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon_macros.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/radeon/server/radeon_reg.h -Copyright: 2000, ATI Technologies Inc., Markham, Ontario, and -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/glx/x11/glxextensions.c - nx-X11/extras/Mesa/src/glx/x11/glxextensions.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/utils.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/utils.h -Copyright: IBM Corporation 2002, 2004 -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/include/GL/internal/sarea.h - nx-X11/extras/Mesa/src/glx/x11/XF86dri.c - nx-X11/extras/Mesa/src/glx/x11/xf86dri.h - nx-X11/extras/Mesa/src/glx/x11/xf86dristr.h -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas - 2000, VA Linux Systems, Inc -License: Expat - FIXME - -Files: nx-X11/lib/X11/XDefaultIMIF.c - nx-X11/lib/X11/XDefaultOMIF.c - nx-X11/lib/X11/XlcDL.c - nx-X11/lib/X11/XlcSL.c -Copyright: 1985-1987, 1991, 1998, The Open Group - 2000, Sun Microsystems, Inc. -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c @@ -3325,78 +1922,20 @@ Copyright: 1992, X Consortium License: Expat FIXME -Files: nx-X11/lib/X11/TextExt.c - nx-X11/lib/X11/TextExt16.c - nx-X11/lib/X11/lcDynamic.c - nx-X11/lib/X11/udcInf.c -Copyright: 1989, 1998 The Open Group - 1995, FUJITSU LIMITED - 1996, 1998 The Open Group -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xtestext1.h - nx-X11/lib/Xext/XTestExt1.c - nx-X11/programs/Xserver/Xext/xtest1dd.c - nx-X11/programs/Xserver/Xext/xtest1di.c -Copyright: 1986-1988, 1998 The Open Group - 1986-1988, Hewlett-Packard Corporation -License: UNKNOWN - FIXME - -Files: nx-X11/lib/font/Type1/fontfcn.h - nx-X11/lib/font/Type1/t1intf.h - nx-X11/lib/font/Type1/t1io.c - nx-X11/lib/font/Type1/util.h -Copyright: 1994-1999, Silicon Graphics, Inc. - International Business Machines,Corp. 1991, -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xf86dga1.h - nx-X11/include/extensions/xf86dga1str.h - nx-X11/include/extensions/xf86dgastr.h - nx-X11/programs/Xserver/Xext/xf86dga.c -Copyright: 1995, Jon Tombs - 1995, XFree86 Inc - 1995-1996, 1999 XFree86 Inc -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c - nx-X11/programs/Xserver/randr/rrcrtc.c - nx-X11/programs/Xserver/randr/rrmode.c - nx-X11/programs/Xserver/randr/rrscreen.c -Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2003, Keith Packard - 2006, Keith Packard - of NoMachine. Redistribution and use of the present */ +Files: nx-X11/programs/Xserver/miext/cw/cw.c + nx-X11/programs/Xserver/miext/cw/cw.h + nx-X11/programs/Xserver/miext/cw/cw_ops.c + nx-X11/programs/Xserver/miext/cw/cw_render.c +Copyright: 2004, Eric Anholt License: UNKNOWN FIXME -Files: nx-X11/include/extensions/fontcacheP.h - nx-X11/lib/font/fontcache/fontcache.c - nx-X11/lib/font/fontcache/fontcache.h -Copyright: 1998-1999, Shunsuke Akiyama - 1998-1999, X-TrueType Server Project -License: BSD-2-clause - FIXME - -Files: nx-X11/include/extensions/fontcache.h - nx-X11/include/extensions/fontcachstr.h - nx-X11/programs/Xserver/Xext/fontcache.c -Copyright: 1998-1999, Shunsuke Akiyama - 1998-1999, X-TrueType Server Project, All rights -License: BSD-2-clause - FIXME - -Files: nx-X11/extras/Mesa/include/GL/dmesa.h - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxg.c - nx-X11/extras/Mesa/src/mesa/drivers/glide/fxg.h -Copyright: 1999-2003, Brian Paul - 1999-2004, Brian Paul - 2002, - Daniel Borca - 2003, - Daniel Borca +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 License: Expat FIXME @@ -3408,40 +1947,10 @@ Copyright: 1999-2003, David Airlie License: Expat FIXME -Files: nx-X11/extras/Mesa/include/GL/internal/dri_interface.h - nx-X11/extras/Mesa/src/glx/x11/indirect.h - nx-X11/extras/Mesa/src/glx/x11/indirect_init.c -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas - IBM Corporation 2004, -License: Expat - FIXME - -Files: nx-X11/include/extensions/xf86vmode.h - nx-X11/include/extensions/xf86vmstr.h - nx-X11/programs/Xserver/Xext/xf86vmode.c -Copyright: 1995, Kaleb S. KEITHLEY -License: Expat - FIXME - -Files: nx-X11/include/extensions/dmxext.h - nx-X11/include/extensions/dmxproto.h - nx-X11/programs/Xserver/Xext/dmx.c -Copyright: 2002-2004, Red Hat Inc., Durham, North Carolina -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_common2.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_debug.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/sis/sis_debug.h -Copyright: 2000, Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan -License: Expat - FIXME - -Files: nx-X11/include/extensions/Xevie.h - nx-X11/include/extensions/Xeviestr.h - nx-X11/programs/Xserver/Xext/xevie.c -Copyright: 2003, Sun Microsystems, Inc - 2003-2005, Sun Microsystems, Inc +Files: nx-X11/lib/X11/FreeEventData.c + nx-X11/lib/X11/GetEventData.c + nx-X11/programs/Xserver/include/protocol-versions.h +Copyright: 2009, Red Hat, Inc License: Expat FIXME @@ -3453,15 +1962,6 @@ Copyright: 1999-2000, Bruno Haible License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/randr/mirandr.c - nx-X11/programs/Xserver/randr/randrproto.h - nx-X11/programs/Xserver/randr/randrstr.h -Copyright: 2000, Compaq Computer Corporation - 2002, Hewlett-Packard Company - 2006, Intel Corporation -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/Context.c nx-X11/lib/X11/Quarks.c nx-X11/lib/X11/Xrm.c @@ -3471,19 +1971,35 @@ Copyright: 1987-1988, 1990 Digital Equipment Corporation, Maynard License: UNKNOWN FIXME -Files: nx-X11/lib/font/Type1/fontfcn.c - nx-X11/lib/font/Type1/scanfont.c - nx-X11/lib/font/Type1/util.c -Copyright: 1994-1999, Silicon Graphics, Inc. - International Business Machines,Corp. 1991 +Files: nx-X11/lib/X11/TextExt.c + nx-X11/lib/X11/TextExt16.c + nx-X11/lib/X11/lcDynamic.c +Copyright: 1989, 1998 The Open Group + 1995, FUJITSU LIMITED + 1996, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/include/Xdefs.h - nx-X11/include/fonts/fontproto.h - nx-X11/programs/Xserver/Xext/xf86dga2.c -Copyright: 1999, - The XFree86 Project Inc - 1999, The XFree86 Project Inc +Files: nx-X11/include/extensions/xtestext1.h + nx-X11/programs/Xserver/Xext/xtest1dd.c + nx-X11/programs/Xserver/Xext/xtest1di.c +Copyright: 1986-1988, 1998 The Open Group + 1986-1988, Hewlett-Packard Corporation +License: UNKNOWN + FIXME + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c + nx-X11/programs/Xserver/randr/rrmode.c + nx-X11/programs/Xserver/randr/rrscreen.c +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2003, Keith Packard + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -3494,72 +2010,20 @@ Copyright: 1987, the Regents of the University of California License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgaregs.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_drmclient.h -Copyright: *No copyright* -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h -Copyright: 1999-2001, Brian Paul - 1999-2003, Brian Paul - IBM Corporation 2004 -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_offsets.py - nx-X11/extras/Mesa/src/mesa/glapi/gl_procs.py -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004""", "BRIAN PAUL, IBM") - IBM Corporation 2004-2005 -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004, -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/glx/x11/xfont.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xfonts.c -Copyright: 1995, Thorsten.Ohl @ Physik.TH-Darmstadt.de - 1999, Brian Paul - 1999-2000, Brian Paul -License: Expat - FIXME - -Files: nx-X11/include/extensions/Print.h - nx-X11/include/extensions/Printstr.h -Copyright: 1996, Digital Equipment Corp - 1996, Fujitsu Limited - 1996, Hewlett-Packard Company - 1996, Hitachi, Ltd - 1996, International Business Machines Corp - 1996, Novell, Inc - 1996, Sun Microsystems, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/vblank.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/vblank.h -Copyright: IBM Corporation 2002 -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/texmem.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mga_texstate.c -Copyright: 2000-2001, VA Linux Systems, Inc - IBM Corporation 2002 +Files: nx-X11/programs/Xserver/dix/region.c + nx-X11/programs/Xserver/mi/mivaltree.c +Copyright: 1987-1989, 1998 The Open Group + 1987-1989, by + 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/spantmp.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/texmem.c -Copyright: 2000-2001, VA Linux Systems, Inc - IBM Corporation 2002-2003, +Files: nx-X11/lib/X11/XimintP.h + nx-X11/lib/X11/imDefIm.c +Copyright: 1990-1992, Oracle and/or its affiliates. + 1991-1992, Oracle and/or its affiliates. + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation License: Expat FIXME @@ -3569,50 +2033,23 @@ Copyright: IBM Corporation 2003 License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/spantmp2.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/spantmp_common.h -Copyright: 2000-2001, VA Linux Systems, Inc - IBM Corporation 2004 -License: Expat - FIXME - -Files: nx-X11/extras/Xpm/lib/amigax.c - nx-X11/extras/Xpm/lib/amigax.h -Copyright: 19896 Lorens Younes - 1996, Lorens Younes -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_ioctl.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_state.c -Copyright: 2004, Nicolai Haehnle - The Weather Channel, Inc. 2002, -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_program.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/radeon_state.h -Copyright: 2004, Nicolai Haehnle. -License: Expat - FIXME - -Files: nx-X11/lib/X11/os2Stubs.c - nx-X11/lib/xtrans/Xtransos2.c -Copyright: 1996, Sebastien Marineau and Holger Veit +Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa/src/glx/x11/indirect_size.h +Copyright: IBM Corporation 2004 License: Expat FIXME -Files: nx-X11/lib/X11/Host.c - nx-X11/lib/X11/LiHosts.c -Copyright: 1986, 1998 The Open Group - 2004, Sun Microsystems, Inc +Files: nx-X11/programs/Xserver/composite/compoverlay.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h +Copyright: 2003, Keith Packard + 2006, Oracle and/or its affiliates. License: Expat FIXME -Files: nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h - nx-X11/programs/Xserver/hw/xfree86/xf86Version.h -Copyright: 1994-2003, The XFree86 Project, Inc - 1997-2003, The XFree86 Project, Inc +Files: nx-X11/programs/Xserver/Xext/sleepuntil.h + nx-X11/programs/Xserver/mi/micoord.h +Copyright: 2000, The XFree86 Project, Inc. + 2001, The XFree86 Project, Inc. License: Expat FIXME @@ -3622,38 +2059,12 @@ Copyright: 2005, Tungsten Graphics License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r200/r200_texmem.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_texmem.c -Copyright: Tungsten Graphics 2002. -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i830/server/i830_common.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/i915/server/i830_common.h -Copyright: 2001, VA Linux Systems Inc., Fremont, California - 2002, Tungsten Graphics Inc., Cedar Park, Texas -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp - nx-X11/extras/Mesa/src/mesa/shader/slang/MachineIndependent/glslang_tab.h -Copyright: 1984, 1989-1990, 2000-2002, Free Software Foundation, Inc -License: GPL-2+ - FIXME - -Files: nx-X11/lib/misc/strlcat.c - nx-X11/lib/misc/strlcpy.c +Files: nx-X11/programs/Xserver/os/strlcat.c + nx-X11/programs/Xserver/os/strlcpy.c Copyright: 1998, Todd C. Miller License: ISC FIXME -Files: nx-X11/include/DPS/XDPS.h - nx-X11/include/DPS/XDPSproto.h -Copyright: 1988-1989, Digital Equipment Corporation - 1988-1994, Adobe Systems Incorporated -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/lcUTF8.c nx-X11/lib/X11/lcUTF8Load.c Copyright: 1993, SunSoft, Inc @@ -3661,25 +2072,36 @@ Copyright: 1993, SunSoft, Inc License: UNKNOWN FIXME -Files: nx-X11/include/extensions/randr.h - nx-X11/lib/Xrandr/Xrandrint.h +Files: nx-X11/include/extensions/randrproto.h + nx-X11/programs/Xserver/randr/randrstr.h Copyright: 2000, Compaq Computer Corporation - 2002, Hewlett Packard, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xf86rush.h - nx-X11/include/extensions/xf86rushstr.h -Copyright: 1998, Daryll Strauss + 2002, Hewlett-Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c - nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h + nxcompshad/X11/include/Xrandr_nxcompshad.h +Copyright: 2000, Compaq Computer Corporation, Inc + 2002, Hewlett-Packard Company, Inc + 2006, Intel Corporation + 2008, Red Hat, Inc +License: UNKNOWN + FIXME + +Files: nx-X11/programs/Xserver/os/log.c + nx-X11/programs/Xserver/os/utils.c +Copyright: 1987, 1998 The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1994, Quarterdeck Office Systems + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -3707,45 +2129,15 @@ Copyright: 1990-1994, FUJITSU LIMITED License: UNKNOWN FIXME -Files: nx-X11/lib/X11/XimintP.h - nx-X11/lib/X11/imDefIm.c -Copyright: 1990-1992, Sun Microsystems, Inc - 1991-1992, Sun Microsystems, Inc - 1992-1994, FUJITSU LIMITED - 1993-1994, Sony Corporation -License: UNKNOWN - FIXME - -Files: nx-X11/config/util/mkshadow/mkshadow.c - nx-X11/config/util/mkshadow/savedir.c -Copyright: 1990, 1993 Free Software Foundation, Inc -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/Xaixlcint.h nx-X11/lib/X11/lcFile.c Copyright: IBM Corporation 1993 License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/include/GL/glut.h - nx-X11/extras/Mesa/include/GL/uglglutshapes.h -Copyright: Mark J. Kilgard, 1994-1996, 1998. */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/Xtst/XRecord.c - nx-X11/lib/font/fc/fserve.c -Copyright: 1990, 1998 The Open Group - 1990, Network Computing Devices - 1995, 1998 The Open Group - 1995, Network Computing Devices -License: UNKNOWN - FIXME - -Files: nx-X11/lib/Xdmcp/Xdmcp.h - nx-X11/programs/Xserver/os/xdmcp.c -Copyright: 1989, Network Computing Devices, Inc., Mountain View, California +Files: nx-X11/include/extensions/record.h + nx-X11/include/extensions/recordstr.h +Copyright: 1995, Network Computing Devices License: UNKNOWN FIXME @@ -3757,6 +2149,12 @@ Copyright: 1990-1991, 1998 The Open Group License: UNKNOWN FIXME +Files: nx-X11/include/GL/glxint.h + nx-X11/programs/Xserver/GL/glx/glxext.c +Copyright: 1991-9 Silicon Graphics, Inc. +License: UNKNOWN + FIXME + Files: nx-X11/programs/Xserver/fb/fbcmap.c nx-X11/programs/Xserver/mi/micmap.c Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA @@ -3793,6 +2191,12 @@ Copyright: 1991, 1998 The Open Group License: UNKNOWN FIXME +Files: nx-X11/include/extensions/XResproto.h + nx-X11/programs/Xserver/Xext/xres.c +Copyright: 2002, XFree86 Inc +License: UNKNOWN + FIXME + Files: nxcomp/MD5.c nxcomp/MD5.h Copyright: 1999, 2002 Aladdin Enterprises. @@ -3800,73 +2204,19 @@ Copyright: 1999, 2002 Aladdin Enterprises. License: Zlib FIXME -Files: nx-X11/extras/Mesa/src/mesa/main/vsnprintf.c -Copyright: 1997, Theo de Raadt +Files: nx-X11/lib/X11/utlist.h +Copyright: 2007-2009, Troy D. Hanson License: BSD-2-clause FIXME -Files: nx-X11/programs/Xserver/randr/rrxinerama.c -Copyright: 2001-2005, Thomas Winischhofer, Vienna, Austria - 2006, Keith Packard -License: BSD-3-clause - FIXME - -Files: nx-X11/lib/font/fontcache/fcqueue.h -Copyright: 1991, 1993 -License: BSD-4-clause - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_vertexprog.c -Copyright: 2005, Aapo Tahkola -License: Expat - FIXME - Files: nx-X11/programs/Xserver/os/xprintf.c Copyright: 2004, Alexander Gottwald License: Expat FIXME -Files: nx-X11/extras/Xpm/cxpm/cxpm.c -Copyright: 1998, Arnaud LE HORS -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/include/GL/uglmesa.h -Copyright: 2001, Wind River Systems, Inc */ - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_fragprog.c -Copyright: 2005, Ben Skeggs -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py -Copyright: 1999-2003, Brian Paul - IBM Corporation 2004 - IBM Corporation 2004""", "BRIAN PAUL, IBM") -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_table.py -Copyright: 1999-2003, Brian Paul - IBM Corporation 2004""", "BRIAN PAUL, IBM") - IBM Corporation 2004, -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_apitemp.py -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004""", "BRIAN PAUL, IBM") - IBM Corporation 2004-2005, -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_x86_asm.py +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h Copyright: 1999-2001, Brian Paul - IBM Corporation 2004-2005""", "BRIAN PAUL, IBM") - IBM Corporation 2004-2005, + IBM Corporation 2004, License: Expat FIXME @@ -3876,71 +2226,21 @@ Copyright: 1997, Keith Whitwell License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/gl_enums.py -Copyright: 1999-2005, Brian Paul""", "BRIAN PAUL") - Zack Rusin 2005 -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgapixel.h -Copyright: 2000-2001, Compaq Computer Inc. VA Linux Systems, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mgapixel.c -Copyright: 2000, Compaq Computer Inc. and VA Linux Systems, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/i810texmem.c -Copyright: 1999, Keith Whitwell - 2003, Dave Airlie -License: Expat - FIXME - Files: nx-X11/lib/X11/UIThrStubs.c Copyright: 1995, David E. Wexelblat. License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/server/ffb_dac.h -Copyright: 2000, David S. Miller (davem@redhat.com) -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/ffb/server/ffb_regs.h -Copyright: 1998, Michal Rehacek (majkl@iname.com) - 1998-2000, Jakub Jelinek (jakub@redhat.com) - 1999, David S. Miller (davem@redhat.com) -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/Xext/xprint.c -Copyright: 1989, The Massachusetts Institute of Technology - 1993, 1995 Hewlett-Packard Company - 1996, Digital Equipment Corp - 1996, Fujitsu Limited - 1996, Hewlett-Packard Company - 1996, Hitachi, Ltd - 1996, International Business Machines Corp - 1996, Novell, Inc - 1996, Sun Microsystems, Inc -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c +Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/os/log.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1994, Quarterdeck Office Systems - 1997-2003, The XFree86 Project, Inc + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: Expat FIXME @@ -3951,79 +2251,77 @@ Copyright: 1987, 1998 The Open Group License: Expat FIXME -Files: nx-X11/programs/Xserver/mi/miregion.c -Copyright: 1987-1989, 1998 The Open Group - 1987-1989, by - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +Copyright: 1989-95 GROUPE BULL License: Expat FIXME -Files: nx-X11/extras/Mesa/src/glx/x11/indirect_window_pos.c -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas - IBM Corporation 2004 +Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h +Copyright: IBM Corporation 2005 License: Expat FIXME -Files: nx-X11/extras/Mesa/src/glx/x11/renderpix.c -Copyright: 1991-2000, Silicon Graphics, Inc - IBM Corporation 2005 +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h +Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc + 2006, Oracle and/or its affiliates. + 2011, Red Hat, Inc License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_fragprog_swz.c -Copyright: 2005, Jerome Glisse. +Files: nx-X11/extras/Mesa/src/mesa/main/mm.h +Copyright: 1999, Keith Whitwell License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r300/r300_render.c -Copyright: 2004, Nicolai Haehnle +Files: nx-X11/lib/xtrans/Xtranssock.c +Copyright: 1993-1994, 1998 The Open Group + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2002, Oracle and/or its affiliates. + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: Expat FIXME Files: nx-X11/programs/Xserver/hw/nxagent/os2Stub.c Copyright: 1996, Sebastien Marineau - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: Expat FIXME Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h Copyright: 1995, X Consortium - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: Expat FIXME -Files: nx-X11/programs/Xserver/os/xalloc.c -Copyright: 1995, Pascal Haible. +Files: nx-X11/programs/Xserver/composite/compositeext.h +Copyright: 2009, NVIDIA Corporation License: Expat FIXME -Files: nx-X11/lib/X11/lcInit.c -Copyright: 1985-1987, 1991, 1998, The Open Group - 1992-1993, TOSHIBA Corp - 2000, Sun Microsystems, Inc. -License: Expat - FIXME - -Files: nx-X11/include/extensions/vldXvMC.h -Copyright: 2004, The Unichrome Project. -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/hw/xfree86/common/compiler.h -Copyright: 1990,91 Thomas Roell, Dinkelscherben, Germany - 1994-2003, The XFree86 Project, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/unichrome/via_memcpy.c -Copyright: 2004, Thomas Hellstrom +Files: nx-X11/lib/X11/os2Stubs.c +Copyright: 1996, Sebastien Marineau and Holger Veit License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/mga/mga_texcombine.c -Copyright: 2003, Ville Syrjala +Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas License: Expat FIXME @@ -4033,45 +2331,20 @@ License: Expat FIXME Files: nxcomp/Version.c -Copyright: 2014, Qindel http://qindel.com and QVD http://theqvd.com */ -License: GPL-3+ - FIXME - -Files: nx-X11/extras/Mesa/include/GL/ggimesa.h -Copyright: 1995-2000, Brian Paul - 1998, Uwe Maurer - 2001, Filip Spacek -License: LGPL-2+ - FIXME - -Files: nx-X11/extras/Mesa/include/GL/mglmesa.h -Copyright: 1996, SciTech Software -License: LGPL-2+ - FIXME - -Files: nx-X11/extras/Mesa/include/GL/directfbgl.h -Copyright: 2001, convergence integrated media GmbH -License: LGPL-2+ - FIXME - -Files: nx-X11/lib/font/Type1/blues.h -Copyright: 1990, Adobe Systems Incorporated - International Business Machines, Corp. 1991 - Lexmark International, Inc. 1991, -License: UNKNOWN +Copyright: 2015, Qindel Formacion y Servicios SL. */ +License: GPL-2 FIXME -Files: nx-X11/lib/font/Type1/type1.c -Copyright: 1990, Adobe Systems Incorporated - 1994-1999, Silicon Graphics, Inc. - International Business Machines, Corp. 1991 - Lexmark International, Inc. 1991, -License: UNKNOWN +Files: version.sh +Copyright: 2015, Mihai Moldovan + 2015, Mike Gabriel +License: GPL-2+ FIXME -Files: nx-X11/include/DPS/XDPSlib.h -Copyright: 1988-1994, Adobe Systems Incorporated and Digital Equipment -License: UNKNOWN +Files: roll-tarballs.sh +Copyright: 2011-2016, Mike Gabriel + 2012, Reinhard Tartler +License: GPL-3+ FIXME Files: nx-X11/programs/Xserver/dix/dixutils.c @@ -4081,18 +2354,6 @@ Copyright: 1987, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/x86/assyntax.h -Copyright: 1992, Vrije Universiteit, The Netherlands - Amsterdam Compiler kit: define ACK_ASSEMBLER -License: UNKNOWN - FIXME - -Files: nx-X11/include/ap_keysym.h -Copyright: 1987, Apollo Computer Inc., Chelmsford, Massachusetts - 1989, Hewlett-Packard Company -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/utf8WMProps.c Copyright: 1991, 1998 The Open Group 2000, Bruno Haible @@ -4106,61 +2367,25 @@ Copyright: 1991, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/randr/randr.h +Files: nx-X11/include/extensions/randr.h Copyright: 2000, Compaq Computer Corporation 2002, Hewlett Packard Company 2006, Intel Corporation -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/NXxrandrint.h -Copyright: 2000, Compaq Computer Corporation - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2002, Hewlett Packard, Inc - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/randrproto.h -Copyright: 2000, Compaq Computer Corporation - 2002, Hewlett-Packard Company + 2008, Red Hat, Inc License: UNKNOWN FIXME Files: nx-X11/programs/Xserver/randr/randr.c Copyright: 2000, Compaq Computer Corporation - 2001, 2011 NoMachine, http://www.nomachine.com/. */ + 2001, 2011 NoMachine (http://www.nomachine.com) */ 2002, Hewlett-Packard Company 2006, Intel Corporation - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/Xrandr/Xrandr.c -Copyright: 2000, Compaq Computer Corporation, Inc - 2002, Hewlett Packard Company, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/NXxrandr.c -Copyright: 2000, Compaq Computer Corporation, Inc - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2002, Hewlett Packard Company, Inc - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/Xrandr/Xrandr.h -Copyright: 2000, Compaq Computer Corporation, Inc - 2002, Hewlett-Packard Company, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/NXxrandr.h -Copyright: 2000, Compaq Computer Corporation, Inc - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2002, Hewlett-Packard Company, Inc - of NoMachine. Redistribution and use of the present */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -4172,49 +2397,11 @@ Copyright: 1987, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.c -Copyright: 2004, Dave Airlie (airlied@linux.ie) -License: UNKNOWN - FIXME - Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h Copyright: 2004, David Airlie License: UNKNOWN FIXME -Files: nx-X11/lib/XTrap/XEWrappers.c -Copyright: 1987-1991, 1994 Digital Equipment Corp. - 1994, Robert Chesler of Absol-Puter, Hudson, NH -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/XTrap/xtrapdi.c -Copyright: 1987-1991, Digital Equipment Corp., Maynard, MA - 1994, Robert Chesler of Absol-Puter, Hudson, NH -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xtrapbits.h -Copyright: 1987-1990, 1994 Digital Equipment Corporation -License: UNKNOWN - FIXME - -Files: nx-X11/lib/font/Type1/t1info.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation - 1990-1991, Network Computing Devices; - International Business Machines,Corp. 1991 -License: UNKNOWN - FIXME - -Files: nx-X11/lib/font/Type1/t1funcs.c -Copyright: 1987, Digital Equipment Corporation - 1990-1991, Network Computing Devices; - 1994-1999, Silicon Graphics, Inc. - International Business Machines,Corp. 1991, -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/imCallbk.c Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts 1994, FUJITSU LIMITED @@ -4222,19 +2409,15 @@ Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/os/utils.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1994, Quarterdeck Office Systems - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/xkbfile/xkbatom.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1994, Silicon Graphics Computer Systems, Inc +Files: nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -4245,32 +2428,12 @@ Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/mi/mivaltree.c -Copyright: 1987-1989, 1998 The Open Group - 1987-1989, by - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/imConv.c Copyright: 1991-1992, Fuji Xerox Co.,Ltd 1993-1994, FUJITSU LIMITED License: UNKNOWN FIXME -Files: nx-X11/lib/X11/lcEuc.c -Copyright: 1992-1993, FUJITSU LIMITED - 1993, Fujitsu Open Systems Solutions, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/lcSjis.c -Copyright: 1992-1993, FUJITSU LIMITED - 1993, Fujitsu Open Systems Solutions, Inc - 1994, Sony Corporation -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/lcDB.c Copyright: 1995, FUJITSU LIMITED IBM Corporation 1993 @@ -4283,32 +2446,52 @@ Copyright: 1992, Fuji Xerox Co., Ltd License: UNKNOWN FIXME -Files: nx-X11/lib/font/Type1/objects.h -Copyright: 1994-1999, Silicon Graphics, Inc. - International Business Machines, Corp. 1991, - Lexmark International, Inc. 1991 +Files: nx-X11/lib/X11/Xprivate.h +Copyright: 2008, Jamey Sharp, Josh Triplett License: UNKNOWN FIXME -Files: nx-X11/lib/font/Type1/curves.c -Copyright: International Business Machines,Corp. 1991, */ +Files: nx-X11/programs/Xserver/randr/rrcrtc.c +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder */ + 2010, Red Hat, Inc + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c -Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2002, Keith Packard, member of The XFree86 Project, Inc - of NoMachine. Redistribution and use of the present */ +Files: nx-X11/programs/Xserver/randr/rrxinerama.c +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2001-2005, Thomas Winischhofer, Vienna, Austria + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/include/GL/glutf90.h -Copyright: Mark J. Kilgard & Willam F. Mitchell, 1998. */ +Files: nx-X11/programs/Xserver/randr/rroutput.c +Copyright: 2006, Keith Packard + 2008, Red Hat, Inc License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/Xext/extmod/modinit.c -Copyright: 1997, Matthieu Herrb +Files: nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2002, Keith Packard, member of The XFree86 Project, Inc + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME @@ -4317,24 +2500,25 @@ Copyright: 1997, Metro Link Incorporated License: UNKNOWN FIXME -Files: nx-X11/lib/xtrans/Xtranssock.c -Copyright: 1993-1994, 1998 The Open Group - 1993-1994, NCR Corporation - Dayton, Ohio, USA - 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2002, Sun Microsystems, Inc. +Files: nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +Copyright: 1991-9 Silicon Graphics, Inc. + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/fb/fbmmx.c -Copyright: 2004, Nicholas Miell - 2004-2005, Red Hat, Inc - 2005, Trolltech AS +Files: nx-X11/programs/Xserver/os/xdmcp.c +Copyright: 1989, Network Computing Devices, Inc., Mountain View, California License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c -Copyright: 1991-9 Silicon Graphics, Inc. - 2001, 2011 NoMachine, http://www.nomachine.com/. */ +Files: nxproxy/Main.c +Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ of NoMachine. Redistribution and use of the present */ License: UNKNOWN FIXME @@ -4363,20 +2547,8 @@ Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation License: UNKNOWN FIXME -Files: nx-X11/config/util/mkhtmlindex.sh -Copyright: 2000, Precision Insight, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/fb/fbmmx.h -Copyright: 2004, Red Hat, Inc - 2005, Trolltech AS -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/XTrap/xtrapdiswp.c -Copyright: 1987-1992, by - 1994, Robert Chesler of Absol-Puter, Hudson, NH +Files: nx-X11/programs/Xserver/randr/rrprovider.c +Copyright: 2012, Red Hat Inc License: UNKNOWN FIXME @@ -4392,37 +2564,18 @@ Copyright: 1993-1994, Sony Corporation License: UNKNOWN FIXME -Files: nx-X11/include/Sunkeysym.h -Copyright: 1991, 1998 The Open Group - 1991, Sun Microsystems, Inc. Mountain View, CA - no- -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/CCC.c Copyright: 1990, 1991 Tektronix, Inc 1994, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/lib/font/fontfile/decompress.c -Copyright: 1985-1986, The Regents of the University of California - 1993, 1998 The Open Group -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/Font.c Copyright: 1986, 1998 The Open Group 2000, The XFree86 Project, Inc License: UNKNOWN FIXME -Files: nx-X11/lib/Xtst/XTest.c -Copyright: 1990-1991, UniSoft Group Limited - 1992-1993, 1998 The Open Group -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/IMWrap.c Copyright: 1991, 1998 The Open Group 1991, the Open Software Foundation @@ -4436,13 +2589,8 @@ Copyright: 1987, 1998 The Open Group License: UNKNOWN FIXME -Files: nx-X11/config/util/mkhtmlindex.pl -Copyright: 2000-2001, VA Linux Systems, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/r128/server/r128_version.h -Copyright: 2000, through 2003, by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +Files: nx-X11/include/Xdefs.h +Copyright: 1999, The XFree86 Project Inc License: UNKNOWN FIXME -- cgit v1.2.3 From 5bdb2fcdf6c0058611124eb9d72e07c7219a0639 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 5 Dec 2016 10:26:28 +0000 Subject: debian/control: B-D alternatively on libxfont1-dev or libxfont-dev. Fix FTBFS on Debian stretch which has libxfont2-dev as default now. Fixes ArcticaProject/nx-libs#295. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6898cdb81..eb0d68904 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxmltok1-dev, libxml2-dev, libxpm-dev, - libxfont-dev, + libxfont1-dev | libxfont-dev, libxdmcp-dev, libxdamage-dev, libxext-dev, -- cgit v1.2.3 From 9acd13e50c3bde9105f6143922028f0de0d4ae50 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 19 Dec 2016 15:03:09 +0100 Subject: release 3.5.99.3 --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f42fc6e77..78c08d3d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -nx-libs (2:3.5.99.2-0.1) unstable; urgency=medium +nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Mon, 19 Dec 2016 15:02:16 +0100 + +nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. See upstream ChangeLog for recent changes. -- cgit v1.2.3 From b0d28c8a666db85d527299c21fc3c2e7954a2bf2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 3 Feb 2017 14:40:19 +0100 Subject: debian/changelog: Cosmetic fix, restoring correct version number for 3.5.99.2 release stanza. Fixes ArcticaProject/nx-libs#303. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 78c08d3d7..4223ebb3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium -- Mike Gabriel Mon, 19 Dec 2016 15:02:16 +0100 -nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium +nx-libs (2:3.5.99.2-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. See upstream ChangeLog for recent changes. -- cgit v1.2.3 From d6f475f6793b031ee2c2c76ce852db5ccb7ae49f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 15:41:18 +0100 Subject: debian/copyright{,.in}: Adopt from Debian's upload candidate, being DEP-5 compliant and up-to-date for 3.5.99.3. Fixes ArcticaProject/nx-libs#2. --- debian/copyright | 3792 ++++++++++++++++++++++++++++++++++++++++++++++++++- debian/copyright.in | 50 +- 2 files changed, 3770 insertions(+), 72 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 3b04eef26..975432d43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,63 +1,3763 @@ -This package was created by Mike Gabriel on Thu Oct 10 22:53:56 CEST 2011 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: NXv3 (aka nx-libs) +Upstream-Contact: Mike Gabriel +Source: https://github.com/ArcticaProject/nx-libs/ -The software components were originally downloaded from http://www.nomachine.com/sources.php +Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h + nx-X11/programs/Xserver/hw/nxagent/screensaver + nx-X11/programs/Xserver/hw/nxagent/Atoms.c + nx-X11/programs/Xserver/hw/nxagent/Atoms.h + nx-X11/programs/Xserver/hw/nxagent/Binder.c + nx-X11/programs/Xserver/hw/nxagent/Binder.h + nx-X11/programs/Xserver/hw/nxagent/Client.c + nx-X11/programs/Xserver/hw/nxagent/Client.h + nx-X11/programs/Xserver/hw/nxagent/Clipboard.c + nx-X11/programs/Xserver/hw/nxagent/Clipboard.h + nx-X11/programs/Xserver/hw/nxagent/Composite.c + nx-X11/programs/Xserver/hw/nxagent/Composite.h + nx-X11/programs/Xserver/hw/nxagent/Dialog.c + nx-X11/programs/Xserver/hw/nxagent/Dialog.h + nx-X11/programs/Xserver/hw/nxagent/Drawable.c + nx-X11/programs/Xserver/hw/nxagent/Drawable.h + nx-X11/programs/Xserver/hw/nxagent/Error.c + nx-X11/programs/Xserver/hw/nxagent/Error.h + nx-X11/programs/Xserver/hw/nxagent/Events.c + nx-X11/programs/Xserver/hw/nxagent/Events.h + nx-X11/programs/Xserver/hw/nxagent/Extensions.c + nx-X11/programs/Xserver/hw/nxagent/Extensions.h + nx-X11/programs/Xserver/hw/nxagent/Handlers.c + nx-X11/programs/Xserver/hw/nxagent/Handlers.h + nx-X11/programs/Xserver/hw/nxagent/Holder.c + nx-X11/programs/Xserver/hw/nxagent/Holder.h + nx-X11/programs/Xserver/hw/nxagent/Icons.h + nx-X11/programs/Xserver/hw/nxagent/Image.c + nx-X11/programs/Xserver/hw/nxagent/Image.h + nx-X11/programs/Xserver/hw/nxagent/Keystroke.c + nx-X11/programs/Xserver/hw/nxagent/Keystroke.h + nx-X11/programs/Xserver/hw/nxagent/Literals.h + nx-X11/programs/Xserver/hw/nxagent/Millis.c + nx-X11/programs/Xserver/hw/nxagent/Millis.h + nx-X11/programs/Xserver/hw/nxagent/Options.c + nx-X11/programs/Xserver/hw/nxagent/Options.h + nx-X11/programs/Xserver/hw/nxagent/Pixels.c + nx-X11/programs/Xserver/hw/nxagent/Pixels.h + nx-X11/programs/Xserver/hw/nxagent/Pixmap.c + nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h + nx-X11/programs/Xserver/hw/nxagent/Reconnect.c + nx-X11/programs/Xserver/hw/nxagent/Reconnect.h + nx-X11/programs/Xserver/hw/nxagent/Render.c + nx-X11/programs/Xserver/hw/nxagent/Render.h + nx-X11/programs/Xserver/hw/nxagent/Rootless.c + nx-X11/programs/Xserver/hw/nxagent/Rootless.h + nx-X11/programs/Xserver/hw/nxagent/Splash.c + nx-X11/programs/Xserver/hw/nxagent/Splash.h + nx-X11/programs/Xserver/hw/nxagent/Split.c + nx-X11/programs/Xserver/hw/nxagent/Split.h + nx-X11/programs/Xserver/hw/nxagent/Trap.c + nx-X11/programs/Xserver/hw/nxagent/Trap.h + nx-X11/programs/Xserver/hw/nxagent/Utils.h + nx-X11/programs/Xserver/hw/nxagent/Window.c + nx-X11/programs/Xserver/hw/nxagent/Windows.h + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.c + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.h + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.h + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.h + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.c + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.h + nx-X11/programs/Xserver/hw/nxagent/compext/Png.c + nx-X11/programs/Xserver/hw/nxagent/compext/Png.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h + nx-X11/programs/Xserver/hw/nxagent/compext/Z.c + nx-X11/programs/Xserver/hw/nxagent/compext/Z.h + nxcompshad/Core.cpp + nxcompshad/Core.h + nxcompshad/Input.cpp + nxcompshad/Input.h + nxcompshad/Logger.cpp + nxcompshad/Logger.h + nxcompshad/Manager.cpp + nxcompshad/Manager.h + nxcompshad/Misc.h + nxcompshad/Poller.h + nxcompshad/Regions.h + nxcompshad/Shadow.cpp + nxcompshad/Shadow.h + nxcompshad/Updater.cpp + nxcompshad/Updater.h + nxcompshad/Win.cpp + nxcompshad/Win.h + nxcompshad/X11.cpp + nxcompshad/X11.h +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 -The software has been improved via various patches by the X2Go project. -The patches reside in the subfolder debian/patches/ of this source package. +Files: nxcomp/ActionCache.cpp + nxcomp/ActionCache.h + nxcomp/Agent.cpp + nxcomp/Agent.h + nxcomp/Alpha.cpp + nxcomp/Alpha.h + nxcomp/Auth.cpp + nxcomp/Auth.h + nxcomp/Bitmap.cpp + nxcomp/Bitmap.h + nxcomp/BlockCache.cpp + nxcomp/BlockCache.h + nxcomp/BlockCacheSet.cpp + nxcomp/BlockCacheSet.h + nxcomp/ChangeGC.cpp + nxcomp/ChangeGC.h + nxcomp/ChangeProperty.cpp + nxcomp/ChangeProperty.h + nxcomp/Channel.cpp + nxcomp/Channel.h + nxcomp/ChannelCache.cpp + nxcomp/ChannelCache.h + nxcomp/ChannelEndPoint.cpp + nxcomp/ChannelEndPoint.h + nxcomp/ChannelStore.h + nxcomp/CharCache.cpp + nxcomp/CharCache.h + nxcomp/Children.cpp + nxcomp/ClearArea.cpp + nxcomp/ClearArea.h + nxcomp/ClientCache.cpp + nxcomp/ClientCache.h + nxcomp/ClientChannel.cpp + nxcomp/ClientChannel.h + nxcomp/ClientProxy.cpp + nxcomp/ClientProxy.h + nxcomp/ClientReadBuffer.cpp + nxcomp/ClientReadBuffer.h + nxcomp/ClientStore.cpp + nxcomp/ClientStore.h + nxcomp/Colormap.cpp + nxcomp/Colormap.h + nxcomp/ConfigureWindow.cpp + nxcomp/ConfigureWindow.h + nxcomp/Control.cpp + nxcomp/Control.h + nxcomp/CopyArea.cpp + nxcomp/CopyArea.h + nxcomp/CreateGC.cpp + nxcomp/CreateGC.h + nxcomp/CreatePixmap.cpp + nxcomp/CreatePixmap.h + nxcomp/DecodeBuffer.cpp + nxcomp/DecodeBuffer.h + nxcomp/EncodeBuffer.cpp + nxcomp/EncodeBuffer.h + nxcomp/FillPoly.cpp + nxcomp/FillPoly.h + nxcomp/Fork.cpp + nxcomp/Fork.h + nxcomp/FreeCache.h + nxcomp/GenericChannel.cpp + nxcomp/GenericChannel.h + nxcomp/GenericReadBuffer.cpp + nxcomp/GenericReadBuffer.h + nxcomp/GenericReply.cpp + nxcomp/GenericReply.h + nxcomp/GenericRequest.cpp + nxcomp/GenericRequest.h + nxcomp/GetImage.cpp + nxcomp/GetImage.h + nxcomp/GetImageReply.cpp + nxcomp/GetImageReply.h + nxcomp/GetProperty.cpp + nxcomp/GetProperty.h + nxcomp/GetPropertyReply.cpp + nxcomp/GetPropertyReply.h + nxcomp/ImageText16.cpp + nxcomp/ImageText16.h + nxcomp/ImageText8.cpp + nxcomp/ImageText8.h + nxcomp/IntCache.cpp + nxcomp/IntCache.h + nxcomp/InternAtom.cpp + nxcomp/InternAtom.h + nxcomp/Jpeg.cpp + nxcomp/Jpeg.h + nxcomp/Keeper.cpp + nxcomp/Keeper.h + nxcomp/List.cpp + nxcomp/List.h + nxcomp/ListFontsReply.cpp + nxcomp/ListFontsReply.h + nxcomp/Loop.cpp + nxcomp/Message.cpp + nxcomp/Message.h + nxcomp/Misc.cpp + nxcomp/Misc.h + nxcomp/NX.h + nxcomp/NXalert.h + nxcomp/NXmitshm.h + nxcomp/NXpack.h + nxcomp/NXproto.h + nxcomp/NXrender.h + nxcomp/NXvars.h + nxcomp/OpcodeCache.h + nxcomp/OpcodeStore.cpp + nxcomp/OpcodeStore.h + nxcomp/Pack.c + nxcomp/Pgn.cpp + nxcomp/Pgn.h + nxcomp/Pipe.cpp + nxcomp/Pipe.h + nxcomp/PolyArc.cpp + nxcomp/PolyArc.h + nxcomp/PolyFillArc.cpp + nxcomp/PolyFillArc.h + nxcomp/PolyFillRectangle.cpp + nxcomp/PolyFillRectangle.h + nxcomp/PolyLine.cpp + nxcomp/PolyLine.h + nxcomp/PolyPoint.cpp + nxcomp/PolyPoint.h + nxcomp/PolySegment.cpp + nxcomp/PolySegment.h + nxcomp/PolyText16.cpp + nxcomp/PolyText16.h + nxcomp/PolyText8.cpp + nxcomp/PolyText8.h + nxcomp/Proxy.cpp + nxcomp/Proxy.h + nxcomp/ProxyReadBuffer.cpp + nxcomp/ProxyReadBuffer.h + nxcomp/PutImage.cpp + nxcomp/PutImage.h + nxcomp/PutPackedImage.cpp + nxcomp/PutPackedImage.h + nxcomp/QueryFontReply.cpp + nxcomp/QueryFontReply.h + nxcomp/ReadBuffer.cpp + nxcomp/ReadBuffer.h + nxcomp/RenderAddGlyphs.cpp + nxcomp/RenderAddGlyphs.h + nxcomp/RenderChangePicture.cpp + nxcomp/RenderChangePicture.h + nxcomp/RenderComposite.cpp + nxcomp/RenderComposite.h + nxcomp/RenderCompositeGlyphs.cpp + nxcomp/RenderCompositeGlyphs.h + nxcomp/RenderCreateGlyphSet.cpp + nxcomp/RenderCreateGlyphSet.h + nxcomp/RenderCreatePicture.cpp + nxcomp/RenderCreatePicture.h + nxcomp/RenderExtension.cpp + nxcomp/RenderExtension.h + nxcomp/RenderFillRectangles.cpp + nxcomp/RenderFillRectangles.h + nxcomp/RenderFreeGlyphSet.cpp + nxcomp/RenderFreeGlyphSet.h + nxcomp/RenderFreePicture.cpp + nxcomp/RenderFreePicture.h + nxcomp/RenderGenericRequest.cpp + nxcomp/RenderGenericRequest.h + nxcomp/RenderMinorExtensionHeaders.h + nxcomp/RenderMinorExtensionMethods.h + nxcomp/RenderMinorExtensionTags.h + nxcomp/RenderPictureClip.cpp + nxcomp/RenderPictureClip.h + nxcomp/RenderPictureFilter.cpp + nxcomp/RenderPictureFilter.h + nxcomp/RenderPictureTransform.cpp + nxcomp/RenderPictureTransform.h + nxcomp/RenderTrapezoids.cpp + nxcomp/RenderTrapezoids.h + nxcomp/RenderTriangles.cpp + nxcomp/RenderTriangles.h + nxcomp/Rgb.cpp + nxcomp/Rgb.h + nxcomp/Rle.cpp + nxcomp/Rle.h + nxcomp/SendEvent.cpp + nxcomp/SendEvent.h + nxcomp/SequenceQueue.cpp + nxcomp/SequenceQueue.h + nxcomp/ServerCache.cpp + nxcomp/ServerCache.h + nxcomp/ServerChannel.cpp + nxcomp/ServerChannel.h + nxcomp/ServerProxy.cpp + nxcomp/ServerProxy.h + nxcomp/ServerReadBuffer.cpp + nxcomp/ServerReadBuffer.h + nxcomp/ServerStore.cpp + nxcomp/ServerStore.h + nxcomp/SetClipRectangles.cpp + nxcomp/SetClipRectangles.h + nxcomp/SetUnpackAlpha.cpp + nxcomp/SetUnpackAlpha.h + nxcomp/SetUnpackColormap.cpp + nxcomp/SetUnpackColormap.h + nxcomp/SetUnpackGeometry.cpp + nxcomp/SetUnpackGeometry.h + nxcomp/ShapeExtension.cpp + nxcomp/ShapeExtension.h + nxcomp/Socket.cpp + nxcomp/Socket.h + nxcomp/Split.cpp + nxcomp/Split.h + nxcomp/StaticCompressor.cpp + nxcomp/StaticCompressor.h + nxcomp/Statistics.cpp + nxcomp/Statistics.h + nxcomp/Timestamp.cpp + nxcomp/Timestamp.h + nxcomp/TranslateCoords.cpp + nxcomp/TranslateCoords.h + nxcomp/Transport.cpp + nxcomp/Transport.h + nxcomp/Types.h + nxcomp/Unpack.cpp + nxcomp/Unpack.h + nxcomp/Vars.c + nxcomp/WriteBuffer.cpp + nxcomp/WriteBuffer.h + nxcomp/XidCache.cpp + nxcomp/XidCache.h + nxcomp/Z.cpp + nxcomp/Z.h +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + Parts of this software are derived from DXPC project. The DXPC version + that NXCOMP got forked from (most likely some DXPC version between + release 3.7.0 and release 3.8.0) "can be considered" (see + LICENSE.nxcomp) as BSD-2-clause, as quoted below: + . + Copyright (c) 1995,1996 Brian Pane + Copyright (c) 1996,1997 Zachary Vonler and Brian Pane + Copyright (c) 1999-2002 Kevin Vigor and Brian Pane + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. -Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org. -Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. +Files: nx-X11/extras/Mesa/include/GL/gl.h + nx-X11/extras/Mesa/include/GL/osmesa.h + nx-X11/extras/Mesa/include/GL/xmesa.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c + nx-X11/extras/Mesa/src/mesa/array_cache/acache.h + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h + nx-X11/extras/Mesa/src/mesa/glapi/glapi.c + nx-X11/extras/Mesa/src/mesa/glapi/glapi.h + nx-X11/extras/Mesa/src/mesa/glapi/glthread.c + nx-X11/extras/Mesa/src/mesa/glapi/glthread.h + nx-X11/extras/Mesa/src/mesa/main/accum.c + nx-X11/extras/Mesa/src/mesa/main/accum.h + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h + nx-X11/extras/Mesa/src/mesa/main/api_eval.h + nx-X11/extras/Mesa/src/mesa/main/api_loopback.c + nx-X11/extras/Mesa/src/mesa/main/api_loopback.h + nx-X11/extras/Mesa/src/mesa/main/api_noop.c + nx-X11/extras/Mesa/src/mesa/main/api_noop.h + nx-X11/extras/Mesa/src/mesa/main/api_validate.c + nx-X11/extras/Mesa/src/mesa/main/api_validate.h + nx-X11/extras/Mesa/src/mesa/main/attrib.c + nx-X11/extras/Mesa/src/mesa/main/attrib.h + nx-X11/extras/Mesa/src/mesa/main/blend.c + nx-X11/extras/Mesa/src/mesa/main/blend.h + nx-X11/extras/Mesa/src/mesa/main/bufferobj.c + nx-X11/extras/Mesa/src/mesa/main/bufferobj.h + nx-X11/extras/Mesa/src/mesa/main/buffers.c + nx-X11/extras/Mesa/src/mesa/main/buffers.h + nx-X11/extras/Mesa/src/mesa/main/clip.c + nx-X11/extras/Mesa/src/mesa/main/clip.h + nx-X11/extras/Mesa/src/mesa/main/colormac.h + nx-X11/extras/Mesa/src/mesa/main/colortab.c + nx-X11/extras/Mesa/src/mesa/main/colortab.h + nx-X11/extras/Mesa/src/mesa/main/config.h + nx-X11/extras/Mesa/src/mesa/main/context.c + nx-X11/extras/Mesa/src/mesa/main/context.h + nx-X11/extras/Mesa/src/mesa/main/convolve.c + nx-X11/extras/Mesa/src/mesa/main/convolve.h + nx-X11/extras/Mesa/src/mesa/main/dd.h + nx-X11/extras/Mesa/src/mesa/main/debug.c + nx-X11/extras/Mesa/src/mesa/main/debug.h + nx-X11/extras/Mesa/src/mesa/main/depth.c + nx-X11/extras/Mesa/src/mesa/main/depth.h + nx-X11/extras/Mesa/src/mesa/main/dispatch.c + nx-X11/extras/Mesa/src/mesa/main/dlist.c + nx-X11/extras/Mesa/src/mesa/main/dlist.h + nx-X11/extras/Mesa/src/mesa/main/drawpix.c + nx-X11/extras/Mesa/src/mesa/main/drawpix.h + nx-X11/extras/Mesa/src/mesa/main/enable.c + nx-X11/extras/Mesa/src/mesa/main/enable.h + nx-X11/extras/Mesa/src/mesa/main/enums.c + nx-X11/extras/Mesa/src/mesa/main/enums.h + nx-X11/extras/Mesa/src/mesa/main/eval.c + nx-X11/extras/Mesa/src/mesa/main/eval.h + nx-X11/extras/Mesa/src/mesa/main/execmem.c + nx-X11/extras/Mesa/src/mesa/main/extensions.c + nx-X11/extras/Mesa/src/mesa/main/extensions.h + nx-X11/extras/Mesa/src/mesa/main/fbobject.c + nx-X11/extras/Mesa/src/mesa/main/fbobject.h + nx-X11/extras/Mesa/src/mesa/main/feedback.c + nx-X11/extras/Mesa/src/mesa/main/feedback.h + nx-X11/extras/Mesa/src/mesa/main/fog.c + nx-X11/extras/Mesa/src/mesa/main/fog.h + nx-X11/extras/Mesa/src/mesa/main/framebuffer.c + nx-X11/extras/Mesa/src/mesa/main/framebuffer.h + nx-X11/extras/Mesa/src/mesa/main/get.h + nx-X11/extras/Mesa/src/mesa/main/getstring.c + nx-X11/extras/Mesa/src/mesa/main/glheader.h + nx-X11/extras/Mesa/src/mesa/main/hash.c + nx-X11/extras/Mesa/src/mesa/main/hash.h + nx-X11/extras/Mesa/src/mesa/main/hint.c + nx-X11/extras/Mesa/src/mesa/main/hint.h + nx-X11/extras/Mesa/src/mesa/main/histogram.c + nx-X11/extras/Mesa/src/mesa/main/histogram.h + nx-X11/extras/Mesa/src/mesa/main/image.c + nx-X11/extras/Mesa/src/mesa/main/image.h + nx-X11/extras/Mesa/src/mesa/main/imports.c + nx-X11/extras/Mesa/src/mesa/main/imports.h + nx-X11/extras/Mesa/src/mesa/main/light.c + nx-X11/extras/Mesa/src/mesa/main/light.h + nx-X11/extras/Mesa/src/mesa/main/lines.c + nx-X11/extras/Mesa/src/mesa/main/lines.h + nx-X11/extras/Mesa/src/mesa/main/macros.h + nx-X11/extras/Mesa/src/mesa/main/matrix.c + nx-X11/extras/Mesa/src/mesa/main/matrix.h + nx-X11/extras/Mesa/src/mesa/main/mtypes.h + nx-X11/extras/Mesa/src/mesa/main/occlude.c + nx-X11/extras/Mesa/src/mesa/main/occlude.h + nx-X11/extras/Mesa/src/mesa/main/pixel.c + nx-X11/extras/Mesa/src/mesa/main/pixel.h + nx-X11/extras/Mesa/src/mesa/main/points.c + nx-X11/extras/Mesa/src/mesa/main/points.h + nx-X11/extras/Mesa/src/mesa/main/polygon.c + nx-X11/extras/Mesa/src/mesa/main/polygon.h + nx-X11/extras/Mesa/src/mesa/main/rastpos.c + nx-X11/extras/Mesa/src/mesa/main/rastpos.h + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h + nx-X11/extras/Mesa/src/mesa/main/state.c + nx-X11/extras/Mesa/src/mesa/main/state.h + nx-X11/extras/Mesa/src/mesa/main/stencil.c + nx-X11/extras/Mesa/src/mesa/main/stencil.h + nx-X11/extras/Mesa/src/mesa/main/texcompress.c + nx-X11/extras/Mesa/src/mesa/main/texcompress.h + nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c + nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c + nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h + nx-X11/extras/Mesa/src/mesa/main/texformat.c + nx-X11/extras/Mesa/src/mesa/main/texformat.h + nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h + nx-X11/extras/Mesa/src/mesa/main/teximage.c + nx-X11/extras/Mesa/src/mesa/main/teximage.h + nx-X11/extras/Mesa/src/mesa/main/texobj.c + nx-X11/extras/Mesa/src/mesa/main/texobj.h + nx-X11/extras/Mesa/src/mesa/main/texstate.c + nx-X11/extras/Mesa/src/mesa/main/texstate.h + nx-X11/extras/Mesa/src/mesa/main/texstore.c + nx-X11/extras/Mesa/src/mesa/main/texstore.h + nx-X11/extras/Mesa/src/mesa/main/varray.c + nx-X11/extras/Mesa/src/mesa/main/varray.h + nx-X11/extras/Mesa/src/mesa/main/version.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_debug.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_eval.c + nx-X11/extras/Mesa/src/mesa/math/m_eval.h + nx-X11/extras/Mesa/src/mesa/math/m_matrix.c + nx-X11/extras/Mesa/src/mesa/math/m_matrix.h + nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_translate.c + nx-X11/extras/Mesa/src/mesa/math/m_translate.h + nx-X11/extras/Mesa/src/mesa/math/m_vector.c + nx-X11/extras/Mesa/src/mesa/math/m_vector.h + nx-X11/extras/Mesa/src/mesa/math/m_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_xform.h + nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h + nx-X11/extras/Mesa/src/mesa/math/mathmod.h + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h + nx-X11/extras/Mesa/src/mesa/shader/program.c + nx-X11/extras/Mesa/src/mesa/shader/program.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h + nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h + nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h + nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.h + nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h + nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h + nx-X11/extras/Mesa/src/mesa/swrast/s_points.c + nx-X11/extras/Mesa/src/mesa/swrast/s_points.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.h + nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h + nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h + nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h + nx-X11/extras/Mesa/src/mesa/swrast/swrast.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h + nx-X11/extras/Mesa/src/mesa/tnl/t_context.c + nx-X11/extras/Mesa/src/mesa/tnl/t_context.h + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h + nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c + nx-X11/extras/Mesa/src/mesa/tnl/tnl.h +Copyright: 1999-2001, Brian Paul + 1999-2002, Brian Paul + 1999-2003, Brian Paul + 1999-2004, Brian Paul + 1999-2005, Brian Paul + 2004-2005, Brian Paul + 2005, Brian Paul +License: Expat - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. +Files: nx-X11/include/XWDFile.h + nx-X11/include/Xalloca.h + nx-X11/include/Xauth.h + nx-X11/include/Xfuncproto.h + nx-X11/include/Xfuncs.h + nx-X11/include/Xos.h + nx-X11/include/Xos_r.h + nx-X11/include/Xosdefs.h + nx-X11/include/Xthreads.h + nx-X11/include/Xwindows.h + nx-X11/include/Xwinsock.h + nx-X11/include/extensions/bigreqstr.h + nx-X11/include/extensions/security.h + nx-X11/include/extensions/securstr.h + nx-X11/include/extensions/xcmiscstr.h + nx-X11/include/extensions/xtestconst.h + nx-X11/include/extensions/xteststr.h + nx-X11/lib/X11/AllCells.c + nx-X11/lib/X11/AllPlanes.c + nx-X11/lib/X11/AllowEv.c + nx-X11/lib/X11/AuDispose.c + nx-X11/lib/X11/AuFileName.c + nx-X11/lib/X11/AuGetBest.c + nx-X11/lib/X11/AuRead.c + nx-X11/lib/X11/AutoRep.c + nx-X11/lib/X11/Backgnd.c + nx-X11/lib/X11/BdrWidth.c + nx-X11/lib/X11/Bell.c + nx-X11/lib/X11/Border.c + nx-X11/lib/X11/ChAccCon.c + nx-X11/lib/X11/ChActPGb.c + nx-X11/lib/X11/ChClMode.c + nx-X11/lib/X11/ChCmap.c + nx-X11/lib/X11/ChGC.c + nx-X11/lib/X11/ChKeyCon.c + nx-X11/lib/X11/ChPntCon.c + nx-X11/lib/X11/ChProp.c + nx-X11/lib/X11/ChSaveSet.c + nx-X11/lib/X11/ChWAttrs.c + nx-X11/lib/X11/ChWindow.c + nx-X11/lib/X11/ChkIfEv.c + nx-X11/lib/X11/ChkMaskEv.c + nx-X11/lib/X11/ChkTypEv.c + nx-X11/lib/X11/ChkTypWEv.c + nx-X11/lib/X11/ChkWinEv.c + nx-X11/lib/X11/CirWin.c + nx-X11/lib/X11/CirWinDn.c + nx-X11/lib/X11/CirWinUp.c + nx-X11/lib/X11/ClDisplay.c + nx-X11/lib/X11/Clear.c + nx-X11/lib/X11/ClearArea.c + nx-X11/lib/X11/ConfWind.c + nx-X11/lib/X11/ConvSel.c + nx-X11/lib/X11/CopyArea.c + nx-X11/lib/X11/CopyCmap.c + nx-X11/lib/X11/CopyGC.c + nx-X11/lib/X11/CopyPlane.c + nx-X11/lib/X11/CrBFData.c + nx-X11/lib/X11/CrCmap.c + nx-X11/lib/X11/CrCursor.c + nx-X11/lib/X11/CrGC.c + nx-X11/lib/X11/CrGlCur.c + nx-X11/lib/X11/CrPFBData.c + nx-X11/lib/X11/CrPixmap.c + nx-X11/lib/X11/CrWindow.c + nx-X11/lib/X11/Cursor.c + nx-X11/lib/X11/DefCursor.c + nx-X11/lib/X11/DelProp.c + nx-X11/lib/X11/Depths.c + nx-X11/lib/X11/DestSubs.c + nx-X11/lib/X11/DestWind.c + nx-X11/lib/X11/DisName.c + nx-X11/lib/X11/DrArc.c + nx-X11/lib/X11/DrArcs.c + nx-X11/lib/X11/DrLine.c + nx-X11/lib/X11/DrLines.c + nx-X11/lib/X11/DrPoint.c + nx-X11/lib/X11/DrPoints.c + nx-X11/lib/X11/DrRect.c + nx-X11/lib/X11/DrRects.c + nx-X11/lib/X11/DrSegs.c + nx-X11/lib/X11/ErrHndlr.c + nx-X11/lib/X11/EvToWire.c + nx-X11/lib/X11/FSSaver.c + nx-X11/lib/X11/FetchName.c + nx-X11/lib/X11/FillArc.c + nx-X11/lib/X11/FillArcs.c + nx-X11/lib/X11/FillPoly.c + nx-X11/lib/X11/FillRct.c + nx-X11/lib/X11/FillRcts.c + nx-X11/lib/X11/Flush.c + nx-X11/lib/X11/FontInfo.c + nx-X11/lib/X11/FontNames.c + nx-X11/lib/X11/FreeCmap.c + nx-X11/lib/X11/FreeCols.c + nx-X11/lib/X11/FreeCurs.c + nx-X11/lib/X11/FreeEData.c + nx-X11/lib/X11/FreeGC.c + nx-X11/lib/X11/FreePix.c + nx-X11/lib/X11/GCMisc.c + nx-X11/lib/X11/Geom.c + nx-X11/lib/X11/GetAtomNm.c + nx-X11/lib/X11/GetColor.c + nx-X11/lib/X11/GetFPath.c + nx-X11/lib/X11/GetFProp.c + nx-X11/lib/X11/GetGCVals.c + nx-X11/lib/X11/GetGeom.c + nx-X11/lib/X11/GetHColor.c + nx-X11/lib/X11/GetIFocus.c + nx-X11/lib/X11/GetImage.c + nx-X11/lib/X11/GetKCnt.c + nx-X11/lib/X11/GetMoEv.c + nx-X11/lib/X11/GetPCnt.c + nx-X11/lib/X11/GetPntMap.c + nx-X11/lib/X11/GetProp.c + nx-X11/lib/X11/GetRGBCMap.c + nx-X11/lib/X11/GetSOwner.c + nx-X11/lib/X11/GetSSaver.c + nx-X11/lib/X11/GetWAttrs.c + nx-X11/lib/X11/GrButton.c + nx-X11/lib/X11/GrKey.c + nx-X11/lib/X11/GrKeybd.c + nx-X11/lib/X11/GrPointer.c + nx-X11/lib/X11/GrServer.c + nx-X11/lib/X11/IfEvent.c + nx-X11/lib/X11/ImText.c + nx-X11/lib/X11/ImText16.c + nx-X11/lib/X11/ImUtil.c + nx-X11/lib/X11/InitExt.c + nx-X11/lib/X11/InsCmap.c + nx-X11/lib/X11/IntAtom.c + nx-X11/lib/X11/KeyBind.c + nx-X11/lib/X11/KeysymStr.c + nx-X11/lib/X11/KillCl.c + nx-X11/lib/X11/LiICmaps.c + nx-X11/lib/X11/LiProps.c + nx-X11/lib/X11/ListExt.c + nx-X11/lib/X11/LoadFont.c + nx-X11/lib/X11/LockDis.c + nx-X11/lib/X11/LookupCol.c + nx-X11/lib/X11/LowerWin.c + nx-X11/lib/X11/Macros.c + nx-X11/lib/X11/MapRaised.c + nx-X11/lib/X11/MapSubs.c + nx-X11/lib/X11/MapWindow.c + nx-X11/lib/X11/MaskEvent.c + nx-X11/lib/X11/Misc.c + nx-X11/lib/X11/ModMap.c + nx-X11/lib/X11/MoveWin.c + nx-X11/lib/X11/NextEvent.c + nx-X11/lib/X11/ParseCol.c + nx-X11/lib/X11/ParseGeom.c + nx-X11/lib/X11/PeekEvent.c + nx-X11/lib/X11/PeekIfEv.c + nx-X11/lib/X11/Pending.c + nx-X11/lib/X11/PixFormats.c + nx-X11/lib/X11/PmapBgnd.c + nx-X11/lib/X11/PmapBord.c + nx-X11/lib/X11/PolyTxt.c + nx-X11/lib/X11/PolyTxt16.c + nx-X11/lib/X11/PropAlloc.c + nx-X11/lib/X11/PutBEvent.c + nx-X11/lib/X11/PutImage.c + nx-X11/lib/X11/QuBest.c + nx-X11/lib/X11/QuColor.c + nx-X11/lib/X11/QuColors.c + nx-X11/lib/X11/QuCurShp.c + nx-X11/lib/X11/QuExt.c + nx-X11/lib/X11/QuKeybd.c + nx-X11/lib/X11/QuPntr.c + nx-X11/lib/X11/QuStipShp.c + nx-X11/lib/X11/QuTextE16.c + nx-X11/lib/X11/QuTextExt.c + nx-X11/lib/X11/QuTileShp.c + nx-X11/lib/X11/QuTree.c + nx-X11/lib/X11/RaiseWin.c + nx-X11/lib/X11/RdBitF.c + nx-X11/lib/X11/RecolorC.c + nx-X11/lib/X11/ReconfWM.c + nx-X11/lib/X11/ReconfWin.c + nx-X11/lib/X11/RepWindow.c + nx-X11/lib/X11/RestackWs.c + nx-X11/lib/X11/RotProp.c + nx-X11/lib/X11/ScrResStr.c + nx-X11/lib/X11/SelInput.c + nx-X11/lib/X11/SendEvent.c + nx-X11/lib/X11/SetBack.c + nx-X11/lib/X11/SetCRects.c + nx-X11/lib/X11/SetClMask.c + nx-X11/lib/X11/SetClOrig.c + nx-X11/lib/X11/SetDashes.c + nx-X11/lib/X11/SetFPath.c + nx-X11/lib/X11/SetFont.c + nx-X11/lib/X11/SetFore.c + nx-X11/lib/X11/SetFunc.c + nx-X11/lib/X11/SetIFocus.c + nx-X11/lib/X11/SetLStyle.c + nx-X11/lib/X11/SetPMask.c + nx-X11/lib/X11/SetPntMap.c + nx-X11/lib/X11/SetRGBCMap.c + nx-X11/lib/X11/SetSOwner.c + nx-X11/lib/X11/SetSSaver.c + nx-X11/lib/X11/SetState.c + nx-X11/lib/X11/SetStip.c + nx-X11/lib/X11/SetTSOrig.c + nx-X11/lib/X11/SetTile.c + nx-X11/lib/X11/StBytes.c + nx-X11/lib/X11/StColor.c + nx-X11/lib/X11/StColors.c + nx-X11/lib/X11/StNColor.c + nx-X11/lib/X11/StName.c + nx-X11/lib/X11/StrKeysym.c + nx-X11/lib/X11/StrToText.c + nx-X11/lib/X11/Sync.c + nx-X11/lib/X11/Synchro.c + nx-X11/lib/X11/Text.c + nx-X11/lib/X11/Text16.c + nx-X11/lib/X11/TextToStr.c + nx-X11/lib/X11/TrCoords.c + nx-X11/lib/X11/UndefCurs.c + nx-X11/lib/X11/UngrabBut.c + nx-X11/lib/X11/UngrabKbd.c + nx-X11/lib/X11/UngrabKey.c + nx-X11/lib/X11/UngrabPtr.c + nx-X11/lib/X11/UngrabSvr.c + nx-X11/lib/X11/UninsCmap.c + nx-X11/lib/X11/UnldFont.c + nx-X11/lib/X11/UnmapSubs.c + nx-X11/lib/X11/UnmapWin.c + nx-X11/lib/X11/VisUtil.c + nx-X11/lib/X11/WMGeom.c + nx-X11/lib/X11/WarpPtr.c + nx-X11/lib/X11/WinEvent.c + nx-X11/lib/X11/Window.c + nx-X11/lib/X11/WrBitF.c + nx-X11/lib/X11/XKBBind.c + nx-X11/lib/X11/XKBCvt.c + nx-X11/lib/X11/Xlib.h + nx-X11/lib/X11/Xlocale.h + nx-X11/lib/X11/cmsMath.c + nx-X11/lib/X11/cursorfont.h + nx-X11/lib/X11/evtomask.c + nx-X11/lib/X11/globals.c + nx-X11/lib/X11/locking.c + nx-X11/lib/X11/locking.h + nx-X11/lib/X11/mbWMProps.c + nx-X11/lib/X11/util/makekeys.c + nx-X11/programs/Xserver/Xext/bigreq.c + nx-X11/programs/Xserver/Xext/shape.c + nx-X11/programs/Xserver/Xext/shm.c + nx-X11/programs/Xserver/Xext/sleepuntil.c + nx-X11/programs/Xserver/Xext/xcmisc.c + nx-X11/programs/Xserver/Xext/xtest.c + nx-X11/programs/Xserver/Xi/queryst.c + nx-X11/programs/Xserver/dix/ffs.c + nx-X11/programs/Xserver/dix/pixmap.c + nx-X11/programs/Xserver/dix/privates.c + nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h + nx-X11/programs/Xserver/include/closestr.h + nx-X11/programs/Xserver/include/opaque.h + nx-X11/programs/Xserver/include/validate.h + nx-X11/programs/Xserver/mi/cbrt.c + nx-X11/programs/Xserver/mi/mibstorest.h + nx-X11/programs/Xserver/mi/miclipn.c + nx-X11/programs/Xserver/mi/midispcur.c + nx-X11/programs/Xserver/mi/mieq.c + nx-X11/programs/Xserver/mi/mifillarc.c + nx-X11/programs/Xserver/mi/mifillarc.h + nx-X11/programs/Xserver/mi/migc.c + nx-X11/programs/Xserver/mi/migc.h + nx-X11/programs/Xserver/mi/miline.h + nx-X11/programs/Xserver/mi/mipointer.c + nx-X11/programs/Xserver/mi/mipointer.h + nx-X11/programs/Xserver/mi/mipointrst.h + nx-X11/programs/Xserver/mi/mipoly.h + nx-X11/programs/Xserver/mi/miscanfill.h + nx-X11/programs/Xserver/mi/miscrinit.c + nx-X11/programs/Xserver/mi/misprite.c + nx-X11/programs/Xserver/mi/misprite.h + nx-X11/programs/Xserver/mi/mispritest.h + nx-X11/programs/Xserver/mi/mivalidate.h + nx-X11/programs/Xserver/mi/miwideline.c + nx-X11/programs/Xserver/mi/miwideline.h + nx-X11/programs/Xserver/mi/mizerarc.c + nx-X11/programs/Xserver/mi/mizerarc.h + nx-X11/programs/Xserver/os/mitauth.c + nx-X11/programs/Xserver/os/rpcauth.c + nx-X11/programs/Xserver/os/secauth.c + nx-X11/programs/Xserver/os/xdmauth.c + nx-X11/programs/Xserver/record/record.c + nx-X11/programs/Xserver/record/set.c + nx-X11/programs/Xserver/record/set.h + nxcompshad/X11/include/XTest_nxcompshad.h +Copyright: 1985, 1987, 1990, 1998, The Open Group + 1985, 1987, 1994, 1998, The Open Group + 1985, 1987, 1998, The Open Group + 1985, 1990, 1998, The Open Group + 1985, 1998, The Open Group + 1985-1986, 1998, The Open Group + 1985-1987, 1991, 1998, The Open Group + 1985-1987, 1998, The Open Group + 1985-1987,1998, The Open Group + 1986, 1990, 1998, The Open Group + 1986, 1998, The Open Group + 1986,1998, The Open Group + 1986-1987, 1998, The Open Group + 1987, 1998, The Open Group + 1988, 1998, The Open Group + 1988-1989, 1998, The Open Group + 1989, 1991, 1998, The Open Group + 1989, 1998, The Open Group + 1990, 1998, The Open Group + 1991, 1998, The Open Group + 1992, 1998, The Open Group + 1993, 1998, The Open Group + 1993-1994, 1998, The Open Group + 1994, 1998, The Open Group + 1995, 1998, The Open Group + 1996, 1998, The Open Group + 1998, 1998, The Open Group + 2003, The Open Group +License: MIT~OpenGroup - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. +Files: make-changelog.sh + regenerate-symbol-docs.sh + bin/nxagent.in + bin/nxproxy.in +Copyright: 2012, Mike Gabriel + 2016, Mike Gabriel +License: GPL-2+ +Comment: + See https://github.com/ArcticaProject/nx-libs/commit/9c0d528 for + make-changelog.sh and regenerate-symbol-docs.sh. + . + FIXME: Drop this comment for 3.5.99.4. - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Files: replace.sh +Copyright: 2013, Jan Engelhardt +License: GPL-2+ +Comment: + See https://github.com/ArcticaProject/nx-libs/commit/9c0d528. + . + FIXME: Drop this comment for 3.5.99.4. -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: +Files: nx-X11/extras/Mesa/src/mesa/main/get.c + nx-X11/extras/Mesa/src/mesa/main/texrender.c + nx-X11/extras/Mesa/src/mesa/main/texrender.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S +Copyright: *No copyright* +License: Expat +Comment: + Missing license headers. Assuming same license as used for other Mesa + files. - Redistribution and use in source and binary forms are permitted provided - that the above copyright notice and this paragraph are duplicated in all - such forms. +Files: nx-X11/include/XF86keysym.h + nx-X11/include/Xatom.h + nx-X11/include/Xw32defs.h + nx-X11/include/extensions/XvMC.h + nx-X11/include/extensions/XvMCproto.h +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license found in other nx-X11 + proto header code files. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +Files: etc/rgb + nx-X11/lib/X11/Cmap.h + nx-X11/lib/X11/Cr.h + nx-X11/lib/X11/Cv.h + nx-X11/lib/X11/ImUtil.h + nx-X11/lib/X11/Key.h + nx-X11/lib/X11/XErrorDB + nx-X11/lib/X11/Xcms.txt + nx-X11/lib/X11/Xintatom.h + nx-X11/lib/X11/Xintconn.h + nx-X11/lib/X11/XlibConf.h + nx-X11/lib/X11/Xresinternal.h + nx-X11/lib/X11/imKStoUCS.c + nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c + nx-X11/lib/X11/lcUniConv/armscii_8.h + nx-X11/lib/X11/lcUniConv/ascii.h + nx-X11/lib/X11/lcUniConv/big5.h + nx-X11/lib/X11/lcUniConv/big5_emacs.h + nx-X11/lib/X11/lcUniConv/big5hkscs.h + nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c + nx-X11/lib/X11/lcUniConv/cp1133.h + nx-X11/lib/X11/lcUniConv/cp1251.h + nx-X11/lib/X11/lcUniConv/cp1255.h + nx-X11/lib/X11/lcUniConv/cp1256.h + nx-X11/lib/X11/lcUniConv/gb2312.h + nx-X11/lib/X11/lcUniConv/gbk.h + nx-X11/lib/X11/lcUniConv/georgian_academy.h + nx-X11/lib/X11/lcUniConv/georgian_ps.h + nx-X11/lib/X11/lcUniConv/iso8859_1.h + nx-X11/lib/X11/lcUniConv/iso8859_10.h + nx-X11/lib/X11/lcUniConv/iso8859_11.h + nx-X11/lib/X11/lcUniConv/iso8859_13.h + nx-X11/lib/X11/lcUniConv/iso8859_14.h + nx-X11/lib/X11/lcUniConv/iso8859_15.h + nx-X11/lib/X11/lcUniConv/iso8859_16.h + nx-X11/lib/X11/lcUniConv/iso8859_2.h + nx-X11/lib/X11/lcUniConv/iso8859_3.h + nx-X11/lib/X11/lcUniConv/iso8859_4.h + nx-X11/lib/X11/lcUniConv/iso8859_5.h + nx-X11/lib/X11/lcUniConv/iso8859_6.h + nx-X11/lib/X11/lcUniConv/iso8859_7.h + nx-X11/lib/X11/lcUniConv/iso8859_8.h + nx-X11/lib/X11/lcUniConv/iso8859_9.h + nx-X11/lib/X11/lcUniConv/iso8859_9e.h + nx-X11/lib/X11/lcUniConv/jisx0201.h + nx-X11/lib/X11/lcUniConv/jisx0208.h + nx-X11/lib/X11/lcUniConv/jisx0212.h + nx-X11/lib/X11/lcUniConv/koi8_c.h + nx-X11/lib/X11/lcUniConv/koi8_r.h + nx-X11/lib/X11/lcUniConv/koi8_u.h + nx-X11/lib/X11/lcUniConv/ksc5601.h + nx-X11/lib/X11/lcUniConv/mulelao.h + nx-X11/lib/X11/lcUniConv/tatar_cyr.h + nx-X11/lib/X11/lcUniConv/tcvn.h + nx-X11/lib/X11/lcUniConv/tis620.h + nx-X11/lib/X11/lcUniConv/ucs2be.h + nx-X11/lib/X11/lcUniConv/utf8.h + nx-X11/lib/X11/lcUniConv/viscii.h +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license found in other libNX_X11 + code files. - Copyright (c) 1995,1996 Brian Pane - Copyright (c) 1996,1997 Zachary Vonler and Brian Pane - Copyright (c) 1999 Kevin Vigor and Brian Pane - Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane +Files: nx-X11/Imakefile + nx-X11/config/Imakefile + nx-X11/config/cf/Imake.cf + nx-X11/config/cf/Imake.rules + nx-X11/config/cf/Imake.tmpl + nx-X11/config/cf/Imakefile + nx-X11/config/cf/Library.tmpl + nx-X11/config/cf/README + nx-X11/config/cf/Server.tmpl + nx-X11/config/cf/ServerLib.tmpl + nx-X11/config/cf/Threads.tmpl + nx-X11/config/cf/X11.rules + nx-X11/config/cf/X11.tmpl + nx-X11/config/cf/cross.def + nx-X11/config/cf/cross.rules + nx-X11/config/cf/host.def + nx-X11/config/cf/linux.cf + nx-X11/config/cf/lnxLib.rules + nx-X11/config/cf/lnxLib.tmpl + nx-X11/config/cf/noop.rules + nx-X11/config/cf/nxversion.def.in + nx-X11/config/cf/site.def + nx-X11/config/cf/xf86.rules + nx-X11/config/cf/xorg.cf + nx-X11/config/cf/xorg.tmpl + nx-X11/config/cf/xorgsite.def + nx-X11/config/cf/xorgversion.def + nx-X11/include/GL/Imakefile + nx-X11/include/Imakefile + nx-X11/include/extensions/Imakefile + nx-X11/lib/Imakefile + nx-X11/lib/X11/Imakefile + nx-X11/lib/xtrans/Imakefile + nx-X11/programs/Imakefile + nx-X11/programs/Xserver/Xi/Imakefile + nx-X11/programs/Xserver/composite/Imakefile + nx-X11/programs/Xserver/damageext/Imakefile + nx-X11/programs/Xserver/dbe/Imakefile + nx-X11/programs/Xserver/dix/Imakefile + nx-X11/programs/Xserver/dix/buildatoms + nx-X11/programs/Xserver/fb/Imakefile + nx-X11/programs/Xserver/GL/Imakefile + nx-X11/programs/Xserver/hw/nxagent/Imakefile + nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile + nx-X11/programs/Xserver/GL/glx/Imakefile + nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile + nx-X11/programs/Xserver/GL/mesa/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/Imakefile + nx-X11/programs/Xserver/GL/mesa/X/Imakefile + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile + nx-X11/programs/Xserver/GL/mesa/main/Imakefile + nx-X11/programs/Xserver/GL/mesa/math/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile + nx-X11/programs/Xserver/Imakefile + nx-X11/programs/Xserver/Xext/Imakefile + nx-X11/programs/Xserver/include/Imakefile + nx-X11/programs/Xserver/mi/Imakefile + nx-X11/programs/Xserver/miext/cw/Imakefile + nx-X11/programs/Xserver/miext/damage/Imakefile + nx-X11/programs/Xserver/os/Imakefile + nx-X11/programs/Xserver/randr/Imakefile + nx-X11/programs/Xserver/record/Imakefile + nx-X11/programs/Xserver/render/Imakefile + nx-X11/programs/Xserver/xfixes/Imakefile + nx-X11/programs/Xserver/xkb/Imakefile +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license as used for imake (see + xutils-dev bin:package). -The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. +Files: nx-X11/programs/Xserver/Xext/dpmsproc.h + nx-X11/programs/Xserver/Xext/panoramiXh.h + nx-X11/programs/Xserver/Xext/panoramiXsrv.h + nx-X11/programs/Xserver/Xext/xvdisp.h + nx-X11/programs/Xserver/Xext/xvmc.c + nx-X11/programs/Xserver/Xext/xvmcext.h + nx-X11/programs/Xserver/dix/initatoms.c + nx-X11/programs/Xserver/include/globals.h + nx-X11/programs/Xserver/mi/micmap.h + nx-X11/programs/Xserver/mi/mioverlay.c + nx-X11/programs/Xserver/mi/mioverlay.h + nx-X11/programs/Xserver/os/xstrans.c + nx-X11/programs/Xserver/xkb/ddxPrivate.c + nx-X11/programs/Xserver/xkb/xkb.h + nx-X11/programs/Xserver/xkb/xkbDflts.h + nx-X11/x-indent-all.sh + nx-X11/x-indent.sh +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license as found in the majority + of other Xserver code files. - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. +Files: nx-X11/include/DECkeysym.h + nx-X11/include/HPkeysym.h + nx-X11/include/X.h + nx-X11/include/Xmd.h + nx-X11/include/Xproto.h + nx-X11/include/Xprotostr.h + nx-X11/include/extensions/sync.h + nx-X11/include/extensions/syncstr.h + nx-X11/include/keysym.h + nx-X11/include/keysymdef.h + nx-X11/lib/X11/ErrDes.c + nx-X11/lib/X11/GetDflt.c + nx-X11/lib/X11/GetHints.c + nx-X11/lib/X11/GetStCmap.c + nx-X11/lib/X11/GetWMCMapW.c + nx-X11/lib/X11/GetWMProto.c + nx-X11/lib/X11/ParseCmd.c + nx-X11/lib/X11/PolyReg.c + nx-X11/lib/X11/Region.c + nx-X11/lib/X11/SetHints.c + nx-X11/lib/X11/SetStCmap.c + nx-X11/lib/X11/SetWMCMapW.c + nx-X11/lib/X11/SetWMProto.c + nx-X11/lib/X11/Xatomtype.h + nx-X11/lib/X11/XimThai.h + nx-X11/lib/X11/Xregion.h + nx-X11/lib/X11/Xresource.h + nx-X11/lib/X11/Xutil.h + nx-X11/lib/X11/imThaiFlt.c + nx-X11/lib/X11/pathmax.h + nx-X11/lib/X11/poly.h + nx-X11/programs/Xserver/Xext/sync.c + nx-X11/programs/Xserver/dix/atom.c + nx-X11/programs/Xserver/dix/colormap.c + nx-X11/programs/Xserver/dix/cursor.c + nx-X11/programs/Xserver/dix/devices.c + nx-X11/programs/Xserver/dix/extension.c + nx-X11/programs/Xserver/dix/gc.c + nx-X11/programs/Xserver/dix/globals.c + nx-X11/programs/Xserver/dix/glyphcurs.c + nx-X11/programs/Xserver/dix/grabs.c + nx-X11/programs/Xserver/dix/property.c + nx-X11/programs/Xserver/dix/swaprep.c + nx-X11/programs/Xserver/dix/swapreq.c + nx-X11/programs/Xserver/dix/tables.c + nx-X11/programs/Xserver/include/closure.h + nx-X11/programs/Xserver/include/colormap.h + nx-X11/programs/Xserver/include/colormapst.h + nx-X11/programs/Xserver/include/cursor.h + nx-X11/programs/Xserver/include/cursorstr.h + nx-X11/programs/Xserver/include/dix.h + nx-X11/programs/Xserver/include/extension.h + nx-X11/programs/Xserver/include/extnsionst.h + nx-X11/programs/Xserver/include/gc.h + nx-X11/programs/Xserver/include/gcstruct.h + nx-X11/programs/Xserver/include/input.h + nx-X11/programs/Xserver/include/inputstr.h + nx-X11/programs/Xserver/include/miscstruct.h + nx-X11/programs/Xserver/include/os.h + nx-X11/programs/Xserver/include/pixmap.h + nx-X11/programs/Xserver/include/pixmapstr.h + nx-X11/programs/Xserver/include/property.h + nx-X11/programs/Xserver/include/propertyst.h + nx-X11/programs/Xserver/include/region.h + nx-X11/programs/Xserver/include/regionstr.h + nx-X11/programs/Xserver/include/resource.h + nx-X11/programs/Xserver/include/rgb.h + nx-X11/programs/Xserver/include/screenint.h + nx-X11/programs/Xserver/include/scrnintstr.h + nx-X11/programs/Xserver/include/selection.h + nx-X11/programs/Xserver/include/servermd.h + nx-X11/programs/Xserver/include/site.h + nx-X11/programs/Xserver/include/window.h + nx-X11/programs/Xserver/include/windowstr.h + nx-X11/programs/Xserver/mi/mi.h + nx-X11/programs/Xserver/mi/miarc.c + nx-X11/programs/Xserver/mi/mibitblt.c + nx-X11/programs/Xserver/mi/micursor.c + nx-X11/programs/Xserver/mi/midash.c + nx-X11/programs/Xserver/mi/mifillrct.c + nx-X11/programs/Xserver/mi/mifpoly.h + nx-X11/programs/Xserver/mi/mifpolycon.c + nx-X11/programs/Xserver/mi/miglblt.c + nx-X11/programs/Xserver/mi/miinitext.c + nx-X11/programs/Xserver/mi/mipoly.c + nx-X11/programs/Xserver/mi/mipolycon.c + nx-X11/programs/Xserver/mi/mipolygen.c + nx-X11/programs/Xserver/mi/mipolypnt.c + nx-X11/programs/Xserver/mi/mipolyrect.c + nx-X11/programs/Xserver/mi/mipolyseg.c + nx-X11/programs/Xserver/mi/mipolytext.c + nx-X11/programs/Xserver/mi/mipolyutil.c + nx-X11/programs/Xserver/mi/mipushpxl.c + nx-X11/programs/Xserver/mi/mispans.c + nx-X11/programs/Xserver/mi/mispans.h + nx-X11/programs/Xserver/mi/mistruct.h + nx-X11/programs/Xserver/mi/miwindow.c + nx-X11/programs/Xserver/mi/mizerclip.c + nx-X11/programs/Xserver/mi/mizerline.c + nx-X11/programs/Xserver/os/connection.c + nx-X11/programs/Xserver/os/io.c + nx-X11/programs/Xserver/os/oscolor.c + nx-X11/programs/Xserver/os/osdep.h + nx-X11/programs/Xserver/os/osinit.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1994, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1998, The Open Group + 1987-1988, Digital Equipment Corporation, Maynard, Massachusetts + 1988, 1998, The Open Group + 1988, Digital Equipment Corporation, Maynard, Massachusetts + 1989, 1998, The Open Group + 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1993, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1993, 1998, The Open Group + 1991, 1993-1994, 1998, The Open Group + 1991,1993, Digital Equipment Corporation, Maynard, Massachusetts + 1993, 1998, The Open Group + 1993, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: +Files: nx-X11/include/extensions/composite.h + nx-X11/include/extensions/compositeproto.h + nx-X11/include/extensions/damageproto.h + nx-X11/include/extensions/damagewire.h + nx-X11/lib/X11/x11_trans.c + nx-X11/lib/X11/xim_trans.c + nx-X11/programs/Xserver/composite/compalloc.c + nx-X11/programs/Xserver/composite/compext.c + nx-X11/programs/Xserver/composite/compinit.c + nx-X11/programs/Xserver/composite/compint.h + nx-X11/programs/Xserver/composite/compwindow.c + nx-X11/programs/Xserver/damageext/damageext.c + nx-X11/programs/Xserver/damageext/damageext.h + nx-X11/programs/Xserver/damageext/damageextint.h + nx-X11/programs/Xserver/fb/fb.h + nx-X11/programs/Xserver/fb/fballpriv.c + nx-X11/programs/Xserver/fb/fbarc.c + nx-X11/programs/Xserver/fb/fbbits.c + nx-X11/programs/Xserver/fb/fbbits.h + nx-X11/programs/Xserver/fb/fbblt.c + nx-X11/programs/Xserver/fb/fbbltone.c + nx-X11/programs/Xserver/fb/fbbstore.c + nx-X11/programs/Xserver/fb/fbcopy.c + nx-X11/programs/Xserver/fb/fbedge.c + nx-X11/programs/Xserver/fb/fbedgeimp.h + nx-X11/programs/Xserver/fb/fbfill.c + nx-X11/programs/Xserver/fb/fbfillrect.c + nx-X11/programs/Xserver/fb/fbfillsp.c + nx-X11/programs/Xserver/fb/fbgc.c + nx-X11/programs/Xserver/fb/fbgetsp.c + nx-X11/programs/Xserver/fb/fbglyph.c + nx-X11/programs/Xserver/fb/fbimage.c + nx-X11/programs/Xserver/fb/fbline.c + nx-X11/programs/Xserver/fb/fbpixmap.c + nx-X11/programs/Xserver/fb/fbpoint.c + nx-X11/programs/Xserver/fb/fbpush.c + nx-X11/programs/Xserver/fb/fbrop.h + nx-X11/programs/Xserver/fb/fbscreen.c + nx-X11/programs/Xserver/fb/fbseg.c + nx-X11/programs/Xserver/fb/fbsetsp.c + nx-X11/programs/Xserver/fb/fbsolid.c + nx-X11/programs/Xserver/fb/fbstipple.c + nx-X11/programs/Xserver/fb/fbtile.c + nx-X11/programs/Xserver/fb/fbtrap.c + nx-X11/programs/Xserver/fb/fbutil.c + nx-X11/programs/Xserver/fb/fbwindow.c + nx-X11/programs/Xserver/miext/damage/damage.c + nx-X11/programs/Xserver/miext/damage/damage.h + nx-X11/programs/Xserver/miext/damage/damagestr.h + nx-X11/programs/Xserver/randr/rrdispatch.c + nx-X11/programs/Xserver/randr/rrinfo.c + nx-X11/programs/Xserver/randr/rrmonitor.c + nx-X11/programs/Xserver/randr/rrpointer.c + nx-X11/programs/Xserver/randr/rrproperty.c + nx-X11/programs/Xserver/randr/rrproviderproperty.c + nx-X11/programs/Xserver/randr/rrsdispatch.c + nx-X11/programs/Xserver/randr/rrtransform.c + nx-X11/programs/Xserver/randr/rrtransform.h + nx-X11/programs/Xserver/render/filter.c + nx-X11/programs/Xserver/render/matrix.c + nx-X11/programs/Xserver/render/mipict.c + nx-X11/programs/Xserver/render/renderedge.c + nx-X11/programs/Xserver/render/renderedge.h + nx-X11/programs/Xserver/xfixes/cursor.c + nx-X11/programs/Xserver/xfixes/region.c + nx-X11/programs/Xserver/xfixes/saveset.c + nx-X11/programs/Xserver/xfixes/select.c + nx-X11/programs/Xserver/xfixes/xfixes.c + nx-X11/programs/Xserver/xfixes/xfixes.h + nx-X11/programs/Xserver/xfixes/xfixesint.h + nxcompshad/X11/include/Xdamage_nxcompshad.h +Copyright: 1998, Keith Packard + 1999, Keith Packard + 2002, Keith Packard + 2003, Keith Packard + 2004, Keith Packard + 2006, Keith Packard + 2007, Keith Packard + 2014, Keith Packard +License: MIT~X11 - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. +Files: nx-X11/include/extensions/XKB.h + nx-X11/include/extensions/XKBconfig.h + nx-X11/include/extensions/XKBfile.h + nx-X11/include/extensions/XKBgeom.h + nx-X11/include/extensions/XKBproto.h + nx-X11/include/extensions/XKBrules.h + nx-X11/include/extensions/XKBsrv.h + nx-X11/include/extensions/XKBstr.h + nx-X11/include/extensions/XKM.h + nx-X11/include/extensions/XKMformat.h + nx-X11/lib/X11/XKB.c + nx-X11/lib/X11/XKBAlloc.c + nx-X11/lib/X11/XKBBell.c + nx-X11/lib/X11/XKBCompat.c + nx-X11/lib/X11/XKBCtrls.c + nx-X11/lib/X11/XKBExtDev.c + nx-X11/lib/X11/XKBGAlloc.c + nx-X11/lib/X11/XKBGeom.c + nx-X11/lib/X11/XKBGetByName.c + nx-X11/lib/X11/XKBGetMap.c + nx-X11/lib/X11/XKBList.c + nx-X11/lib/X11/XKBMAlloc.c + nx-X11/lib/X11/XKBMisc.c + nx-X11/lib/X11/XKBNames.c + nx-X11/lib/X11/XKBRdBuf.c + nx-X11/lib/X11/XKBSetGeom.c + nx-X11/lib/X11/XKBSetMap.c + nx-X11/lib/X11/XKBUse.c + nx-X11/lib/X11/XKBleds.c + nx-X11/lib/X11/XKBlib.h + nx-X11/lib/X11/XKBlibint.h + nx-X11/programs/Xserver/include/xkbfile.h + nx-X11/programs/Xserver/include/xkbrules.h + nx-X11/programs/Xserver/include/xkbsrv.h + nx-X11/programs/Xserver/include/xkbstr.h + nx-X11/programs/Xserver/xkb/XKBAlloc.c + nx-X11/programs/Xserver/xkb/XKBGAlloc.c + nx-X11/programs/Xserver/xkb/XKBMAlloc.c + nx-X11/programs/Xserver/xkb/XKBMisc.c + nx-X11/programs/Xserver/xkb/ddxBeep.c + nx-X11/programs/Xserver/xkb/ddxConfig.c + nx-X11/programs/Xserver/xkb/ddxCtrls.c + nx-X11/programs/Xserver/xkb/ddxDevBtn.c + nx-X11/programs/Xserver/xkb/ddxFakeBtn.c + nx-X11/programs/Xserver/xkb/ddxFakeMtn.c + nx-X11/programs/Xserver/xkb/ddxInit.c + nx-X11/programs/Xserver/xkb/ddxKeyClick.c + nx-X11/programs/Xserver/xkb/ddxKillSrv.c + nx-X11/programs/Xserver/xkb/ddxLEDs.c + nx-X11/programs/Xserver/xkb/ddxList.c + nx-X11/programs/Xserver/xkb/ddxLoad.c + nx-X11/programs/Xserver/xkb/ddxVT.c + nx-X11/programs/Xserver/xkb/maprules.c + nx-X11/programs/Xserver/xkb/xkb.c + nx-X11/programs/Xserver/xkb/xkbAccessX.c + nx-X11/programs/Xserver/xkb/xkbActions.c + nx-X11/programs/Xserver/xkb/xkbEvents.c + nx-X11/programs/Xserver/xkb/xkbInit.c + nx-X11/programs/Xserver/xkb/xkbLEDs.c + nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c + nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c + nx-X11/programs/Xserver/xkb/xkbSwap.c + nx-X11/programs/Xserver/xkb/xkbUtils.c + nx-X11/programs/Xserver/xkb/xkbconfig.c + nx-X11/programs/Xserver/xkb/xkberrs.c + nx-X11/programs/Xserver/xkb/xkbfmisc.c + nx-X11/programs/Xserver/xkb/xkbgeom.h + nx-X11/programs/Xserver/xkb/xkbout.c + nx-X11/programs/Xserver/xkb/xkbtext.c + nx-X11/programs/Xserver/xkb/xkmread.c +Copyright: 1993, Silicon Graphics Computer Systems, Inc + 1994, Silicon Graphics Computer Systems, Inc + 1995, Silicon Graphics Computer Systems, Inc + 1996, Silicon Graphics Computer Systems, Inc +License: MIT~X11 +Files: nx-X11/lib/X11/AddDIC.c + nx-X11/lib/X11/AddSF.c + nx-X11/lib/X11/CvColW.c + nx-X11/lib/X11/CvCols.c + nx-X11/lib/X11/IdOfPr.c + nx-X11/lib/X11/LRGB.c + nx-X11/lib/X11/Lab.c + nx-X11/lib/X11/LabGcC.c + nx-X11/lib/X11/LabGcL.c + nx-X11/lib/X11/LabGcLC.c + nx-X11/lib/X11/LabMnL.c + nx-X11/lib/X11/LabMxC.c + nx-X11/lib/X11/LabMxL.c + nx-X11/lib/X11/LabMxLC.c + nx-X11/lib/X11/LabWpAj.c + nx-X11/lib/X11/Luv.c + nx-X11/lib/X11/LuvGcC.c + nx-X11/lib/X11/LuvGcL.c + nx-X11/lib/X11/LuvGcLC.c + nx-X11/lib/X11/LuvMnL.c + nx-X11/lib/X11/LuvMxC.c + nx-X11/lib/X11/LuvMxL.c + nx-X11/lib/X11/LuvMxLC.c + nx-X11/lib/X11/LuvWpAj.c + nx-X11/lib/X11/OfCCC.c + nx-X11/lib/X11/PrOfId.c + nx-X11/lib/X11/QBlack.c + nx-X11/lib/X11/QBlue.c + nx-X11/lib/X11/QGreen.c + nx-X11/lib/X11/QRed.c + nx-X11/lib/X11/QWhite.c + nx-X11/lib/X11/QuCol.c + nx-X11/lib/X11/QuCols.c + nx-X11/lib/X11/SetCCC.c + nx-X11/lib/X11/SetGetCols.c + nx-X11/lib/X11/StCol.c + nx-X11/lib/X11/StCols.c + nx-X11/lib/X11/UNDEFINED.c + nx-X11/lib/X11/XRGB.c + nx-X11/lib/X11/XYZ.c + nx-X11/lib/X11/Xcms.h + nx-X11/lib/X11/Xcmsint.h + nx-X11/lib/X11/cmsAllCol.c + nx-X11/lib/X11/cmsAllNCol.c + nx-X11/lib/X11/cmsCmap.c + nx-X11/lib/X11/cmsColNm.c + nx-X11/lib/X11/cmsGlobls.c + nx-X11/lib/X11/cmsInt.c + nx-X11/lib/X11/cmsLkCol.c + nx-X11/lib/X11/cmsProp.c + nx-X11/lib/X11/cmsTrig.c + nx-X11/lib/X11/uvY.c + nx-X11/lib/X11/xyY.c +Copyright: 1990, 1991, Tektronix, Inc +License: MIT~Tektronix -The packaging for Debian is copyright 2011 Mike Gabriel and is released -under the GPL version 2. On Debian systems, the complete text of the GNU -General Public License can be found in `/usr/share/common-licenses/GPL-2'. +Files: nx-X11/lib/X11/HVC.c + nx-X11/lib/X11/HVCGcC.c + nx-X11/lib/X11/HVCGcV.c + nx-X11/lib/X11/HVCGcVC.c + nx-X11/lib/X11/HVCMnV.c + nx-X11/lib/X11/HVCMxC.c + nx-X11/lib/X11/HVCMxV.c + nx-X11/lib/X11/HVCMxVC.c + nx-X11/lib/X11/HVCMxVs.c + nx-X11/lib/X11/HVCWpAj.c +Copyright: 1990, 1991, Tektronix, Inc +License: MIT~Tektronix~3-clause +Files: nx-X11/extras/Mesa/include/GL/glext.h + nx-X11/extras/Mesa/include/GL/glxext.h + nx-X11/extras/Mesa/include/GL/internal/glcore.h + nx-X11/extras/Mesa/src/glx/x11/compsize.c + nx-X11/include/GL/glx.h + nx-X11/include/GL/glxmd.h + nx-X11/include/GL/glxproto.h + nx-X11/include/GL/glxtokens.h + nx-X11/programs/Xserver/GL/glx/g_disptab.c + nx-X11/programs/Xserver/GL/glx/g_disptab.h + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h + nx-X11/programs/Xserver/GL/glx/g_render.c + nx-X11/programs/Xserver/GL/glx/g_renderswap.c + nx-X11/programs/Xserver/GL/glx/g_single.c + nx-X11/programs/Xserver/GL/glx/g_singleswap.c + nx-X11/programs/Xserver/GL/glx/global.c + nx-X11/programs/Xserver/GL/glx/glxbuf.c + nx-X11/programs/Xserver/GL/glx/glxbuf.h + nx-X11/programs/Xserver/GL/glx/glxcmds.c + nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c + nx-X11/programs/Xserver/GL/glx/glxcontext.h + nx-X11/programs/Xserver/GL/glx/glxdrawable.h + nx-X11/programs/Xserver/GL/glx/glxerror.h + nx-X11/programs/Xserver/GL/glx/glxext.h + nx-X11/programs/Xserver/GL/glx/glxfb.c + nx-X11/programs/Xserver/GL/glx/glxfb.h + nx-X11/programs/Xserver/GL/glx/glximports.c + nx-X11/programs/Xserver/GL/glx/glximports.h + nx-X11/programs/Xserver/GL/glx/glxmem.c + nx-X11/programs/Xserver/GL/glx/glxmem.h + nx-X11/programs/Xserver/GL/glx/glxpix.c + nx-X11/programs/Xserver/GL/glx/glxpix.h + nx-X11/programs/Xserver/GL/glx/glxscreens.c + nx-X11/programs/Xserver/GL/glx/glxscreens.h + nx-X11/programs/Xserver/GL/glx/glxserver.h + nx-X11/programs/Xserver/GL/glx/glxutil.c + nx-X11/programs/Xserver/GL/glx/glxutil.h + nx-X11/programs/Xserver/GL/glx/impsize.h + nx-X11/programs/Xserver/GL/glx/render2.c + nx-X11/programs/Xserver/GL/glx/render2swap.c + nx-X11/programs/Xserver/GL/glx/renderpix.c + nx-X11/programs/Xserver/GL/glx/renderpixswap.c + nx-X11/programs/Xserver/GL/glx/rensize.c + nx-X11/programs/Xserver/GL/glx/rensizetab.c + nx-X11/programs/Xserver/GL/glx/single2.c + nx-X11/programs/Xserver/GL/glx/single2swap.c + nx-X11/programs/Xserver/GL/glx/singlepix.c + nx-X11/programs/Xserver/GL/glx/singlepixswap.c + nx-X11/programs/Xserver/GL/glx/singlesize.c + nx-X11/programs/Xserver/GL/glx/singlesize.h + nx-X11/programs/Xserver/GL/glx/unpack.h + nx-X11/programs/Xserver/GL/glx/xfont.c +Copyright: 1991-2000, Silicon Graphics, Inc + 1991-2004, Silicon Graphics, Inc +License: SGI-1.1 + +Files: nx-X11/programs/Xserver/Xext/xtest1dd.h + nx-X11/programs/Xserver/Xi/allowev.h + nx-X11/programs/Xserver/Xi/chgdctl.h + nx-X11/programs/Xserver/Xi/chgfctl.h + nx-X11/programs/Xserver/Xi/chgkbd.h + nx-X11/programs/Xserver/Xi/chgkmap.h + nx-X11/programs/Xserver/Xi/chgprop.h + nx-X11/programs/Xserver/Xi/chgptr.h + nx-X11/programs/Xserver/Xi/closedev.h + nx-X11/programs/Xserver/Xi/devbell.h + nx-X11/programs/Xserver/Xi/exglobals.h + nx-X11/programs/Xserver/Xi/getbmap.h + nx-X11/programs/Xserver/Xi/getdctl.h + nx-X11/programs/Xserver/Xi/getfctl.h + nx-X11/programs/Xserver/Xi/getfocus.h + nx-X11/programs/Xserver/Xi/getkmap.h + nx-X11/programs/Xserver/Xi/getmmap.h + nx-X11/programs/Xserver/Xi/getprop.h + nx-X11/programs/Xserver/Xi/getselev.h + nx-X11/programs/Xserver/Xi/getvers.h + nx-X11/programs/Xserver/Xi/grabdev.h + nx-X11/programs/Xserver/Xi/grabdevb.h + nx-X11/programs/Xserver/Xi/grabdevk.h + nx-X11/programs/Xserver/Xi/gtmotion.h + nx-X11/programs/Xserver/Xi/listdev.h + nx-X11/programs/Xserver/Xi/opendev.h + nx-X11/programs/Xserver/Xi/queryst.h + nx-X11/programs/Xserver/Xi/selectev.h + nx-X11/programs/Xserver/Xi/sendexev.h + nx-X11/programs/Xserver/Xi/setbmap.h + nx-X11/programs/Xserver/Xi/setdval.h + nx-X11/programs/Xserver/Xi/setfocus.h + nx-X11/programs/Xserver/Xi/setmmap.h + nx-X11/programs/Xserver/Xi/setmode.h + nx-X11/programs/Xserver/Xi/ungrdev.h + nx-X11/programs/Xserver/Xi/ungrdevb.h + nx-X11/programs/Xserver/Xi/ungrdevk.h + nx-X11/programs/Xserver/dix/dispatch.h + nx-X11/programs/Xserver/include/XIstubs.h + nx-X11/programs/Xserver/include/dixevents.h + nx-X11/programs/Xserver/include/dixgrabs.h + nx-X11/programs/Xserver/include/exevents.h + nx-X11/programs/Xserver/include/extinit.h + nx-X11/programs/Xserver/include/swaprep.h + nx-X11/programs/Xserver/include/swapreq.h +Copyright: 1996, Thomas E. Dickey +License: MIT~X11 + +Files: nx-X11/include/extensions/XI.h + nx-X11/include/extensions/XIproto.h + nx-X11/programs/Xserver/Xi/allowev.c + nx-X11/programs/Xserver/Xi/chgdctl.c + nx-X11/programs/Xserver/Xi/chgfctl.c + nx-X11/programs/Xserver/Xi/chgkbd.c + nx-X11/programs/Xserver/Xi/chgkmap.c + nx-X11/programs/Xserver/Xi/chgprop.c + nx-X11/programs/Xserver/Xi/chgptr.c + nx-X11/programs/Xserver/Xi/closedev.c + nx-X11/programs/Xserver/Xi/devbell.c + nx-X11/programs/Xserver/Xi/exevents.c + nx-X11/programs/Xserver/Xi/extinit.c + nx-X11/programs/Xserver/Xi/getbmap.c + nx-X11/programs/Xserver/Xi/getdctl.c + nx-X11/programs/Xserver/Xi/getfctl.c + nx-X11/programs/Xserver/Xi/getfocus.c + nx-X11/programs/Xserver/Xi/getkmap.c + nx-X11/programs/Xserver/Xi/getmmap.c + nx-X11/programs/Xserver/Xi/getprop.c + nx-X11/programs/Xserver/Xi/getselev.c + nx-X11/programs/Xserver/Xi/getvers.c + nx-X11/programs/Xserver/Xi/grabdev.c + nx-X11/programs/Xserver/Xi/grabdevb.c + nx-X11/programs/Xserver/Xi/grabdevk.c + nx-X11/programs/Xserver/Xi/gtmotion.c + nx-X11/programs/Xserver/Xi/listdev.c + nx-X11/programs/Xserver/Xi/opendev.c + nx-X11/programs/Xserver/Xi/selectev.c + nx-X11/programs/Xserver/Xi/sendexev.c + nx-X11/programs/Xserver/Xi/setbmap.c + nx-X11/programs/Xserver/Xi/setdval.c + nx-X11/programs/Xserver/Xi/setfocus.c + nx-X11/programs/Xserver/Xi/setmmap.c + nx-X11/programs/Xserver/Xi/setmode.c + nx-X11/programs/Xserver/Xi/stubs.c + nx-X11/programs/Xserver/Xi/ungrdev.c + nx-X11/programs/Xserver/Xi/ungrdevb.c + nx-X11/programs/Xserver/Xi/ungrdevk.c +Copyright: 1989, 1998, The Open Group + 1989, Hewlett-Packard Company, Palo Alto, California +License: MIT~OpenGroup +Comment: + The Hewlett-Packard Company, Palo Alto, California licensed + their work on these files under MIT~OldStyle. + +Files: nx-X11/programs/Xserver/hw/nxagent/Args.c + nx-X11/programs/Xserver/hw/nxagent/Args.h + nx-X11/programs/Xserver/hw/nxagent/Colormap.c + nx-X11/programs/Xserver/hw/nxagent/Colormap.h + nx-X11/programs/Xserver/hw/nxagent/Cursor.c + nx-X11/programs/Xserver/hw/nxagent/Cursor.h + nx-X11/programs/Xserver/hw/nxagent/Display.c + nx-X11/programs/Xserver/hw/nxagent/Display.h + nx-X11/programs/Xserver/hw/nxagent/Font.c + nx-X11/programs/Xserver/hw/nxagent/Font.h + nx-X11/programs/Xserver/hw/nxagent/GC.c + nx-X11/programs/Xserver/hw/nxagent/GCOps.c + nx-X11/programs/Xserver/hw/nxagent/GCOps.h + nx-X11/programs/Xserver/hw/nxagent/GCs.h + nx-X11/programs/Xserver/hw/nxagent/Init.c + nx-X11/programs/Xserver/hw/nxagent/Init.h + nx-X11/programs/Xserver/hw/nxagent/Keyboard.c + nx-X11/programs/Xserver/hw/nxagent/Keyboard.h + nx-X11/programs/Xserver/hw/nxagent/Pointer.c + nx-X11/programs/Xserver/hw/nxagent/Pointer.h + nx-X11/programs/Xserver/hw/nxagent/Screen.c + nx-X11/programs/Xserver/hw/nxagent/Screen.h + nx-X11/programs/Xserver/hw/nxagent/TestExt.c + nx-X11/programs/Xserver/hw/nxagent/Visual.c + nx-X11/programs/Xserver/hw/nxagent/Visual.h +Copyright: 1993, Davor Matic + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + The code in these files was derived from Xnest. As the code changes + done by NoMachine are immense, GPL-2 is listed as these files' primary + license. + . + Xnest was originally published under the following license: + . + Copyright 1993 by Davor Matic + . + 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. Davor Matic makes no representations about + the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + +Files: nx-X11/include/extensions/render.h + nx-X11/include/extensions/renderproto.h + nx-X11/programs/Xserver/fb/fb24_32.c + nx-X11/programs/Xserver/fb/fboverlay.c + nx-X11/programs/Xserver/fb/fboverlay.h + nx-X11/programs/Xserver/fb/fbpict.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrender_nxagent.h + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h + nx-X11/programs/Xserver/render/glyph.c + nx-X11/programs/Xserver/render/glyphstr.h + nx-X11/programs/Xserver/render/miglyph.c + nx-X11/programs/Xserver/render/mipict.h + nx-X11/programs/Xserver/render/picture.c + nx-X11/programs/Xserver/render/picture.h + nx-X11/programs/Xserver/render/picturestr.h + nx-X11/programs/Xserver/render/render.c +Copyright: 2000, SuSE, Inc +License: MIT~X11 + +Files: nx-X11/lib/X11/OCWrap.c + nx-X11/lib/X11/OMWrap.c + nx-X11/lib/X11/XlcPubI.h + nx-X11/lib/X11/lcCharSet.c + nx-X11/lib/X11/lcConv.c + nx-X11/lib/X11/lcDefConv.c + nx-X11/lib/X11/lcPrTxt.c + nx-X11/lib/X11/lcPubWrap.c + nx-X11/lib/X11/lcPublic.c + nx-X11/lib/X11/lcRM.c + nx-X11/lib/X11/lcStd.c + nx-X11/lib/X11/lcTxtPr.c + nx-X11/lib/X11/lcUtil.c + nx-X11/lib/X11/omImText.c + nx-X11/lib/X11/omTextExt.c + nx-X11/lib/X11/omTextPer.c +Copyright: 1992-1993, TOSHIBA Corp +License: MIT~X11 + +Files: nx-X11/include/extensions/dpms.h + nx-X11/include/extensions/dpmsstr.h + nx-X11/include/extensions/panoramiXext.h + nx-X11/include/extensions/panoramiXproto.h + nx-X11/programs/Xserver/Xext/dpms.c + nx-X11/programs/Xserver/Xext/dpmsstubs.c + nx-X11/programs/Xserver/Xext/panoramiX.c + nx-X11/programs/Xserver/Xext/panoramiX.h + nx-X11/programs/Xserver/Xext/panoramiXSwap.c + nx-X11/programs/Xserver/Xext/panoramiXprocs.c + nx-X11/programs/Xserver/dix/dixfonts.c + nx-X11/programs/Xserver/randr/panoramiXproto.h +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts + 1996, Digital Equipment Corporation, Maynard, Massachusetts +License: Expat~NoAdvert + +Files: nx-X11/lib/X11/XimImSw.h + nx-X11/lib/X11/XimProto.h + nx-X11/lib/X11/imDefFlt.c + nx-X11/lib/X11/imDefLkup.c + nx-X11/lib/X11/imDispch.c + nx-X11/lib/X11/imExten.c + nx-X11/lib/X11/imInt.c + nx-X11/lib/X11/imLcGIc.c + nx-X11/lib/X11/imLcIc.c + nx-X11/lib/X11/imLcSIc.c + nx-X11/lib/X11/imRmAttr.c +Copyright: 1990-1994, FUJITSU LIMITED + 1992-1993, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993-1994, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/lib/X11/XlcGeneric.h + nx-X11/lib/X11/XlcPublic.h + nx-X11/lib/X11/XomGeneric.h + nx-X11/lib/X11/lcCT.c + nx-X11/lib/X11/lcGenConv.c + nx-X11/lib/X11/lcGeneric.c + nx-X11/lib/X11/omDefault.c + nx-X11/lib/X11/omGeneric.c + nx-X11/lib/X11/omText.c + nx-X11/lib/X11/omTextEsc.c + nx-X11/lib/X11/omXChar.c +Copyright: 1992-1993, TOSHIBA Corp + 1995, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/include/extensions/Xv.h + nx-X11/include/extensions/Xvproto.h + nx-X11/lib/X11/imEvToWire.c + nx-X11/programs/Xserver/Xext/xvdisp.c + nx-X11/programs/Xserver/Xext/xvdix.h + nx-X11/programs/Xserver/Xext/xvmain.c + nx-X11/programs/Xserver/include/dixfont.h + nx-X11/programs/Xserver/include/dixfontstr.h + nx-X11/programs/Xserver/include/dixstruct.h +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, Digital Equipment Corporation, Maynard, Massachusetts + 1993, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OldStyle + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c + nx-X11/programs/Xserver/hw/nxagent/NXevents.c + nx-X11/programs/Xserver/hw/nxagent/NXextension.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c + nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c + nx-X11/programs/Xserver/hw/nxagent/NXproperty.c + nx-X11/programs/Xserver/hw/nxagent/NXresource.c + nx-X11/programs/Xserver/hw/nxagent/NXwindow.c + nx-X11/programs/Xserver/os/WaitFor.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Only a few lines in these files have been added by NoMachine + when first implementing the nxagent DDX. Those lines (ifdef'ed + with NXAGENT_SERVER) must be considered as strictly GPL-2 + licensed additions. + +Files: nx-X11/include/extensions/xfixesproto.h + nx-X11/include/extensions/xfixeswire.h + nx-X11/programs/Xserver/fb/fbcompose.c + nx-X11/programs/Xserver/fb/fbpict.h + nx-X11/programs/Xserver/render/animcur.c + nx-X11/programs/Xserver/render/miindex.c + nx-X11/programs/Xserver/render/mirect.c + nx-X11/programs/Xserver/render/mitrap.c + nx-X11/programs/Xserver/render/mitri.c +Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc + 2001, Keith Packard, member of The XFree86 Project, Inc + 2002, Keith Packard, member of The XFree86 Project, Inc +License: MIT~X11 + +Files: nx-X11/include/Sunkeysym.h + nx-X11/lib/X11/Host.c + nx-X11/lib/X11/LiHosts.c + nx-X11/lib/X11/XDefaultIMIF.c + nx-X11/lib/X11/XDefaultOMIF.c + nx-X11/lib/X11/XlcDL.c + nx-X11/lib/X11/XlcSL.c + nx-X11/lib/X11/lcInit.c +Copyright: 1985-1987, 1991, 1998, The Open Group + 1986, 1998, The Open Group + 1991, 1998, The Open Group + 1991, Oracle and/or its affiliates. + 2000, Oracle and/or its affiliates. + 2004, Oracle and/or its affiliates. +License: MIT~OpenGroup +Comment: + Contributions by Oracle and/or its affiliates (from 1991, 2000, 2004) + have to be considered as licensed under Expat. + +Files: nx-X11/lib/X11/ConnDis.c + nx-X11/lib/X11/OpenDis.c + nx-X11/lib/X11/XlibAsync.c + nx-X11/lib/X11/XlibInt.c + nx-X11/lib/X11/Xlibint.h + nx-X11/programs/Xserver/Xext/security.c + nx-X11/programs/Xserver/Xext/SecurityPolicy + nx-X11/programs/Xserver/hw/nxagent/NXshm.c + nx-X11/programs/Xserver/os/auth.c +Copyright: 1984-1985, 1987, 1989, 1998, The Open Group + 1985-1986, 1998, The Open Group + 1985-1987, 1998, The Open Group + 1988, 1998, The Open Group + 1989, 1998, The Open Group + 1992, 1998, The Open Group + 1996, 1998, The Open Group + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + . + Missing copyright information in SecurityPolicy. Assuming same + situation as for Xext/security.c. + +Files: nx-X11/lib/X11/XimTrInt.h + nx-X11/lib/X11/XimTrX.h + nx-X11/lib/X11/XimTrans.h + nx-X11/lib/X11/imDefIc.c + nx-X11/lib/X11/imTrX.c + nx-X11/lib/X11/imTrans.c + nx-X11/lib/X11/imTransR.c +Copyright: 1991-1992, Oracle and/or its affiliates. + 1992, Oracle and/or its affiliates. + 1992-1994, FUJITSU LIMITED + 1993-1994, FUJITSU LIMITED +License: Expat +Comment: + The original work on these files by Oracle and/or its + affiliates have been licensed under Expat. Later + contributions by FUJITSU LIMITED have been licensed + under MIT~X11. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h + nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h + nx-X11/programs/Xserver/hw/nxagent/NXrender.c +Copyright: 2000, SuSE, Inc + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Adaptations required for the nxagent DDX done by NoMachine + need to be considered as strictly GPL-2 licensed additions. + +Files: nx-X11/programs/Xserver/dix/dispatch.c + nx-X11/programs/Xserver/dix/events.c + nx-X11/programs/Xserver/dix/main.c + nx-X11/programs/Xserver/dix/resource.c + nx-X11/programs/Xserver/dix/window.c + nx-X11/programs/Xserver/mi/miexpose.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/include/extensions/Xdbeproto.h + nx-X11/programs/Xserver/dbe/dbe.c + nx-X11/programs/Xserver/dbe/dbestruct.h + nx-X11/programs/Xserver/dbe/midbe.c + nx-X11/programs/Xserver/dbe/midbe.h + nx-X11/programs/Xserver/dbe/midbestr.h +Copyright: 1994-1995, Hewlett-Packard Company +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c +Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas + 2004, Tungsten Graphics Inc., Cedar Park, Texas +License: Expat + +Files: nx-X11/lib/xtrans/Xtrans.c + nx-X11/lib/xtrans/Xtrans.h + nx-X11/lib/xtrans/Xtransint.h + nx-X11/lib/xtrans/Xtranslcl.c + nx-X11/lib/xtrans/Xtransutil.c + nx-X11/lib/xtrans/transport.c +Copyright: 1993-1994, 1998, The Open Group + 1993-1994, NCR Corporation - Dayton, Ohio, USA +License: MIT~OpenGroup +Comment: + The NCR Corporation licensed their work on these files under + the following license: + . + Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, 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 NCR not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. NCR makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + . + NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + NO EVENT SHALL NCR 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. + +Files: nx-X11/lib/X11/XimintL.h + nx-X11/lib/X11/imImSw.c + nx-X11/lib/X11/imLcIm.c + nx-X11/lib/X11/imThaiIc.c + nx-X11/lib/X11/imThaiIm.c +Copyright: 1991-1994, FUJITSU LIMITED + 1992-1993, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993, Digital Equipment Corporation +License: MIT~X11 + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c +Copyright: 2003, Tungsten Graphics, inc +License: Expat + +Files: nx-X11/include/extensions/saver.h + nx-X11/include/extensions/saverproto.h + nx-X11/include/extensions/scrnsaver.h + nx-X11/programs/Xserver/Xext/saver.c +Copyright: 1992, X Consortium +License: Expat~NoAdvert + +Files: nx-X11/programs/Xserver/miext/cw/cw.c + nx-X11/programs/Xserver/miext/cw/cw.h + nx-X11/programs/Xserver/miext/cw/cw_ops.c + nx-X11/programs/Xserver/miext/cw/cw_render.c +Copyright: 2004, Eric Anholt +License: MIT~X11 + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h +Copyright: 1999-2003, David Airlie + 2004, David Airlie +License: Expat + +Files: nx-X11/lib/X11/FreeEventData.c + nx-X11/lib/X11/GetEventData.c + nx-X11/programs/Xserver/include/protocol-versions.h +Copyright: 2009, Red Hat, Inc +License: Expat + +Files: nx-X11/include/extensions/xf86bigfont.h + nx-X11/include/extensions/xf86bigfproto.h + nx-X11/programs/Xserver/Xext/xf86bigfont.c +Copyright: 1999-2000, Bruno Haible + 1999-2000, The XFree86 Project, Inc +License: MIT~X11 +Comment: + Assuming license as found in other files contributed + by Bruno Haible. Possibly needs clarification at X.org + upstream. + +Files: nx-X11/lib/X11/Context.c + nx-X11/lib/X11/Quarks.c + nx-X11/lib/X11/Xrm.c +Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard + 1987-1988, 1990, 1994, 1998, The Open Group + 1987-1988, 1990, 1998, The Open Group +License: MIT~OldStyle +Comment: + Contributions on these files by the OpenGroup have to be considered + as licensed under MIT~OpenGroup. + +Files: nx-X11/lib/X11/TextExt.c + nx-X11/lib/X11/TextExt16.c + nx-X11/lib/X11/lcDynamic.c +Copyright: 1989, 1998, The Open Group + 1995, FUJITSU LIMITED + 1996, 1998, The Open Group +License: MIT~OpenGroup + +Files: nx-X11/include/extensions/xtestext1.h + nx-X11/programs/Xserver/Xext/xtest1dd.c + nx-X11/programs/Xserver/Xext/xtest1di.c +Copyright: 1986-1988, 1998, The Open Group + 1986-1988, Hewlett-Packard Corporation +License: MIT~OpenGroup +Comment: + Contributions by Hewlett-Packard Corporation have been licensed + under the following license: + . + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, 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 Hewlett-Packard not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + . + Hewlett-Packard makes no representations about the + suitability of this software for any purpose. It is provided + "as is" without express or implied warranty. + . + As additional note, we find: + . + This software is not subject to any license of the American + Telephone and Telegraph Company or of the Regents of the + University of California. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c + nx-X11/programs/Xserver/randr/rrmode.c + nx-X11/programs/Xserver/randr/rrscreen.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2003, Keith Packard + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/include/bstore.h + nx-X11/programs/Xserver/include/bstorestr.h + nx-X11/programs/Xserver/mi/mibstore.h +Copyright: 1987, the Regents of the University of California +License: MIT~VeryOldStyle~UniOfCalifornia + +Files: nx-X11/programs/Xserver/dix/region.c + nx-X11/programs/Xserver/mi/mivaltree.c +Copyright: 1987-1989, 1998, The Open Group + 1987-1989, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/XimintP.h + nx-X11/lib/X11/imDefIm.c +Copyright: 1990-1992, Oracle and/or its affiliates. + 1991-1992, Oracle and/or its affiliates. + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation +License: Expat +Comment: + Original work from Oracle and/or its affiliates have been licensed + as Expat. Later contributions by FUJITSU LIMITED and Sony Corporation + have been licensed under MIT~X11. + +Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa/src/glx/x11/indirect_size.h + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h +Copyright: 2003, IBM Corporation + IBM Corporation 2004 +License: Expat + +Files: nx-X11/programs/Xserver/composite/compoverlay.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h +Copyright: 2003, Keith Packard + 2006, Oracle and/or its affiliates. +License: MIT~X11 +Comment: + Original work by Keith Packard has been licensed under MIT~X11. Later + contributions by Oracle and/or its affiliates have been licensed + under Expat. + +Files: nx-X11/programs/Xserver/Xext/sleepuntil.h + nx-X11/programs/Xserver/mi/micoord.h +Copyright: 2000, The XFree86 Project, Inc. + 2001, The XFree86 Project, Inc. +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h +Copyright: 2005, Tungsten Graphics +License: Expat + +Files: nx-X11/programs/Xserver/os/strlcat.c + nx-X11/programs/Xserver/os/strlcpy.c +Copyright: 1998, Todd C. Miller +License: MIT~ISC + +Files: nx-X11/lib/X11/lcUTF8.c + nx-X11/lib/X11/lcUTF8Load.c +Copyright: 1993, SunSoft, Inc + 1999-2000, Bruno Haible +License: MIT~X11 + +Files: nx-X11/include/extensions/randrproto.h + nx-X11/programs/Xserver/randr/randrstr.h +Copyright: 2000, Compaq Computer Corporation + 2002, Hewlett-Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h + nxcompshad/X11/include/Xrandr_nxcompshad.h +Copyright: 2000, Compaq Computer Corporation, Inc + 2002, Hewlett-Packard Company, Inc + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/os/log.c + nx-X11/programs/Xserver/os/utils.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1994, Quarterdeck Office Systems + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/lib/X11/GetNrmHint.c + nx-X11/lib/X11/SetNrmHint.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + and Wyse have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/imLcFlt.c + nx-X11/lib/X11/imLcLkup.c +Copyright: 1992, 1994, FUJITSU LIMITED + 1992, Fuji Xerox Co., Ltd +License: MIT~X11 + +Files: nx-X11/lib/X11/Ximint.h + nx-X11/lib/X11/imRm.c +Copyright: 1990-1994, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation + 1994, Sony Corporation +License: MIT~X11 + +Files: nx-X11/lib/X11/Xaixlcint.h + nx-X11/lib/X11/lcFile.c +Copyright: 1993, IBM Corporation +License: MIT~OldStyle + +Files: nx-X11/include/extensions/record.h + nx-X11/include/extensions/recordstr.h +Copyright: 1995, Network Computing Devices +License: MIT~OldStyle + +Files: nx-X11/lib/X11/FilterEv.c + nx-X11/lib/X11/RegstFlt.c +Copyright: 1990-1991, 1998, The Open Group + 1990-1991, OMRON Corporation + 1991, 1998, The Open Group +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/include/GL/glxint.h + nx-X11/programs/Xserver/GL/glx/glxext.c +Copyright: 1991-1999 Silicon Graphics, Inc. +License: GLX-1.0 + +Files: nx-X11/programs/Xserver/fb/fbcmap.c + nx-X11/programs/Xserver/mi/micmap.c +Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA. +License: MIT~OldStyle +Comment: + Copyright attributions of Sun Microsystems, Inc. now belong + to Oracle. + +Files: nx-X11/lib/X11/GetTxtProp.c + nx-X11/lib/X11/Iconify.c + nx-X11/lib/X11/SetTxtProp.c + nx-X11/lib/X11/Withdraw.c +Copyright: 1988, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca +License: MIT~OldStyle +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/lib/X11/mbWrap.c + nx-X11/lib/X11/wcWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation +License: MIT~OldStyle +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/lib/X11/FSWrap.c + nx-X11/lib/X11/lcWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the TOSHIBA Corp +License: MIT~OpenGroup +Comment: + Contributions by OSF and TOSHIBA have been licensed under + MIT~X11. + +Files: nx-X11/include/extensions/XResproto.h + nx-X11/programs/Xserver/Xext/xres.c +Copyright: 2002, XFree86 Inc +License: XFree86 + +Files: nxcomp/MD5.c + nxcomp/MD5.h +Copyright: 1999, 2002, Aladdin Enterprises. + 1999-2000, 2002, Aladdin Enterprises. +License: Zlib + +Files: nx-X11/lib/X11/utlist.h +Copyright: 2007-2009, Troy D. Hanson +License: BSD-1-clause + +Files: nx-X11/programs/Xserver/os/xprintf.c +Copyright: 2004, Alexander Gottwald +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h +Copyright: 1999-2001, Brian Paul + IBM Corporation 2004, +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h +Copyright: 1997, Keith Whitwell + 1999-2001, Brian Paul +License: Expat + +Files: nx-X11/lib/X11/UIThrStubs.c +Copyright: 1995, David E. Wexelblat. +License: Expat~NoAdvert + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + The original code has been licensed under MIT~OldStyle. + . + Later contributions got licensed under Expat~NoAdvert. + . + Some few modifications introduced by NoMachine have to be considered as + strictly GPL-2 licensed. + +Files: nx-X11/programs/Xserver/os/access.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 2004, Sun Microsystems, Inc +License: Expat~NoAdvert +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +Copyright: 1989-1995, GROUPE BULL +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h +Copyright: 2005, IBM Corporation +License: Expat + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h +Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc + 2006, Oracle and/or its affiliates. + 2011, Red Hat, Inc +License: MIT~X11 +Comment: + Original work by Keith Packard has been licensed under MIT~X11. + . + Later contributions by Oracle and/or its affiliates and Red Hat, Inc. + have been licensed under Expat. + +Files: nx-X11/extras/Mesa/src/mesa/main/mm.h +Copyright: 1999, Keith Whitwell +License: Expat + +Files: nx-X11/lib/xtrans/Xtranssock.c +Copyright: 1993-1994, 1998, The Open Group + 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Oracle and/or its affiliates. + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Original code from The Open Group has been licensed under + MIT~OpenGroup. + . + Contributions by NCR Corporation has been licensed under + MIT~OldStyle. + . + Contributions by Oracle and/or its affiliates have been + licensed under Expat. + . + Modifications from NoMachine for making xtrans work + over the NX protocol, have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/hw/nxagent/os2Stub.c +Copyright: 1996, Sebastien Marineau + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + No NX specific changes can be found in this file. GPL-2 + license in file header does not apply. + . + Note from upstream side: This file will be removed in + nx-libs 3.5.99.4. + +Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h +Copyright: 1995, X Consortium + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + Modifications by NoMachine have to be considered as + strictly GPL-2 license. + +Files: nx-X11/programs/Xserver/composite/compositeext.h +Copyright: 2009, NVIDIA Corporation +License: Expat + +Files: nx-X11/lib/X11/os2Stubs.c +Copyright: 1996, Sebastien Marineau and Holger Veit +License: Expat~NoAdvert +Comment: + Note from upstream side: This file will be removed in + nx-libs 3.5.99.4. + +Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas +License: Expat + + +Files: nx-X11/extras/Mesa/src/mesa/main/mm.c +Copyright: 1999, Wittawat Yamwong +License: Expat + +Files: nxcomp/Version.c +Copyright: 2015, Qindel Formacion y Servicios SL. +License: GPL-2 + +Files: version.sh +Copyright: 2015, Mihai Moldovan + 2015, Mike Gabriel +License: GPL-2+ + +Files: roll-tarballs.sh +Copyright: 2011-2016, Mike Gabriel + 2012, Reinhard Tartler +License: GPL-3+ + +Files: nx-X11/programs/Xserver/dix/dixutils.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1988,1991, Adobe Systems Incorporated. +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + . + Contributions by Adobe Systems Inc. have been licensed under MIT~Adobe. + +Files: nx-X11/lib/X11/utf8WMProps.c +Copyright: 1991, 1998, The Open Group + 2000, Bruno Haible +License: MIT~OpenGroup +Comment: + Contributions by Bruno Haible have been licensed under MIT~X11. + +Files: nx-X11/lib/X11/utf8Wrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 2000, Bruno Haible +License: MIT~OpenGroup +Comment: + Contributions by Bruno Haible have been licensed under MIT~X11. + . + Contributions by OSF have been licensed under MIT~OldStyle. + +Files: nx-X11/include/extensions/randr.h +Copyright: 2000, Compaq Computer Corporation + 2002, Hewlett Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/randr/randr.c +Copyright: 2000, Compaq Computer Corporation + 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Hewlett-Packard Company + 2006, Intel Corporation + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/include/misc.h +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1992-1993, Data General Corporation; + 1992-1993, OMRON Corporation +License: MIT~OpenGroup +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by Digital Equipment Corporation, Maynard, Massachusetts have + been licensed under MIT~OldStyle. + . + Contributions by Data General Corporation and OMRON Corporation have been + licnsed under MIT~X11. + +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h +Copyright: 2004, David Airlie +License: Expat +Comment: + Missing license in header, assuming same license as found + in other Mesa files with same copyright holder. + +Files: nx-X11/lib/X11/imCallbk.c +Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts + 1994, FUJITSU LIMITED + 1994, Sony Corporation +License: MIT~OldStyle + +Files: nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OldStyle +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/lib/X11/WMProps.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1993, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca. +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + and Wyse have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/imConv.c +Copyright: 1991-1992, Fuji Xerox Co.,Ltd + 1993-1994, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/lib/X11/lcDB.c +Copyright: 1995, FUJITSU LIMITED + 1993, IBM Corporation +License: MIT~OldStyle + +Files: nx-X11/lib/X11/imLcPrs.c +Copyright: 1992, Fuji Xerox Co., Ltd + 1992, Oki Technosystems Laboratory, Inc +License: MIT~X11 + +Files: nx-X11/lib/X11/Xprivate.h +Copyright: 2008, Jamey Sharp, Josh Triplett +License: MIT~X11 +Comment: + Assuming MIT~X11 from "MIT, see COPYING file" in file header. + +Files: nx-X11/programs/Xserver/randr/rrcrtc.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2010, Red Hat, Inc + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/randr/rrxinerama.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2001-2005, Thomas Winischhofer, Vienna, Austria + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/randr/rroutput.c +Copyright: 2006, Keith Packard + 2008, Red Hat, Inc +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Keith Packard, member of The XFree86 Project, Inc + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/include/Xarch.h +Copyright: 1997, Metro Link Incorporated +License: MIT~X11 + +Files: nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +Copyright: 1991-1999 Silicon Graphics, Inc. + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GLX-1.0 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/os/xdmcp.c +Copyright: 1989, Network Computing Devices, Inc., Mountain View, California +License: MIT~VeryOldStyle~NCD + +Files: nxproxy/Main.c +Copyright: 2001, 2011, NoMachine, http://www.nomachine.com/. +License: GPL-2 + +Files: nx-X11/lib/X11/Xlcint.h +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation + 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the TOSHIBA Corp + 1993-1994, Sony Corporation + 1993-1994, the FUJITSU LIMITED +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/lib/X11/SetLocale.c +Copyright: 1987,1998, The Open Group + 1990-1991, OMRON Corporation, NTT Software Corporation +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/lib/X11/ICWrap.c +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation + 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the FUJITSU LIMITED +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/programs/Xserver/randr/rrprovider.c +Copyright: 2012, Red Hat Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/mi/mibank.c +Copyright: 1990,91,92,93 Thomas Roell, Germany + 1991,92,93 SGCS (Snitily Graphics Consulting Services), USA + 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +License: MIT~X11 + +Files: nx-X11/lib/X11/imInsClbk.c +Copyright: 1993-1994, Sony Corporation +License: MIT~OldStyle + +Files: nx-X11/lib/X11/CCC.c +Copyright: 1990, 1991, Tektronix, Inc + 1994, 1998, The Open Group +License: MIT~Tektronix +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by Tektronix, Inc. have been licensed under MIT~Tektronix. + +Files: nx-X11/lib/X11/Font.c +Copyright: 1986, 1998, The Open Group + 2000, The XFree86 Project, Inc +License: MIT~OpenGroup + +Files: nx-X11/lib/X11/IMWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993-1994, the Sony Corporation +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/programs/Xserver/mi/mibstore.c +Copyright: 1987, 1998, The Open Group + 1987, the Regents of the University of California +License: MIT~OpenGroup +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the Regents of the University of California have been + licensed under MIT~VeryOldStyle~UniOfCalifornia. + +Files: nx-X11/include/Xdefs.h +Copyright: 1999, The XFree86 Project Inc +License: XFree86 + +Files: nx-X11/programs/Xserver/mi/mibank.h +Copyright: 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +License: MIT~X11 + +Files: fix-patch-whitespace + nx-X11/programs/Xserver/fix-miregion + nx-X11/programs/Xserver/fix-miregion-private + nx-X11/programs/Xserver/fix-region +Copyright: 2010, Keith Packard +License: MIT~X11 +Comment: + Copyright holder taken from author field in Git commit (at X.org's + xserver.git). + . + Missing license header (also at X.org). Assuming MIT~X11. + +Files: testscripts/run-nxproxy2nxagent-on-localhost + testscripts/run-nxproxy2nxagent-over-network + testscripts/run-nxproxy2nxagent-over-sockets + testscripts/run-nxproxy2nxproxy + testscripts/run-nxproxy2nxproxy-over-sockets + testscripts/slave-agent + testscripts/slave-client +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com/) + 2015-2016, Mike Gabriel +License: GPL-2 + +Files: testscripts/slave-agent + testscripts/slave-client +Copyright: 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 + +Files: ChangeLog + Makefile + VERSION + doc/README.NX-development + doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt + doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt + doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt + doc/libNX_X11/symbols/libNX_X11::symbols.txt + doc/nxagent/README.keystrokes + doc/nxcomp/DXPC_re-licensed_debug_784565.mbox + doc/nxcomp/README.on-retroactive-DXPC-license + doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf + doc/nxcompext/symbols/nxcompext::symbol-usage_internally.txt + doc/nxcompext/symbols/nxcompext::symbol-usage_nxagent.txt + doc/nxcompext/symbols/nxcompext::symbols.txt + doc/nxproxy/README-VALGRIND + etc/keystrokes.cfg + etc/nxagent.keyboard + nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 + nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm + nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm + nx-X11/programs/Xserver/hw/nxagent/x2go.xpm + nx-X11/Makefile + nxcomp/Makefile.in + nxcomp/VERSION + nxcomp/configure.in + nxcomp/nxcomp.pc.in + nxcompshad/Makefile.in + nxcompshad/VERSION + nxcompshad/configure.in + nxcompshad/nxcompshad.pc.in + nxproxy/Makefile.in + nxproxy/VERSION + nxproxy/configure.in + nxproxy/man/nxproxy.1 +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + No explicit license information in individual files. Assuming + copyright holders as found in LICENSE file. + +Files: nx-X11/include/Xpoll.h.in +Copyright: 1994, 1998, The Open Group + 2005, Daniel Stone + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Contributions by NoMachine have to be considered as strictly GPL-2 + licensed. + . + Contributions by Daniel Stone have been licensed under MIT~X11. + +Files: nxcomp/mkinstalldirs + nxproxy/mkinstalldirs +Copyright: *No copyright* +License: public-domain + +Files: nxcomp/install-sh + nxcompshad/install-sh + nxproxy/install-sh +Copyright: 1994, X Consortium +License: Expat~NoAdvert +Comment: + Missing license headers. License and copyright information obtained from + later versions of this file as found in automake-1.14. + . + FIXME: This comment will be obsolete for 3.5.99.4. + +Files: debian/* +Copyright: 2011-2016, Mike Gabriel + 2011-2013, Reinhard Tartler + 2015-2016, Mihai Moldovan +License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause + +License: GPL-2 + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; version 2 of the License. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-3+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: Expat~NoAdvert + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the sale, + use or other dealings in this Software without prior written authorization. + +License: MIT~OpenGroup + 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. + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + +License: MIT~X11 + 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 the copyright holders not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no representations + about the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + . + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL THE COPYRIGHT HOLDERS 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. + +License: MIT~Tektronix + Permission is hereby granted to use, copy, modify, sell, and otherwise + distribute this software and its documentation for any purpose and + without fee, provided that this copyright, permission, and disclaimer + notice is reproduced in all copies of this software and in supporting + documentation. TekColor is a trademark of Tektronix, Inc. + . + Tektronix makes no representation about the suitability of this software + for any purpose. It is provided "as is" and with all faults. + . + TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, + INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX 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 THE PERFORMANCE OF THIS SOFTWARE. + +License: MIT~Tektronix~3-clause + Permission is hereby granted to use, copy, modify, sell, and otherwise + distribute this software and its documentation for any purpose and + without fee, provided that this copyright, permission, and disclaimer + notice is reproduced in all copies of this software and in supporting + documentation. TekColor is a trademark of Tektronix, Inc. + . + Tektronix makes no representation about the suitability of this software + for any purpose. It is provided "as is" and with all faults. + . + TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, + INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOqSE. IN NO EVENT SHALL TEKTRONIX 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 THE PERFORMANCE OF THIS SOFTWARE. + +License: MIT~OldStyle + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + 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 the copyright holder(s) + not be used in advertising or publicity pertaining to distribution of + the software without specific, written prior permission. + . + THE COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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. + +License: MIT~Adobe + Permission to use, copy, modify, distribute, and sublicense this software and its + documentation for any purpose and without fee is hereby granted, provided that + the above copyright notices appear in all copies and that both those copyright + notices and this permission notice appear in supporting documentation and that + the name of Adobe Systems Incorporated not be used in advertising or publicity + pertaining to distribution of the software without specific, written prior + permission. No trademark license to use the Adobe trademarks is hereby + granted. If the Adobe trademark "Display PostScript"(tm) is used to describe + this software, its functionality or for any other purpose, such use shall be + limited to a statement that this software works in conjunction with the Display + PostScript system. Proper trademark attribution to reflect Adobe's ownership + of the trademark shall be given whenever any such reference to the Display + PostScript system is made. + . + ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY + PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. ADOBE + DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- + INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE TO YOU + OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY + DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT + LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER + SUPPORT FOR THE SOFTWARE. + . + Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems + Incorporated which may be registered in certain jurisdictions. + +License: MIT~VeryOldStyle~UniOfCalifornia + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies. The University of + California makes no representations about the suitability of this software + for any purpose. It is provided "as is" without express or implied + warranty. + . + [The University of California makes no representations about the suitability + of this software for any purpose. It is provided "as is" without express or + implied warranty.] + +License: MIT~VeryOldStyle~NCD + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, 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 N.C.D. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. N.C.D. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + +License: MIT~ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE + FOR ANY SPECIAL, DIRECT, 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. + +License: SGI-1.1 + SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) + . + 1. Definitions. + . + 1.1. "Additional Notice Provisions" means such additional provisions as + appear in the Notice in Original Code under the heading "Additional + Notice Provisions." + . + 1.2. "Covered Code" means the Original Code or Modifications, or any + combination thereof. + . + 1.3. "Hardware" means any physical device that accepts input, processes + input, stores the results of processing, and/or provides output. + . + 1.4. "Larger Work" means a work that combines Covered Code or portions + thereof with code not governed by the terms of this License. + . + 1.5. "Licensable" means having the right to grant, to the maximum extent + possible, whether at the time of the initial grant or subsequently + acquired, any and all of the rights conveyed herein. + . + 1.6. "License" means this document. + . + 1.7. "Licensed Patents" means patent claims Licensable by SGI that are + infringed by the use or sale of Original Code or any Modifications + provided by SGI, or any combination thereof. + . + 1.8. "Modifications" means any addition to or deletion from the substance or + structure of the Original Code or any previous Modifications. When + Covered Code is released as a series of files, a Modification is: + . + A. Any addition to the contents of a file containing Original Code and/or + addition to or deletion from the contents of a file containing previous + Modifications. + . + B. Any new file that contains any part of the Original Code or previous + Modifications. + . + 1.9. "Notice" means any notice in Original Code or Covered Code, as required + by and in compliance with this License. + . + 1.10. "Original Code" means source code of computer software code that is + described in the source code Notice required by Exhibit A as Original + Code, and updates and error corrections specifically thereto. + . + 1.11. "Recipient" means an individual or a legal entity exercising rights + under, and complying with all of the terms of, this License or a future + version of this License issued under Section 8. For legal entities, + "Recipient" includes any entity that controls, is controlled by, or is + under common control with Recipient. For purposes of this definition, + "control" of an entity means (a) the power, direct or indirect, to + direct or manage such entity, or (b) ownership of fifty percent (50%) or + more of the outstanding shares or beneficial ownership of such entity. + . + 1.12. "Recipient Patents" means patent claims Licensable by a Recipient that + are infringed by the use or sale of Original Code or any Modifications + provided by SGI, or any combination thereof. + . + 1.13. "SGI" means Silicon Graphics, Inc. + . + 1.14. "SGI Patents" means patent claims Licensable by SGI other than the + Licensed Patents. + . + 2. License Grant and Restrictions. + . + 2.1. SGI License Grant. Subject to the terms of this License and any + third party intellectual property claims, for the duration of + intellectual property protections inherent in the Original Code, SGI + hereby grants Recipient a worldwide, royalty-free, non-exclusive + license, to do the following: (i) under copyrights Licensable by SGI, to + reproduce, distribute, create derivative works from, and, to the extent + applicable, display and perform the Original Code and/or any + Modifications provided by SGI alone and/or as part of a Larger Work; and + (ii) under any Licensable Patents, to make, have made, use, sell, offer + for sale, import and/or otherwise transfer the Original Code and/or any + Modifications provided by SGI. Recipient accepts the terms and + conditions of this License by undertaking any of the aforementioned + actions. The patent license shall apply to the Covered Code if, at the + time any related Modification is added, such addition of the + Modification causes such combination to be covered by the Licensed + Patents. The patent license in Section 2.1(ii) shall not apply to any + other combinations that include the Modification. No patent license is + provided under SGI Patents for infringements of SGI Patents by + Modifications not provided by SGI or combinations of Original Code and + Modifications not provided by SGI. + . + 2.2. Recipient License Grant. Subject to the terms of this License and + any third party intellectual property claims, Recipient hereby grants + SGI and any other Recipients a worldwide, royalty-free, non-exclusive + license, under any Recipient Patents, to make, have made, use, sell, + offer for sale, import and/or otherwise transfer the Original Code + and/or any Modifications provided by SGI. + . + 2.3. No License For Hardware Implementations. The licenses granted in + Section 2.1 and 2.2 are not applicable to implementation in Hardware of + the algorithms embodied in the Original Code or any Modifications + provided by SGI . + . + 3. Redistributions. + . + 3.1. Retention of Notice/Copy of License. The Notice set forth in + Exhibit A, below, must be conspicuously retained or included in any and + all redistributions of Covered Code. For distributions of the Covered + Code in source code form, the Notice must appear in every file that can + include a text comments field; in executable form, the Notice and a copy + of this License must appear in related documentation or collateral where + the Recipient’s rights relating to Covered Code are described. Any + Additional Notice Provisions which actually appears in the Original Code + must also be retained or included in any and all redistributions of + Covered Code. + . + 3.2. Alternative License. Provided that Recipient is in compliance with + the terms of this License, Recipient may, so long as without derogation + of any of SGI’s rights in and to the Original Code, distribute the + source code and/or executable version(s) of Covered Code under (1) this + License; (2) a license identical to this License but for only such + changes as are necessary in order to clarify Recipient’s role as + licensor of Modifications; and/or (3) a license of Recipient’s choosing, + containing terms different from this License, provided that the license + terms include this Section 3 and Sections 4, 6, 7, 10, 12, and 13, which + terms may not be modified or superseded by any other terms of such + license. If Recipient elects to use any license other than this License, + Recipient must make it absolutely clear that any of its terms which + differ from this License are offered by Recipient alone, and not by SGI. + It is emphasized that this License is a limited license, and, regardless + of the license form employed by Recipient in accordance with this + Section 3.2, Recipient may relicense only such rights, in Original Code + and Modifications by SGI, as it has actually been granted by SGI in this + License. + . + 3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any + liability incurred by SGI as a result of any such alternative license + terms Recipient offers. + . + 4. Termination. This License and the rights granted hereunder will + terminate automatically if Recipient breaches any term herein and fails + to cure such breach within 30 days thereof. Any sublicense to the + Covered Code that is properly granted shall survive any termination of + this License, absent termination by the terms of such sublicense. + Provisions that, by their nature, must remain in effect beyond the + termination of this License, shall survive. + . + 5. No Trademark Or Other Rights. This License does not grant any + rights to: (i) any software apart from the Covered Code, nor shall any + other rights or licenses not expressly granted hereunder arise by + implication, estoppel or otherwise with respect to the Covered Code; + (ii) any trade name, trademark or service mark whatsoever, including + without limitation any related right for purposes of endorsement or + promotion of products derived from the Covered Code, without prior + written permission of SGI; or (iii) any title to or ownership of the + Original Code, which shall at all times remains with SGI. All rights in + the Original Code not expressly granted under this License are reserved. + . + 6. Compliance with Laws; Non-Infringement. There are various worldwide + laws, regulations, and executive orders applicable to dispositions of + Covered Code, including without limitation export, re-export, and import + control laws, regulations, and executive orders, of the U.S. government + and other countries, and Recipient is reminded it is obliged to obey + such laws, regulations, and executive orders. Recipient may not + distribute Covered Code that (i) in any way infringes (directly or + contributorily) any intellectual property rights of any kind of any + other person or entity or (ii) breaches any representation or warranty, + express, implied or statutory, to which, under any applicable law, it + might be deemed to have been subject. + . + 7. Claims of Infringement. If Recipient learns of any third party claim + that any disposition of Covered Code and/or functionality wholly or + partially infringes the third party's intellectual property rights, + Recipient will promptly notify SGI of such claim. + . + 8. Versions of the License. SGI may publish revised and/or new versions of + the License from time to time, each with a distinguishing version + number. Once Covered Code has been published under a particular version + of the License, Recipient may, for the duration of the license, continue + to use it under the terms of that version, or choose to use such Covered + Code under the terms of any subsequent version published by SGI. Subject + to the provisions of Sections 3 and 4 of this License, only SGI may + modify the terms applicable to Covered Code created under this License. + . + 9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS + AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT + LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, + SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND + NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE + OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI + ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR OR CORRECTION. THIS + DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS + DISCLAIMER. + . + 10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, + WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT + LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE + LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF + SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. + THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR + PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE + LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT + EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. + . + 11. Indemnity. Recipient shall be solely responsible for damages + arising, directly or indirectly, out of its utilization of rights under + this License. Recipient will defend, indemnify and hold harmless Silicon + Graphics, Inc. from and against any loss, liability, damages, costs or + expenses (including the payment of reasonable attorneys fees) arising + out of Recipient's use, modification, reproduction and distribution of + the Covered Code or out of any representation or warranty made by + Recipient. + . + 12. U.S. Government End Users. The Covered Code is a "commercial item" + consisting of "commercial computer software" as such terms are defined + in title 48 of the Code of Federal Regulations and all U.S. Government + End Users acquire only the rights set forth in this License and are + subject to the terms of this License. + . + 13. Miscellaneous. This License represents the complete agreement + concerning the its subject matter. If any provision of this License is + held to be unenforceable, such provision shall be reformed so as to + achieve as nearly as possible the same legal and economic effect as the + original provision and the remainder of this License will remain in + effect. This License shall be governed by and construed in accordance + with the laws of the United States and the State of California as + applied to agreements entered into and to be performed entirely within + California between California residents. Any litigation relating to this + License shall be subject to the exclusive jurisdiction of the Federal + Courts of the Northern District of California (or, absent subject matter + jurisdiction in such courts, the courts of the State of California), + with venue lying exclusively in Santa Clara County, California, with the + losing party responsible for costs, including without limitation, court + costs and reasonable attorneys fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale of + Goods is expressly excluded. Any law or regulation that provides that + the language of a contract shall be construed against the drafter shall + not apply to this License. + . + Exhibit A + . + License Applicability. Except to the extent portions of this file are + made subject to an alternative license as permitted in the SGI Free + Software License B, Version 1.1 (the "License"), the contents of this + file are subject only to the provisions of the License. You may not use + this file except in compliance with the License. You may obtain a copy + of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 + Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: + . + http://oss.sgi.com/projects/FreeB + . + Note that, as provided in the License, the Software is distributed on an + "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS + DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND + CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A + PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + . + Original Code. The Original Code is: [name of software, version number, + and release date], developed by Silicon Graphics, Inc. The Original Code + is Copyright (c) [dates of first publication, as appearing in the Notice + in the Original Code] Silicon Graphics, Inc. Copyright in any portions + created by third parties is as indicated elsewhere herein. All Rights + Reserved. + . + Additional Notice Provisions: [such additional provisions, if any, as + appear in the Notice in the Original Code under the heading "Additional + Notice Provisions"] + +License: GLX-1.0 + GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") + . + Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby + grants permission to Recipient (defined below), under Recipient's + copyrights in the Original Software (defined below), to use, copy, + modify, merge, publish, distribute, sublicense and/or sell copies of + Subject Software (defined below), and to permit persons to whom the + Subject Software is furnished in accordance with this License to do the + same, subject to all of the following terms and conditions, which + Recipient accepts by engaging in any such use, copying, modifying, + merging, publishing, distributing, sublicensing or selling: + . + 1. Definitions. + . + (a) "Original Software" means source code of computer software code + which is described in Exhibit A as Original Software. + . + (b) "Modifications" means any addition to or deletion from the + substance or structure of either the Original Software or any + previous Modifications. When Subject Software is released as a + series of files, a Modification means (i) any addition to or + deletion from the contents of a file containing Original Software or + previous Modifications and (ii) any new file that contains any part + of the Original Code or previous Modifications. + . + (c) "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + . + (d) "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. + For legal entities, "Recipient" includes any entity which controls, + is controlled by, or is under common control with Recipient. For + purposes of this definition, "control" of an entity means (a) the + power, direct or indirect, to direct or manage such entity, or (b) + ownership of fifty percent (50%) or more of the outstanding shares + or beneficial ownership of such entity. + . + 2. Redistribution of Source Code Subject to These Terms. Redistributions + of Subject Software in source code form must retain the notice set forth + in Exhibit A, below, in every file. A copy of this License must be + included in any documentation for such Subject Software where the + recipients' rights relating to Subject Software are described. Recipient + may distribute the source code version of Subject Software under a + license of Recipient's choice, which may contain terms different from + this License, provided that (i) Recipient is in compliance with the + terms of this License, and (ii) the license terms include this Section 2 + and Sections 3, 4, 7, 8, 10, 12 and 13 of this License, which terms may + not be modified or superseded by any other terms of such license. If + Recipient distributes the source code version under a different license + Recipient must make it absolutely clear that any terms which differ from + this License are offered by Recipient alone, not by SGI. Recipient + hereby agrees to indemnify SGI for any liability incurred by SGI as a + result of any such terms Recipient offers. + . + 3. Redistribution in Executable Form. The notice set forth in Exhibit A + must be conspicuously included in any notice in an executable version of + Subject Software, related documentation or collateral in which Recipient + describes the user's rights relating to the Subject Software. Recipient + may distribute the executable version of Subject Software under a + license of Recipient's choice, which may contain terms different from + this License, provided that (i) Recipient is in compliance with the + terms of this License, and (ii) the license terms include this Section 3 + and Sections 4, 7, 8, 10, 12 and 13 of this License, which terms may not + be modified or superseded by any other terms of such license. If + Recipient distributes the executable version under a different license + Recipient must make it absolutely clear that any terms which differ from + this License are offered by Recipient alone, not by SGI. Recipient + hereby agrees to indemnify SGI for any liability incurred by SGI as a + result of any such terms Recipient offers. + . + 4. Termination. This License and the rights granted hereunder will + terminate automatically if Recipient fails to comply with terms herein + and fails to cure such breach within 30 days of the breach. Any + sublicense to the Subject Software which is properly granted shall + survive any termination of this License absent termination by the terms + of such sublicense. Provisions which, by their nature, must remain in + effect beyond the termination of this License shall survive. + . + 5. No Trademark Rights. This License does not grant any rights to use + any trade name, trademark or service mark whatsoever. No trade name, + trademark or service mark of SGI may be used to endorse or promote + products derived from the Subject Software without prior written + permission of SGI. + . + 6. No Other Rights. This License does not grant any rights with respect + to the OpenGL API or to any software or hardware implementation thereof + or to any other software whatsoever, nor shall any other rights or + licenses not expressly granted hereunder arise by implication, estoppel + or otherwise with respect to the Subject Software. Title to and + ownership of the Original Software at all times remains with SGI. All + rights in the Original Software not expressly granted under this License + are reserved. + . + 7. Compliance with Laws; Non-Infringement. Recipient shall comply with + all applicable laws and regulations in connection with use and + distribution of the Subject Software, including but not limited to, all + export and import control laws and regulations of the U.S. government + and other countries. Recipient may not distribute Subject Software that + (i) in any way infringes (directly or contributorily) the rights + (including patent, copyright, trade secret, trademark or other + intellectual property rights of any kind) of any other person or entity + or (ii) breaches any representation or warranty, express, implied or + statutory, which under any applicable law it might be deemed to have + been distributed. + . + 8. Claims of Infringement. If Recipient at any time has knowledge of any + one or more third party claims that reproduction, modification, use, + distribution, import or sale of Subject Software (including particular + functionality or code incorporated in Subject Software) infringes the + third party's intellectual property rights, Recipient must place in a + well-identified web page bearing the title "LEGAL" a description of each + such claim and a description of the party making each such claim in + sufficient detail that a user of the Subject Software will know whom to + contact regarding the claim. Also, upon gaining such knowledge of any + such claim, Recipient must conspicuously include the URL for such web + page in the Exhibit A notice required under Sections 2 and 3, above, and + in the text of any related documentation, license agreement or + collateral in which Recipient describes end user's rights relating to + the Subject Software. If Recipient obtains such knowledge after it makes + Subject Software available to any other person or entity, Recipient + shall take other steps (such as notifying appropriate mailing lists or + newsgroups) reasonably calculated to inform those who received the + Subject Software that new knowledge has been obtained. + . + 9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" + BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS + FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- + INFRINGING. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF THE + SOFTWARE. SHOULD ANY SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI + ASSUMES NO COST OR LIABILITY FOR ANY SERVICING, REPAIR OR CORRECTION. + THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT + UNDER THIS DISCLAIMER. + . + 10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR + STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR + BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, + DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER + FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR + LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY + OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO + LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE + TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME + JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR + CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO + RECIPIENT. + . + 11. Indemnity. Recipient shall be solely responsible for damages + arising, directly or indirectly, out of its utilization of rights under + this License. Recipient will defend, indemnify and hold harmless Silicon + Graphics, Inc. from and against any loss, liability, damages, costs or + expenses (including the payment of reasonable attorneys fees) arising + out of Recipient's use, modification, reproduction and distribution of + the Subject Software or out of any representation or warranty made by + Recipient. + . + 12. U.S. Government End Users. The Subject Software is a "commercial + item" consisting of "commercial computer software" as such terms are + defined in title 48 of the Code of Federal Regulations and all U.S. + Government End Users acquire only the rights set forth in this License + and are subject to the terms of this License. + . + 13. Miscellaneous. This License represents the complete agreement + concerning subject matter hereof. If any provision of this License is + held to be unenforceable, such provision shall be reformed so as to + achieve as nearly as possible the same economic effect as the original + provision and the remainder of this License will remain in effect. This + License shall be governed by and construed in accordance with the laws + of the United States and the State of California as applied to + agreements entered into and to be performed entirely within California + between California residents. Any litigation relating to this License + shall be subject to the exclusive jurisdiction of the Federal Courts of + the Northern District of California (or, absent subject matter + jurisdiction in such courts, the courts of the State of California), + with venue lying exclusively in Santa Clara County, California, with the + losing party responsible for costs, including without limitation, court + costs and reasonable attorneys fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale of + Goods is expressly excluded. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall + not apply to this License. + . + Exhibit A + . + The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 + and 13 of the GLX Public License Version 1.0 (the "License"). You may + not use this file except in compliance with those sections of the + License. You may obtain a copy of the License at Silicon Graphics, Inc., + attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 + or at http://www.sgi.com/software/opensource/glx/license.html. + . + Software distributed under the License is distributed on an "AS IS" + basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY + IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR + PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific + language governing rights and limitations under the License. + . + The Original Software is GLX version 1.2 source code, released February, + 1999. The developer of the Original Software is Silicon Graphics, Inc. + Those portions of the Subject Software created by Silicon Graphics, Inc. + are Copyright (c) 1991-1999 Silicon Graphics, Inc. All Rights Reserved. + +License: XFree86 + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of The XFree86 Project + Inc. shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization from The XFree86 Project Inc.. + +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: BSD-1-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: public-domain + No license required for any purpose; the work is not subject to + copyright in any jurisdiction. diff --git a/debian/copyright.in b/debian/copyright.in index 4e828ccc9..92955a4a4 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1484,7 +1484,6 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h nx-X11/programs/Xserver/GL/glx/singlesize.h nx-X11/programs/Xserver/GL/glx/unpack.h nx-X11/programs/Xserver/GL/glx/xfont.c - nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h Copyright: 1991-2000, Silicon Graphics, Inc 1991-2004, Silicon Graphics, Inc License: UNKNOWN @@ -1862,16 +1861,6 @@ Copyright: 1994-1995, Hewlett-Packard Company License: Expat FIXME -Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h - nx-X11/programs/Xserver/GL/include/GL/xf86glx.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c @@ -1894,6 +1883,15 @@ Copyright: 1993-1994, 1998 The Open Group License: UNKNOWN FIXME +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas +License: Expat + FIXME + Files: nx-X11/lib/X11/XimintL.h nx-X11/lib/X11/imImSw.c nx-X11/lib/X11/imLcIm.c @@ -1930,15 +1928,6 @@ Copyright: 2004, Eric Anholt License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h -Copyright: 1999-2001, Brian Paul - 1999-2003, Brian Paul - IBM Corporation 2004 -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h @@ -2010,6 +1999,21 @@ Copyright: 1987, the Regents of the University of California License: UNKNOWN FIXME +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 +License: Expat + FIXME + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + IBM Corporation 2004, +License: Expat + FIXME + Files: nx-X11/programs/Xserver/dix/region.c nx-X11/programs/Xserver/mi/mivaltree.c Copyright: 1987-1989, 1998 The Open Group @@ -2214,12 +2218,6 @@ Copyright: 2004, Alexander Gottwald License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004, -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h Copyright: 1997, Keith Whitwell 1999-2001, Brian Paul -- cgit v1.2.3 From c45cab1ba5a6ffe3832039d89c26a6d11068d417 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:52:04 +0100 Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr//nx/X11 rather than /usr//nx-X11). --- debian/nxagent.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/nxagent.install b/debian/nxagent.install index 75e72fcde..5f6a9de35 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -4,7 +4,7 @@ usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -usr/lib/*/nx-X11/ +usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard -- cgit v1.2.3 From 4a01be659888c4a6a0eeb8396a3521ee759a7e20 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:53:25 +0100 Subject: debian/rules: Don't manually override SHLIBDIR via the dh_auto_build call. The default in the main Makefile should work fine. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index d30574c07..180de6984 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ override_dh_auto_install: override_dh_auto_build: - PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' SHLIBDIR="$(LIBDIR)" + PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From a474b9f931a2e22ce5d6255f1179c3b0cd00dd85 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 19:02:16 +0100 Subject: debian/patches: Update 016_nx-X11_install-location.debian.patch. Adapt path to recent upstream changes. --- debian/patches/016_nx-X11_install-location.debian.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index ee5bb66cf..d8a63a6c0 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -6,16 +6,16 @@ Author: Mike Gabriel Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -749,7 +749,7 @@ +@@ -730,7 +730,7 @@ #define AlternateUsrLibDir YES #endif #else --#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -767,7 +767,7 @@ +@@ -748,7 +748,7 @@ #define AlternateUsrDataDir YES #endif #else @@ -26,7 +26,7 @@ Last-Update: 2012-12-31 #endif --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def -@@ -72,7 +72,7 @@ +@@ -69,7 +69,7 @@ #ifdef AfterVendorCF #ifndef ProjectRoot -- cgit v1.2.3 From 52760b6e8727032dd1845359f3ac9d2c147872bb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 16:31:00 +0100 Subject: debian/patches: Update comment header of 016_nx-X11_install-location.debian.patch. --- debian/patches/016_nx-X11_install-location.debian.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index d8a63a6c0..c758a3cfe 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -1,9 +1,17 @@ Description: FHS adaptation for Debian packaging - On Debian, NX libraries and binaries are installed to - /usr/lib/nx. +Abstract: + On Debian, binaries are installed to /usr//nx. + . + Also, a fake-libX11 library symlink is placed into + /usr//nx/X11. + . + The given paths will be overridden by the Debian packaging + and modified into multi-arch paths. + Forwarded: not-needed Author: Mike Gabriel -Last-Update: 2012-12-31 +Last-Update: 2017-02-08 + --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -730,7 +730,7 @@ -- cgit v1.2.3 From e1f2902bb1ad29f852f97dc08a3e3e29ad88c384 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 24 Feb 2017 22:22:47 +0000 Subject: release 3.5.99.4 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4223ebb3d..9e2dd7ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.4-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 24 Feb 2017 22:19:27 +0000 + nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 744e288d104a7df040ccb9a095c3e402fc2820d7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:20:18 +0100 Subject: debian/nxagent.*: Drop conffile /etc/nxagent/rgb utilizing dpkg-maintscript-helper. --- debian/control | 2 ++ debian/nxagent.install | 2 -- debian/nxagent.postinst | 8 ++++++++ debian/nxagent.postrm | 8 ++++++++ debian/nxagent.preinst | 8 ++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100755 debian/nxagent.postinst create mode 100755 debian/nxagent.postrm create mode 100755 debian/nxagent.preinst (limited to 'debian') diff --git a/debian/control b/debian/control index eb0d68904..a98f7f6f0 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,8 @@ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all Multi-Arch: foreign +Pre-Depends: + dpkg (>= 1.15.7.2), Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), diff --git a/debian/nxagent.install b/debian/nxagent.install index 5f6a9de35..34f5c3a76 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,4 @@ etc/nxagent/keystrokes.cfg -etc/nxagent/rgb -usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent diff --git a/debian/nxagent.postinst b/debian/nxagent.postinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.postrm b/debian/nxagent.postrm new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.preinst b/debian/nxagent.preinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.preinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# -- cgit v1.2.3 From fff875549f70b5f16f9e15cb8fdb4022939bf806 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:33:35 +0100 Subject: debian/patches: Update/rebase 016_nx-X11_install-location.debian.patch. --- debian/patches/016_nx-X11_install-location.debian.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index c758a3cfe..c8458311d 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -14,7 +14,7 @@ Last-Update: 2017-02-08 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -730,7 +730,7 @@ +@@ -725,7 +725,7 @@ #define AlternateUsrLibDir YES #endif #else @@ -23,7 +23,7 @@ Last-Update: 2017-02-08 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -748,7 +748,7 @@ +@@ -743,7 +743,7 @@ #define AlternateUsrDataDir YES #endif #else -- cgit v1.2.3 From 8383b192549a1fd74e75cbbeeea10b5eb95914e3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 19:34:33 +0000 Subject: debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are reachable for nxagent (via placing a symlink to /usr/share/nx/fonts). --- debian/nx-x11-common.dirs | 2 ++ debian/nx-x11-common.links | 1 + 2 files changed, 3 insertions(+) create mode 100644 debian/nx-x11-common.dirs create mode 100644 debian/nx-x11-common.links (limited to 'debian') diff --git a/debian/nx-x11-common.dirs b/debian/nx-x11-common.dirs new file mode 100644 index 000000000..07c657e09 --- /dev/null +++ b/debian/nx-x11-common.dirs @@ -0,0 +1,2 @@ +# we symlink to this dir, so make sure it exists +usr/share/fonts/X11 \ No newline at end of file diff --git a/debian/nx-x11-common.links b/debian/nx-x11-common.links new file mode 100644 index 000000000..1c181aa84 --- /dev/null +++ b/debian/nx-x11-common.links @@ -0,0 +1 @@ +usr/share/fonts/X11 usr/share/nx/fonts \ No newline at end of file -- cgit v1.2.3 From 6fd724366597f37848a7a9aaf9d823b5ea6737b7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 08:59:15 +0100 Subject: debian/control: Versioned B-D on libXfont (>= 1.4.2). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a98f7f6f0..c00550dc2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxmltok1-dev, libxml2-dev, libxpm-dev, - libxfont1-dev | libxfont-dev, + libxfont1-dev | libxfont-dev (>= 1.4.2), libxdmcp-dev, libxdamage-dev, libxext-dev, -- cgit v1.2.3 From a5432aac893cc6857b2189fcaae55002858ca376 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Apr 2017 10:09:32 +0000 Subject: debian/control: Use B-D libxfont-dev only. Follow libXfont2 transition on Debian (and alike). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c00550dc2..b1898252f 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxmltok1-dev, libxml2-dev, libxpm-dev, - libxfont1-dev | libxfont-dev (>= 1.4.2), + libxfont-dev (>= 1.4.2), libxdmcp-dev, libxdamage-dev, libxext-dev, -- cgit v1.2.3 From d6479c9f4545ca9388f4e62e4a0549ca5c604318 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Apr 2017 20:54:19 +0000 Subject: debian/patches: Update 016_nx-X11_install-location.debian.patch (due to fuzziness). --- debian/patches/016_nx-X11_install-location.debian.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index c8458311d..78f569bfb 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -14,7 +14,7 @@ Last-Update: 2017-02-08 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -725,7 +725,7 @@ +@@ -734,7 +734,7 @@ #define AlternateUsrLibDir YES #endif #else @@ -23,7 +23,7 @@ Last-Update: 2017-02-08 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -743,7 +743,7 @@ +@@ -752,7 +752,7 @@ #define AlternateUsrDataDir YES #endif #else -- cgit v1.2.3 From 3a2ecb9a5d3b54b07cb3ea54d74f80a0686821db Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 Apr 2017 17:01:25 +0200 Subject: release 3.5.99.5 --- debian/changelog | 7 +++++++ debian/copyright | 38 -------------------------------------- 2 files changed, 7 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9e2dd7ae8..81092a664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.5-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Tue, 11 Apr 2017 17:00:28 +0200 + nx-libs (2:3.5.99.4-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/debian/copyright b/debian/copyright index 975432d43..b3573e421 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1016,19 +1016,10 @@ Files: make-changelog.sh Copyright: 2012, Mike Gabriel 2016, Mike Gabriel License: GPL-2+ -Comment: - See https://github.com/ArcticaProject/nx-libs/commit/9c0d528 for - make-changelog.sh and regenerate-symbol-docs.sh. - . - FIXME: Drop this comment for 3.5.99.4. Files: replace.sh Copyright: 2013, Jan Engelhardt License: GPL-2+ -Comment: - See https://github.com/ArcticaProject/nx-libs/commit/9c0d528. - . - FIXME: Drop this comment for 3.5.99.4. Files: nx-X11/extras/Mesa/src/mesa/main/get.c nx-X11/extras/Mesa/src/mesa/main/texrender.c @@ -2516,22 +2507,6 @@ Comment: over the NX protocol, have to be considered as strictly GPL-2 licensed. -Files: nx-X11/programs/Xserver/hw/nxagent/os2Stub.c -Copyright: 1996, Sebastien Marineau - 2001, 2011, NoMachine (http://www.nomachine.com) - 2008-2014, Oleksandr Shneyder - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan - 2014-2016, Ulrich Sibiller - 2015-2016, Qindel Group (http://www.qindel.com) -License: Expat~NoAdvert -Comment: - No NX specific changes can be found in this file. GPL-2 - license in file header does not apply. - . - Note from upstream side: This file will be removed in - nx-libs 3.5.99.4. - Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h Copyright: 1995, X Consortium 2001, 2011, NoMachine (http://www.nomachine.com) @@ -2549,18 +2524,10 @@ Files: nx-X11/programs/Xserver/composite/compositeext.h Copyright: 2009, NVIDIA Corporation License: Expat -Files: nx-X11/lib/X11/os2Stubs.c -Copyright: 1996, Sebastien Marineau and Holger Veit -License: Expat~NoAdvert -Comment: - Note from upstream side: This file will be removed in - nx-libs 3.5.99.4. - Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas License: Expat - Files: nx-X11/extras/Mesa/src/mesa/main/mm.c Copyright: 1999, Wittawat Yamwong License: Expat @@ -2967,11 +2934,6 @@ Files: nxcomp/install-sh nxproxy/install-sh Copyright: 1994, X Consortium License: Expat~NoAdvert -Comment: - Missing license headers. License and copyright information obtained from - later versions of this file as found in automake-1.14. - . - FIXME: This comment will be obsolete for 3.5.99.4. Files: debian/* Copyright: 2011-2016, Mike Gabriel -- cgit v1.2.3 From 244ce534a0bea1c5d206471bae6dec88afcda6e2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 Apr 2017 10:21:30 +0200 Subject: Xserver: Build nxagent with MIT-SCREEN-SAVER extension enabled. Fixes ArcticaProject/nx-libs#80 --- debian/control | 17 +++++++++++++++++ debian/nx-x11proto-scrnsaver-dev.install | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 debian/nx-x11proto-scrnsaver-dev.install (limited to 'debian') diff --git a/debian/control b/debian/control index b1898252f..faa27aadb 100644 --- a/debian/control +++ b/debian/control @@ -306,6 +306,23 @@ Description: nx-X11 Render extension wire protocol (dummy package) . This package can be safely removed. +Package: nx-x11proto-scrnsaver-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, +Breaks: nxlibs (<= 3.5.1), + libnx-x11-dev (<< 2:3.5.0.29-1~), +Description: nx-X11 Screen Saver extension wire protocol + NX is a software suite which implements very efficient + compression of the X11 protocol. This increases performance when + using X applications over a network, especially a slow one. + . + This package provides development headers describing the wire protocol + for the MIT-SCREEN-SAVER extension, used to notify the server of client + screen saver events. + Package: libnx-mesa-extras-dev Section: libdevel Architecture: any diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install new file mode 100644 index 000000000..952a6c52f --- /dev/null +++ b/debian/nx-x11proto-scrnsaver-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/saver.h +usr/include/*/nx-X11/extensions/saverproto.h +usr/include/*/nx-X11/extensions/scrnsaver.h \ No newline at end of file -- cgit v1.2.3 From 0eb3bbd2530c8d7325998442aa281883ef64637f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Apr 2017 15:02:52 +0200 Subject: debian/copyright{,in}: Pull-over latest changes on these files from the official Debian package. --- debian/copyright | 70 +++++--- debian/copyright.in | 501 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 437 insertions(+), 134 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index b3573e421..a7eebe167 100644 --- a/debian/copyright +++ b/debian/copyright @@ -107,6 +107,28 @@ Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2015-2016, Qindel Group (http://www.qindel.com) License: GPL-2 +Files: nx-X11/programs/Xserver/include/client.h +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies) +License: MIT~X11 + +Files: nx-X11/programs/Xserver/os/client.c +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies) + 1993, 2010, Oracle and/or its affiliates +License: MIT~X11 + +Files: nx-X11/programs/Xserver/include/list.h +Copyright: 2010, Intel Corporation + 2010, Francisco Jerez +License: MIT~X11 + +Files: nx-X11/programs/Xserver/os/reallocarray.c +Copyright: 2008, Otto Moerbeek +License: MIT~ISC + +Files: nx-X11/programs/Xserver/os/timingsafe_memcmp.c +Copyright: 2014, Google Inc. +License: MIT~ISC + Files: nxcomp/ActionCache.cpp nxcomp/ActionCache.h nxcomp/Agent.cpp @@ -943,6 +965,7 @@ Files: nx-X11/include/XWDFile.h nx-X11/programs/Xserver/dix/pixmap.c nx-X11/programs/Xserver/dix/privates.c nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h nx-X11/programs/Xserver/include/closestr.h nx-X11/programs/Xserver/include/opaque.h @@ -998,6 +1021,7 @@ Copyright: 1985, 1987, 1990, 1998, The Open Group 1989, 1991, 1998, The Open Group 1989, 1998, The Open Group 1990, 1998, The Open Group + 1990, 1994, 1998, The Open Group 1991, 1998, The Open Group 1992, 1998, The Open Group 1993, 1998, The Open Group @@ -1054,7 +1078,9 @@ Comment: Missing license headers. Assuming same license found in other nx-X11 proto header code files. -Files: etc/rgb +Files: doc/libNX_X11/lcUniConv/8bit_tab_to_h.c + doc/libNX_X11/lcUniConv/cjk_tab_to_h.c + doc/libNX_X11/lcUniConv/README nx-X11/lib/X11/Cmap.h nx-X11/lib/X11/Cr.h nx-X11/lib/X11/Cv.h @@ -1067,13 +1093,10 @@ Files: etc/rgb nx-X11/lib/X11/XlibConf.h nx-X11/lib/X11/Xresinternal.h nx-X11/lib/X11/imKStoUCS.c - nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c nx-X11/lib/X11/lcUniConv/armscii_8.h - nx-X11/lib/X11/lcUniConv/ascii.h nx-X11/lib/X11/lcUniConv/big5.h nx-X11/lib/X11/lcUniConv/big5_emacs.h nx-X11/lib/X11/lcUniConv/big5hkscs.h - nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c nx-X11/lib/X11/lcUniConv/cp1133.h nx-X11/lib/X11/lcUniConv/cp1251.h nx-X11/lib/X11/lcUniConv/cp1255.h @@ -1425,6 +1448,7 @@ Files: nx-X11/include/extensions/composite.h nx-X11/programs/Xserver/xfixes/xfixes.c nx-X11/programs/Xserver/xfixes/xfixes.h nx-X11/programs/Xserver/xfixes/xfixesint.h + nx-X11/programs/Xserver/Xext/shmint.h nxcompshad/X11/include/Xdamage_nxcompshad.h Copyright: 1998, Keith Packard 1999, Keith Packard @@ -1792,7 +1816,6 @@ Files: nx-X11/include/extensions/render.h nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h nx-X11/programs/Xserver/render/glyph.c nx-X11/programs/Xserver/render/glyphstr.h - nx-X11/programs/Xserver/render/miglyph.c nx-X11/programs/Xserver/render/mipict.h nx-X11/programs/Xserver/render/picture.c nx-X11/programs/Xserver/render/picture.h @@ -1926,10 +1949,6 @@ License: MIT~X11 Files: nx-X11/include/Sunkeysym.h nx-X11/lib/X11/Host.c nx-X11/lib/X11/LiHosts.c - nx-X11/lib/X11/XDefaultIMIF.c - nx-X11/lib/X11/XDefaultOMIF.c - nx-X11/lib/X11/XlcDL.c - nx-X11/lib/X11/XlcSL.c nx-X11/lib/X11/lcInit.c Copyright: 1985-1987, 1991, 1998, The Open Group 1986, 1998, The Open Group @@ -1993,9 +2012,7 @@ Comment: Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h - nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c nx-X11/programs/Xserver/hw/nxagent/NXpicture.c - nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h nx-X11/programs/Xserver/hw/nxagent/NXrender.c Copyright: 2000, SuSE, Inc 2001, 2011, NoMachine (http://www.nomachine.com) @@ -2162,7 +2179,6 @@ Comment: Files: nx-X11/lib/X11/TextExt.c nx-X11/lib/X11/TextExt16.c - nx-X11/lib/X11/lcDynamic.c Copyright: 1989, 1998, The Open Group 1995, FUJITSU LIMITED 1996, 1998, The Open Group @@ -2337,8 +2353,7 @@ Copyright: 1990-1994, FUJITSU LIMITED 1994, Sony Corporation License: MIT~X11 -Files: nx-X11/lib/X11/Xaixlcint.h - nx-X11/lib/X11/lcFile.c +Files: nx-X11/lib/X11/lcFile.c Copyright: 1993, IBM Corporation License: MIT~OldStyle @@ -2781,12 +2796,6 @@ Files: nx-X11/programs/Xserver/randr/rrprovider.c Copyright: 2012, Red Hat Inc License: MIT~X11 -Files: nx-X11/programs/Xserver/mi/mibank.c -Copyright: 1990,91,92,93 Thomas Roell, Germany - 1991,92,93 SGCS (Snitily Graphics Consulting Services), USA - 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org -License: MIT~X11 - Files: nx-X11/lib/X11/imInsClbk.c Copyright: 1993-1994, Sony Corporation License: MIT~OldStyle @@ -2830,10 +2839,6 @@ Files: nx-X11/include/Xdefs.h Copyright: 1999, The XFree86 Project Inc License: XFree86 -Files: nx-X11/programs/Xserver/mi/mibank.h -Copyright: 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org -License: MIT~X11 - Files: fix-patch-whitespace nx-X11/programs/Xserver/fix-miregion nx-X11/programs/Xserver/fix-miregion-private @@ -2862,6 +2867,10 @@ Files: testscripts/slave-agent Copyright: 2015-2016, Qindel Group (http://www.qindel.com) License: GPL-2 +Files: mesa-quilt +Copyright: Mike Gabriel +License: GPL-3+ + Files: ChangeLog Makefile VERSION @@ -2871,6 +2880,7 @@ Files: ChangeLog doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt doc/libNX_X11/symbols/libNX_X11::symbols.txt doc/nxagent/README.keystrokes + doc/nxagent/README.keystrokes.debug doc/nxcomp/DXPC_re-licensed_debug_784565.mbox doc/nxcomp/README.on-retroactive-DXPC-license doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf @@ -2934,6 +2944,18 @@ Files: nxcomp/install-sh nxproxy/install-sh Copyright: 1994, X Consortium License: Expat~NoAdvert +Comment: + Missing license headers. License and copyright information obtained from + later versions of this file as found in automake-1.14. + . + FIXME: This comment will be obsolete for 3.5.99.6. + +Files: nx-X11/extras/Mesa.patches/* +Copyright: 2017, Mike Gabriel */ + 2017, Mihai Moldovan + 2017, Ulrich Sibiller + 2017, Qindel Group (http://www.qindel.com) +License: Expat Files: debian/* Copyright: 2011-2016, Mike Gabriel diff --git a/debian/copyright.in b/debian/copyright.in index 92955a4a4..98dfbdc9b 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -4,7 +4,13 @@ Upstream-Contact: FIXME Source: FIXME Disclaimer: Autogenerated by CDBS -Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h +Files: nx-X11/Imakefile + nx-X11/config/cf/host.def + nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h + nx-X11/lib/X11/Imakefile + nx-X11/programs/Imakefile + nx-X11/programs/Xserver/Imakefile + nx-X11/programs/Xserver/Xext/Imakefile nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.h nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -80,6 +86,12 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h nx-X11/programs/Xserver/hw/nxagent/compext/Z.c nx-X11/programs/Xserver/hw/nxagent/compext/Z.h + nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm + nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm + nx-X11/programs/Xserver/hw/nxagent/screensaver + nx-X11/programs/Xserver/mi/Imakefile + nx-X11/programs/Xserver/os/Imakefile + nx-X11/programs/Xserver/randr/Imakefile nxcomp/ActionCache.cpp nxcomp/ActionCache.h nxcomp/Agent.cpp @@ -174,6 +186,7 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/ListFontsReply.cpp nxcomp/ListFontsReply.h nxcomp/Loop.cpp + nxcomp/Makefile.in nxcomp/Message.cpp nxcomp/Message.h nxcomp/Misc.cpp @@ -308,12 +321,14 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcomp/XidCache.h nxcomp/Z.cpp nxcomp/Z.h + nxcomp/configure.in nxcompshad/Core.cpp nxcompshad/Core.h nxcompshad/Input.cpp nxcompshad/Input.h nxcompshad/Logger.cpp nxcompshad/Logger.h + nxcompshad/Makefile.in nxcompshad/Manager.cpp nxcompshad/Manager.h nxcompshad/Misc.h @@ -327,6 +342,7 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcompshad/Win.h nxcompshad/X11.cpp nxcompshad/X11.h + nxcompshad/configure.in Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ 2008-2014, Oleksandr Shneyder */ 2011-2016, Mike Gabriel */ @@ -880,6 +896,7 @@ Files: nx-X11/include/XWDFile.h nx-X11/lib/X11/WinEvent.c nx-X11/lib/X11/Window.c nx-X11/lib/X11/WrBitF.c + nx-X11/lib/X11/XErrorDB nx-X11/lib/X11/XKBBind.c nx-X11/lib/X11/XKBCvt.c nx-X11/lib/X11/Xlib.h @@ -903,6 +920,7 @@ Files: nx-X11/include/XWDFile.h nx-X11/programs/Xserver/dix/pixmap.c nx-X11/programs/Xserver/dix/privates.c nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h nx-X11/programs/Xserver/include/closestr.h nx-X11/programs/Xserver/include/opaque.h @@ -957,9 +975,11 @@ Copyright: 1985, 1987, 1990, 1998 The Open Group 1988-1989, 1998 The Open Group 1989, 1991, 1998, The Open Group 1989, 1998 The Open Group + 1990, 1994, 1998, The Open Group 1990, 1998 The Open Group 1991, 1998 The Open Group 1992, 1998 The Open Group + 1993, 1995, 1998, The Open Group 1993, 1998 The Open Group 1993-1994, 1998 The Open Group 1994, 1998 The Open Group @@ -970,7 +990,90 @@ Copyright: 1985, 1987, 1990, 1998 The Open Group License: UNKNOWN FIXME -Files: make-changelog.sh +Files: ChangeLog + Makefile + VERSION + debian/README.source + debian/compat + debian/control + debian/copyright + debian/copyright.in + debian/libnx-x11-6.install + debian/libnx-x11-6.symbols + debian/libnx-x11-6.triggers + debian/libnx-x11-dev.install + debian/libxcomp-dev.install + debian/libxcomp-dev.links + debian/libxcomp3.doc-base + debian/libxcomp3.docs + debian/libxcomp3.install + debian/libxcomp3.triggers + debian/libxcompshad-dev.install + debian/libxcompshad-dev.links + debian/libxcompshad3.install + debian/libxcompshad3.triggers + debian/nx-x11-common.install + debian/nx-x11proto-composite-dev.install + debian/nx-x11proto-core-dev.install + debian/nx-x11proto-damage-dev.install + debian/nx-x11proto-randr-dev.install + debian/nx-x11proto-render-dev.install + debian/nx-x11proto-xext-dev.install + debian/nx-x11proto-xfixes-dev.install + debian/nx-x11proto-xinerama-dev.install + debian/nxagent.doc-base + debian/nxagent.docs + debian/nxagent.install + debian/nxagent.postinst + debian/nxagent.postrm + debian/nxagent.preinst + debian/nxproxy.doc-base + debian/nxproxy.docs + debian/nxproxy.install + debian/patches/2001_nx-X11_install-location.debian.patch + debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch + debian/patches/series + debian/rules + debian/source/format + debian/upstream/signing-key.asc + debian/watch + doc/README.NX-development + doc/libNX_X11/lcUniConv/8bit_tab_to_h.c + doc/libNX_X11/lcUniConv/README + doc/libNX_X11/lcUniConv/cjk_tab_to_h.c + doc/nxagent/README.keystrokes + doc/nxagent/README.keystrokes.debug + doc/nxproxy/README-VALGRIND + etc/keystrokes.cfg + etc/nxagent.keyboard + nx-X11/Makefile + nx-X11/config/Imakefile + nx-X11/config/cf/Imake.cf + nx-X11/config/cf/Imake.rules + nx-X11/config/cf/Imake.tmpl + nx-X11/config/cf/Imakefile + nx-X11/config/cf/Library.tmpl + nx-X11/config/cf/README + nx-X11/config/cf/Server.tmpl + nx-X11/config/cf/ServerLib.tmpl + nx-X11/config/cf/Threads.tmpl + nx-X11/config/cf/X11.rules + nx-X11/config/cf/X11.tmpl + nx-X11/config/cf/cross.def + nx-X11/config/cf/cross.rules + nx-X11/config/cf/linux.cf + nx-X11/config/cf/lnxLib.rules + nx-X11/config/cf/lnxLib.tmpl + nx-X11/config/cf/noop.rules + nx-X11/config/cf/nxversion.def.in + nx-X11/config/cf/site.def + nx-X11/config/cf/xf86.rules + nx-X11/config/cf/xorg.cf + nx-X11/config/cf/xorg.tmpl + nx-X11/config/cf/xorgsite.def + nx-X11/config/cf/xorgversion.def + nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch + nx-X11/extras/Mesa.patches/series nx-X11/extras/Mesa/src/mesa/main/get.c nx-X11/extras/Mesa/src/mesa/main/texrender.c nx-X11/extras/Mesa/src/mesa/main/texrender.h @@ -986,11 +1089,15 @@ Files: make-changelog.sh nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h + nx-X11/include/GL/Imakefile + nx-X11/include/Imakefile nx-X11/include/XF86keysym.h nx-X11/include/Xatom.h nx-X11/include/Xw32defs.h + nx-X11/include/extensions/Imakefile nx-X11/include/extensions/XvMC.h nx-X11/include/extensions/XvMCproto.h + nx-X11/lib/Imakefile nx-X11/lib/X11/Cmap.h nx-X11/lib/X11/Cr.h nx-X11/lib/X11/Cv.h @@ -1001,13 +1108,10 @@ Files: make-changelog.sh nx-X11/lib/X11/XlibConf.h nx-X11/lib/X11/Xresinternal.h nx-X11/lib/X11/imKStoUCS.c - nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c nx-X11/lib/X11/lcUniConv/armscii_8.h - nx-X11/lib/X11/lcUniConv/ascii.h nx-X11/lib/X11/lcUniConv/big5.h nx-X11/lib/X11/lcUniConv/big5_emacs.h nx-X11/lib/X11/lcUniConv/big5hkscs.h - nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c nx-X11/lib/X11/lcUniConv/cp1133.h nx-X11/lib/X11/lcUniConv/cp1251.h nx-X11/lib/X11/lcUniConv/cp1255.h @@ -1046,37 +1150,84 @@ Files: make-changelog.sh nx-X11/lib/X11/lcUniConv/ucs2be.h nx-X11/lib/X11/lcUniConv/utf8.h nx-X11/lib/X11/lcUniConv/viscii.h + nx-X11/lib/xtrans/Imakefile + nx-X11/programs/Xserver/GL/Imakefile + nx-X11/programs/Xserver/GL/glx/Imakefile + nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile + nx-X11/programs/Xserver/GL/mesa/Imakefile nx-X11/programs/Xserver/GL/mesa/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/X/Imakefile nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/main/Imakefile nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/math/Imakefile nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc + nx-X11/programs/Xserver/Xext/SecurityPolicy nx-X11/programs/Xserver/Xext/dpmsproc.h nx-X11/programs/Xserver/Xext/panoramiXh.h nx-X11/programs/Xserver/Xext/panoramiXsrv.h nx-X11/programs/Xserver/Xext/xvdisp.h nx-X11/programs/Xserver/Xext/xvmc.c nx-X11/programs/Xserver/Xext/xvmcext.h + nx-X11/programs/Xserver/Xi/Imakefile + nx-X11/programs/Xserver/composite/Imakefile + nx-X11/programs/Xserver/damageext/Imakefile + nx-X11/programs/Xserver/dbe/Imakefile + nx-X11/programs/Xserver/dix/Imakefile + nx-X11/programs/Xserver/dix/buildatoms nx-X11/programs/Xserver/dix/initatoms.c + nx-X11/programs/Xserver/fb/Imakefile + nx-X11/programs/Xserver/fix-miregion + nx-X11/programs/Xserver/fix-miregion-private + nx-X11/programs/Xserver/fix-region + nx-X11/programs/Xserver/hw/nxagent/Imakefile + nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile + nx-X11/programs/Xserver/include/Imakefile nx-X11/programs/Xserver/include/globals.h nx-X11/programs/Xserver/mi/micmap.h nx-X11/programs/Xserver/mi/mioverlay.c nx-X11/programs/Xserver/mi/mioverlay.h + nx-X11/programs/Xserver/miext/cw/Imakefile + nx-X11/programs/Xserver/miext/damage/Imakefile nx-X11/programs/Xserver/os/xstrans.c + nx-X11/programs/Xserver/record/Imakefile + nx-X11/programs/Xserver/render/Imakefile + nx-X11/programs/Xserver/xfixes/Imakefile + nx-X11/programs/Xserver/xkb/Imakefile nx-X11/programs/Xserver/xkb/ddxPrivate.c nx-X11/programs/Xserver/xkb/xkb.h nx-X11/programs/Xserver/xkb/xkbDflts.h nx-X11/x-indent-all.sh nx-X11/x-indent.sh - regenerate-symbol-docs.sh - replace.sh + nxcomp/VERSION + nxcomp/install-sh + nxcomp/mkinstalldirs + nxcomp/nxcomp.pc.in + nxcompshad/VERSION + nxcompshad/install-sh + nxcompshad/nxcompshad.pc.in + nxproxy/Makefile.in + nxproxy/VERSION + nxproxy/configure.in + nxproxy/install-sh + nxproxy/man/nxproxy.1 + nxproxy/mkinstalldirs Copyright: *No copyright* License: UNKNOWN FIXME @@ -1211,6 +1362,7 @@ Files: nx-X11/include/extensions/composite.h nx-X11/include/extensions/damagewire.h nx-X11/lib/X11/x11_trans.c nx-X11/lib/X11/xim_trans.c + nx-X11/programs/Xserver/Xext/shmint.h nx-X11/programs/Xserver/composite/compalloc.c nx-X11/programs/Xserver/composite/compext.c nx-X11/programs/Xserver/composite/compinit.c @@ -1618,26 +1770,6 @@ Copyright: 1993, Davor Matic License: UNKNOWN FIXME -Files: nx-X11/include/extensions/render.h - nx-X11/include/extensions/renderproto.h - nx-X11/programs/Xserver/fb/fb24_32.c - nx-X11/programs/Xserver/fb/fboverlay.c - nx-X11/programs/Xserver/fb/fboverlay.h - nx-X11/programs/Xserver/fb/fbpict.c - nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrender_nxagent.h - nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h - nx-X11/programs/Xserver/render/glyph.c - nx-X11/programs/Xserver/render/glyphstr.h - nx-X11/programs/Xserver/render/miglyph.c - nx-X11/programs/Xserver/render/mipict.h - nx-X11/programs/Xserver/render/picture.c - nx-X11/programs/Xserver/render/picture.h - nx-X11/programs/Xserver/render/picturestr.h - nx-X11/programs/Xserver/render/render.c -Copyright: 2000, SuSE, Inc -License: UNKNOWN - FIXME - Files: nx-X11/lib/X11/OCWrap.c nx-X11/lib/X11/OMWrap.c nx-X11/lib/X11/XlcPubI.h @@ -1658,6 +1790,25 @@ Copyright: 1992-1993, TOSHIBA Corp License: UNKNOWN FIXME +Files: nx-X11/include/extensions/render.h + nx-X11/include/extensions/renderproto.h + nx-X11/programs/Xserver/fb/fb24_32.c + nx-X11/programs/Xserver/fb/fboverlay.c + nx-X11/programs/Xserver/fb/fboverlay.h + nx-X11/programs/Xserver/fb/fbpict.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrender_nxagent.h + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h + nx-X11/programs/Xserver/render/glyph.c + nx-X11/programs/Xserver/render/glyphstr.h + nx-X11/programs/Xserver/render/mipict.h + nx-X11/programs/Xserver/render/picture.c + nx-X11/programs/Xserver/render/picture.h + nx-X11/programs/Xserver/render/picturestr.h + nx-X11/programs/Xserver/render/render.c +Copyright: 2000, SuSE, Inc +License: UNKNOWN + FIXME + Files: nx-X11/include/extensions/dpms.h nx-X11/include/extensions/dpmsstr.h nx-X11/include/extensions/panoramiXext.h @@ -1763,23 +1914,6 @@ Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc License: UNKNOWN FIXME -Files: nx-X11/include/Sunkeysym.h - nx-X11/lib/X11/Host.c - nx-X11/lib/X11/LiHosts.c - nx-X11/lib/X11/XDefaultIMIF.c - nx-X11/lib/X11/XDefaultOMIF.c - nx-X11/lib/X11/XlcDL.c - nx-X11/lib/X11/XlcSL.c - nx-X11/lib/X11/lcInit.c -Copyright: 1985-1987, 1991, 1998, The Open Group - 1986, 1998 The Open Group - 1991, 1998 The Open Group - 1991, Oracle and/or its affiliates. - 2000, Oracle and/or its affiliates. - 2004, Oracle and/or its affiliates. -License: Expat - FIXME - Files: nx-X11/lib/X11/ConnDis.c nx-X11/lib/X11/OpenDis.c nx-X11/lib/X11/XlibAsync.c @@ -1805,6 +1939,17 @@ Copyright: 1984-1985, 1987, 1989, 1998 The Open Group License: UNKNOWN FIXME +Files: + + + + + + +Copyright: +License: + FIXME + Files: nx-X11/lib/X11/XimTrInt.h nx-X11/lib/X11/XimTrX.h nx-X11/lib/X11/XimTrans.h @@ -1819,22 +1964,16 @@ Copyright: 1991-1992, Oracle and/or its affiliates. License: Expat FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c - nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h - nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h - nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c - nx-X11/programs/Xserver/hw/nxagent/NXpicture.c - nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h - nx-X11/programs/Xserver/hw/nxagent/NXrender.c -Copyright: 2000, SuSE, Inc - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S +Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas + 2004, Tungsten Graphics Inc., Cedar Park, Texas +License: Expat FIXME Files: nx-X11/programs/Xserver/dix/dispatch.c @@ -1861,17 +2000,6 @@ Copyright: 1994-1995, Hewlett-Packard Company License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c -Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas - 2004, Tungsten Graphics Inc., Cedar Park, Texas -License: Expat - FIXME - Files: nx-X11/lib/xtrans/Xtrans.c nx-X11/lib/xtrans/Xtrans.h nx-X11/lib/xtrans/Xtransint.h @@ -1904,6 +2032,46 @@ Copyright: 1991-1994, FUJITSU LIMITED License: UNKNOWN FIXME +Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h + nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXrender.c +Copyright: 2000, SuSE, Inc + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + +Files: testscripts/run-nxproxy2nxagent-on-localhost + testscripts/run-nxproxy2nxagent-over-network + testscripts/run-nxproxy2nxagent-over-sockets + testscripts/run-nxproxy2nxproxy + testscripts/run-nxproxy2nxproxy-over-sockets +Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ + 2015-2016, Mike Gabriel */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + +Files: nx-X11/include/Sunkeysym.h + nx-X11/lib/X11/Host.c + nx-X11/lib/X11/LiHosts.c + nx-X11/lib/X11/lcInit.c +Copyright: 1985-1987, 1991, 1998, The Open Group + 1986, 1998 The Open Group + 1991, 1998 The Open Group + 1991, Oracle and/or its affiliates. + 2000, Oracle and/or its affiliates. + 2004, Oracle and/or its affiliates. +License: Expat + FIXME + Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c @@ -1943,6 +2111,14 @@ Copyright: 2009, Red Hat, Inc License: Expat FIXME +Files: bin/nxagent.in + bin/nxproxy.in + mesa-quilt +Copyright: 2012, Mike Gabriel + 2017, Mike Gabriel +License: GPL-3+ + FIXME + Files: nx-X11/include/extensions/xf86bigfont.h nx-X11/include/extensions/xf86bigfproto.h nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -1960,15 +2136,6 @@ Copyright: 1987-1988, 1990 Digital Equipment Corporation, Maynard License: UNKNOWN FIXME -Files: nx-X11/lib/X11/TextExt.c - nx-X11/lib/X11/TextExt16.c - nx-X11/lib/X11/lcDynamic.c -Copyright: 1989, 1998 The Open Group - 1995, FUJITSU LIMITED - 1996, 1998 The Open Group -License: UNKNOWN - FIXME - Files: nx-X11/include/extensions/xtestext1.h nx-X11/programs/Xserver/Xext/xtest1dd.c nx-X11/programs/Xserver/Xext/xtest1di.c @@ -1999,17 +2166,17 @@ Copyright: 1987, the Regents of the University of California License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h Copyright: 1999-2001, Brian Paul - 1999-2003, Brian Paul IBM Corporation 2004 License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul IBM Corporation 2004, License: Expat FIXME @@ -2063,6 +2230,12 @@ Copyright: 2005, Tungsten Graphics License: Expat FIXME +Files: make-changelog.sh + regenerate-symbol-docs.sh +Copyright: 2016, Mike Gabriel +License: GPL-2+ + FIXME + Files: nx-X11/programs/Xserver/os/strlcat.c nx-X11/programs/Xserver/os/strlcpy.c Copyright: 1998, Todd C. Miller @@ -2133,9 +2306,10 @@ Copyright: 1990-1994, FUJITSU LIMITED License: UNKNOWN FIXME -Files: nx-X11/lib/X11/Xaixlcint.h - nx-X11/lib/X11/lcFile.c -Copyright: IBM Corporation 1993 +Files: nx-X11/lib/X11/TextExt.c + nx-X11/lib/X11/TextExt16.c +Copyright: 1989, 1998 The Open Group + 1995, FUJITSU LIMITED License: UNKNOWN FIXME @@ -2153,6 +2327,13 @@ Copyright: 1990-1991, 1998 The Open Group License: UNKNOWN FIXME +Files: testscripts/slave-agent + testscripts/slave-client +Copyright: 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + Files: nx-X11/include/GL/glxint.h nx-X11/programs/Xserver/GL/glx/glxext.c Copyright: 1991-9 Silicon Graphics, Inc. @@ -2249,6 +2430,12 @@ Copyright: 1987, 1998 The Open Group License: Expat FIXME +Files: nx-X11/programs/Xserver/include/list.h +Copyright: 2010, Francisco Jerez + 2010, Intel Corporation +License: Expat + FIXME + Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h Copyright: 1989-95 GROUPE BULL License: Expat @@ -2259,6 +2446,11 @@ Copyright: IBM Corporation 2005 License: Expat FIXME +Files: fix-patch-whitespace +Copyright: 2010, Keith Packard +License: Expat + FIXME + Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc 2006, Oracle and/or its affiliates. @@ -2284,18 +2476,6 @@ Copyright: 1993-1994, 1998 The Open Group License: Expat FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/os2Stub.c -Copyright: 1996, Sebastien Marineau - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: Expat - FIXME - Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h Copyright: 1995, X Consortium 2001, 2011 NoMachine (http://www.nomachine.com) */ @@ -2313,8 +2493,14 @@ Copyright: 2009, NVIDIA Corporation License: Expat FIXME -Files: nx-X11/lib/X11/os2Stubs.c -Copyright: 1996, Sebastien Marineau and Holger Veit +Files: nx-X11/programs/Xserver/include/client.h +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All +License: Expat + FIXME + +Files: nx-X11/programs/Xserver/os/client.c +Copyright: 1993, 2010, Oracle and/or its affiliates. + 2010, Nokia Corporation and/or its subsidiary(-ies). All License: Expat FIXME @@ -2328,11 +2514,43 @@ Copyright: 1999, Wittawat Yamwong License: Expat FIXME +Files: LICENSE.nxcomp +Copyright: 1995-1996,2000,2006, Brian Pane + 1996-1997, Zachary Vonler and Brian Pane + 1999, Kevin Vigor and Brian Pane + 2000,2003, Gian Filippo Pinzari + 2000,2006, Gian Filippo Pinzari and Brian Pane + 2001,2010, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) + of the aforementioned +License: GPL + FIXME + +Files: LICENSE +Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) + of the aforementioned holders +License: GPL + FIXME + Files: nxcomp/Version.c Copyright: 2015, Qindel Formacion y Servicios SL. */ License: GPL-2 FIXME +Files: replace.sh +Copyright: 2013, Jan Engelhardt +License: GPL-2+ + FIXME + Files: version.sh Copyright: 2015, Mihai Moldovan 2015, Mike Gabriel @@ -2345,6 +2563,21 @@ Copyright: 2011-2016, Mike Gabriel License: GPL-3+ FIXME +Files: nx-X11/programs/Xserver/os/timingsafe_memcmp.c +Copyright: 2014, Google Inc +License: ISC + FIXME + +Files: nx-X11/programs/Xserver/os/reallocarray.c +Copyright: 2008, Otto Moerbeek +License: ISC + FIXME + +Files: doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf +Copyright: +œ7óY9Ø»¢TŽ÷x²ÛÐ`>+‡ºUNcf / +License: UNKNOWN + FIXME + Files: nx-X11/programs/Xserver/dix/dixutils.c Copyright: 1987, 1998 The Open Group 1987, Digital Equipment Corporation, Maynard, Massachusetts @@ -2352,6 +2585,15 @@ Copyright: 1987, 1998 The Open Group License: UNKNOWN FIXME +Files: doc/nxcomp/README.on-retroactive-DXPC-license +Copyright: 1995-1996, Brian Pane + 1996-1997, Zachary Vonler and Brian Pane + 1999, Kevin Vigor and Brian Pane + 2000-2001, Gian Filippo Pinzari and Brian Pane + states: +License: UNKNOWN + FIXME + Files: nx-X11/lib/X11/utf8WMProps.c Copyright: 1991, 1998 The Open Group 2000, Bruno Haible @@ -2387,6 +2629,19 @@ Copyright: 2000, Compaq Computer Corporation License: UNKNOWN FIXME +Files: nx-X11/include/Xpoll.h.in +Copyright: 1994, 1998 The Open Group + 2001, 2011 NoMachine (http://www.nomachine.com) */ + 2005, Daniel Stone + 2008-2014, Oleksandr Shneyder */ + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan */ + 2014-2016, Ulrich Sibiller */ + 2015-2016, Qindel Group (http://www.qindel.com) */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + Files: nx-X11/programs/Xserver/include/misc.h Copyright: 1987, 1998 The Open Group 1987, Digital Equipment Corporation, Maynard, Massachusetts @@ -2438,12 +2693,29 @@ Copyright: 1995, FUJITSU LIMITED License: UNKNOWN FIXME +Files: COPYING +Copyright: 1989, 1991 Free Software Foundation, Inc. + the software, and +License: UNKNOWN + FIXME + Files: nx-X11/lib/X11/imLcPrs.c Copyright: 1992, Fuji Xerox Co., Ltd 1992, Oki Technosystems Laboratory, Inc License: UNKNOWN FIXME +Files: nx-X11/programs/Xserver/hw/nxagent/x2go.xpm +Copyright: 2008, Heinz-M. Graesing */ + of the aforementioned persons and companies. */ +License: UNKNOWN + FIXME + +Files: nx-X11/lib/X11/lcFile.c +Copyright: IBM Corporation 1993 +License: UNKNOWN + FIXME + Files: nx-X11/lib/X11/Xprivate.h Copyright: 2008, Jamey Sharp, Josh Triplett License: UNKNOWN @@ -2510,6 +2782,12 @@ Copyright: 1991-9 Silicon Graphics, Inc. License: UNKNOWN FIXME +Files: nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +Copyright: 1984, - 1991, 1993-1994, 1998 The Open Group + 2011, - 2016, Mike Gabriel +License: UNKNOWN + FIXME + Files: nx-X11/programs/Xserver/os/xdmcp.c Copyright: 1989, Network Computing Devices, Inc., Mountain View, California License: UNKNOWN @@ -2550,15 +2828,13 @@ Copyright: 2012, Red Hat Inc License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/mi/mibank.c -Copyright: 1990,91,92,93 Thomas Roell, Germany - 1991,92,93 SGCS (Snitily Graphics Consulting Services), USA - 1997, through 2004, by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +Files: nx-X11/lib/X11/imInsClbk.c +Copyright: 1993-1994, Sony Corporation License: UNKNOWN FIXME -Files: nx-X11/lib/X11/imInsClbk.c -Copyright: 1993-1994, Sony Corporation +Files: nx-X11/lib/X11/Xcms.txt +Copyright: 1990, 1991 Tektronix Inc License: UNKNOWN FIXME @@ -2592,8 +2868,13 @@ Copyright: 1999, The XFree86 Project Inc License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/mi/mibank.h -Copyright: 1997, through 2004, by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +Files: debian/changelog +Copyright: attributions +License: UNKNOWN + FIXME + +Files: doc/nxcomp/DXPC_re-licensed_debug_784565.mbox +Copyright: states: License: UNKNOWN FIXME -- cgit v1.2.3 From fdd66710fe059efa39b17f7048913248ba24f499 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Apr 2017 15:05:06 +0200 Subject: debian/control: Pull-over latest changes on these files from the official Debian package. Various improvements several package descriptions. --- debian/control | 69 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index faa27aadb..be63c2514 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,8 @@ Description: nx-X11 (common files) compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides all architecture-independent files for nx-X11. + This package provides all runtime architecture-independent files for + nx-X11 Xserver (aka nxagent). Package: nx-x11proto-core-dev Section: libdevel @@ -102,13 +103,13 @@ Replaces: nxlibs, libnx-xrandr2, libnx-xrender1, libnx-xtst6, -Description: nx-X11 client-side library +Description: nxagent's libNX_X11 client-part library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides the core nx-X11 libraries customized for - nxagent. + This package provides the libNX_X11 library (a libX11 drop-in + replacement used by nxagent). Package: libnx-x11-dev Provides: libnx-x11-6-dev @@ -141,13 +142,13 @@ Replaces: nxlibs-dev, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, -Description: nx-X11 client-side library (development headers) +Description: nxagent's libNX_X11 client-part library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides the development headers for the core nx-X11 - libraries customized for nxagent. + This package provides development headers of the libNX_X11 library (a + libX11 drop-in replacement used by nxagent). Package: libnx-x11-6-dbg Architecture: any @@ -229,16 +230,14 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Description: nx-X11 Damage extension wire protocol (dummy package) +Description: nx-X11 Damage extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package removes the obsoleted wire protocol headers for the - libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide - installed libXdamage gets used. - . - This package can be safely removed. + This package provides development headers describing the wire protocol + for the Damage extension, used to notify clients of changes made to + particular areas. Package: nx-x11proto-xfixes-dev Section: libdevel @@ -267,10 +266,9 @@ Description: nx-X11 Xinerama extension wire protocol compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package removes the obsoleted headers for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. + This package provides development headers describing the wire protocol + for the XINERAMA extension, used to use and manage a multiple-screen + display. Package: nx-x11proto-randr-dev Section: libdevel @@ -278,16 +276,14 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Description: nx-X11 RandR extension wire protocol (dummy package) +Description: nx-X11 RandR extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package removes the obsoleted headers for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. + This package provides development headers describing the wire protocol + for the RandR extension, used to change display properties such as + resolution, rotation, reflection, et al, on the fly. Package: nx-x11proto-render-dev Section: libdevel @@ -295,16 +291,13 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Description: nx-X11 Render extension wire protocol (dummy package) +Description: nx-X11 Render extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package removes the obsoleted headers for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. + This package provides development headers describing the wire protocol for + the Render extension, used to implement Porter-Duff operations within X. Package: nx-x11proto-scrnsaver-dev Section: libdevel @@ -356,15 +349,15 @@ Breaks: Replaces: nxauth, libxcompext3, -Description: NX agent +Description: Nested Xserver (aka NX Agent) supporting the NX compression protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nxagent is an agent providing NX transport of X sessions. The application - is based on the well known Xnest "nested" server. nxagent, like Xnest, - is an X server for its own clients, and at the same time, an X client - for a system's local X server. + nxagent is a nested Xserver providing NX transport of X sessions. The + application is based on the well known Xnest "nested" server. nxagent, + like Xnest, is an X server for its own clients, and at the same time, an + X client for a system's local X server. . The main scope of nxagent is to eliminate X round-trips or transform them into asynchronous replies. nxagent works together with nxproxy. @@ -448,7 +441,7 @@ Breaks: nxcomp (<= 3.5.1), qvd-libxcomp3, Replaces: nxcomp, qvd-libxcomp3, -Description: nx-X11 compression library +Description: NX compression library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. @@ -464,7 +457,7 @@ Depends: ${misc:Depends}, Breaks: nxcomp-dev (<=3.5.1) Replaces: nxcomp-dev, -Description: nx-X11 compression library (development headers) +Description: NX compression library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. @@ -499,7 +492,7 @@ Depends: libnx-x11-6 (= ${binary:Version}), Breaks: nxcompshad (<=3.5.1) Replaces: nxcompshad -Description: nx-X11 shadowing library +Description: NX shadowing library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. @@ -515,7 +508,7 @@ Depends: ${misc:Depends}, Breaks: nxcompshad-dev (<= 3.5.1), Replaces: nxcompshad-dev, -Description: nx-X11 shadowing library (development headers) +Description: NX shadowing library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. -- cgit v1.2.3 From 35ec402fd7861f8ae38dd444fa645c430c6389c8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Apr 2017 15:07:53 +0200 Subject: debian/control: Pre-D (nx-x11-common) on versioned dpkg not required anymore. --- debian/control | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index be63c2514..bcf557685 100644 --- a/debian/control +++ b/debian/control @@ -39,8 +39,6 @@ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.15.7.2), Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), -- cgit v1.2.3 From a51cb94559e9228a55e01956f242dabccc5e6b14 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Apr 2017 15:11:06 +0200 Subject: debian/{rules,nx-x11proto-xext-dev}: More Xext header files belong int nx-x11proto-xext-dev (instead of removing them in debian/rules). --- debian/nx-x11proto-xext-dev.install | 13 +++++++++++-- debian/rules | 9 --------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install index dff1fb037..26a719b01 100644 --- a/debian/nx-x11proto-xext-dev.install +++ b/debian/nx-x11proto-xext-dev.install @@ -1,6 +1,15 @@ +usr/include/*/nx-X11/extensions/bigreqstr.h +usr/include/*/nx-X11/extensions/dpms.h usr/include/*/nx-X11/extensions/dpmsstr.h -usr/include/*/nx-X11/extensions/xteststr.h -usr/include/*/nx-X11/extensions/xtestconst.h +usr/include/*/nx-X11/extensions/record*.h +usr/include/*/nx-X11/extensions/security.h usr/include/*/nx-X11/extensions/securstr.h +usr/include/*/nx-X11/extensions/sync.h usr/include/*/nx-X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/xf86bigfproto.h +usr/include/*/nx-X11/extensions/xf86bigfont.h +usr/include/*/nx-X11/extensions/xcmiscstr.h usr/include/*/nx-X11/extensions/Xdbeproto.h +usr/include/*/nx-X11/extensions/xtestconst.h +usr/include/*/nx-X11/extensions/xtestext1.h +usr/include/*/nx-X11/extensions/xteststr.h diff --git a/debian/rules b/debian/rules index 180de6984..86ca0531f 100755 --- a/debian/rules +++ b/debian/rules @@ -31,17 +31,8 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/dpms.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/security.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/sync.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtestext1.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing -- cgit v1.2.3 From cc17d89e22994b07f822ee13782ff654f4bb0daa Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Apr 2017 15:14:00 +0200 Subject: debian/control: Add get-orig-source rule as in official Debian package. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 86ca0531f..707bdec54 100755 --- a/debian/rules +++ b/debian/rules @@ -53,3 +53,6 @@ override_dh_strip: override_dh_makeshlibs: dh_makeshlibs -n + +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=.. -- cgit v1.2.3 From adb2f80cc1ccd1066949ca851d8c963ff61bf1d1 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan <ïonic@ionic.de> Date: Tue, 18 Apr 2017 17:21:53 +0000 Subject: {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM and DEB packages. --- debian/control | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index bcf557685..5ead9fb6b 100644 --- a/debian/control +++ b/debian/control @@ -338,6 +338,8 @@ Depends: libxcomp3 (= ${binary:Version}), libxcompshad3 (= ${binary:Version}), libnx-x11-6 (= ${binary:Version}), +# For /usr/bin/xkbcomp + x11-xkb-utils, Recommends: xfonts-base, xkb-data, -- cgit v1.2.3 From 06a6a5fca31a2f104c734ce49acaaccb5ddf1718 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 21 Apr 2017 16:26:31 +0200 Subject: release 3.5.99.6 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 81092a664..fa725b607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.6-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 21 Apr 2017 16:24:19 +0200 + nx-libs (2:3.5.99.5-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 776785afbb71d4d5f2999e8b023ed232ee325662 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 21 Apr 2017 21:31:14 +0200 Subject: debian/copyright: Update copyright attributions (re-add nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h). --- debian/copyright | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index a7eebe167..92872d75e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2013,6 +2013,7 @@ Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h nx-X11/programs/Xserver/hw/nxagent/NXrender.c Copyright: 2000, SuSE, Inc 2001, 2011, NoMachine (http://www.nomachine.com) -- cgit v1.2.3 From 5d5336541a7fb09f0164bebc63dc3113e553d720 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 5 May 2017 00:16:41 +0200 Subject: release 3.5.99.7 --- debian/changelog | 7 +++++++ debian/copyright | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fa725b607..93d779b59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.7-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 05 May 2017 00:15:57 +0200 + nx-libs (2:3.5.99.6-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/debian/copyright b/debian/copyright index 92872d75e..c68ca9c3a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2949,7 +2949,7 @@ Comment: Missing license headers. License and copyright information obtained from later versions of this file as found in automake-1.14. . - FIXME: This comment will be obsolete for 3.5.99.6. + FIXME: This comment will be obsolete for 3.5.99.7. Files: nx-X11/extras/Mesa.patches/* Copyright: 2017, Mike Gabriel */ -- cgit v1.2.3 From 150cbc23dfdf853a9bbe5f58599d3547304ad229 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 6 May 2017 02:01:47 +0200 Subject: debian/copyright: Update copyright attributions. --- debian/copyright | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index c68ca9c3a..dfa30adc4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1156,6 +1156,9 @@ Files: nx-X11/Imakefile nx-X11/config/cf/X11.tmpl nx-X11/config/cf/cross.def nx-X11/config/cf/cross.rules + nx-X11/config/cf/gnu.cf + nx-X11/config/cf/gnuLib.rules + nx-X11/config/cf/gnuLib.tmpl nx-X11/config/cf/host.def nx-X11/config/cf/linux.cf nx-X11/config/cf/lnxLib.rules -- cgit v1.2.3 From 65c420515bb767eebc24c44bffcd78c2f8c59da1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 6 May 2017 01:31:14 +0200 Subject: debian/patches: Update 016_nx-X11_install-location.debian.patch (line numbers only). --- debian/patches/016_nx-X11_install-location.debian.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index 78f569bfb..a2a0f9f45 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -14,7 +14,7 @@ Last-Update: 2017-02-08 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -734,7 +734,7 @@ +@@ -736,7 +736,7 @@ #define AlternateUsrLibDir YES #endif #else @@ -23,7 +23,7 @@ Last-Update: 2017-02-08 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -752,7 +752,7 @@ +@@ -754,7 +754,7 @@ #define AlternateUsrDataDir YES #endif #else -- cgit v1.2.3 From 3b15804cef3c4412897bf243c063af6506a21976 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Jun 2017 21:21:49 +0200 Subject: release 3.5.99.8 --- debian/changelog | 7 +++++++ debian/copyright | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 93d779b59..77c9eedc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.8-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 30 Jun 2017 21:21:09 +0200 + nx-libs (2:3.5.99.7-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/debian/copyright b/debian/copyright index dfa30adc4..607cb2a1d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2952,7 +2952,8 @@ Comment: Missing license headers. License and copyright information obtained from later versions of this file as found in automake-1.14. . - FIXME: This comment will be obsolete for 3.5.99.7. + FIXME: This block will be obsolete for 3.5.99.8. We are about to + remove the above files entirely from the code tree. Files: nx-X11/extras/Mesa.patches/* Copyright: 2017, Mike Gabriel */ -- cgit v1.2.3 From 322e39b79729bc72bd37265949a04962e427ef0a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Jun 2017 13:58:47 +0200 Subject: m4/nx-macros.m4: Add autotools macros derived from X.org and nxcomp* configure.in files. --- debian/copyright | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 607cb2a1d..cce8e17dd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2875,6 +2875,11 @@ Files: mesa-quilt Copyright: Mike Gabriel License: GPL-3+ +Files: m4/nx-macros.m4 +Copyright: 2005, 2006, Oracle and/or its affiliates + 2017, Mike Gabriel +License: Expat + Files: ChangeLog Makefile VERSION -- cgit v1.2.3 From 41ea54b0217175a4b78980671f4c6818eb66b166 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 26 Apr 2017 13:26:47 +0200 Subject: nxproxy: Switch to autoreconf. This also solves the last remnant of overlinking as described in GH issue #133. Fixes ArcticaProject/nx-libs#133. --- debian/copyright | 11 ++++++----- debian/rules | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index cce8e17dd..b08ec0335 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2756,7 +2756,7 @@ Files: nx-X11/programs/Xserver/os/xdmcp.c Copyright: 1989, Network Computing Devices, Inc., Mountain View, California License: MIT~VeryOldStyle~NCD -Files: nxproxy/Main.c +Files: nxproxy/src/Main.c Copyright: 2001, 2011, NoMachine, http://www.nomachine.com/. License: GPL-2 @@ -2912,10 +2912,13 @@ Files: ChangeLog nxcompshad/VERSION nxcompshad/configure.in nxcompshad/nxcompshad.pc.in - nxproxy/Makefile.in nxproxy/VERSION - nxproxy/configure.in nxproxy/man/nxproxy.1 + nxproxy/Makefile.am + nxproxy/configure.ac + nxproxy/m4/.placeholder + nxproxy/man/Makefile.am + nxproxy/src/Makefile.am Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2008-2014, Oleksandr Shneyder 2011-2016, Mike Gabriel */ @@ -2944,13 +2947,11 @@ Comment: Contributions by Daniel Stone have been licensed under MIT~X11. Files: nxcomp/mkinstalldirs - nxproxy/mkinstalldirs Copyright: *No copyright* License: public-domain Files: nxcomp/install-sh nxcompshad/install-sh - nxproxy/install-sh Copyright: 1994, X Consortium License: Expat~NoAdvert Comment: diff --git a/debian/rules b/debian/rules index 707bdec54..1400c79bd 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,11 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --with quilt + CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports -- cgit v1.2.3 From 397d3ac06a83a94606be75daaeb2aba056ad4254 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Jul 2017 11:47:02 +0200 Subject: debian/rules: Drop redundant --with-symbols configure option, '-g' already gets added by debhelper. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 1400c79bd..adfc34e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + CONFIGURE="./configure --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports -- cgit v1.2.3 From 622360ea2ec9cde354aece445e4b9fb4b7664eea Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Jul 2017 11:38:17 +0200 Subject: debian/control: Add B-D: automake (required for Debian jessie, Ubuntu trusty and Ubuntu xenial). --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 5ead9fb6b..3db97375d 100644 --- a/debian/control +++ b/debian/control @@ -26,6 +26,7 @@ Build-Depends: libxinerama-dev, libxrender-dev, autoconf, + automake, pkg-config, x11proto-core-dev, expat, -- cgit v1.2.3 From 76b48676844bc7aa0511b8371ef6347b2e8ad545 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 25 Apr 2017 15:27:17 +0200 Subject: nxcompshad: Switch to autoreconf. --- debian/copyright | 50 ++++++++++++++++++++--------------------- debian/libxcompshad-dev.install | 1 + debian/rules | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index b08ec0335..d9ef896b0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -80,25 +80,25 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h nx-X11/programs/Xserver/hw/nxagent/compext/Z.c nx-X11/programs/Xserver/hw/nxagent/compext/Z.h - nxcompshad/Core.cpp - nxcompshad/Core.h - nxcompshad/Input.cpp - nxcompshad/Input.h - nxcompshad/Logger.cpp - nxcompshad/Logger.h - nxcompshad/Manager.cpp - nxcompshad/Manager.h - nxcompshad/Misc.h - nxcompshad/Poller.h - nxcompshad/Regions.h - nxcompshad/Shadow.cpp - nxcompshad/Shadow.h - nxcompshad/Updater.cpp - nxcompshad/Updater.h - nxcompshad/Win.cpp - nxcompshad/Win.h - nxcompshad/X11.cpp - nxcompshad/X11.h + nxcompshad/include/Shadow.h + nxcompshad/src/Core.cpp + nxcompshad/src/Core.h + nxcompshad/src/Input.cpp + nxcompshad/src/Input.h + nxcompshad/src/Logger.cpp + nxcompshad/src/Logger.h + nxcompshad/src/Manager.cpp + nxcompshad/src/Manager.h + nxcompshad/src/Misc.h + nxcompshad/src/Poller.h + nxcompshad/src/Regions.h + nxcompshad/src/Shadow.cpp + nxcompshad/src/Updater.cpp + nxcompshad/src/Updater.h + nxcompshad/src/Win.cpp + nxcompshad/src/Win.h + nxcompshad/src/X11.cpp + nxcompshad/src/X11.h Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2008-2014, Oleksandr Shneyder 2011-2016, Mike Gabriel */ @@ -1001,7 +1001,7 @@ Files: nx-X11/include/XWDFile.h nx-X11/programs/Xserver/record/record.c nx-X11/programs/Xserver/record/set.c nx-X11/programs/Xserver/record/set.h - nxcompshad/X11/include/XTest_nxcompshad.h + nxcompshad/src/X11/include/XTest_nxcompshad.h Copyright: 1985, 1987, 1990, 1998, The Open Group 1985, 1987, 1994, 1998, The Open Group 1985, 1987, 1998, The Open Group @@ -1452,7 +1452,7 @@ Files: nx-X11/include/extensions/composite.h nx-X11/programs/Xserver/xfixes/xfixes.h nx-X11/programs/Xserver/xfixes/xfixesint.h nx-X11/programs/Xserver/Xext/shmint.h - nxcompshad/X11/include/Xdamage_nxcompshad.h + nxcompshad/src/X11/include/Xdamage_nxcompshad.h Copyright: 1998, Keith Packard 1999, Keith Packard 2002, Keith Packard @@ -2310,7 +2310,7 @@ Copyright: 2000, Compaq Computer Corporation License: MIT~X11 Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h - nxcompshad/X11/include/Xrandr_nxcompshad.h + nxcompshad/src/X11/include/Xrandr_nxcompshad.h Copyright: 2000, Compaq Computer Corporation, Inc 2002, Hewlett-Packard Company, Inc 2006, Intel Corporation @@ -2908,10 +2908,11 @@ Files: ChangeLog nxcomp/VERSION nxcomp/configure.in nxcomp/nxcomp.pc.in - nxcompshad/Makefile.in + nxcompshad/Makefile.am nxcompshad/VERSION - nxcompshad/configure.in + nxcompshad/configure.ac nxcompshad/nxcompshad.pc.in + nxcompshad/src/Makefile.am nxproxy/VERSION nxproxy/man/nxproxy.1 nxproxy/Makefile.am @@ -2951,7 +2952,6 @@ Copyright: *No copyright* License: public-domain Files: nxcomp/install-sh - nxcompshad/install-sh Copyright: 1994, X Consortium License: Expat~NoAdvert Comment: diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install index 2010f5950..68318ee03 100644 --- a/debian/libxcompshad-dev.install +++ b/debian/libxcompshad-dev.install @@ -1,3 +1,4 @@ usr/lib/*/libXcompshad.so +usr/lib/*/libXcompshad.a usr/include/*/nx/Shadow.h usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/rules b/debian/rules index adfc34e5e..b59ba83a5 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_install: # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a + rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ -- cgit v1.2.3 From 96167fcdb0fed9857ab30b1f311b45ea177260d2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Jul 2017 10:38:30 +0200 Subject: debian/control: Process with wrap-and-sort -s. --- debian/control | 351 +++++++++++++++++++++++++-------------------------------- 1 file changed, 152 insertions(+), 199 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3db97375d..7a69ad03d 100644 --- a/debian/control +++ b/debian/control @@ -2,36 +2,34 @@ Source: nx-libs Section: x11 Priority: extra Maintainer: Artica Project -Uploaders: - Mike Gabriel , - Mihai Moldovan +Uploaders: Mike Gabriel , Mihai Moldovan Build-Depends: + autoconf, + automake, debhelper (>= 9), dpkg-dev (>= 1.16.1.1), - libpng-dev, + expat, libjpeg-dev, - zlib1g-dev, - quilt (>= 0.46-7~), - libxmltok1-dev, - libxml2-dev, - libxpm-dev, - libxfont-dev (>= 1.4.2), - libxdmcp-dev, + libpixman-1-dev (>= 0.13.2), + libpng-dev, + libxcomposite-dev, libxdamage-dev, + libxdmcp-dev, libxext-dev, - libxcomposite-dev, - libxrandr-dev, libxfixes-dev, - libxtst-dev, + libxfont-dev (>= 1.4.2), libxinerama-dev, + libxml2-dev, + libxmltok1-dev, + libxpm-dev, + libxrandr-dev, libxrender-dev, - autoconf, - automake, + libxtst-dev, pkg-config, + quilt (>= 0.46-7~), x11proto-core-dev, - expat, - libpixman-1-dev (>= 0.13.2), xutils-dev, + zlib1g-dev Standards-Version: 3.9.8 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ @@ -40,11 +38,11 @@ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all Multi-Arch: foreign -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-1~), - nxagent (<< 2:3.5.0.29-1~), +Depends: ${misc:Depends} +Breaks: + libnx-x11 (<< 2:3.5.0.29-1~), + nxagent (<< 2:3.5.0.29-1~), + nxlibs (<= 3.5.1) Description: nx-X11 (common files) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -56,10 +54,8 @@ Description: nx-X11 (common files) Package: nx-x11proto-core-dev Section: libdevel Architecture: any -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), +Depends: ${misc:Depends} +Breaks: libnx-x11-dev (<< 2:3.5.0.29-1~), nxlibs (<= 3.5.1) Description: nx-X11 core wire protocol and auxiliary headers NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -73,35 +69,38 @@ Package: libnx-x11-6 Architecture: any Multi-Arch: same Depends: - ${shlibs:Depends}, - ${misc:Depends}, - nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), libxcomp3 (= ${binary:Version}), -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-1~), - libnx-xext6 (<< 2:3.6.0.0), - libnx-xau6 (<< 2:3.6.0.0), - libnx-xcomposite1 (<< 2:3.6.0.0), - libnx-xdamage1 (<< 2:3.6.0.0), - libnx-xdmcp6 (<< 2:3.6.0.0), - libnx-xfixes3 (<< 2:3.6.0.0), - libnx-xinerama1 (<< 2:3.6.0.0), - libnx-xpm4 (<< 2:3.6.0.0), - libnx-xrandr2 (<< 2:3.6.0.0), - libnx-xrender1 (<< 2:3.6.0.0), - libnx-xtst6 (<< 2:3.6.0.0), -Replaces: nxlibs, - libnx-xext6, - libnx-xau6, - libnx-xcomposite1, - libnx-xdamage1, - libnx-xdmcp6, - libnx-xfixes3, - libnx-xinerama1, - libnx-xpm4, - libnx-xrandr2, - libnx-xrender1, - libnx-xtst6, + nx-x11-common (<< ${source:Version}.1), + nx-x11-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Breaks: + libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xau6 (<< 2:3.6.0.0), + libnx-xcomposite1 (<< 2:3.6.0.0), + libnx-xdamage1 (<< 2:3.6.0.0), + libnx-xdmcp6 (<< 2:3.6.0.0), + libnx-xext6 (<< 2:3.6.0.0), + libnx-xfixes3 (<< 2:3.6.0.0), + libnx-xinerama1 (<< 2:3.6.0.0), + libnx-xpm4 (<< 2:3.6.0.0), + libnx-xrandr2 (<< 2:3.6.0.0), + libnx-xrender1 (<< 2:3.6.0.0), + libnx-xtst6 (<< 2:3.6.0.0), + nxlibs (<= 3.5.1) +Replaces: + libnx-xau6, + libnx-xcomposite1, + libnx-xdamage1, + libnx-xdmcp6, + libnx-xext6, + libnx-xfixes3, + libnx-xinerama1, + libnx-xpm4, + libnx-xrandr2, + libnx-xrender1, + libnx-xtst6, + nxlibs Description: nxagent's libNX_X11 client-part library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -114,33 +113,33 @@ Package: libnx-x11-dev Provides: libnx-x11-6-dev Section: libdevel Architecture: any -Breaks: nxlibs-dev (<=3.5.1), - libnx-xext-dev (<< 2:3.6.0.0), - libnx-xau-dev (<< 2:3.6.0.0), - libnx-xcomposite-dev (<< 2:3.6.0.0), - libnx-xdamage-dev (<< 2:3.6.0.0), - libnx-xdmcp-dev (<< 2:3.6.0.0), - libnx-xfixes-dev (<< 2:3.6.0.0), - libnx-xinerama-dev (<< 2:3.6.0.0), - libnx-xpm-dev (<< 2:3.6.0.0), - libnx-xrandr-dev (<< 2:3.6.0.0), - libnx-xrender-dev (<< 2:3.6.0.0), - libnx-xtst-dev (<< 2:3.6.0.0), -Replaces: nxlibs-dev, - libnx-xext-dev, - libnx-xau-dev, - libnx-xcomposite-dev, - libnx-xdamage-dev, - libnx-xdmcp-dev, - libnx-xfixes-dev, - libnx-xinerama-dev, - libnx-xpm-dev, - libnx-xrandr-dev, - libnx-xrender-dev, - libnx-xtst-dev, -Depends: - libnx-x11-6 (= ${binary:Version}), - ${misc:Depends}, +Breaks: + libnx-xau-dev (<< 2:3.6.0.0), + libnx-xcomposite-dev (<< 2:3.6.0.0), + libnx-xdamage-dev (<< 2:3.6.0.0), + libnx-xdmcp-dev (<< 2:3.6.0.0), + libnx-xext-dev (<< 2:3.6.0.0), + libnx-xfixes-dev (<< 2:3.6.0.0), + libnx-xinerama-dev (<< 2:3.6.0.0), + libnx-xpm-dev (<< 2:3.6.0.0), + libnx-xrandr-dev (<< 2:3.6.0.0), + libnx-xrender-dev (<< 2:3.6.0.0), + libnx-xtst-dev (<< 2:3.6.0.0), + nxlibs-dev (<=3.5.1) +Replaces: + libnx-xau-dev, + libnx-xcomposite-dev, + libnx-xdamage-dev, + libnx-xdmcp-dev, + libnx-xext-dev, + libnx-xfixes-dev, + libnx-xinerama-dev, + libnx-xpm-dev, + libnx-xrandr-dev, + libnx-xrender-dev, + libnx-xtst-dev, + nxlibs-dev +Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends} Description: nxagent's libNX_X11 client-part library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -152,34 +151,34 @@ Description: nxagent's libNX_X11 client-part library (development headers) Package: libnx-x11-6-dbg Architecture: any Multi-Arch: same -Depends: - libnx-x11-6 (= ${binary:Version}), - ${misc:Depends}, +Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends} Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), - libnx-xext6-dbg (<< 2:3.6.0.0), - libnx-xau6-dbg (<< 2:3.6.0.0), - libnx-xcomposite1-dbg (<< 2:3.6.0.0), - libnx-xdamage1-dbg (<< 2:3.6.0.0), - libnx-xdmcp6-dbg (<< 2:3.6.0.0), - libnx-xfixes3-dbg (<< 2:3.6.0.0), - libnx-xinerama1-dbg (<< 2:3.6.0.0), - libnx-xpm4-dbg (<< 2:3.6.0.0), - libnx-xrandr2-dbg (<< 2:3.6.0.0), - libnx-xrender1-dbg (<< 2:3.6.0.0), - libnx-xtst6-dbg (<< 2:3.6.0.0), -Replaces: nx-x11-dbg, - libnx-xext6-dbg, - libnx-xau6-dbg, - libnx-xcomposite1-dbg, - libnx-xdamage1-dbg, - libnx-xdmcp6-dbg, - libnx-xfixes3-dbg, - libnx-xinerama1-dbg, - libnx-xpm4-dbg, - libnx-xrandr2-dbg, - libnx-xrender1-dbg, - libnx-xtst6-dbg, +Breaks: + libnx-xau6-dbg (<< 2:3.6.0.0), + libnx-xcomposite1-dbg (<< 2:3.6.0.0), + libnx-xdamage1-dbg (<< 2:3.6.0.0), + libnx-xdmcp6-dbg (<< 2:3.6.0.0), + libnx-xext6-dbg (<< 2:3.6.0.0), + libnx-xfixes3-dbg (<< 2:3.6.0.0), + libnx-xinerama1-dbg (<< 2:3.6.0.0), + libnx-xpm4-dbg (<< 2:3.6.0.0), + libnx-xrandr2-dbg (<< 2:3.6.0.0), + libnx-xrender1-dbg (<< 2:3.6.0.0), + libnx-xtst6-dbg (<< 2:3.6.0.0), + nx-x11-dbg (<< 2:3.5.0.29-1~) +Replaces: + libnx-xau6-dbg, + libnx-xcomposite1-dbg, + libnx-xdamage1-dbg, + libnx-xdmcp6-dbg, + libnx-xext6-dbg, + libnx-xfixes3-dbg, + libnx-xinerama1-dbg, + libnx-xpm4-dbg, + libnx-xrandr2-dbg, + libnx-xrender1-dbg, + libnx-xtst6-dbg, + nx-x11-dbg Description: nx-X11 client-side library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -192,11 +191,11 @@ Package: nx-x11proto-xext-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), - libnx-xext-dev (<< 2:3.5.99.0~), +Depends: ${misc:Depends} +Breaks: + libnx-x11-dev (<< 2:3.5.0.29-1~), + libnx-xext-dev (<< 2:3.5.99.0~), + nxlibs (<= 3.5.1) Description: nx-X11 miscellaneous extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -210,10 +209,8 @@ Package: nx-x11proto-composite-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), +Depends: ${misc:Depends} +Breaks: libnx-x11-dev (<< 2:3.5.0.29-1~), nxlibs (<= 3.5.1) Description: nx-X11 Composite extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -227,8 +224,7 @@ Package: nx-x11proto-damage-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, +Depends: ${misc:Depends} Description: nx-X11 Damage extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -242,10 +238,8 @@ Package: nx-x11proto-xfixes-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), +Depends: ${misc:Depends} +Breaks: libnx-x11-dev (<< 2:3.5.0.29-1~), nxlibs (<= 3.5.1) Description: nx-X11 'xfixes' extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -258,8 +252,7 @@ Package: nx-x11proto-xinerama-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, +Depends: ${misc:Depends} Description: nx-X11 Xinerama extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -273,8 +266,7 @@ Package: nx-x11proto-randr-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, +Depends: ${misc:Depends} Description: nx-X11 RandR extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -288,8 +280,7 @@ Package: nx-x11proto-render-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, +Depends: ${misc:Depends} Description: nx-X11 Render extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -302,10 +293,8 @@ Package: nx-x11proto-scrnsaver-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: - ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-1~), +Depends: ${misc:Depends} +Breaks: libnx-x11-dev (<< 2:3.5.0.29-1~), nxlibs (<= 3.5.1) Description: nx-X11 Screen Saver extension wire protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -318,9 +307,7 @@ Description: nx-X11 Screen Saver extension wire protocol Package: libnx-mesa-extras-dev Section: libdevel Architecture: any -Depends: - libnx-x11-dev (= ${binary:Version}), - ${misc:Depends}, +Depends: libnx-x11-dev (= ${binary:Version}), ${misc:Depends} Description: Library headers for nx-X11/Mesa (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -334,22 +321,15 @@ Package: nxagent Architecture: any Multi-Arch: foreign Depends: - ${shlibs:Depends}, - ${misc:Depends}, + libnx-x11-6 (= ${binary:Version}), libxcomp3 (= ${binary:Version}), libxcompshad3 (= ${binary:Version}), - libnx-x11-6 (= ${binary:Version}), -# For /usr/bin/xkbcomp x11-xkb-utils, -Recommends: - xfonts-base, - xkb-data, -Breaks: - nxauth, - libxcompext3 (<< 2:3.5.99.3~), -Replaces: - nxauth, - libxcompext3, + ${misc:Depends}, + ${shlibs:Depends} +Recommends: xfonts-base, xkb-data +Breaks: libxcompext3 (<< 2:3.5.99.3~), nxauth +Replaces: libxcompext3, nxauth Description: Nested Xserver (aka NX Agent) supporting the NX compression protocol NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -361,7 +341,7 @@ Description: Nested Xserver (aka NX Agent) supporting the NX compression protoco X client for a system's local X server. . The main scope of nxagent is to eliminate X round-trips or transform - them into asynchronous replies. nxagent works together with nxproxy. + them into asynchronous replies. nxagent works together with nxproxy. nxproxy itself does not make any effort to minimize round-trips by itself, this is demanded of nxagent. . @@ -373,10 +353,8 @@ Package: nxagent-dbg Section: debug Architecture: any Multi-Arch: foreign -Depends: - nxagent (= ${binary:Version}), - ${misc:Depends}, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), +Depends: nxagent (= ${binary:Version}), ${misc:Depends} +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~) Description: NX agent (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -394,16 +372,9 @@ Description: NX agent (debug package) Package: nxproxy Architecture: any Multi-Arch: foreign -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libxcomp3 (= ${binary:Version}), -Breaks: - qvd-nxproxy, - nxauth, -Replaces: - qvd-nxproxy, - nxauth, +Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Breaks: nxauth, qvd-nxproxy +Replaces: nxauth, qvd-nxproxy Description: NX proxy NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -415,12 +386,9 @@ Package: nxproxy-dbg Section: debug Architecture: any Multi-Arch: foreign -Depends: - nxproxy (= ${binary:Version}), - ${misc:Depends}, -Suggests: - libxcomp3-dbg, -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), +Depends: nxproxy (= ${binary:Version}), ${misc:Depends} +Suggests: libxcomp3-dbg +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~) Description: NX proxy (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -435,13 +403,9 @@ Description: NX proxy (debug package) Package: libxcomp3 Architecture: any Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Breaks: nxcomp (<= 3.5.1), - qvd-libxcomp3, -Replaces: nxcomp, - qvd-libxcomp3, +Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: nxcomp (<= 3.5.1), qvd-libxcomp3 +Replaces: nxcomp, qvd-libxcomp3 Description: NX compression library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -453,11 +417,9 @@ Package: libxcomp-dev Provides: libxcomp3-dev Section: libdevel Architecture: any -Depends: - libxcomp3 (= ${binary:Version}), - ${misc:Depends}, +Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends} Breaks: nxcomp-dev (<=3.5.1) -Replaces: nxcomp-dev, +Replaces: nxcomp-dev Description: NX compression library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -470,11 +432,9 @@ Description: NX compression library (development headers) Package: libxcomp3-dbg Architecture: any Multi-Arch: same -Depends: - libxcomp3 (= ${binary:Version}), - ${misc:Depends}, +Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends} Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~) Description: nx-X11 compression library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -487,10 +447,7 @@ Description: nx-X11 compression library (debug package) Package: libxcompshad3 Architecture: any Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libnx-x11-6 (= ${binary:Version}), +Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: nxcompshad (<=3.5.1) Replaces: nxcompshad Description: NX shadowing library @@ -504,11 +461,9 @@ Package: libxcompshad-dev Provides: libxcompshad3-dev Section: libdevel Architecture: any -Depends: - libxcompshad3 (= ${binary:Version}), - ${misc:Depends}, -Breaks: nxcompshad-dev (<= 3.5.1), -Replaces: nxcompshad-dev, +Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends} +Breaks: nxcompshad-dev (<= 3.5.1) +Replaces: nxcompshad-dev Description: NX shadowing library (development headers) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -521,11 +476,9 @@ Description: NX shadowing library (development headers) Package: libxcompshad3-dbg Architecture: any Multi-Arch: same -Depends: - libxcompshad3 (= ${binary:Version}), - ${misc:Depends}, +Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends} Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), +Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~) Description: nx-X11 shadowing library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when -- cgit v1.2.3 From ad1d453493de461a07d0fce8c334845920662de1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Jul 2017 10:38:47 +0200 Subject: debian/copyright: White-space cleanup. --- debian/copyright | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index d9ef896b0..247f00f41 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1793,7 +1793,7 @@ Copyright: 1993, Davor Matic 2015-2016, Qindel Group (http://www.qindel.com) License: GPL-2 Comment: - The code in these files was derived from Xnest. As the code changes + The code in these files was derived from Xnest. As the code changes done by NoMachine are immense, GPL-2 is listed as these files' primary license. . @@ -1893,7 +1893,7 @@ Files: nx-X11/lib/X11/XlcGeneric.h nx-X11/lib/X11/omXChar.c Copyright: 1992-1993, TOSHIBA Corp 1995, FUJITSU LIMITED -License: MIT~X11 +License: MIT~X11 Files: nx-X11/include/extensions/Xv.h nx-X11/include/extensions/Xvproto.h @@ -1947,7 +1947,7 @@ Files: nx-X11/include/extensions/xfixesproto.h Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc 2001, Keith Packard, member of The XFree86 Project, Inc 2002, Keith Packard, member of The XFree86 Project, Inc -License: MIT~X11 +License: MIT~X11 Files: nx-X11/include/Sunkeysym.h nx-X11/lib/X11/Host.c @@ -1962,7 +1962,7 @@ Copyright: 1985-1987, 1991, 1998, The Open Group License: MIT~OpenGroup Comment: Contributions by Oracle and/or its affiliates (from 1991, 2000, 2004) - have to be considered as licensed under Expat. + have to be considered as licensed under Expat. Files: nx-X11/lib/X11/ConnDis.c nx-X11/lib/X11/OpenDis.c @@ -1986,7 +1986,7 @@ Copyright: 1984-1985, 1987, 1989, 1998, The Open Group 2014-2016, Mihai Moldovan 2014-2016, Ulrich Sibiller 2015-2016, Qindel Group (http://www.qindel.com) -License: MIT~OpenGroup +License: MIT~OpenGroup Comment: Modifications by NoMachine have to be considered as strictly GPL-2 licensed. @@ -2010,7 +2010,7 @@ Comment: The original work on these files by Oracle and/or its affiliates have been licensed under Expat. Later contributions by FUJITSU LIMITED have been licensed - under MIT~X11. + under MIT~X11. Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h @@ -2115,7 +2115,7 @@ Copyright: 1991-1994, FUJITSU LIMITED 1992-1993, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993, Digital Equipment Corporation -License: MIT~X11 +License: MIT~X11 Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h @@ -2193,7 +2193,7 @@ Files: nx-X11/include/extensions/xtestext1.h nx-X11/programs/Xserver/Xext/xtest1di.c Copyright: 1986-1988, 1998, The Open Group 1986-1988, Hewlett-Packard Corporation -License: MIT~OpenGroup +License: MIT~OpenGroup Comment: Contributions by Hewlett-Packard Corporation have been licensed under the following license: @@ -2207,8 +2207,8 @@ Comment: advertising or publicity pertaining to distribution of the software without specific, written prior permission. . - Hewlett-Packard makes no representations about the - suitability of this software for any purpose. It is provided + Hewlett-Packard makes no representations about the + suitability of this software for any purpose. It is provided "as is" without express or implied warranty. . As additional note, we find: @@ -2228,7 +2228,7 @@ Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2014-2016, Mihai Moldovan 2014-2016, Ulrich Sibiller 2015-2016, Qindel Group (http://www.qindel.com) -License: MIT~X11 +License: MIT~X11 Comment: Modifications by NoMachine have to be considered as strictly GPL-2 licensed. @@ -2277,7 +2277,7 @@ License: MIT~X11 Comment: Original work by Keith Packard has been licensed under MIT~X11. Later contributions by Oracle and/or its affiliates have been licensed - under Expat. + under Expat. Files: nx-X11/programs/Xserver/Xext/sleepuntil.h nx-X11/programs/Xserver/mi/micoord.h @@ -2307,7 +2307,7 @@ Copyright: 2000, Compaq Computer Corporation 2002, Hewlett-Packard Company 2006, Intel Corporation 2008, Red Hat, Inc -License: MIT~X11 +License: MIT~X11 Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h nxcompshad/src/X11/include/Xrandr_nxcompshad.h @@ -2355,7 +2355,7 @@ Copyright: 1990-1994, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993-1994, Sony Corporation 1994, Sony Corporation -License: MIT~X11 +License: MIT~X11 Files: nx-X11/lib/X11/lcFile.c Copyright: 1993, IBM Corporation @@ -3226,7 +3226,7 @@ License: MIT~ISC CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. License: SGI-1.1 - SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) + SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) . 1. Definitions. . @@ -3255,7 +3255,7 @@ License: SGI-1.1 . 1.8. "Modifications" means any addition to or deletion from the substance or structure of the Original Code or any previous Modifications. When - Covered Code is released as a series of files, a Modification is: + Covered Code is released as a series of files, a Modification is: . A. Any addition to the contents of a file containing Original Code and/or addition to or deletion from the contents of a file containing previous @@ -3282,7 +3282,7 @@ License: SGI-1.1 . 1.12. "Recipient Patents" means patent claims Licensable by a Recipient that are infringed by the use or sale of Original Code or any Modifications - provided by SGI, or any combination thereof. + provided by SGI, or any combination thereof. . 1.13. "SGI" means Silicon Graphics, Inc. . @@ -3310,7 +3310,7 @@ License: SGI-1.1 other combinations that include the Modification. No patent license is provided under SGI Patents for infringements of SGI Patents by Modifications not provided by SGI or combinations of Original Code and - Modifications not provided by SGI. + Modifications not provided by SGI. . 2.2. Recipient License Grant. Subject to the terms of this License and any third party intellectual property claims, Recipient hereby grants @@ -3324,7 +3324,7 @@ License: SGI-1.1 the algorithms embodied in the Original Code or any Modifications provided by SGI . . - 3. Redistributions. + 3. Redistributions. . 3.1. Retention of Notice/Copy of License. The Notice set forth in Exhibit A, below, must be conspicuously retained or included in any and @@ -3377,7 +3377,7 @@ License: SGI-1.1 promotion of products derived from the Covered Code, without prior written permission of SGI; or (iii) any title to or ownership of the Original Code, which shall at all times remains with SGI. All rights in - the Original Code not expressly granted under this License are reserved. + the Original Code not expressly granted under this License are reserved. . 6. Compliance with Laws; Non-Infringement. There are various worldwide laws, regulations, and executive orders applicable to dispositions of @@ -3473,7 +3473,7 @@ License: SGI-1.1 file are subject only to the provisions of the License. You may not use this file except in compliance with the License. You may obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 - Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: + Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: . http://oss.sgi.com/projects/FreeB . -- cgit v1.2.3 From ccd7c6962bb50faa4a1549011824e34c0d0792b9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 14 Jul 2017 10:42:15 +0200 Subject: debian/control: Add B-D: libtool (required for Debian jessie, Ubuntu trusty and Ubuntu xenial). --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 7a69ad03d..4211b7705 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: libjpeg-dev, libpixman-1-dev (>= 0.13.2), libpng-dev, + libtool, libxcomposite-dev, libxdamage-dev, libxdmcp-dev, -- cgit v1.2.3 From f76c82403888bb498973ec974dbfd20e4edb02fe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 30 Jun 2017 20:13:51 +0200 Subject: nxcomp: Switch to autoreconf. --- debian/libxcomp-dev.install | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install index e27e6ecf0..f73422f40 100644 --- a/debian/libxcomp-dev.install +++ b/debian/libxcomp-dev.install @@ -1,4 +1,5 @@ usr/lib/*/libXcomp.so +usr/lib/*/libXcomp.a usr/include/*/nx/NX.h usr/include/*/nx/NXalert.h usr/include/*/nx/NXpack.h diff --git a/debian/rules b/debian/rules index b59ba83a5..13490a86c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ override_dh_clean: override_dh_install: # remove static libs - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a + rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la # remove extras, GL, and other unneeded headers -- cgit v1.2.3 From 93c4cea66aa328dcfe378d3569c75c40f18d662d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Jul 2017 13:42:32 +0200 Subject: debian/rules: Drop override_dh_clean target. Not required anymore, as configure files get removed correctly now. --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 13490a86c..864ec35b4 100755 --- a/debian/rules +++ b/debian/rules @@ -17,10 +17,6 @@ override_dh_auto_clean: rm -Rf nx-X11/.build-exports dh_auto_clean -override_dh_clean: - rm -f nx*/configure - dh_clean - override_dh_install: # remove static libs -- cgit v1.2.3 From 1472e7e37838f17b7ed948fa206e8c3434a9d346 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 17 Jul 2017 12:53:26 +0200 Subject: debian/rules: Add configure option --disable-silent-rules. --- debian/rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 864ec35b4..e0a6b952c 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,11 @@ export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + CONFIGURE="./configure --prefix=/usr \ + --disable-silent-rules \ + --libdir=$(LIBDIR) \ + --includedir=$(INCLUDEDIR) \ + --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports -- cgit v1.2.3 From c350873c7c977efe5210484f04160be45f84ba7e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 21 Jul 2017 12:31:09 +0200 Subject: Convert nx-X11/lib/ build flow from imake to autotools. --- debian/libnx-x11-6.symbols | 6 +++--- debian/libnx-x11-dev.install | 2 ++ debian/nx-x11-common.install | 4 ++-- debian/rules | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 0724aac2f..2901c1d83 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -874,8 +874,8 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XLockMutex_fn@Base 3.5.0.29 _XLookupKeysym@Base 3.5.0.29 _XLookupString@Base 3.5.0.29 - _XNoticeCreateBitmap@Base 3.5.0.29 - _XNoticePutBitmap@Base 3.5.0.29 +#MISSING: 3.5.99.9# _XNoticeCreateBitmap@Base 3.5.0.29 +#MISSING: 3.5.99.9# _XNoticePutBitmap@Base 3.5.0.29 _XOpenLC@Base 3.5.0.29 _XParseBaseFontNameList@Base 3.5.0.29 _XPollfdCacheAdd@Base 3.5.0.29 @@ -909,7 +909,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XTextHeight@Base 3.5.0.29 _XTranslateKey@Base 3.5.0.29 _XTranslateKeySym@Base 3.5.0.29 - _XTryShapeBitmapCursor@Base 3.5.0.29 +#MISSING: 2:3.5.99.9# _XTryShapeBitmapCursor@Base 3.5.0.29 _XUnknownCopyEventCookie@Base 2:3.5.99.2 _XUnknownNativeEvent@Base 3.5.0.29 _XUnknownWireEvent@Base 3.5.0.29 diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 5f9590cbc..169f0f6ef 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,4 +1,5 @@ usr/lib/*/libNX_X11.so +usr/lib/*/libNX_X11.a usr/include/*/nx-X11/ImUtil.h usr/include/*/nx-X11/Xauth.h usr/include/*/nx-X11/XKBlib.h @@ -13,3 +14,4 @@ usr/include/*/nx-X11/Xutil.h usr/include/*/nx-X11/cursorfont.h usr/include/*/nx-X11/misc.h usr/include/*/nx-X11/os.h +usr/lib/*/pkgconfig/nx-x11.pc diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install index 00880c3d7..ad6c1ef74 100644 --- a/debian/nx-x11-common.install +++ b/debian/nx-x11-common.install @@ -1,3 +1,3 @@ usr/share/nx/SecurityPolicy -usr/share/nx/XErrorDB -usr/share/nx/Xcms.txt +usr/share/nx/X11/XErrorDB +usr/share/nx/X11/Xcms.txt diff --git a/debian/rules b/debian/rules index e0a6b952c..0ef8ab488 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,7 @@ override_dh_install: # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la + rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.la # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ -- cgit v1.2.3 From 9edd6e055c015c0f34c0b28c966fe98d6afdb259 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 11 Aug 2017 16:44:24 -0400 Subject: debian/control: Add D (libnx-x11-6): libx11-data. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 4211b7705..58b28f12f 100644 --- a/debian/control +++ b/debian/control @@ -73,6 +73,7 @@ Depends: libxcomp3 (= ${binary:Version}), nx-x11-common (<< ${source:Version}.1), nx-x11-common (>= ${source:Version}), + libx11-data, ${misc:Depends}, ${shlibs:Depends} Breaks: -- cgit v1.2.3 From 9a79e09a5e5e487d48c71f909cfd0432c7c785f7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 11 Aug 2017 12:51:52 -0400 Subject: debian/rules: Use tabs as first indentation level. --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 0ef8ab488..91965c66f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,10 +12,10 @@ export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARC %: CONFIGURE="./configure --prefix=/usr \ - --disable-silent-rules \ - --libdir=$(LIBDIR) \ - --includedir=$(INCLUDEDIR) \ - --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + --disable-silent-rules \ + --libdir=$(LIBDIR) \ + --includedir=$(INCLUDEDIR) \ + --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports -- cgit v1.2.3 From 3b7e5a42f5abecb903a9d730d163d704520efb07 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 11 Aug 2017 12:53:50 -0400 Subject: debian/rules: Re-order configure options for the sake of more beauty. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 91965c66f..925c98f08 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,8 @@ export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --prefix=/usr \ - --disable-silent-rules \ + CONFIGURE="./configure --disable-silent-rules \ + --prefix=/usr \ --libdir=$(LIBDIR) \ --includedir=$(INCLUDEDIR) \ --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt -- cgit v1.2.3 From 9cffffe5ecaaaffe98ef0eba2c9b1657052a9631 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 30 Aug 2017 16:57:57 +0200 Subject: debian/copyright: Update copyright attributions. --- debian/copyright | 2262 +++++++++++++++++++++++++++--------------------------- 1 file changed, 1149 insertions(+), 1113 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 247f00f41..f6206283f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: NXv3 (aka nx-libs) Upstream-Contact: Mike Gabriel Source: https://github.com/ArcticaProject/nx-libs/ -Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h +Files: nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/hw/nxagent/screensaver nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -95,8 +95,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h nxcompshad/src/Shadow.cpp nxcompshad/src/Updater.cpp nxcompshad/src/Updater.h - nxcompshad/src/Win.cpp - nxcompshad/src/Win.h nxcompshad/src/X11.cpp nxcompshad/src/X11.h Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) @@ -129,234 +127,235 @@ Files: nx-X11/programs/Xserver/os/timingsafe_memcmp.c Copyright: 2014, Google Inc. License: MIT~ISC -Files: nxcomp/ActionCache.cpp - nxcomp/ActionCache.h - nxcomp/Agent.cpp - nxcomp/Agent.h - nxcomp/Alpha.cpp - nxcomp/Alpha.h - nxcomp/Auth.cpp - nxcomp/Auth.h - nxcomp/Bitmap.cpp - nxcomp/Bitmap.h - nxcomp/BlockCache.cpp - nxcomp/BlockCache.h - nxcomp/BlockCacheSet.cpp - nxcomp/BlockCacheSet.h - nxcomp/ChangeGC.cpp - nxcomp/ChangeGC.h - nxcomp/ChangeProperty.cpp - nxcomp/ChangeProperty.h - nxcomp/Channel.cpp - nxcomp/Channel.h - nxcomp/ChannelCache.cpp - nxcomp/ChannelCache.h - nxcomp/ChannelEndPoint.cpp - nxcomp/ChannelEndPoint.h - nxcomp/ChannelStore.h - nxcomp/CharCache.cpp - nxcomp/CharCache.h - nxcomp/Children.cpp - nxcomp/ClearArea.cpp - nxcomp/ClearArea.h - nxcomp/ClientCache.cpp - nxcomp/ClientCache.h - nxcomp/ClientChannel.cpp - nxcomp/ClientChannel.h - nxcomp/ClientProxy.cpp - nxcomp/ClientProxy.h - nxcomp/ClientReadBuffer.cpp - nxcomp/ClientReadBuffer.h - nxcomp/ClientStore.cpp - nxcomp/ClientStore.h - nxcomp/Colormap.cpp - nxcomp/Colormap.h - nxcomp/ConfigureWindow.cpp - nxcomp/ConfigureWindow.h - nxcomp/Control.cpp - nxcomp/Control.h - nxcomp/CopyArea.cpp - nxcomp/CopyArea.h - nxcomp/CreateGC.cpp - nxcomp/CreateGC.h - nxcomp/CreatePixmap.cpp - nxcomp/CreatePixmap.h - nxcomp/DecodeBuffer.cpp - nxcomp/DecodeBuffer.h - nxcomp/EncodeBuffer.cpp - nxcomp/EncodeBuffer.h - nxcomp/FillPoly.cpp - nxcomp/FillPoly.h - nxcomp/Fork.cpp - nxcomp/Fork.h - nxcomp/FreeCache.h - nxcomp/GenericChannel.cpp - nxcomp/GenericChannel.h - nxcomp/GenericReadBuffer.cpp - nxcomp/GenericReadBuffer.h - nxcomp/GenericReply.cpp - nxcomp/GenericReply.h - nxcomp/GenericRequest.cpp - nxcomp/GenericRequest.h - nxcomp/GetImage.cpp - nxcomp/GetImage.h - nxcomp/GetImageReply.cpp - nxcomp/GetImageReply.h - nxcomp/GetProperty.cpp - nxcomp/GetProperty.h - nxcomp/GetPropertyReply.cpp - nxcomp/GetPropertyReply.h - nxcomp/ImageText16.cpp - nxcomp/ImageText16.h - nxcomp/ImageText8.cpp - nxcomp/ImageText8.h - nxcomp/IntCache.cpp - nxcomp/IntCache.h - nxcomp/InternAtom.cpp - nxcomp/InternAtom.h - nxcomp/Jpeg.cpp - nxcomp/Jpeg.h - nxcomp/Keeper.cpp - nxcomp/Keeper.h - nxcomp/List.cpp - nxcomp/List.h - nxcomp/ListFontsReply.cpp - nxcomp/ListFontsReply.h - nxcomp/Loop.cpp - nxcomp/Message.cpp - nxcomp/Message.h - nxcomp/Misc.cpp - nxcomp/Misc.h - nxcomp/NX.h - nxcomp/NXalert.h - nxcomp/NXmitshm.h - nxcomp/NXpack.h - nxcomp/NXproto.h - nxcomp/NXrender.h - nxcomp/NXvars.h - nxcomp/OpcodeCache.h - nxcomp/OpcodeStore.cpp - nxcomp/OpcodeStore.h - nxcomp/Pack.c - nxcomp/Pgn.cpp - nxcomp/Pgn.h - nxcomp/Pipe.cpp - nxcomp/Pipe.h - nxcomp/PolyArc.cpp - nxcomp/PolyArc.h - nxcomp/PolyFillArc.cpp - nxcomp/PolyFillArc.h - nxcomp/PolyFillRectangle.cpp - nxcomp/PolyFillRectangle.h - nxcomp/PolyLine.cpp - nxcomp/PolyLine.h - nxcomp/PolyPoint.cpp - nxcomp/PolyPoint.h - nxcomp/PolySegment.cpp - nxcomp/PolySegment.h - nxcomp/PolyText16.cpp - nxcomp/PolyText16.h - nxcomp/PolyText8.cpp - nxcomp/PolyText8.h - nxcomp/Proxy.cpp - nxcomp/Proxy.h - nxcomp/ProxyReadBuffer.cpp - nxcomp/ProxyReadBuffer.h - nxcomp/PutImage.cpp - nxcomp/PutImage.h - nxcomp/PutPackedImage.cpp - nxcomp/PutPackedImage.h - nxcomp/QueryFontReply.cpp - nxcomp/QueryFontReply.h - nxcomp/ReadBuffer.cpp - nxcomp/ReadBuffer.h - nxcomp/RenderAddGlyphs.cpp - nxcomp/RenderAddGlyphs.h - nxcomp/RenderChangePicture.cpp - nxcomp/RenderChangePicture.h - nxcomp/RenderComposite.cpp - nxcomp/RenderComposite.h - nxcomp/RenderCompositeGlyphs.cpp - nxcomp/RenderCompositeGlyphs.h - nxcomp/RenderCreateGlyphSet.cpp - nxcomp/RenderCreateGlyphSet.h - nxcomp/RenderCreatePicture.cpp - nxcomp/RenderCreatePicture.h - nxcomp/RenderExtension.cpp - nxcomp/RenderExtension.h - nxcomp/RenderFillRectangles.cpp - nxcomp/RenderFillRectangles.h - nxcomp/RenderFreeGlyphSet.cpp - nxcomp/RenderFreeGlyphSet.h - nxcomp/RenderFreePicture.cpp - nxcomp/RenderFreePicture.h - nxcomp/RenderGenericRequest.cpp - nxcomp/RenderGenericRequest.h - nxcomp/RenderMinorExtensionHeaders.h - nxcomp/RenderMinorExtensionMethods.h - nxcomp/RenderMinorExtensionTags.h - nxcomp/RenderPictureClip.cpp - nxcomp/RenderPictureClip.h - nxcomp/RenderPictureFilter.cpp - nxcomp/RenderPictureFilter.h - nxcomp/RenderPictureTransform.cpp - nxcomp/RenderPictureTransform.h - nxcomp/RenderTrapezoids.cpp - nxcomp/RenderTrapezoids.h - nxcomp/RenderTriangles.cpp - nxcomp/RenderTriangles.h - nxcomp/Rgb.cpp - nxcomp/Rgb.h - nxcomp/Rle.cpp - nxcomp/Rle.h - nxcomp/SendEvent.cpp - nxcomp/SendEvent.h - nxcomp/SequenceQueue.cpp - nxcomp/SequenceQueue.h - nxcomp/ServerCache.cpp - nxcomp/ServerCache.h - nxcomp/ServerChannel.cpp - nxcomp/ServerChannel.h - nxcomp/ServerProxy.cpp - nxcomp/ServerProxy.h - nxcomp/ServerReadBuffer.cpp - nxcomp/ServerReadBuffer.h - nxcomp/ServerStore.cpp - nxcomp/ServerStore.h - nxcomp/SetClipRectangles.cpp - nxcomp/SetClipRectangles.h - nxcomp/SetUnpackAlpha.cpp - nxcomp/SetUnpackAlpha.h - nxcomp/SetUnpackColormap.cpp - nxcomp/SetUnpackColormap.h - nxcomp/SetUnpackGeometry.cpp - nxcomp/SetUnpackGeometry.h - nxcomp/ShapeExtension.cpp - nxcomp/ShapeExtension.h - nxcomp/Socket.cpp - nxcomp/Socket.h - nxcomp/Split.cpp - nxcomp/Split.h - nxcomp/StaticCompressor.cpp - nxcomp/StaticCompressor.h - nxcomp/Statistics.cpp - nxcomp/Statistics.h - nxcomp/Timestamp.cpp - nxcomp/Timestamp.h - nxcomp/TranslateCoords.cpp - nxcomp/TranslateCoords.h - nxcomp/Transport.cpp - nxcomp/Transport.h - nxcomp/Types.h - nxcomp/Unpack.cpp - nxcomp/Unpack.h - nxcomp/Vars.c - nxcomp/WriteBuffer.cpp - nxcomp/WriteBuffer.h - nxcomp/XidCache.cpp - nxcomp/XidCache.h - nxcomp/Z.cpp - nxcomp/Z.h +Files: + nxcomp/include/NX.h + nxcomp/include/NXalert.h + nxcomp/include/NXpack.h + nxcomp/include/NXproto.h + nxcomp/include/NXvars.h + nxcomp/src/ActionCache.cpp + nxcomp/src/ActionCache.h + nxcomp/src/Agent.cpp + nxcomp/src/Agent.h + nxcomp/src/Alpha.cpp + nxcomp/src/Alpha.h + nxcomp/src/Auth.cpp + nxcomp/src/Auth.h + nxcomp/src/Bitmap.cpp + nxcomp/src/Bitmap.h + nxcomp/src/BlockCache.cpp + nxcomp/src/BlockCache.h + nxcomp/src/BlockCacheSet.cpp + nxcomp/src/BlockCacheSet.h + nxcomp/src/ChangeGC.cpp + nxcomp/src/ChangeGC.h + nxcomp/src/ChangeProperty.cpp + nxcomp/src/ChangeProperty.h + nxcomp/src/Channel.cpp + nxcomp/src/Channel.h + nxcomp/src/ChannelCache.cpp + nxcomp/src/ChannelCache.h + nxcomp/src/ChannelEndPoint.cpp + nxcomp/src/ChannelEndPoint.h + nxcomp/src/ChannelStore.h + nxcomp/src/CharCache.cpp + nxcomp/src/CharCache.h + nxcomp/src/Children.cpp + nxcomp/src/ClearArea.cpp + nxcomp/src/ClearArea.h + nxcomp/src/ClientCache.cpp + nxcomp/src/ClientCache.h + nxcomp/src/ClientChannel.cpp + nxcomp/src/ClientChannel.h + nxcomp/src/ClientProxy.cpp + nxcomp/src/ClientProxy.h + nxcomp/src/ClientReadBuffer.cpp + nxcomp/src/ClientReadBuffer.h + nxcomp/src/ClientStore.cpp + nxcomp/src/ClientStore.h + nxcomp/src/Colormap.cpp + nxcomp/src/Colormap.h + nxcomp/src/ConfigureWindow.cpp + nxcomp/src/ConfigureWindow.h + nxcomp/src/Control.cpp + nxcomp/src/Control.h + nxcomp/src/CopyArea.cpp + nxcomp/src/CopyArea.h + nxcomp/src/CreateGC.cpp + nxcomp/src/CreateGC.h + nxcomp/src/CreatePixmap.cpp + nxcomp/src/CreatePixmap.h + nxcomp/src/DecodeBuffer.cpp + nxcomp/src/DecodeBuffer.h + nxcomp/src/EncodeBuffer.cpp + nxcomp/src/EncodeBuffer.h + nxcomp/src/FillPoly.cpp + nxcomp/src/FillPoly.h + nxcomp/src/Fork.cpp + nxcomp/src/Fork.h + nxcomp/src/FreeCache.h + nxcomp/src/GenericChannel.cpp + nxcomp/src/GenericChannel.h + nxcomp/src/GenericReadBuffer.cpp + nxcomp/src/GenericReadBuffer.h + nxcomp/src/GenericReply.cpp + nxcomp/src/GenericReply.h + nxcomp/src/GenericRequest.cpp + nxcomp/src/GenericRequest.h + nxcomp/src/GetImage.cpp + nxcomp/src/GetImage.h + nxcomp/src/GetImageReply.cpp + nxcomp/src/GetImageReply.h + nxcomp/src/GetProperty.cpp + nxcomp/src/GetProperty.h + nxcomp/src/GetPropertyReply.cpp + nxcomp/src/GetPropertyReply.h + nxcomp/src/ImageText16.cpp + nxcomp/src/ImageText16.h + nxcomp/src/ImageText8.cpp + nxcomp/src/ImageText8.h + nxcomp/src/IntCache.cpp + nxcomp/src/IntCache.h + nxcomp/src/InternAtom.cpp + nxcomp/src/InternAtom.h + nxcomp/src/Jpeg.cpp + nxcomp/src/Jpeg.h + nxcomp/src/Keeper.cpp + nxcomp/src/Keeper.h + nxcomp/src/List.cpp + nxcomp/src/List.h + nxcomp/src/ListFontsReply.cpp + nxcomp/src/ListFontsReply.h + nxcomp/src/Loop.cpp + nxcomp/src/Message.cpp + nxcomp/src/Message.h + nxcomp/src/Misc.cpp + nxcomp/src/Misc.h + nxcomp/src/NXmitshm.h + nxcomp/src/NXrender.h + nxcomp/src/OpcodeCache.h + nxcomp/src/OpcodeStore.cpp + nxcomp/src/OpcodeStore.h + nxcomp/src/Pack.c + nxcomp/src/Pgn.cpp + nxcomp/src/Pgn.h + nxcomp/src/Pipe.cpp + nxcomp/src/Pipe.h + nxcomp/src/PolyArc.cpp + nxcomp/src/PolyArc.h + nxcomp/src/PolyFillArc.cpp + nxcomp/src/PolyFillArc.h + nxcomp/src/PolyFillRectangle.cpp + nxcomp/src/PolyFillRectangle.h + nxcomp/src/PolyLine.cpp + nxcomp/src/PolyLine.h + nxcomp/src/PolyPoint.cpp + nxcomp/src/PolyPoint.h + nxcomp/src/PolySegment.cpp + nxcomp/src/PolySegment.h + nxcomp/src/PolyText16.cpp + nxcomp/src/PolyText16.h + nxcomp/src/PolyText8.cpp + nxcomp/src/PolyText8.h + nxcomp/src/Proxy.cpp + nxcomp/src/Proxy.h + nxcomp/src/ProxyReadBuffer.cpp + nxcomp/src/ProxyReadBuffer.h + nxcomp/src/PutImage.cpp + nxcomp/src/PutImage.h + nxcomp/src/PutPackedImage.cpp + nxcomp/src/PutPackedImage.h + nxcomp/src/QueryFontReply.cpp + nxcomp/src/QueryFontReply.h + nxcomp/src/ReadBuffer.cpp + nxcomp/src/ReadBuffer.h + nxcomp/src/RenderAddGlyphs.cpp + nxcomp/src/RenderAddGlyphs.h + nxcomp/src/RenderChangePicture.cpp + nxcomp/src/RenderChangePicture.h + nxcomp/src/RenderComposite.cpp + nxcomp/src/RenderComposite.h + nxcomp/src/RenderCompositeGlyphs.cpp + nxcomp/src/RenderCompositeGlyphs.h + nxcomp/src/RenderCreateGlyphSet.cpp + nxcomp/src/RenderCreateGlyphSet.h + nxcomp/src/RenderCreatePicture.cpp + nxcomp/src/RenderCreatePicture.h + nxcomp/src/RenderExtension.cpp + nxcomp/src/RenderExtension.h + nxcomp/src/RenderFillRectangles.cpp + nxcomp/src/RenderFillRectangles.h + nxcomp/src/RenderFreeGlyphSet.cpp + nxcomp/src/RenderFreeGlyphSet.h + nxcomp/src/RenderFreePicture.cpp + nxcomp/src/RenderFreePicture.h + nxcomp/src/RenderGenericRequest.cpp + nxcomp/src/RenderGenericRequest.h + nxcomp/src/RenderMinorExtensionHeaders.h + nxcomp/src/RenderMinorExtensionMethods.h + nxcomp/src/RenderMinorExtensionTags.h + nxcomp/src/RenderPictureClip.cpp + nxcomp/src/RenderPictureClip.h + nxcomp/src/RenderPictureFilter.cpp + nxcomp/src/RenderPictureFilter.h + nxcomp/src/RenderPictureTransform.cpp + nxcomp/src/RenderPictureTransform.h + nxcomp/src/RenderTrapezoids.cpp + nxcomp/src/RenderTrapezoids.h + nxcomp/src/RenderTriangles.cpp + nxcomp/src/RenderTriangles.h + nxcomp/src/Rgb.cpp + nxcomp/src/Rgb.h + nxcomp/src/Rle.cpp + nxcomp/src/Rle.h + nxcomp/src/SendEvent.cpp + nxcomp/src/SendEvent.h + nxcomp/src/SequenceQueue.cpp + nxcomp/src/SequenceQueue.h + nxcomp/src/ServerCache.cpp + nxcomp/src/ServerCache.h + nxcomp/src/ServerChannel.cpp + nxcomp/src/ServerChannel.h + nxcomp/src/ServerProxy.cpp + nxcomp/src/ServerProxy.h + nxcomp/src/ServerReadBuffer.cpp + nxcomp/src/ServerReadBuffer.h + nxcomp/src/ServerStore.cpp + nxcomp/src/ServerStore.h + nxcomp/src/SetClipRectangles.cpp + nxcomp/src/SetClipRectangles.h + nxcomp/src/SetUnpackAlpha.cpp + nxcomp/src/SetUnpackAlpha.h + nxcomp/src/SetUnpackColormap.cpp + nxcomp/src/SetUnpackColormap.h + nxcomp/src/SetUnpackGeometry.cpp + nxcomp/src/SetUnpackGeometry.h + nxcomp/src/ShapeExtension.cpp + nxcomp/src/ShapeExtension.h + nxcomp/src/Socket.cpp + nxcomp/src/Socket.h + nxcomp/src/Split.cpp + nxcomp/src/Split.h + nxcomp/src/StaticCompressor.cpp + nxcomp/src/StaticCompressor.h + nxcomp/src/Statistics.cpp + nxcomp/src/Statistics.h + nxcomp/src/Timestamp.cpp + nxcomp/src/Timestamp.h + nxcomp/src/TranslateCoords.cpp + nxcomp/src/TranslateCoords.h + nxcomp/src/Transport.cpp + nxcomp/src/Transport.h + nxcomp/src/Types.h + nxcomp/src/Unpack.cpp + nxcomp/src/Unpack.h + nxcomp/src/Vars.c + nxcomp/src/WriteBuffer.cpp + nxcomp/src/WriteBuffer.h + nxcomp/src/XidCache.cpp + nxcomp/src/XidCache.h + nxcomp/src/Z.cpp + nxcomp/src/Z.h Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) 2008-2014, Oleksandr Shneyder 2011-2016, Mike Gabriel */ @@ -400,304 +399,304 @@ Comment: SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: nx-X11/extras/Mesa/include/GL/gl.h - nx-X11/extras/Mesa/include/GL/osmesa.h - nx-X11/extras/Mesa/include/GL/xmesa.h - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c - nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h - nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c - nx-X11/extras/Mesa/src/mesa/array_cache/acache.h - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c - nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c - nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h - nx-X11/extras/Mesa/src/mesa/glapi/glapi.c - nx-X11/extras/Mesa/src/mesa/glapi/glapi.h - nx-X11/extras/Mesa/src/mesa/glapi/glthread.c - nx-X11/extras/Mesa/src/mesa/glapi/glthread.h - nx-X11/extras/Mesa/src/mesa/main/accum.c - nx-X11/extras/Mesa/src/mesa/main/accum.h - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c - nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h - nx-X11/extras/Mesa/src/mesa/main/api_eval.h - nx-X11/extras/Mesa/src/mesa/main/api_loopback.c - nx-X11/extras/Mesa/src/mesa/main/api_loopback.h - nx-X11/extras/Mesa/src/mesa/main/api_noop.c - nx-X11/extras/Mesa/src/mesa/main/api_noop.h - nx-X11/extras/Mesa/src/mesa/main/api_validate.c - nx-X11/extras/Mesa/src/mesa/main/api_validate.h - nx-X11/extras/Mesa/src/mesa/main/attrib.c - nx-X11/extras/Mesa/src/mesa/main/attrib.h - nx-X11/extras/Mesa/src/mesa/main/blend.c - nx-X11/extras/Mesa/src/mesa/main/blend.h - nx-X11/extras/Mesa/src/mesa/main/bufferobj.c - nx-X11/extras/Mesa/src/mesa/main/bufferobj.h - nx-X11/extras/Mesa/src/mesa/main/buffers.c - nx-X11/extras/Mesa/src/mesa/main/buffers.h - nx-X11/extras/Mesa/src/mesa/main/clip.c - nx-X11/extras/Mesa/src/mesa/main/clip.h - nx-X11/extras/Mesa/src/mesa/main/colormac.h - nx-X11/extras/Mesa/src/mesa/main/colortab.c - nx-X11/extras/Mesa/src/mesa/main/colortab.h - nx-X11/extras/Mesa/src/mesa/main/config.h - nx-X11/extras/Mesa/src/mesa/main/context.c - nx-X11/extras/Mesa/src/mesa/main/context.h - nx-X11/extras/Mesa/src/mesa/main/convolve.c - nx-X11/extras/Mesa/src/mesa/main/convolve.h - nx-X11/extras/Mesa/src/mesa/main/dd.h - nx-X11/extras/Mesa/src/mesa/main/debug.c - nx-X11/extras/Mesa/src/mesa/main/debug.h - nx-X11/extras/Mesa/src/mesa/main/depth.c - nx-X11/extras/Mesa/src/mesa/main/depth.h - nx-X11/extras/Mesa/src/mesa/main/dispatch.c - nx-X11/extras/Mesa/src/mesa/main/dlist.c - nx-X11/extras/Mesa/src/mesa/main/dlist.h - nx-X11/extras/Mesa/src/mesa/main/drawpix.c - nx-X11/extras/Mesa/src/mesa/main/drawpix.h - nx-X11/extras/Mesa/src/mesa/main/enable.c - nx-X11/extras/Mesa/src/mesa/main/enable.h - nx-X11/extras/Mesa/src/mesa/main/enums.c - nx-X11/extras/Mesa/src/mesa/main/enums.h - nx-X11/extras/Mesa/src/mesa/main/eval.c - nx-X11/extras/Mesa/src/mesa/main/eval.h - nx-X11/extras/Mesa/src/mesa/main/execmem.c - nx-X11/extras/Mesa/src/mesa/main/extensions.c - nx-X11/extras/Mesa/src/mesa/main/extensions.h - nx-X11/extras/Mesa/src/mesa/main/fbobject.c - nx-X11/extras/Mesa/src/mesa/main/fbobject.h - nx-X11/extras/Mesa/src/mesa/main/feedback.c - nx-X11/extras/Mesa/src/mesa/main/feedback.h - nx-X11/extras/Mesa/src/mesa/main/fog.c - nx-X11/extras/Mesa/src/mesa/main/fog.h - nx-X11/extras/Mesa/src/mesa/main/framebuffer.c - nx-X11/extras/Mesa/src/mesa/main/framebuffer.h - nx-X11/extras/Mesa/src/mesa/main/get.h - nx-X11/extras/Mesa/src/mesa/main/getstring.c - nx-X11/extras/Mesa/src/mesa/main/glheader.h - nx-X11/extras/Mesa/src/mesa/main/hash.c - nx-X11/extras/Mesa/src/mesa/main/hash.h - nx-X11/extras/Mesa/src/mesa/main/hint.c - nx-X11/extras/Mesa/src/mesa/main/hint.h - nx-X11/extras/Mesa/src/mesa/main/histogram.c - nx-X11/extras/Mesa/src/mesa/main/histogram.h - nx-X11/extras/Mesa/src/mesa/main/image.c - nx-X11/extras/Mesa/src/mesa/main/image.h - nx-X11/extras/Mesa/src/mesa/main/imports.c - nx-X11/extras/Mesa/src/mesa/main/imports.h - nx-X11/extras/Mesa/src/mesa/main/light.c - nx-X11/extras/Mesa/src/mesa/main/light.h - nx-X11/extras/Mesa/src/mesa/main/lines.c - nx-X11/extras/Mesa/src/mesa/main/lines.h - nx-X11/extras/Mesa/src/mesa/main/macros.h - nx-X11/extras/Mesa/src/mesa/main/matrix.c - nx-X11/extras/Mesa/src/mesa/main/matrix.h - nx-X11/extras/Mesa/src/mesa/main/mtypes.h - nx-X11/extras/Mesa/src/mesa/main/occlude.c - nx-X11/extras/Mesa/src/mesa/main/occlude.h - nx-X11/extras/Mesa/src/mesa/main/pixel.c - nx-X11/extras/Mesa/src/mesa/main/pixel.h - nx-X11/extras/Mesa/src/mesa/main/points.c - nx-X11/extras/Mesa/src/mesa/main/points.h - nx-X11/extras/Mesa/src/mesa/main/polygon.c - nx-X11/extras/Mesa/src/mesa/main/polygon.h - nx-X11/extras/Mesa/src/mesa/main/rastpos.c - nx-X11/extras/Mesa/src/mesa/main/rastpos.h - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c - nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h - nx-X11/extras/Mesa/src/mesa/main/state.c - nx-X11/extras/Mesa/src/mesa/main/state.h - nx-X11/extras/Mesa/src/mesa/main/stencil.c - nx-X11/extras/Mesa/src/mesa/main/stencil.h - nx-X11/extras/Mesa/src/mesa/main/texcompress.c - nx-X11/extras/Mesa/src/mesa/main/texcompress.h - nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c - nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c - nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h - nx-X11/extras/Mesa/src/mesa/main/texformat.c - nx-X11/extras/Mesa/src/mesa/main/texformat.h - nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h - nx-X11/extras/Mesa/src/mesa/main/teximage.c - nx-X11/extras/Mesa/src/mesa/main/teximage.h - nx-X11/extras/Mesa/src/mesa/main/texobj.c - nx-X11/extras/Mesa/src/mesa/main/texobj.h - nx-X11/extras/Mesa/src/mesa/main/texstate.c - nx-X11/extras/Mesa/src/mesa/main/texstate.h - nx-X11/extras/Mesa/src/mesa/main/texstore.c - nx-X11/extras/Mesa/src/mesa/main/texstore.h - nx-X11/extras/Mesa/src/mesa/main/varray.c - nx-X11/extras/Mesa/src/mesa/main/varray.h - nx-X11/extras/Mesa/src/mesa/main/version.h - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c - nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h - nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_debug.h - nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c - nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c - nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h - nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c - nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_eval.c - nx-X11/extras/Mesa/src/mesa/math/m_eval.h - nx-X11/extras/Mesa/src/mesa/math/m_matrix.c - nx-X11/extras/Mesa/src/mesa/math/m_matrix.h - nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h - nx-X11/extras/Mesa/src/mesa/math/m_translate.c - nx-X11/extras/Mesa/src/mesa/math/m_translate.h - nx-X11/extras/Mesa/src/mesa/math/m_vector.c - nx-X11/extras/Mesa/src/mesa/math/m_vector.h - nx-X11/extras/Mesa/src/mesa/math/m_xform.c - nx-X11/extras/Mesa/src/mesa/math/m_xform.h - nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h - nx-X11/extras/Mesa/src/mesa/math/mathmod.h - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c - nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c - nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c - nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h - nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c - nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c - nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c - nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h - nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h - nx-X11/extras/Mesa/src/mesa/shader/program.c - nx-X11/extras/Mesa/src/mesa/shader/program.h - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c - nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c - nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h - nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c - nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c - nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h - nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c - nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c - nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h - nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c - nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h - nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c - nx-X11/extras/Mesa/src/mesa/swrast/s_context.c - nx-X11/extras/Mesa/src/mesa/swrast/s_context.h - nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c - nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c - nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c - nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h - nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c - nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h - nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c - nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c - nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c - nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c - nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h - nx-X11/extras/Mesa/src/mesa/swrast/s_points.c - nx-X11/extras/Mesa/src/mesa/swrast/s_points.h - nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c - nx-X11/extras/Mesa/src/mesa/swrast/s_span.c - nx-X11/extras/Mesa/src/mesa/swrast/s_span.h - nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c - nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h - nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c - nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c - nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h - nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h - nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c - nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h - nx-X11/extras/Mesa/src/mesa/swrast/swrast.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h - nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c - nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h - nx-X11/extras/Mesa/src/mesa/tnl/t_context.c - nx-X11/extras/Mesa/src/mesa/tnl/t_context.h - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c - nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h - nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c - nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c - nx-X11/extras/Mesa/src/mesa/tnl/tnl.h +Files: nx-X11/extras/Mesa_6.4.2/include/GL/gl.h + nx-X11/extras/Mesa_6.4.2/include/GL/osmesa.h + nx-X11/extras/Mesa_6.4.2/include/GL/xmesa.h + nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.c + nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.h + nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_import.c + nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/acache.h + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.h + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/glxheader.h + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_api.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_buffer.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_dd.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_line.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_span.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_tri.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xmesaP.h + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.c + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.h + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.c + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_eval.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/colormac.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/config.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/dd.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/dispatch.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/execmem.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/getstring.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/macros.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/mtypes.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_fxt1.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_s3tc.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/version.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.h + nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_clip_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_copy_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_clip.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_norm.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_util.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_xform.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_dotprod_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_norm_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_trans_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.c + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform_tmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/math/mathmod.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragprog.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertprog.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.c + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/traverse_wrap.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aalinetemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatritemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_bitmap.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_buffers.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_copypix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_imaging.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_linetemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pointtemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_readpix.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_spantemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texstore.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_trispan.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_tritemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/swrast.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_tritmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/swrast_setup.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_loopback.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_playback.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram_sse.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cliptmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cull.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_fog.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_light.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_lighttmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_normals.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_points.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_program.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_render.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_rendertmp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texgen.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texmat.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_vertex.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_eval.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_exec.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/tnl.h Copyright: 1999-2001, Brian Paul 1999-2002, Brian Paul 1999-2003, Brian Paul @@ -724,236 +723,236 @@ Files: nx-X11/include/XWDFile.h nx-X11/include/extensions/xcmiscstr.h nx-X11/include/extensions/xtestconst.h nx-X11/include/extensions/xteststr.h - nx-X11/lib/X11/AllCells.c - nx-X11/lib/X11/AllPlanes.c - nx-X11/lib/X11/AllowEv.c - nx-X11/lib/X11/AuDispose.c - nx-X11/lib/X11/AuFileName.c - nx-X11/lib/X11/AuGetBest.c - nx-X11/lib/X11/AuRead.c - nx-X11/lib/X11/AutoRep.c - nx-X11/lib/X11/Backgnd.c - nx-X11/lib/X11/BdrWidth.c - nx-X11/lib/X11/Bell.c - nx-X11/lib/X11/Border.c - nx-X11/lib/X11/ChAccCon.c - nx-X11/lib/X11/ChActPGb.c - nx-X11/lib/X11/ChClMode.c - nx-X11/lib/X11/ChCmap.c - nx-X11/lib/X11/ChGC.c - nx-X11/lib/X11/ChKeyCon.c - nx-X11/lib/X11/ChPntCon.c - nx-X11/lib/X11/ChProp.c - nx-X11/lib/X11/ChSaveSet.c - nx-X11/lib/X11/ChWAttrs.c - nx-X11/lib/X11/ChWindow.c - nx-X11/lib/X11/ChkIfEv.c - nx-X11/lib/X11/ChkMaskEv.c - nx-X11/lib/X11/ChkTypEv.c - nx-X11/lib/X11/ChkTypWEv.c - nx-X11/lib/X11/ChkWinEv.c - nx-X11/lib/X11/CirWin.c - nx-X11/lib/X11/CirWinDn.c - nx-X11/lib/X11/CirWinUp.c - nx-X11/lib/X11/ClDisplay.c - nx-X11/lib/X11/Clear.c - nx-X11/lib/X11/ClearArea.c - nx-X11/lib/X11/ConfWind.c - nx-X11/lib/X11/ConvSel.c - nx-X11/lib/X11/CopyArea.c - nx-X11/lib/X11/CopyCmap.c - nx-X11/lib/X11/CopyGC.c - nx-X11/lib/X11/CopyPlane.c - nx-X11/lib/X11/CrBFData.c - nx-X11/lib/X11/CrCmap.c - nx-X11/lib/X11/CrCursor.c - nx-X11/lib/X11/CrGC.c - nx-X11/lib/X11/CrGlCur.c - nx-X11/lib/X11/CrPFBData.c - nx-X11/lib/X11/CrPixmap.c - nx-X11/lib/X11/CrWindow.c - nx-X11/lib/X11/Cursor.c - nx-X11/lib/X11/DefCursor.c - nx-X11/lib/X11/DelProp.c - nx-X11/lib/X11/Depths.c - nx-X11/lib/X11/DestSubs.c - nx-X11/lib/X11/DestWind.c - nx-X11/lib/X11/DisName.c - nx-X11/lib/X11/DrArc.c - nx-X11/lib/X11/DrArcs.c - nx-X11/lib/X11/DrLine.c - nx-X11/lib/X11/DrLines.c - nx-X11/lib/X11/DrPoint.c - nx-X11/lib/X11/DrPoints.c - nx-X11/lib/X11/DrRect.c - nx-X11/lib/X11/DrRects.c - nx-X11/lib/X11/DrSegs.c - nx-X11/lib/X11/ErrHndlr.c - nx-X11/lib/X11/EvToWire.c - nx-X11/lib/X11/FSSaver.c - nx-X11/lib/X11/FetchName.c - nx-X11/lib/X11/FillArc.c - nx-X11/lib/X11/FillArcs.c - nx-X11/lib/X11/FillPoly.c - nx-X11/lib/X11/FillRct.c - nx-X11/lib/X11/FillRcts.c - nx-X11/lib/X11/Flush.c - nx-X11/lib/X11/FontInfo.c - nx-X11/lib/X11/FontNames.c - nx-X11/lib/X11/FreeCmap.c - nx-X11/lib/X11/FreeCols.c - nx-X11/lib/X11/FreeCurs.c - nx-X11/lib/X11/FreeEData.c - nx-X11/lib/X11/FreeGC.c - nx-X11/lib/X11/FreePix.c - nx-X11/lib/X11/GCMisc.c - nx-X11/lib/X11/Geom.c - nx-X11/lib/X11/GetAtomNm.c - nx-X11/lib/X11/GetColor.c - nx-X11/lib/X11/GetFPath.c - nx-X11/lib/X11/GetFProp.c - nx-X11/lib/X11/GetGCVals.c - nx-X11/lib/X11/GetGeom.c - nx-X11/lib/X11/GetHColor.c - nx-X11/lib/X11/GetIFocus.c - nx-X11/lib/X11/GetImage.c - nx-X11/lib/X11/GetKCnt.c - nx-X11/lib/X11/GetMoEv.c - nx-X11/lib/X11/GetPCnt.c - nx-X11/lib/X11/GetPntMap.c - nx-X11/lib/X11/GetProp.c - nx-X11/lib/X11/GetRGBCMap.c - nx-X11/lib/X11/GetSOwner.c - nx-X11/lib/X11/GetSSaver.c - nx-X11/lib/X11/GetWAttrs.c - nx-X11/lib/X11/GrButton.c - nx-X11/lib/X11/GrKey.c - nx-X11/lib/X11/GrKeybd.c - nx-X11/lib/X11/GrPointer.c - nx-X11/lib/X11/GrServer.c - nx-X11/lib/X11/IfEvent.c - nx-X11/lib/X11/ImText.c - nx-X11/lib/X11/ImText16.c - nx-X11/lib/X11/ImUtil.c - nx-X11/lib/X11/InitExt.c - nx-X11/lib/X11/InsCmap.c - nx-X11/lib/X11/IntAtom.c - nx-X11/lib/X11/KeyBind.c - nx-X11/lib/X11/KeysymStr.c - nx-X11/lib/X11/KillCl.c - nx-X11/lib/X11/LiICmaps.c - nx-X11/lib/X11/LiProps.c - nx-X11/lib/X11/ListExt.c - nx-X11/lib/X11/LoadFont.c - nx-X11/lib/X11/LockDis.c - nx-X11/lib/X11/LookupCol.c - nx-X11/lib/X11/LowerWin.c - nx-X11/lib/X11/Macros.c - nx-X11/lib/X11/MapRaised.c - nx-X11/lib/X11/MapSubs.c - nx-X11/lib/X11/MapWindow.c - nx-X11/lib/X11/MaskEvent.c - nx-X11/lib/X11/Misc.c - nx-X11/lib/X11/ModMap.c - nx-X11/lib/X11/MoveWin.c - nx-X11/lib/X11/NextEvent.c - nx-X11/lib/X11/ParseCol.c - nx-X11/lib/X11/ParseGeom.c - nx-X11/lib/X11/PeekEvent.c - nx-X11/lib/X11/PeekIfEv.c - nx-X11/lib/X11/Pending.c - nx-X11/lib/X11/PixFormats.c - nx-X11/lib/X11/PmapBgnd.c - nx-X11/lib/X11/PmapBord.c - nx-X11/lib/X11/PolyTxt.c - nx-X11/lib/X11/PolyTxt16.c - nx-X11/lib/X11/PropAlloc.c - nx-X11/lib/X11/PutBEvent.c - nx-X11/lib/X11/PutImage.c - nx-X11/lib/X11/QuBest.c - nx-X11/lib/X11/QuColor.c - nx-X11/lib/X11/QuColors.c - nx-X11/lib/X11/QuCurShp.c - nx-X11/lib/X11/QuExt.c - nx-X11/lib/X11/QuKeybd.c - nx-X11/lib/X11/QuPntr.c - nx-X11/lib/X11/QuStipShp.c - nx-X11/lib/X11/QuTextE16.c - nx-X11/lib/X11/QuTextExt.c - nx-X11/lib/X11/QuTileShp.c - nx-X11/lib/X11/QuTree.c - nx-X11/lib/X11/RaiseWin.c - nx-X11/lib/X11/RdBitF.c - nx-X11/lib/X11/RecolorC.c - nx-X11/lib/X11/ReconfWM.c - nx-X11/lib/X11/ReconfWin.c - nx-X11/lib/X11/RepWindow.c - nx-X11/lib/X11/RestackWs.c - nx-X11/lib/X11/RotProp.c - nx-X11/lib/X11/ScrResStr.c - nx-X11/lib/X11/SelInput.c - nx-X11/lib/X11/SendEvent.c - nx-X11/lib/X11/SetBack.c - nx-X11/lib/X11/SetCRects.c - nx-X11/lib/X11/SetClMask.c - nx-X11/lib/X11/SetClOrig.c - nx-X11/lib/X11/SetDashes.c - nx-X11/lib/X11/SetFPath.c - nx-X11/lib/X11/SetFont.c - nx-X11/lib/X11/SetFore.c - nx-X11/lib/X11/SetFunc.c - nx-X11/lib/X11/SetIFocus.c - nx-X11/lib/X11/SetLStyle.c - nx-X11/lib/X11/SetPMask.c - nx-X11/lib/X11/SetPntMap.c - nx-X11/lib/X11/SetRGBCMap.c - nx-X11/lib/X11/SetSOwner.c - nx-X11/lib/X11/SetSSaver.c - nx-X11/lib/X11/SetState.c - nx-X11/lib/X11/SetStip.c - nx-X11/lib/X11/SetTSOrig.c - nx-X11/lib/X11/SetTile.c - nx-X11/lib/X11/StBytes.c - nx-X11/lib/X11/StColor.c - nx-X11/lib/X11/StColors.c - nx-X11/lib/X11/StNColor.c - nx-X11/lib/X11/StName.c - nx-X11/lib/X11/StrKeysym.c - nx-X11/lib/X11/StrToText.c - nx-X11/lib/X11/Sync.c - nx-X11/lib/X11/Synchro.c - nx-X11/lib/X11/Text.c - nx-X11/lib/X11/Text16.c - nx-X11/lib/X11/TextToStr.c - nx-X11/lib/X11/TrCoords.c - nx-X11/lib/X11/UndefCurs.c - nx-X11/lib/X11/UngrabBut.c - nx-X11/lib/X11/UngrabKbd.c - nx-X11/lib/X11/UngrabKey.c - nx-X11/lib/X11/UngrabPtr.c - nx-X11/lib/X11/UngrabSvr.c - nx-X11/lib/X11/UninsCmap.c - nx-X11/lib/X11/UnldFont.c - nx-X11/lib/X11/UnmapSubs.c - nx-X11/lib/X11/UnmapWin.c - nx-X11/lib/X11/VisUtil.c - nx-X11/lib/X11/WMGeom.c - nx-X11/lib/X11/WarpPtr.c - nx-X11/lib/X11/WinEvent.c - nx-X11/lib/X11/Window.c - nx-X11/lib/X11/WrBitF.c - nx-X11/lib/X11/XKBBind.c - nx-X11/lib/X11/XKBCvt.c - nx-X11/lib/X11/Xlib.h - nx-X11/lib/X11/Xlocale.h - nx-X11/lib/X11/cmsMath.c - nx-X11/lib/X11/cursorfont.h - nx-X11/lib/X11/evtomask.c - nx-X11/lib/X11/globals.c - nx-X11/lib/X11/locking.c - nx-X11/lib/X11/locking.h - nx-X11/lib/X11/mbWMProps.c - nx-X11/lib/X11/util/makekeys.c + nx-X11/lib/src/AllCells.c + nx-X11/lib/src/AllPlanes.c + nx-X11/lib/src/AllowEv.c + nx-X11/lib/src/AuDispose.c + nx-X11/lib/src/AuFileName.c + nx-X11/lib/src/AuGetBest.c + nx-X11/lib/src/AuRead.c + nx-X11/lib/src/AutoRep.c + nx-X11/lib/src/Backgnd.c + nx-X11/lib/src/BdrWidth.c + nx-X11/lib/src/Bell.c + nx-X11/lib/src/Border.c + nx-X11/lib/src/ChAccCon.c + nx-X11/lib/src/ChActPGb.c + nx-X11/lib/src/ChClMode.c + nx-X11/lib/src/ChCmap.c + nx-X11/lib/src/ChGC.c + nx-X11/lib/src/ChKeyCon.c + nx-X11/lib/src/ChPntCon.c + nx-X11/lib/src/ChProp.c + nx-X11/lib/src/ChSaveSet.c + nx-X11/lib/src/ChWAttrs.c + nx-X11/lib/src/ChWindow.c + nx-X11/lib/src/ChkIfEv.c + nx-X11/lib/src/ChkMaskEv.c + nx-X11/lib/src/ChkTypEv.c + nx-X11/lib/src/ChkTypWEv.c + nx-X11/lib/src/ChkWinEv.c + nx-X11/lib/src/CirWin.c + nx-X11/lib/src/CirWinDn.c + nx-X11/lib/src/CirWinUp.c + nx-X11/lib/src/ClDisplay.c + nx-X11/lib/src/Clear.c + nx-X11/lib/src/ClearArea.c + nx-X11/lib/src/ConfWind.c + nx-X11/lib/src/ConvSel.c + nx-X11/lib/src/CopyArea.c + nx-X11/lib/src/CopyCmap.c + nx-X11/lib/src/CopyGC.c + nx-X11/lib/src/CopyPlane.c + nx-X11/lib/src/CrBFData.c + nx-X11/lib/src/CrCmap.c + nx-X11/lib/src/CrCursor.c + nx-X11/lib/src/CrGC.c + nx-X11/lib/src/CrGlCur.c + nx-X11/lib/src/CrPFBData.c + nx-X11/lib/src/CrPixmap.c + nx-X11/lib/src/CrWindow.c + nx-X11/lib/src/Cursor.c + nx-X11/lib/src/DefCursor.c + nx-X11/lib/src/DelProp.c + nx-X11/lib/src/Depths.c + nx-X11/lib/src/DestSubs.c + nx-X11/lib/src/DestWind.c + nx-X11/lib/src/DisName.c + nx-X11/lib/src/DrArc.c + nx-X11/lib/src/DrArcs.c + nx-X11/lib/src/DrLine.c + nx-X11/lib/src/DrLines.c + nx-X11/lib/src/DrPoint.c + nx-X11/lib/src/DrPoints.c + nx-X11/lib/src/DrRect.c + nx-X11/lib/src/DrRects.c + nx-X11/lib/src/DrSegs.c + nx-X11/lib/src/ErrHndlr.c + nx-X11/lib/src/EvToWire.c + nx-X11/lib/src/FSSaver.c + nx-X11/lib/src/FetchName.c + nx-X11/lib/src/FillArc.c + nx-X11/lib/src/FillArcs.c + nx-X11/lib/src/FillPoly.c + nx-X11/lib/src/FillRct.c + nx-X11/lib/src/FillRcts.c + nx-X11/lib/src/Flush.c + nx-X11/lib/src/FontInfo.c + nx-X11/lib/src/FontNames.c + nx-X11/lib/src/FreeCmap.c + nx-X11/lib/src/FreeCols.c + nx-X11/lib/src/FreeCurs.c + nx-X11/lib/src/FreeEData.c + nx-X11/lib/src/FreeGC.c + nx-X11/lib/src/FreePix.c + nx-X11/lib/src/GCMisc.c + nx-X11/lib/src/Geom.c + nx-X11/lib/src/GetAtomNm.c + nx-X11/lib/src/GetColor.c + nx-X11/lib/src/GetFPath.c + nx-X11/lib/src/GetFProp.c + nx-X11/lib/src/GetGCVals.c + nx-X11/lib/src/GetGeom.c + nx-X11/lib/src/GetHColor.c + nx-X11/lib/src/GetIFocus.c + nx-X11/lib/src/GetImage.c + nx-X11/lib/src/GetKCnt.c + nx-X11/lib/src/GetMoEv.c + nx-X11/lib/src/GetPCnt.c + nx-X11/lib/src/GetPntMap.c + nx-X11/lib/src/GetProp.c + nx-X11/lib/src/GetRGBCMap.c + nx-X11/lib/src/GetSOwner.c + nx-X11/lib/src/GetSSaver.c + nx-X11/lib/src/GetWAttrs.c + nx-X11/lib/src/GrButton.c + nx-X11/lib/src/GrKey.c + nx-X11/lib/src/GrKeybd.c + nx-X11/lib/src/GrPointer.c + nx-X11/lib/src/GrServer.c + nx-X11/lib/src/IfEvent.c + nx-X11/lib/src/ImText.c + nx-X11/lib/src/ImText16.c + nx-X11/lib/src/ImUtil.c + nx-X11/lib/src/InitExt.c + nx-X11/lib/src/InsCmap.c + nx-X11/lib/src/IntAtom.c + nx-X11/lib/src/KeyBind.c + nx-X11/lib/src/KeysymStr.c + nx-X11/lib/src/KillCl.c + nx-X11/lib/src/LiICmaps.c + nx-X11/lib/src/LiProps.c + nx-X11/lib/src/ListExt.c + nx-X11/lib/src/LoadFont.c + nx-X11/lib/src/LockDis.c + nx-X11/lib/src/LookupCol.c + nx-X11/lib/src/LowerWin.c + nx-X11/lib/src/Macros.c + nx-X11/lib/src/MapRaised.c + nx-X11/lib/src/MapSubs.c + nx-X11/lib/src/MapWindow.c + nx-X11/lib/src/MaskEvent.c + nx-X11/lib/src/Misc.c + nx-X11/lib/src/ModMap.c + nx-X11/lib/src/MoveWin.c + nx-X11/lib/src/NextEvent.c + nx-X11/lib/src/ParseCol.c + nx-X11/lib/src/ParseGeom.c + nx-X11/lib/src/PeekEvent.c + nx-X11/lib/src/PeekIfEv.c + nx-X11/lib/src/Pending.c + nx-X11/lib/src/PixFormats.c + nx-X11/lib/src/PmapBgnd.c + nx-X11/lib/src/PmapBord.c + nx-X11/lib/src/PolyTxt.c + nx-X11/lib/src/PolyTxt16.c + nx-X11/lib/src/PropAlloc.c + nx-X11/lib/src/PutBEvent.c + nx-X11/lib/src/PutImage.c + nx-X11/lib/src/QuBest.c + nx-X11/lib/src/QuColor.c + nx-X11/lib/src/QuColors.c + nx-X11/lib/src/QuCurShp.c + nx-X11/lib/src/QuExt.c + nx-X11/lib/src/QuKeybd.c + nx-X11/lib/src/QuPntr.c + nx-X11/lib/src/QuStipShp.c + nx-X11/lib/src/QuTextE16.c + nx-X11/lib/src/QuTextExt.c + nx-X11/lib/src/QuTileShp.c + nx-X11/lib/src/QuTree.c + nx-X11/lib/src/RaiseWin.c + nx-X11/lib/src/RdBitF.c + nx-X11/lib/src/RecolorC.c + nx-X11/lib/src/ReconfWM.c + nx-X11/lib/src/ReconfWin.c + nx-X11/lib/src/RepWindow.c + nx-X11/lib/src/RestackWs.c + nx-X11/lib/src/RotProp.c + nx-X11/lib/src/ScrResStr.c + nx-X11/lib/src/SelInput.c + nx-X11/lib/src/SendEvent.c + nx-X11/lib/src/SetBack.c + nx-X11/lib/src/SetCRects.c + nx-X11/lib/src/SetClMask.c + nx-X11/lib/src/SetClOrig.c + nx-X11/lib/src/SetDashes.c + nx-X11/lib/src/SetFPath.c + nx-X11/lib/src/SetFont.c + nx-X11/lib/src/SetFore.c + nx-X11/lib/src/SetFunc.c + nx-X11/lib/src/SetIFocus.c + nx-X11/lib/src/SetLStyle.c + nx-X11/lib/src/SetPMask.c + nx-X11/lib/src/SetPntMap.c + nx-X11/lib/src/SetRGBCMap.c + nx-X11/lib/src/SetSOwner.c + nx-X11/lib/src/SetSSaver.c + nx-X11/lib/src/SetState.c + nx-X11/lib/src/SetStip.c + nx-X11/lib/src/SetTSOrig.c + nx-X11/lib/src/SetTile.c + nx-X11/lib/src/StBytes.c + nx-X11/lib/src/StColor.c + nx-X11/lib/src/StColors.c + nx-X11/lib/src/StNColor.c + nx-X11/lib/src/StName.c + nx-X11/lib/src/StrKeysym.c + nx-X11/lib/src/StrToText.c + nx-X11/lib/src/Sync.c + nx-X11/lib/src/Synchro.c + nx-X11/lib/src/Text.c + nx-X11/lib/src/Text16.c + nx-X11/lib/src/TextToStr.c + nx-X11/lib/src/TrCoords.c + nx-X11/lib/src/UndefCurs.c + nx-X11/lib/src/UngrabBut.c + nx-X11/lib/src/UngrabKbd.c + nx-X11/lib/src/UngrabKey.c + nx-X11/lib/src/UngrabPtr.c + nx-X11/lib/src/UngrabSvr.c + nx-X11/lib/src/UninsCmap.c + nx-X11/lib/src/UnldFont.c + nx-X11/lib/src/UnmapSubs.c + nx-X11/lib/src/UnmapWin.c + nx-X11/lib/src/VisUtil.c + nx-X11/lib/src/WMGeom.c + nx-X11/lib/src/WarpPtr.c + nx-X11/lib/src/WinEvent.c + nx-X11/lib/src/Window.c + nx-X11/lib/src/WrBitF.c + nx-X11/lib/src/xkb/XKBBind.c + nx-X11/lib/src/xkb/XKBCvt.c + nx-X11/lib/include/X11/Xlib.h + nx-X11/lib/include/X11/Xlocale.h + nx-X11/lib/src/xcms/cmsMath.c + nx-X11/lib/include/X11/cursorfont.h + nx-X11/lib/src/evtomask.c + nx-X11/lib/src/globals.c + nx-X11/lib/src/locking.c + nx-X11/lib/src/locking.h + nx-X11/lib/src/xlibi18n/mbWMProps.c + nx-X11/lib/src/util/makekeys.c nx-X11/programs/Xserver/Xext/bigreq.c nx-X11/programs/Xserver/Xext/shape.c nx-X11/programs/Xserver/Xext/shm.c @@ -1041,26 +1040,38 @@ Copyright: 2012, Mike Gabriel 2016, Mike Gabriel License: GPL-2+ +Files: nx-X11/extras/README.Mesa.patches + nx-X11/programs/Xserver/GL/include/GL/xf86glx.h + nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h + nx-X11/lib/nx-x11.pc.in +Copyright: + 2017, Mike Gabriel + 2017, Qindel Group (http://www.qindel.com) +License: GPL-2+ +Comment: + Files lack copyright information, assuming copyright from + upstream Git history and license from main COPYING file. + Files: replace.sh Copyright: 2013, Jan Engelhardt License: GPL-2+ -Files: nx-X11/extras/Mesa/src/mesa/main/get.c - nx-X11/extras/Mesa/src/mesa/main/texrender.c - nx-X11/extras/Mesa/src/mesa/main/texrender.h - nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h - nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h - nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.c + nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram_syn.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_syn.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc_bin.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_shader_syn.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_version_syn.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h + nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86_gcc.S Copyright: *No copyright* License: Expat Comment: @@ -1081,60 +1092,61 @@ Comment: Files: doc/libNX_X11/lcUniConv/8bit_tab_to_h.c doc/libNX_X11/lcUniConv/cjk_tab_to_h.c doc/libNX_X11/lcUniConv/README - nx-X11/lib/X11/Cmap.h - nx-X11/lib/X11/Cr.h - nx-X11/lib/X11/Cv.h - nx-X11/lib/X11/ImUtil.h - nx-X11/lib/X11/Key.h - nx-X11/lib/X11/XErrorDB - nx-X11/lib/X11/Xcms.txt - nx-X11/lib/X11/Xintatom.h - nx-X11/lib/X11/Xintconn.h - nx-X11/lib/X11/XlibConf.h - nx-X11/lib/X11/Xresinternal.h - nx-X11/lib/X11/imKStoUCS.c - nx-X11/lib/X11/lcUniConv/armscii_8.h - nx-X11/lib/X11/lcUniConv/big5.h - nx-X11/lib/X11/lcUniConv/big5_emacs.h - nx-X11/lib/X11/lcUniConv/big5hkscs.h - nx-X11/lib/X11/lcUniConv/cp1133.h - nx-X11/lib/X11/lcUniConv/cp1251.h - nx-X11/lib/X11/lcUniConv/cp1255.h - nx-X11/lib/X11/lcUniConv/cp1256.h - nx-X11/lib/X11/lcUniConv/gb2312.h - nx-X11/lib/X11/lcUniConv/gbk.h - nx-X11/lib/X11/lcUniConv/georgian_academy.h - nx-X11/lib/X11/lcUniConv/georgian_ps.h - nx-X11/lib/X11/lcUniConv/iso8859_1.h - nx-X11/lib/X11/lcUniConv/iso8859_10.h - nx-X11/lib/X11/lcUniConv/iso8859_11.h - nx-X11/lib/X11/lcUniConv/iso8859_13.h - nx-X11/lib/X11/lcUniConv/iso8859_14.h - nx-X11/lib/X11/lcUniConv/iso8859_15.h - nx-X11/lib/X11/lcUniConv/iso8859_16.h - nx-X11/lib/X11/lcUniConv/iso8859_2.h - nx-X11/lib/X11/lcUniConv/iso8859_3.h - nx-X11/lib/X11/lcUniConv/iso8859_4.h - nx-X11/lib/X11/lcUniConv/iso8859_5.h - nx-X11/lib/X11/lcUniConv/iso8859_6.h - nx-X11/lib/X11/lcUniConv/iso8859_7.h - nx-X11/lib/X11/lcUniConv/iso8859_8.h - nx-X11/lib/X11/lcUniConv/iso8859_9.h - nx-X11/lib/X11/lcUniConv/iso8859_9e.h - nx-X11/lib/X11/lcUniConv/jisx0201.h - nx-X11/lib/X11/lcUniConv/jisx0208.h - nx-X11/lib/X11/lcUniConv/jisx0212.h - nx-X11/lib/X11/lcUniConv/koi8_c.h - nx-X11/lib/X11/lcUniConv/koi8_r.h - nx-X11/lib/X11/lcUniConv/koi8_u.h - nx-X11/lib/X11/lcUniConv/ksc5601.h - nx-X11/lib/X11/lcUniConv/mulelao.h - nx-X11/lib/X11/lcUniConv/tatar_cyr.h - nx-X11/lib/X11/lcUniConv/tcvn.h - nx-X11/lib/X11/lcUniConv/tis620.h - nx-X11/lib/X11/lcUniConv/ucs2be.h - nx-X11/lib/X11/lcUniConv/utf8.h - nx-X11/lib/X11/lcUniConv/viscii.h + nx-X11/lib/src/Cmap.h + nx-X11/lib/src/Cr.h + nx-X11/lib/src/xcms/Cv.h + nx-X11/lib/include/X11/ImUtil.h + nx-X11/lib/src/Key.h + nx-X11/lib/src/XErrorDB + nx-X11/lib/src/xcms/Xcms.txt + nx-X11/lib/src/Xintatom.h + nx-X11/lib/src/Xintconn.h + nx-X11/lib/include/X11/XlibConf.h.in + nx-X11/lib/src/Xresinternal.h + nx-X11/lib/src/xlibi18n/imKStoUCS.c + nx-X11/lib/src/xlibi18n/lcUniConv/armscii_8.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5_emacs.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5hkscs.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1133.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1251.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1255.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1256.h + nx-X11/lib/src/xlibi18n/lcUniConv/gb2312.h + nx-X11/lib/src/xlibi18n/lcUniConv/gbk.h + nx-X11/lib/src/xlibi18n/lcUniConv/georgian_academy.h + nx-X11/lib/src/xlibi18n/lcUniConv/georgian_ps.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_1.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_10.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_11.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_13.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_14.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_15.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_16.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_2.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_3.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_4.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_5.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_6.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_7.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_8.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9e.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0201.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0208.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0212.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_c.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_r.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_u.h + nx-X11/lib/src/xlibi18n/lcUniConv/ksc5601.h + nx-X11/lib/src/xlibi18n/lcUniConv/mulelao.h + nx-X11/lib/src/xlibi18n/lcUniConv/tatar_cyr.h + nx-X11/lib/src/xlibi18n/lcUniConv/tcvn.h + nx-X11/lib/src/xlibi18n/lcUniConv/tis620.h + nx-X11/lib/src/xlibi18n/lcUniConv/ucs2be.h + nx-X11/lib/src/xlibi18n/lcUniConv/utf8.h + nx-X11/lib/src/xlibi18n/lcUniConv/viscii.h + nx-X11/lib/src/util/mkks.sh Copyright: *No copyright* License: MIT~OpenGroup Comment: @@ -1174,9 +1186,6 @@ Files: nx-X11/Imakefile nx-X11/include/GL/Imakefile nx-X11/include/Imakefile nx-X11/include/extensions/Imakefile - nx-X11/lib/Imakefile - nx-X11/lib/X11/Imakefile - nx-X11/lib/xtrans/Imakefile nx-X11/programs/Imakefile nx-X11/programs/Xserver/Xi/Imakefile nx-X11/programs/Xserver/composite/Imakefile @@ -1265,27 +1274,27 @@ Files: nx-X11/include/DECkeysym.h nx-X11/include/extensions/syncstr.h nx-X11/include/keysym.h nx-X11/include/keysymdef.h - nx-X11/lib/X11/ErrDes.c - nx-X11/lib/X11/GetDflt.c - nx-X11/lib/X11/GetHints.c - nx-X11/lib/X11/GetStCmap.c - nx-X11/lib/X11/GetWMCMapW.c - nx-X11/lib/X11/GetWMProto.c - nx-X11/lib/X11/ParseCmd.c - nx-X11/lib/X11/PolyReg.c - nx-X11/lib/X11/Region.c - nx-X11/lib/X11/SetHints.c - nx-X11/lib/X11/SetStCmap.c - nx-X11/lib/X11/SetWMCMapW.c - nx-X11/lib/X11/SetWMProto.c - nx-X11/lib/X11/Xatomtype.h - nx-X11/lib/X11/XimThai.h - nx-X11/lib/X11/Xregion.h - nx-X11/lib/X11/Xresource.h - nx-X11/lib/X11/Xutil.h - nx-X11/lib/X11/imThaiFlt.c - nx-X11/lib/X11/pathmax.h - nx-X11/lib/X11/poly.h + nx-X11/lib/src/ErrDes.c + nx-X11/lib/src/GetDflt.c + nx-X11/lib/src/GetHints.c + nx-X11/lib/src/GetStCmap.c + nx-X11/lib/src/GetWMCMapW.c + nx-X11/lib/src/GetWMProto.c + nx-X11/lib/src/ParseCmd.c + nx-X11/lib/src/PolyReg.c + nx-X11/lib/src/Region.c + nx-X11/lib/src/SetHints.c + nx-X11/lib/src/SetStCmap.c + nx-X11/lib/src/SetWMCMapW.c + nx-X11/lib/src/SetWMProto.c + nx-X11/lib/src/Xatomtype.h + nx-X11/lib/src/xlibi18n/XimThai.h + nx-X11/lib/include/X11/Xregion.h + nx-X11/lib/include/X11/Xresource.h + nx-X11/lib/include/X11/Xutil.h + nx-X11/lib/modules/im/ximcp/imThaiFlt.c + nx-X11/lib/src/pathmax.h + nx-X11/lib/src/poly.h nx-X11/programs/Xserver/Xext/sync.c nx-X11/programs/Xserver/dix/atom.c nx-X11/programs/Xserver/dix/colormap.c @@ -1385,8 +1394,8 @@ Files: nx-X11/include/extensions/composite.h nx-X11/include/extensions/compositeproto.h nx-X11/include/extensions/damageproto.h nx-X11/include/extensions/damagewire.h - nx-X11/lib/X11/x11_trans.c - nx-X11/lib/X11/xim_trans.c + nx-X11/lib/src/x11_trans.c + nx-X11/lib/src/xlibi18n/xim_trans.c nx-X11/programs/Xserver/composite/compalloc.c nx-X11/programs/Xserver/composite/compext.c nx-X11/programs/Xserver/composite/compinit.c @@ -1473,27 +1482,27 @@ Files: nx-X11/include/extensions/XKB.h nx-X11/include/extensions/XKBstr.h nx-X11/include/extensions/XKM.h nx-X11/include/extensions/XKMformat.h - nx-X11/lib/X11/XKB.c - nx-X11/lib/X11/XKBAlloc.c - nx-X11/lib/X11/XKBBell.c - nx-X11/lib/X11/XKBCompat.c - nx-X11/lib/X11/XKBCtrls.c - nx-X11/lib/X11/XKBExtDev.c - nx-X11/lib/X11/XKBGAlloc.c - nx-X11/lib/X11/XKBGeom.c - nx-X11/lib/X11/XKBGetByName.c - nx-X11/lib/X11/XKBGetMap.c - nx-X11/lib/X11/XKBList.c - nx-X11/lib/X11/XKBMAlloc.c - nx-X11/lib/X11/XKBMisc.c - nx-X11/lib/X11/XKBNames.c - nx-X11/lib/X11/XKBRdBuf.c - nx-X11/lib/X11/XKBSetGeom.c - nx-X11/lib/X11/XKBSetMap.c - nx-X11/lib/X11/XKBUse.c - nx-X11/lib/X11/XKBleds.c - nx-X11/lib/X11/XKBlib.h - nx-X11/lib/X11/XKBlibint.h + nx-X11/lib/src/xkb/XKB.c + nx-X11/lib/src/xkb/XKBAlloc.c + nx-X11/lib/src/xkb/XKBBell.c + nx-X11/lib/src/xkb/XKBCompat.c + nx-X11/lib/src/xkb/XKBCtrls.c + nx-X11/lib/src/xkb/XKBExtDev.c + nx-X11/lib/src/xkb/XKBGAlloc.c + nx-X11/lib/src/xkb/XKBGeom.c + nx-X11/lib/src/xkb/XKBGetByName.c + nx-X11/lib/src/xkb/XKBGetMap.c + nx-X11/lib/src/xkb/XKBList.c + nx-X11/lib/src/xkb/XKBMAlloc.c + nx-X11/lib/src/xkb/XKBMisc.c + nx-X11/lib/src/xkb/XKBNames.c + nx-X11/lib/src/xkb/XKBRdBuf.c + nx-X11/lib/src/xkb/XKBSetGeom.c + nx-X11/lib/src/xkb/XKBSetMap.c + nx-X11/lib/src/xkb/XKBUse.c + nx-X11/lib/src/xkb/XKBleds.c + nx-X11/lib/include/X11/XKBlib.h + nx-X11/lib/src/xkb/XKBlibint.h nx-X11/programs/Xserver/include/xkbfile.h nx-X11/programs/Xserver/include/xkbrules.h nx-X11/programs/Xserver/include/xkbsrv.h @@ -1539,79 +1548,79 @@ Copyright: 1993, Silicon Graphics Computer Systems, Inc 1996, Silicon Graphics Computer Systems, Inc License: MIT~X11 -Files: nx-X11/lib/X11/AddDIC.c - nx-X11/lib/X11/AddSF.c - nx-X11/lib/X11/CvColW.c - nx-X11/lib/X11/CvCols.c - nx-X11/lib/X11/IdOfPr.c - nx-X11/lib/X11/LRGB.c - nx-X11/lib/X11/Lab.c - nx-X11/lib/X11/LabGcC.c - nx-X11/lib/X11/LabGcL.c - nx-X11/lib/X11/LabGcLC.c - nx-X11/lib/X11/LabMnL.c - nx-X11/lib/X11/LabMxC.c - nx-X11/lib/X11/LabMxL.c - nx-X11/lib/X11/LabMxLC.c - nx-X11/lib/X11/LabWpAj.c - nx-X11/lib/X11/Luv.c - nx-X11/lib/X11/LuvGcC.c - nx-X11/lib/X11/LuvGcL.c - nx-X11/lib/X11/LuvGcLC.c - nx-X11/lib/X11/LuvMnL.c - nx-X11/lib/X11/LuvMxC.c - nx-X11/lib/X11/LuvMxL.c - nx-X11/lib/X11/LuvMxLC.c - nx-X11/lib/X11/LuvWpAj.c - nx-X11/lib/X11/OfCCC.c - nx-X11/lib/X11/PrOfId.c - nx-X11/lib/X11/QBlack.c - nx-X11/lib/X11/QBlue.c - nx-X11/lib/X11/QGreen.c - nx-X11/lib/X11/QRed.c - nx-X11/lib/X11/QWhite.c - nx-X11/lib/X11/QuCol.c - nx-X11/lib/X11/QuCols.c - nx-X11/lib/X11/SetCCC.c - nx-X11/lib/X11/SetGetCols.c - nx-X11/lib/X11/StCol.c - nx-X11/lib/X11/StCols.c - nx-X11/lib/X11/UNDEFINED.c - nx-X11/lib/X11/XRGB.c - nx-X11/lib/X11/XYZ.c - nx-X11/lib/X11/Xcms.h - nx-X11/lib/X11/Xcmsint.h - nx-X11/lib/X11/cmsAllCol.c - nx-X11/lib/X11/cmsAllNCol.c - nx-X11/lib/X11/cmsCmap.c - nx-X11/lib/X11/cmsColNm.c - nx-X11/lib/X11/cmsGlobls.c - nx-X11/lib/X11/cmsInt.c - nx-X11/lib/X11/cmsLkCol.c - nx-X11/lib/X11/cmsProp.c - nx-X11/lib/X11/cmsTrig.c - nx-X11/lib/X11/uvY.c - nx-X11/lib/X11/xyY.c +Files: nx-X11/lib/src/xcms/AddDIC.c + nx-X11/lib/src/xcms/AddSF.c + nx-X11/lib/src/xcms/CvColW.c + nx-X11/lib/src/xcms/CvCols.c + nx-X11/lib/src/xcms/IdOfPr.c + nx-X11/lib/src/xcms/LRGB.c + nx-X11/lib/src/xcms/Lab.c + nx-X11/lib/src/xcms/LabGcC.c + nx-X11/lib/src/xcms/LabGcL.c + nx-X11/lib/src/xcms/LabGcLC.c + nx-X11/lib/src/xcms/LabMnL.c + nx-X11/lib/src/xcms/LabMxC.c + nx-X11/lib/src/xcms/LabMxL.c + nx-X11/lib/src/xcms/LabMxLC.c + nx-X11/lib/src/xcms/LabWpAj.c + nx-X11/lib/src/xcms/Luv.c + nx-X11/lib/src/xcms/LuvGcC.c + nx-X11/lib/src/xcms/LuvGcL.c + nx-X11/lib/src/xcms/LuvGcLC.c + nx-X11/lib/src/xcms/LuvMnL.c + nx-X11/lib/src/xcms/LuvMxC.c + nx-X11/lib/src/xcms/LuvMxL.c + nx-X11/lib/src/xcms/LuvMxLC.c + nx-X11/lib/src/xcms/LuvWpAj.c + nx-X11/lib/src/xcms/OfCCC.c + nx-X11/lib/src/xcms/PrOfId.c + nx-X11/lib/src/xcms/QBlack.c + nx-X11/lib/src/xcms/QBlue.c + nx-X11/lib/src/xcms/QGreen.c + nx-X11/lib/src/xcms/QRed.c + nx-X11/lib/src/xcms/QWhite.c + nx-X11/lib/src/xcms/QuCol.c + nx-X11/lib/src/xcms/QuCols.c + nx-X11/lib/src/xcms/SetCCC.c + nx-X11/lib/src/xcms/SetGetCols.c + nx-X11/lib/src/xcms/StCol.c + nx-X11/lib/src/xcms/StCols.c + nx-X11/lib/src/xcms/UNDEFINED.c + nx-X11/lib/src/xcms/XRGB.c + nx-X11/lib/src/xcms/XYZ.c + nx-X11/lib/include/X11/Xcms.h + nx-X11/lib/src/xcms/Xcmsint.h + nx-X11/lib/src/xcms/cmsAllCol.c + nx-X11/lib/src/xcms/cmsAllNCol.c + nx-X11/lib/src/xcms/cmsCmap.c + nx-X11/lib/src/xcms/cmsColNm.c + nx-X11/lib/src/xcms/cmsGlobls.c + nx-X11/lib/src/xcms/cmsInt.c + nx-X11/lib/src/xcms/cmsLkCol.c + nx-X11/lib/src/xcms/cmsProp.c + nx-X11/lib/src/xcms/cmsTrig.c + nx-X11/lib/src/xcms/uvY.c + nx-X11/lib/src/xcms/xyY.c Copyright: 1990, 1991, Tektronix, Inc License: MIT~Tektronix -Files: nx-X11/lib/X11/HVC.c - nx-X11/lib/X11/HVCGcC.c - nx-X11/lib/X11/HVCGcV.c - nx-X11/lib/X11/HVCGcVC.c - nx-X11/lib/X11/HVCMnV.c - nx-X11/lib/X11/HVCMxC.c - nx-X11/lib/X11/HVCMxV.c - nx-X11/lib/X11/HVCMxVC.c - nx-X11/lib/X11/HVCMxVs.c - nx-X11/lib/X11/HVCWpAj.c +Files: nx-X11/lib/src/xcms/HVC.c + nx-X11/lib/src/xcms/HVCGcC.c + nx-X11/lib/src/xcms/HVCGcV.c + nx-X11/lib/src/xcms/HVCGcVC.c + nx-X11/lib/src/xcms/HVCMnV.c + nx-X11/lib/src/xcms/HVCMxC.c + nx-X11/lib/src/xcms/HVCMxV.c + nx-X11/lib/src/xcms/HVCMxVC.c + nx-X11/lib/src/xcms/HVCMxVs.c + nx-X11/lib/src/xcms/HVCWpAj.c Copyright: 1990, 1991, Tektronix, Inc License: MIT~Tektronix~3-clause -Files: nx-X11/extras/Mesa/include/GL/glext.h - nx-X11/extras/Mesa/include/GL/glxext.h - nx-X11/extras/Mesa/include/GL/internal/glcore.h - nx-X11/extras/Mesa/src/glx/x11/compsize.c +Files: nx-X11/extras/Mesa_6.4.2/include/GL/glext.h + nx-X11/extras/Mesa_6.4.2/include/GL/glxext.h + nx-X11/extras/Mesa_6.4.2/include/GL/internal/glcore.h + nx-X11/extras/Mesa_6.4.2/src/glx/x11/compsize.c nx-X11/include/GL/glx.h nx-X11/include/GL/glxmd.h nx-X11/include/GL/glxproto.h @@ -1827,22 +1836,22 @@ Files: nx-X11/include/extensions/render.h Copyright: 2000, SuSE, Inc License: MIT~X11 -Files: nx-X11/lib/X11/OCWrap.c - nx-X11/lib/X11/OMWrap.c - nx-X11/lib/X11/XlcPubI.h - nx-X11/lib/X11/lcCharSet.c - nx-X11/lib/X11/lcConv.c - nx-X11/lib/X11/lcDefConv.c - nx-X11/lib/X11/lcPrTxt.c - nx-X11/lib/X11/lcPubWrap.c - nx-X11/lib/X11/lcPublic.c - nx-X11/lib/X11/lcRM.c - nx-X11/lib/X11/lcStd.c - nx-X11/lib/X11/lcTxtPr.c - nx-X11/lib/X11/lcUtil.c - nx-X11/lib/X11/omImText.c - nx-X11/lib/X11/omTextExt.c - nx-X11/lib/X11/omTextPer.c +Files: nx-X11/lib/src/OCWrap.c + nx-X11/lib/src/OMWrap.c + nx-X11/lib/src/xlibi18n/XlcPubI.h + nx-X11/lib/src/xlibi18n/lcCharSet.c + nx-X11/lib/src/xlibi18n/lcConv.c + nx-X11/lib/modules/lc/def/lcDefConv.c + nx-X11/lib/src/xlibi18n/lcPrTxt.c + nx-X11/lib/src/xlibi18n/lcPubWrap.c + nx-X11/lib/src/xlibi18n/lcPublic.c + nx-X11/lib/src/xlibi18n/lcRM.c + nx-X11/lib/src/xlibi18n/lcStd.c + nx-X11/lib/src/xlibi18n/lcTxtPr.c + nx-X11/lib/src/xlibi18n/lcUtil.c + nx-X11/lib/modules/om/generic/omImText.c + nx-X11/lib/modules/om/generic/omTextExt.c + nx-X11/lib/modules/om/generic/omTextPer.c Copyright: 1992-1993, TOSHIBA Corp License: MIT~X11 @@ -1863,41 +1872,41 @@ Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts 1996, Digital Equipment Corporation, Maynard, Massachusetts License: Expat~NoAdvert -Files: nx-X11/lib/X11/XimImSw.h - nx-X11/lib/X11/XimProto.h - nx-X11/lib/X11/imDefFlt.c - nx-X11/lib/X11/imDefLkup.c - nx-X11/lib/X11/imDispch.c - nx-X11/lib/X11/imExten.c - nx-X11/lib/X11/imInt.c - nx-X11/lib/X11/imLcGIc.c - nx-X11/lib/X11/imLcIc.c - nx-X11/lib/X11/imLcSIc.c - nx-X11/lib/X11/imRmAttr.c +Files: nx-X11/lib/src/xlibi18n/XimImSw.h + nx-X11/lib/src/xlibi18n/XimProto.h + nx-X11/lib/modules/im/ximcp/imDefFlt.c + nx-X11/lib/modules/im/ximcp/imDefLkup.c + nx-X11/lib/modules/im/ximcp/imDispch.c + nx-X11/lib/modules/im/ximcp/imExten.c + nx-X11/lib/modules/im/ximcp/imInt.c + nx-X11/lib/modules/im/ximcp/imLcGIc.c + nx-X11/lib/modules/im/ximcp/imLcIc.c + nx-X11/lib/modules/im/ximcp/imLcSIc.c + nx-X11/lib/modules/im/ximcp/imRmAttr.c Copyright: 1990-1994, FUJITSU LIMITED 1992-1993, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993-1994, FUJITSU LIMITED License: MIT~X11 -Files: nx-X11/lib/X11/XlcGeneric.h - nx-X11/lib/X11/XlcPublic.h - nx-X11/lib/X11/XomGeneric.h - nx-X11/lib/X11/lcCT.c - nx-X11/lib/X11/lcGenConv.c - nx-X11/lib/X11/lcGeneric.c - nx-X11/lib/X11/omDefault.c - nx-X11/lib/X11/omGeneric.c - nx-X11/lib/X11/omText.c - nx-X11/lib/X11/omTextEsc.c - nx-X11/lib/X11/omXChar.c +Files: nx-X11/lib/src/xlibi18n/XlcGeneric.h + nx-X11/lib/src/xlibi18n/XlcPublic.h + nx-X11/lib/src/XomGeneric.h + nx-X11/lib/src/xlibi18n/lcCT.c + nx-X11/lib/modules/lc/gen/lcGenConv.c + nx-X11/lib/src/xlibi18n/lcGeneric.c + nx-X11/lib/modules/om/generic/omDefault.c + nx-X11/lib/modules/om/generic/omGeneric.c + nx-X11/lib/modules/om/generic/omText.c + nx-X11/lib/modules/om/generic/omTextEsc.c + nx-X11/lib/modules/om/generic/omXChar.c Copyright: 1992-1993, TOSHIBA Corp 1995, FUJITSU LIMITED License: MIT~X11 Files: nx-X11/include/extensions/Xv.h nx-X11/include/extensions/Xvproto.h - nx-X11/lib/X11/imEvToWire.c + nx-X11/lib/modules/im/ximcp/imEvToWire.c nx-X11/programs/Xserver/Xext/xvdisp.c nx-X11/programs/Xserver/Xext/xvdix.h nx-X11/programs/Xserver/Xext/xvmain.c @@ -1950,9 +1959,9 @@ Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc License: MIT~X11 Files: nx-X11/include/Sunkeysym.h - nx-X11/lib/X11/Host.c - nx-X11/lib/X11/LiHosts.c - nx-X11/lib/X11/lcInit.c + nx-X11/lib/src/Host.c + nx-X11/lib/src/LiHosts.c + nx-X11/lib/src/xlibi18n/lcInit.c Copyright: 1985-1987, 1991, 1998, The Open Group 1986, 1998, The Open Group 1991, 1998, The Open Group @@ -1964,11 +1973,11 @@ Comment: Contributions by Oracle and/or its affiliates (from 1991, 2000, 2004) have to be considered as licensed under Expat. -Files: nx-X11/lib/X11/ConnDis.c - nx-X11/lib/X11/OpenDis.c - nx-X11/lib/X11/XlibAsync.c - nx-X11/lib/X11/XlibInt.c - nx-X11/lib/X11/Xlibint.h +Files: nx-X11/lib/src/ConnDis.c + nx-X11/lib/src/OpenDis.c + nx-X11/lib/src/XlibAsync.c + nx-X11/lib/src/XlibInt.c + nx-X11/lib/include/X11/Xlibint.h nx-X11/programs/Xserver/Xext/security.c nx-X11/programs/Xserver/Xext/SecurityPolicy nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -1994,13 +2003,13 @@ Comment: Missing copyright information in SecurityPolicy. Assuming same situation as for Xext/security.c. -Files: nx-X11/lib/X11/XimTrInt.h - nx-X11/lib/X11/XimTrX.h - nx-X11/lib/X11/XimTrans.h - nx-X11/lib/X11/imDefIc.c - nx-X11/lib/X11/imTrX.c - nx-X11/lib/X11/imTrans.c - nx-X11/lib/X11/imTransR.c +Files: nx-X11/lib/src/xlibi18n/XimTrInt.h + nx-X11/lib/src/xlibi18n/XimTrX.h + nx-X11/lib/src/xlibi18n/XimTrans.h + nx-X11/lib/modules/im/ximcp/imDefIc.c + nx-X11/lib/modules/im/ximcp/imTrX.c + nx-X11/lib/modules/im/ximcp/imTrans.c + nx-X11/lib/modules/im/ximcp/imTransR.c Copyright: 1991-1992, Oracle and/or its affiliates. 1992, Oracle and/or its affiliates. 1992-1994, FUJITSU LIMITED @@ -2055,7 +2064,7 @@ Files: nx-X11/include/extensions/Xdbeproto.h Copyright: 1994-1995, Hewlett-Packard Company License: Expat~NoAdvert -Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h +Files: nx-X11/extras/Mesa_6.4.2/include/GL/xmesa_xf86.h nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h @@ -2063,22 +2072,22 @@ Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas License: Expat -Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_generic.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86.c Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas 2004, Tungsten Graphics Inc., Cedar Park, Texas License: Expat -Files: nx-X11/lib/xtrans/Xtrans.c - nx-X11/lib/xtrans/Xtrans.h - nx-X11/lib/xtrans/Xtransint.h - nx-X11/lib/xtrans/Xtranslcl.c - nx-X11/lib/xtrans/Xtransutil.c - nx-X11/lib/xtrans/transport.c +Files: nx-X11/lib/include/xtrans/Xtrans.c + nx-X11/lib/include/xtrans/Xtrans.h + nx-X11/lib/include/xtrans/Xtransint.h + nx-X11/lib/include/xtrans/Xtranslcl.c + nx-X11/lib/include/xtrans/Xtransutil.c + nx-X11/lib/include/xtrans/transport.c Copyright: 1993-1994, 1998, The Open Group 1993-1994, NCR Corporation - Dayton, Ohio, USA License: MIT~OpenGroup @@ -2106,21 +2115,21 @@ Comment: NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Files: nx-X11/lib/X11/XimintL.h - nx-X11/lib/X11/imImSw.c - nx-X11/lib/X11/imLcIm.c - nx-X11/lib/X11/imThaiIc.c - nx-X11/lib/X11/imThaiIm.c +Files: nx-X11/lib/src/xlibi18n/XimintL.h + nx-X11/lib/modules/im/ximcp/imImSw.c + nx-X11/lib/modules/im/ximcp/imLcIm.c + nx-X11/lib/modules/im/ximcp/imThaiIc.c + nx-X11/lib/modules/im/ximcp/imThaiIm.c Copyright: 1991-1994, FUJITSU LIMITED 1992-1993, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993, Digital Equipment Corporation License: MIT~X11 -Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.h + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_generic.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_sse.c Copyright: 2003, Tungsten Graphics, inc License: Expat @@ -2138,23 +2147,23 @@ Files: nx-X11/programs/Xserver/miext/cw/cw.c Copyright: 2004, Eric Anholt License: MIT~X11 -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glprocs.h Copyright: 1999-2001, Brian Paul 1999-2003, Brian Paul IBM Corporation 2004 License: Expat -Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.c + nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.h Copyright: 1999-2003, David Airlie 2004, David Airlie License: Expat -Files: nx-X11/lib/X11/FreeEventData.c - nx-X11/lib/X11/GetEventData.c +Files: nx-X11/lib/src/FreeEventData.c + nx-X11/lib/src/GetEventData.c nx-X11/programs/Xserver/include/protocol-versions.h Copyright: 2009, Red Hat, Inc License: Expat @@ -2170,9 +2179,9 @@ Comment: by Bruno Haible. Possibly needs clarification at X.org upstream. -Files: nx-X11/lib/X11/Context.c - nx-X11/lib/X11/Quarks.c - nx-X11/lib/X11/Xrm.c +Files: nx-X11/lib/src/Context.c + nx-X11/lib/src/Quarks.c + nx-X11/lib/src/Xrm.c Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard 1987-1988, 1990, 1994, 1998, The Open Group 1987-1988, 1990, 1998, The Open Group @@ -2181,8 +2190,8 @@ Comment: Contributions on these files by the OpenGroup have to be considered as licensed under MIT~OpenGroup. -Files: nx-X11/lib/X11/TextExt.c - nx-X11/lib/X11/TextExt16.c +Files: nx-X11/lib/src/TextExt.c + nx-X11/lib/src/TextExt16.c Copyright: 1989, 1998, The Open Group 1995, FUJITSU LIMITED 1996, 1998, The Open Group @@ -2249,8 +2258,8 @@ Comment: Contributions by Digital Equipment Corporation, Maynard, Massachusetts have been licensed under MIT~OldStyle. -Files: nx-X11/lib/X11/XimintP.h - nx-X11/lib/X11/imDefIm.c +Files: nx-X11/lib/src/xlibi18n/XimintP.h + nx-X11/lib/modules/im/ximcp/imDefIm.c Copyright: 1990-1992, Oracle and/or its affiliates. 1991-1992, Oracle and/or its affiliates. 1992-1994, FUJITSU LIMITED @@ -2261,10 +2270,10 @@ Comment: as Expat. Later contributions by FUJITSU LIMITED and Sony Corporation have been licensed under MIT~X11. -Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c - nx-X11/extras/Mesa/src/glx/x11/indirect_size.h - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h +Files: nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.h + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c + nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.h Copyright: 2003, IBM Corporation IBM Corporation 2004 License: Expat @@ -2285,8 +2294,8 @@ Copyright: 2000, The XFree86 Project, Inc. 2001, The XFree86 Project, Inc. License: Expat~NoAdvert -Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.c + nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.h Copyright: 2005, Tungsten Graphics License: Expat @@ -2295,8 +2304,8 @@ Files: nx-X11/programs/Xserver/os/strlcat.c Copyright: 1998, Todd C. Miller License: MIT~ISC -Files: nx-X11/lib/X11/lcUTF8.c - nx-X11/lib/X11/lcUTF8Load.c +Files: nx-X11/lib/src/xlibi18n/lcUTF8.c + nx-X11/lib/modules/lc/Utf8/lcUTF8Load.c Copyright: 1993, SunSoft, Inc 1999-2000, Bruno Haible License: MIT~X11 @@ -2333,8 +2342,8 @@ Comment: Modifications by NoMachine have to be considered as strictly GPL-2 licensed. -Files: nx-X11/lib/X11/GetNrmHint.c - nx-X11/lib/X11/SetNrmHint.c +Files: nx-X11/lib/src/GetNrmHint.c + nx-X11/lib/src/SetNrmHint.c Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts 1987-1988, 1998, The Open Group 1988, Wyse Technology, Inc., San Jose, Ca @@ -2343,21 +2352,21 @@ Comment: Contributions by Digital Equipment Corporation, Maynard, Massachusetts and Wyse have been licensed under MIT~OldStyle. -Files: nx-X11/lib/X11/imLcFlt.c - nx-X11/lib/X11/imLcLkup.c +Files: nx-X11/lib/modules/im/ximcp/imLcFlt.c + nx-X11/lib/modules/im/ximcp/imLcLkup.c Copyright: 1992, 1994, FUJITSU LIMITED 1992, Fuji Xerox Co., Ltd License: MIT~X11 -Files: nx-X11/lib/X11/Ximint.h - nx-X11/lib/X11/imRm.c +Files: nx-X11/lib/src/xlibi18n/Ximint.h + nx-X11/lib/modules/im/ximcp/imRm.c Copyright: 1990-1994, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993-1994, Sony Corporation 1994, Sony Corporation License: MIT~X11 -Files: nx-X11/lib/X11/lcFile.c +Files: nx-X11/lib/src/xlibi18n/lcFile.c Copyright: 1993, IBM Corporation License: MIT~OldStyle @@ -2366,8 +2375,8 @@ Files: nx-X11/include/extensions/record.h Copyright: 1995, Network Computing Devices License: MIT~OldStyle -Files: nx-X11/lib/X11/FilterEv.c - nx-X11/lib/X11/RegstFlt.c +Files: nx-X11/lib/src/FilterEv.c + nx-X11/lib/src/RegstFlt.c Copyright: 1990-1991, 1998, The Open Group 1990-1991, OMRON Corporation 1991, 1998, The Open Group @@ -2389,10 +2398,10 @@ Comment: Copyright attributions of Sun Microsystems, Inc. now belong to Oracle. -Files: nx-X11/lib/X11/GetTxtProp.c - nx-X11/lib/X11/Iconify.c - nx-X11/lib/X11/SetTxtProp.c - nx-X11/lib/X11/Withdraw.c +Files: nx-X11/lib/src/GetTxtProp.c + nx-X11/lib/src/Iconify.c + nx-X11/lib/src/SetTxtProp.c + nx-X11/lib/src/Withdraw.c Copyright: 1988, 1998, The Open Group 1988, Wyse Technology, Inc., San Jose, Ca License: MIT~OldStyle @@ -2400,8 +2409,8 @@ Comment: Contributions by The Open Group have been licensed under MIT~OpenGroup. -Files: nx-X11/lib/X11/mbWrap.c - nx-X11/lib/X11/wcWrap.c +Files: nx-X11/lib/src/xlibi18n/mbWrap.c + nx-X11/lib/src/xlibi18n/wcWrap.c Copyright: 1991, 1998, The Open Group 1991, the Open Software Foundation License: MIT~OldStyle @@ -2409,8 +2418,8 @@ Comment: Contributions by The Open Group have been licensed under MIT~OpenGroup. -Files: nx-X11/lib/X11/FSWrap.c - nx-X11/lib/X11/lcWrap.c +Files: nx-X11/lib/src/FSWrap.c + nx-X11/lib/src/xlibi18n/lcWrap.c Copyright: 1991, 1998, The Open Group 1991, the Open Software Foundation 1993, the TOSHIBA Corp @@ -2424,13 +2433,13 @@ Files: nx-X11/include/extensions/XResproto.h Copyright: 2002, XFree86 Inc License: XFree86 -Files: nxcomp/MD5.c - nxcomp/MD5.h +Files: nxcomp/src/MD5.c + nxcomp/include/MD5.h Copyright: 1999, 2002, Aladdin Enterprises. 1999-2000, 2002, Aladdin Enterprises. License: Zlib -Files: nx-X11/lib/X11/utlist.h +Files: nx-X11/lib/src/utlist.h Copyright: 2007-2009, Troy D. Hanson License: BSD-1-clause @@ -2438,17 +2447,17 @@ Files: nx-X11/programs/Xserver/os/xprintf.c Copyright: 2004, Alexander Gottwald License: Expat -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapioffsets.h Copyright: 1999-2001, Brian Paul IBM Corporation 2004, License: Expat -Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/simple_list.h Copyright: 1997, Keith Whitwell 1999-2001, Brian Paul License: Expat -Files: nx-X11/lib/X11/UIThrStubs.c +Files: nx-X11/lib/src/UIThrStubs.c Copyright: 1995, David E. Wexelblat. License: Expat~NoAdvert @@ -2483,7 +2492,7 @@ Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h Copyright: 1989-1995, GROUPE BULL License: Expat~NoAdvert -Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/dispatch.h Copyright: 2005, IBM Corporation License: Expat @@ -2498,11 +2507,11 @@ Comment: Later contributions by Oracle and/or its affiliates and Red Hat, Inc. have been licensed under Expat. -Files: nx-X11/extras/Mesa/src/mesa/main/mm.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.h Copyright: 1999, Keith Whitwell License: Expat -Files: nx-X11/lib/xtrans/Xtranssock.c +Files: nx-X11/lib/include/xtrans/Xtranssock.c Copyright: 1993-1994, 1998, The Open Group 2001, 2011, NoMachine (http://www.nomachine.com) 2002, Oracle and/or its affiliates. @@ -2543,15 +2552,15 @@ Files: nx-X11/programs/Xserver/composite/compositeext.h Copyright: 2009, NVIDIA Corporation License: Expat -Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.c Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas License: Expat -Files: nx-X11/extras/Mesa/src/mesa/main/mm.c +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.c Copyright: 1999, Wittawat Yamwong License: Expat -Files: nxcomp/Version.c +Files: nxcomp/src/Version.c Copyright: 2015, Qindel Formacion y Servicios SL. License: GPL-2 @@ -2576,14 +2585,14 @@ Comment: . Contributions by Adobe Systems Inc. have been licensed under MIT~Adobe. -Files: nx-X11/lib/X11/utf8WMProps.c +Files: nx-X11/lib/src/xlibi18n/utf8WMProps.c Copyright: 1991, 1998, The Open Group 2000, Bruno Haible License: MIT~OpenGroup Comment: Contributions by Bruno Haible have been licensed under MIT~X11. -Files: nx-X11/lib/X11/utf8Wrap.c +Files: nx-X11/lib/src/xlibi18n/utf8Wrap.c Copyright: 1991, 1998, The Open Group 1991, the Open Software Foundation 2000, Bruno Haible @@ -2630,14 +2639,14 @@ Comment: Contributions by Data General Corporation and OMRON Corporation have been licnsed under MIT~X11. -Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h +Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.h Copyright: 2004, David Airlie License: Expat Comment: Missing license in header, assuming same license as found in other Mesa files with same copyright holder. -Files: nx-X11/lib/X11/imCallbk.c +Files: nx-X11/lib/modules/im/ximcp/imCallbk.c Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts 1994, FUJITSU LIMITED 1994, Sony Corporation @@ -2656,7 +2665,7 @@ Comment: Modifications by NoMachine have to be considered as strictly GPL-2 licensed. -Files: nx-X11/lib/X11/WMProps.c +Files: nx-X11/lib/src/WMProps.c Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts 1987-1988, 1993, 1998, The Open Group 1988, Wyse Technology, Inc., San Jose, Ca. @@ -2665,22 +2674,22 @@ Comment: Contributions by Digital Equipment Corporation, Maynard, Massachusetts and Wyse have been licensed under MIT~OldStyle. -Files: nx-X11/lib/X11/imConv.c +Files: nx-X11/lib/src/imConv.c Copyright: 1991-1992, Fuji Xerox Co.,Ltd 1993-1994, FUJITSU LIMITED License: MIT~X11 -Files: nx-X11/lib/X11/lcDB.c +Files: nx-X11/lib/src/xlibi18n/lcDB.c Copyright: 1995, FUJITSU LIMITED 1993, IBM Corporation License: MIT~OldStyle -Files: nx-X11/lib/X11/imLcPrs.c +Files: nx-X11/lib/modules/im/ximcp/imLcPrs.c Copyright: 1992, Fuji Xerox Co., Ltd 1992, Oki Technosystems Laboratory, Inc License: MIT~X11 -Files: nx-X11/lib/X11/Xprivate.h +Files: nx-X11/lib/src/Xprivate.h Copyright: 2008, Jamey Sharp, Josh Triplett License: MIT~X11 Comment: @@ -2760,7 +2769,7 @@ Files: nxproxy/src/Main.c Copyright: 2001, 2011, NoMachine, http://www.nomachine.com/. License: GPL-2 -Files: nx-X11/lib/X11/Xlcint.h +Files: nx-X11/lib/src/xlibi18n/Xlcint.h Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation 1991, 1998, The Open Group 1991, the Open Software Foundation @@ -2774,7 +2783,7 @@ Comment: Contributions by the other copyright holders have been licensed under MIT~X11. -Files: nx-X11/lib/X11/SetLocale.c +Files: nx-X11/lib/src/SetLocale.c Copyright: 1987,1998, The Open Group 1990-1991, OMRON Corporation, NTT Software Corporation License: MIT~X11 @@ -2784,7 +2793,7 @@ Comment: Contributions by the other copyright holders have been licensed under MIT~X11. -Files: nx-X11/lib/X11/ICWrap.c +Files: nx-X11/lib/src/xlibi18n/ICWrap.c Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation 1991, 1998, The Open Group 1991, the Open Software Foundation @@ -2800,11 +2809,11 @@ Files: nx-X11/programs/Xserver/randr/rrprovider.c Copyright: 2012, Red Hat Inc License: MIT~X11 -Files: nx-X11/lib/X11/imInsClbk.c +Files: nx-X11/lib/modules/im/ximcp/imInsClbk.c Copyright: 1993-1994, Sony Corporation License: MIT~OldStyle -Files: nx-X11/lib/X11/CCC.c +Files: nx-X11/lib/src/xcms/CCC.c Copyright: 1990, 1991, Tektronix, Inc 1994, 1998, The Open Group License: MIT~Tektronix @@ -2813,12 +2822,12 @@ Comment: . Contributions by Tektronix, Inc. have been licensed under MIT~Tektronix. -Files: nx-X11/lib/X11/Font.c +Files: nx-X11/lib/src/Font.c Copyright: 1986, 1998, The Open Group 2000, The XFree86 Project, Inc License: MIT~OpenGroup -Files: nx-X11/lib/X11/IMWrap.c +Files: nx-X11/lib/src/xlibi18n/IMWrap.c Copyright: 1991, 1998, The Open Group 1991, the Open Software Foundation 1993-1994, the Sony Corporation @@ -2880,10 +2889,14 @@ Copyright: 2005, 2006, Oracle and/or its affiliates 2017, Mike Gabriel License: Expat +Files: m4/nx-xtrans.m4 +Copyright: 2005, 2006, Oracle and/or its affiliates +License: Expat + Files: ChangeLog Makefile + README.md VERSION - doc/README.NX-development doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt @@ -2904,20 +2917,17 @@ Files: ChangeLog nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm nx-X11/programs/Xserver/hw/nxagent/x2go.xpm nx-X11/Makefile - nxcomp/Makefile.in - nxcomp/VERSION - nxcomp/configure.in + nxcomp/Makefile.am + nxcomp/src/Makefile.am + nxcomp/configure.ac nxcomp/nxcomp.pc.in nxcompshad/Makefile.am - nxcompshad/VERSION nxcompshad/configure.ac nxcompshad/nxcompshad.pc.in nxcompshad/src/Makefile.am - nxproxy/VERSION nxproxy/man/nxproxy.1 nxproxy/Makefile.am nxproxy/configure.ac - nxproxy/m4/.placeholder nxproxy/man/Makefile.am nxproxy/src/Makefile.am Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) @@ -2947,33 +2957,57 @@ Comment: . Contributions by Daniel Stone have been licensed under MIT~X11. -Files: nxcomp/mkinstalldirs -Copyright: *No copyright* -License: public-domain - -Files: nxcomp/install-sh -Copyright: 1994, X Consortium -License: Expat~NoAdvert -Comment: - Missing license headers. License and copyright information obtained from - later versions of this file as found in automake-1.14. - . - FIXME: This block will be obsolete for 3.5.99.8. We are about to - remove the above files entirely from the code tree. - -Files: nx-X11/extras/Mesa.patches/* -Copyright: 2017, Mike Gabriel */ +Files: nx-X11/extras/Mesa.patches_6.4.2/* +Copyright: 2017, Mike Gabriel */ 2017, Mihai Moldovan 2017, Ulrich Sibiller 2017, Qindel Group (http://www.qindel.com) License: Expat +Files: nx-X11/lib/configure.ac + nx-X11/lib/Makefile.am + nx-X11/lib/src/xkb/Makefile.am + nx-X11/lib/src/util/Makefile.am + nx-X11/lib/src/Makefile.am + nx-X11/lib/src/xcms/Makefile.am + nx-X11/lib/src/xlibi18n/Makefile.am + nx-X11/lib/modules/om/generic/Makefile.am + nx-X11/lib/modules/om/Makefile.am + nx-X11/lib/modules/Makefile.am + nx-X11/lib/modules/im/ximcp/Makefile.am + nx-X11/lib/modules/im/Makefile.am + nx-X11/lib/modules/lc/Makefile.am + nx-X11/lib/modules/lc/gen/Makefile.am + nx-X11/lib/modules/lc/def/Makefile.am + nx-X11/lib/modules/lc/Utf8/Makefile.am + nx-X11/lib/include/Makefile.am +Copyright: 2017, Mike Gabriel */ + 2017, Mihai Moldovan + 2017, Ulrich Sibiller + 2017, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Passages in the above files have been derived + from X.org's libX11, but got heavily changed. + +Files: nx-X11/lib/m4/ax_define_dir.m4 +Copyright: 2008, Stepan Kasal + 2008, Andreas Schwab + 2008, Guido U. Draheim + 2008, Alexandre Oliva +License: permissive + Files: debian/* Copyright: 2011-2016, Mike Gabriel 2011-2013, Reinhard Tartler 2015-2016, Mihai Moldovan License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause +Files: nx-libs.spec +Copyright: 2011-2017, Mike Gabriel + 2015-2017, Mihai Moldovan +License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause + License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -3753,6 +3787,8 @@ License: BSD-1-clause NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: public-domain - No license required for any purpose; the work is not subject to - copyright in any jurisdiction. +License: permissive + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. -- cgit v1.2.3 From bdd4fc21227330312e101665c6f59be99c965bd8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 30 Aug 2017 18:07:59 +0200 Subject: debian/control: Bump Standards-Version: to 4.0.1. No changes needed. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 58b28f12f..a8e386619 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: x11proto-core-dev, xutils-dev, zlib1g-dev -Standards-Version: 3.9.8 +Standards-Version: 4.0.1 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ -- cgit v1.2.3 From 13264ea7f447af1acedc8fd82268a4aba7a69ff9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 30 Aug 2017 19:29:58 +0200 Subject: debian/rules: Strip static libraries before installing them into the lib*.dev packages. --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 925c98f08..61ff2d934 100755 --- a/debian/rules +++ b/debian/rules @@ -23,10 +23,13 @@ override_dh_auto_clean: override_dh_install: - # remove static libs + # strip static libs and remove .la files rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.a # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ -- cgit v1.2.3 From f4afa5a5619d965bed6024c95e430e4f042edffb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 30 Aug 2017 19:33:55 +0200 Subject: release 3.5.99.9 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 77c9eedc3..d92eb702d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.9-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Wed, 30 Aug 2017 19:32:14 +0200 + nx-libs (2:3.5.99.8-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 6557c0043da97efcade165265f74f8e8901cd412 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Sep 2017 14:57:56 +0200 Subject: release 3.5.99.10 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d92eb702d..ea0c2db2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.10-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 15 Sep 2017 14:57:20 +0200 + nx-libs (2:3.5.99.9-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 4bc1d6cccb26a7dec7a3911762d16967a7567fc3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Sep 2017 15:59:03 +0200 Subject: debian/control: Drop non-required B-D libxmltok1-dev. --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a8e386619..7f9273834 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Build-Depends: libxfont-dev (>= 1.4.2), libxinerama-dev, libxml2-dev, - libxmltok1-dev, libxpm-dev, libxrandr-dev, libxrender-dev, -- cgit v1.2.3 From 3c95d604073e555f78a4c5174f857bc7fb2881c9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Sep 2017 15:59:30 +0200 Subject: debian/control: Bump Standards-Version: to 4.1.0. No changes needed. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7f9273834..e8b9fd906 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Build-Depends: x11proto-core-dev, xutils-dev, zlib1g-dev -Standards-Version: 4.0.1 +Standards-Version: 4.1.0 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ -- cgit v1.2.3 From ca43087812afa2817ddc086591b60d593aacc954 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 21 Nov 2017 13:28:17 +0100 Subject: Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and nxagent to BINDIR. Fixes ArcticaProject/nx-libs#546. --- debian/nxagent.install | 3 ++- debian/nxproxy.install | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/nxagent.install b/debian/nxagent.install index 34f5c3a76..87ba3583f 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,8 +1,9 @@ etc/nxagent/keystrokes.cfg usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* -usr/lib/*/nx/bin/nxagent usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard +# FIXME: compatibility symlink, drop for 3.6.0 release +usr/lib/*/nx/bin/nxagent diff --git a/debian/nxproxy.install b/debian/nxproxy.install index 8ade77d6d..988f2842f 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,4 +1,3 @@ -usr/lib/*/nx/bin/nxproxy usr/bin/nxproxy usr/share/man/man1/nxproxy.1* usr/share/nx/VERSION.nxproxy -- cgit v1.2.3 From 7610c0f19e01f2815966b1e333d65c8ab748bd1f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 13 Dec 2017 23:43:41 +0100 Subject: debian/*: Adopt from official Debian package where appropriate. --- debian/control | 2 +- debian/copyright | 717 ++--- debian/copyright.in | 3157 +++++++++----------- debian/libnx-x11-6.symbols | 40 +- debian/libnx-x11-dev.install | 6 +- debian/libxcomp-dev.install | 8 +- debian/libxcomp3.docs | 2 +- debian/libxcompshad-dev.install | 4 +- debian/libxcompshad-dev.links | 1 - debian/nx-x11proto-composite-dev.install | 2 +- debian/nx-x11proto-damage-dev.install | 2 +- debian/nx-x11proto-render-dev.install | 1 - debian/nx-x11proto-scrnsaver-dev.install | 2 +- debian/nx-x11proto-xext-dev.install | 6 +- debian/nx-x11proto-xfixes-dev.install | 3 +- debian/nxagent.install | 8 +- .../016_nx-X11_install-location.debian.patch | 45 - ...erver-xext_set-securitypolicy-path.debian.patch | 19 - ...sts-and-genericevent-extensions.full+lite.patch | 1870 ------------ debian/patches/series | 5 +- debian/rules | 47 + debian/watch | 4 +- 22 files changed, 1921 insertions(+), 4030 deletions(-) delete mode 100644 debian/patches/016_nx-X11_install-location.debian.patch delete mode 100644 debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch delete mode 100644 debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch (limited to 'debian') diff --git a/debian/control b/debian/control index e8b9fd906..0ab6dffe3 100644 --- a/debian/control +++ b/debian/control @@ -69,10 +69,10 @@ Package: libnx-x11-6 Architecture: any Multi-Arch: same Depends: + libx11-data, libxcomp3 (= ${binary:Version}), nx-x11-common (<< ${source:Version}.1), nx-x11-common (>= ${source:Version}), - libx11-data, ${misc:Depends}, ${shlibs:Depends} Breaks: diff --git a/debian/copyright b/debian/copyright index f6206283f..a8a0acdbb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -399,304 +399,304 @@ Comment: SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: nx-X11/extras/Mesa_6.4.2/include/GL/gl.h - nx-X11/extras/Mesa_6.4.2/include/GL/osmesa.h - nx-X11/extras/Mesa_6.4.2/include/GL/xmesa.h - nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.c - nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_context.h - nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/ac_import.c - nx-X11/extras/Mesa_6.4.2/src/mesa/array_cache/acache.h - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/common/driverfuncs.h - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/glxheader.h - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_api.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_buffer.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_dd.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_line.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_span.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xm_tri.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/x11/xmesaP.h - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.c - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapi.h - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.c - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glthread.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/accum.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_arrayelt.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_eval.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_loopback.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_noop.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/api_validate.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/attrib.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/blend.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/bufferobj.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/buffers.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/clip.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/colormac.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/colortab.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/config.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/context.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/convolve.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/dd.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/debug.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/depth.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/dispatch.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/dlist.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/drawpix.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/enable.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/enums.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/eval.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/execmem.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/extensions.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/fbobject.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/feedback.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/fog.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/framebuffer.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/getstring.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/hash.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/hint.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/histogram.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/image.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/light.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/lines.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/macros.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/matrix.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/mtypes.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/occlude.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/pixel.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/points.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/polygon.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/rastpos.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/renderbuffer.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/state.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/stencil.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_fxt1.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texcompress_s3tc.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texformat_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/teximage.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texobj.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstate.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texstore.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/varray.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/version.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt.h - nx-X11/extras/Mesa_6.4.2/src/mesa/main/vtxfmt_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_clip_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_copy_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_clip.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_norm.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_util.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_debug_xform.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_dotprod_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_eval.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_matrix.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_norm_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_trans_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_translate.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_vector.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.c - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/m_xform_tmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/math/mathmod.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbfragparse.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogparse.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbvertparse.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_mesa.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragparse.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvfragprog.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvprogram.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertexec.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertparse.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/nvvertprog.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/program.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/shaderobjects_3dlabs.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_assignment.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_conditional.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_constructor.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_assemble_typeinfo.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_compile.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_execute.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_preprocess.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_storage.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.c - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/slang_utility.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/traverse_wrap.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aaline.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aalinetemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatriangle.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_aatritemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_accum.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_alpha.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_bitmap.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_blend.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_buffers.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_context.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_copypix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_depth.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_drawpix.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_feedback.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_fog.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_imaging.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_lines.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_linetemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_logic.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_masking.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_nvfragprog.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pixeltex.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_points.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_pointtemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_readpix.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_span.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_spantemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_stencil.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texstore.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_texture.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_triangle.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_trispan.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_tritemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_zoom.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/swrast.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_context.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_triangle.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/ss_tritmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast_setup/swrast_setup.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_api.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_array_import.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_context.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_pipeline.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_loopback.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_playback.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_arbprogram_sse.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cliptmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_cull.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_fog.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_light.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_lighttmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_normals.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_points.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_program.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_render.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_rendertmp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texgen.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_texmat.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vb_vertex.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_eval.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_exec.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/tnl.h +Files: nx-X11/extras/Mesa/include/GL/gl.h + nx-X11/extras/Mesa/include/GL/osmesa.h + nx-X11/extras/Mesa/include/GL/xmesa.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c + nx-X11/extras/Mesa/src/mesa/array_cache/acache.h + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h + nx-X11/extras/Mesa/src/mesa/glapi/glapi.c + nx-X11/extras/Mesa/src/mesa/glapi/glapi.h + nx-X11/extras/Mesa/src/mesa/glapi/glthread.c + nx-X11/extras/Mesa/src/mesa/glapi/glthread.h + nx-X11/extras/Mesa/src/mesa/main/accum.c + nx-X11/extras/Mesa/src/mesa/main/accum.h + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h + nx-X11/extras/Mesa/src/mesa/main/api_eval.h + nx-X11/extras/Mesa/src/mesa/main/api_loopback.c + nx-X11/extras/Mesa/src/mesa/main/api_loopback.h + nx-X11/extras/Mesa/src/mesa/main/api_noop.c + nx-X11/extras/Mesa/src/mesa/main/api_noop.h + nx-X11/extras/Mesa/src/mesa/main/api_validate.c + nx-X11/extras/Mesa/src/mesa/main/api_validate.h + nx-X11/extras/Mesa/src/mesa/main/attrib.c + nx-X11/extras/Mesa/src/mesa/main/attrib.h + nx-X11/extras/Mesa/src/mesa/main/blend.c + nx-X11/extras/Mesa/src/mesa/main/blend.h + nx-X11/extras/Mesa/src/mesa/main/bufferobj.c + nx-X11/extras/Mesa/src/mesa/main/bufferobj.h + nx-X11/extras/Mesa/src/mesa/main/buffers.c + nx-X11/extras/Mesa/src/mesa/main/buffers.h + nx-X11/extras/Mesa/src/mesa/main/clip.c + nx-X11/extras/Mesa/src/mesa/main/clip.h + nx-X11/extras/Mesa/src/mesa/main/colormac.h + nx-X11/extras/Mesa/src/mesa/main/colortab.c + nx-X11/extras/Mesa/src/mesa/main/colortab.h + nx-X11/extras/Mesa/src/mesa/main/config.h + nx-X11/extras/Mesa/src/mesa/main/context.c + nx-X11/extras/Mesa/src/mesa/main/context.h + nx-X11/extras/Mesa/src/mesa/main/convolve.c + nx-X11/extras/Mesa/src/mesa/main/convolve.h + nx-X11/extras/Mesa/src/mesa/main/dd.h + nx-X11/extras/Mesa/src/mesa/main/debug.c + nx-X11/extras/Mesa/src/mesa/main/debug.h + nx-X11/extras/Mesa/src/mesa/main/depth.c + nx-X11/extras/Mesa/src/mesa/main/depth.h + nx-X11/extras/Mesa/src/mesa/main/dispatch.c + nx-X11/extras/Mesa/src/mesa/main/dlist.c + nx-X11/extras/Mesa/src/mesa/main/dlist.h + nx-X11/extras/Mesa/src/mesa/main/drawpix.c + nx-X11/extras/Mesa/src/mesa/main/drawpix.h + nx-X11/extras/Mesa/src/mesa/main/enable.c + nx-X11/extras/Mesa/src/mesa/main/enable.h + nx-X11/extras/Mesa/src/mesa/main/enums.c + nx-X11/extras/Mesa/src/mesa/main/enums.h + nx-X11/extras/Mesa/src/mesa/main/eval.c + nx-X11/extras/Mesa/src/mesa/main/eval.h + nx-X11/extras/Mesa/src/mesa/main/execmem.c + nx-X11/extras/Mesa/src/mesa/main/extensions.c + nx-X11/extras/Mesa/src/mesa/main/extensions.h + nx-X11/extras/Mesa/src/mesa/main/fbobject.c + nx-X11/extras/Mesa/src/mesa/main/fbobject.h + nx-X11/extras/Mesa/src/mesa/main/feedback.c + nx-X11/extras/Mesa/src/mesa/main/feedback.h + nx-X11/extras/Mesa/src/mesa/main/fog.c + nx-X11/extras/Mesa/src/mesa/main/fog.h + nx-X11/extras/Mesa/src/mesa/main/framebuffer.c + nx-X11/extras/Mesa/src/mesa/main/framebuffer.h + nx-X11/extras/Mesa/src/mesa/main/get.h + nx-X11/extras/Mesa/src/mesa/main/getstring.c + nx-X11/extras/Mesa/src/mesa/main/glheader.h + nx-X11/extras/Mesa/src/mesa/main/hash.c + nx-X11/extras/Mesa/src/mesa/main/hash.h + nx-X11/extras/Mesa/src/mesa/main/hint.c + nx-X11/extras/Mesa/src/mesa/main/hint.h + nx-X11/extras/Mesa/src/mesa/main/histogram.c + nx-X11/extras/Mesa/src/mesa/main/histogram.h + nx-X11/extras/Mesa/src/mesa/main/image.c + nx-X11/extras/Mesa/src/mesa/main/image.h + nx-X11/extras/Mesa/src/mesa/main/imports.c + nx-X11/extras/Mesa/src/mesa/main/imports.h + nx-X11/extras/Mesa/src/mesa/main/light.c + nx-X11/extras/Mesa/src/mesa/main/light.h + nx-X11/extras/Mesa/src/mesa/main/lines.c + nx-X11/extras/Mesa/src/mesa/main/lines.h + nx-X11/extras/Mesa/src/mesa/main/macros.h + nx-X11/extras/Mesa/src/mesa/main/matrix.c + nx-X11/extras/Mesa/src/mesa/main/matrix.h + nx-X11/extras/Mesa/src/mesa/main/mtypes.h + nx-X11/extras/Mesa/src/mesa/main/occlude.c + nx-X11/extras/Mesa/src/mesa/main/occlude.h + nx-X11/extras/Mesa/src/mesa/main/pixel.c + nx-X11/extras/Mesa/src/mesa/main/pixel.h + nx-X11/extras/Mesa/src/mesa/main/points.c + nx-X11/extras/Mesa/src/mesa/main/points.h + nx-X11/extras/Mesa/src/mesa/main/polygon.c + nx-X11/extras/Mesa/src/mesa/main/polygon.h + nx-X11/extras/Mesa/src/mesa/main/rastpos.c + nx-X11/extras/Mesa/src/mesa/main/rastpos.h + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h + nx-X11/extras/Mesa/src/mesa/main/state.c + nx-X11/extras/Mesa/src/mesa/main/state.h + nx-X11/extras/Mesa/src/mesa/main/stencil.c + nx-X11/extras/Mesa/src/mesa/main/stencil.h + nx-X11/extras/Mesa/src/mesa/main/texcompress.c + nx-X11/extras/Mesa/src/mesa/main/texcompress.h + nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c + nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c + nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h + nx-X11/extras/Mesa/src/mesa/main/texformat.c + nx-X11/extras/Mesa/src/mesa/main/texformat.h + nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h + nx-X11/extras/Mesa/src/mesa/main/teximage.c + nx-X11/extras/Mesa/src/mesa/main/teximage.h + nx-X11/extras/Mesa/src/mesa/main/texobj.c + nx-X11/extras/Mesa/src/mesa/main/texobj.h + nx-X11/extras/Mesa/src/mesa/main/texstate.c + nx-X11/extras/Mesa/src/mesa/main/texstate.h + nx-X11/extras/Mesa/src/mesa/main/texstore.c + nx-X11/extras/Mesa/src/mesa/main/texstore.h + nx-X11/extras/Mesa/src/mesa/main/varray.c + nx-X11/extras/Mesa/src/mesa/main/varray.h + nx-X11/extras/Mesa/src/mesa/main/version.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_debug.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_eval.c + nx-X11/extras/Mesa/src/mesa/math/m_eval.h + nx-X11/extras/Mesa/src/mesa/math/m_matrix.c + nx-X11/extras/Mesa/src/mesa/math/m_matrix.h + nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_translate.c + nx-X11/extras/Mesa/src/mesa/math/m_translate.h + nx-X11/extras/Mesa/src/mesa/math/m_vector.c + nx-X11/extras/Mesa/src/mesa/math/m_vector.h + nx-X11/extras/Mesa/src/mesa/math/m_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_xform.h + nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h + nx-X11/extras/Mesa/src/mesa/math/mathmod.h + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h + nx-X11/extras/Mesa/src/mesa/shader/program.c + nx-X11/extras/Mesa/src/mesa/shader/program.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h + nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h + nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h + nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.h + nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h + nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h + nx-X11/extras/Mesa/src/mesa/swrast/s_points.c + nx-X11/extras/Mesa/src/mesa/swrast/s_points.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.h + nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h + nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h + nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h + nx-X11/extras/Mesa/src/mesa/swrast/swrast.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h + nx-X11/extras/Mesa/src/mesa/tnl/t_context.c + nx-X11/extras/Mesa/src/mesa/tnl/t_context.h + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h + nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c + nx-X11/extras/Mesa/src/mesa/tnl/tnl.h Copyright: 1999-2001, Brian Paul 1999-2002, Brian Paul 1999-2003, Brian Paul @@ -1040,8 +1040,7 @@ Copyright: 2012, Mike Gabriel 2016, Mike Gabriel License: GPL-2+ -Files: nx-X11/extras/README.Mesa.patches - nx-X11/programs/Xserver/GL/include/GL/xf86glx.h +Files: nx-X11/programs/Xserver/GL/include/GL/xf86glx.h nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h nx-X11/lib/nx-x11.pc.in Copyright: @@ -1056,22 +1055,23 @@ Files: replace.sh Copyright: 2013, Jan Engelhardt License: GPL-2+ -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/get.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.c - nx-X11/extras/Mesa_6.4.2/src/mesa/main/texrender.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/arbprogram_syn.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/grammar/grammar_syn.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_core_gc_bin.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_shader_syn.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_version_syn.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h - nx-X11/extras/Mesa_6.4.2/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86_gcc.S +Files: nx-X11/extras/Mesa/src/mesa/main/get.c + nx-X11/extras/Mesa/src/mesa/main/texrender.c + nx-X11/extras/Mesa/src/mesa/main/texrender.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S + nx-X11/extras/Mesa/src/mesa/main/KNOWN_BUGS Copyright: *No copyright* License: Expat Comment: @@ -1617,10 +1617,10 @@ Files: nx-X11/lib/src/xcms/HVC.c Copyright: 1990, 1991, Tektronix, Inc License: MIT~Tektronix~3-clause -Files: nx-X11/extras/Mesa_6.4.2/include/GL/glext.h - nx-X11/extras/Mesa_6.4.2/include/GL/glxext.h - nx-X11/extras/Mesa_6.4.2/include/GL/internal/glcore.h - nx-X11/extras/Mesa_6.4.2/src/glx/x11/compsize.c +Files: nx-X11/extras/Mesa/include/GL/glext.h + nx-X11/extras/Mesa/include/GL/glxext.h + nx-X11/extras/Mesa/include/GL/internal/glcore.h + nx-X11/extras/Mesa/src/glx/x11/compsize.c nx-X11/include/GL/glx.h nx-X11/include/GL/glxmd.h nx-X11/include/GL/glxproto.h @@ -2064,7 +2064,7 @@ Files: nx-X11/include/extensions/Xdbeproto.h Copyright: 1994-1995, Hewlett-Packard Company License: Expat~NoAdvert -Files: nx-X11/extras/Mesa_6.4.2/include/GL/xmesa_xf86.h +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h @@ -2072,12 +2072,12 @@ Files: nx-X11/extras/Mesa_6.4.2/include/GL/xmesa_xf86.h Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_save_api.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_api.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_generic.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vtx_x86.c +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas 2004, Tungsten Graphics Inc., Cedar Park, Texas License: Expat @@ -2126,10 +2126,10 @@ Copyright: 1991-1994, FUJITSU LIMITED 1993, Digital Equipment Corporation License: MIT~X11 -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex.h - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_generic.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vertex_sse.c +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c Copyright: 2003, Tungsten Graphics, inc License: Expat @@ -2147,17 +2147,17 @@ Files: nx-X11/programs/Xserver/miext/cw/cw.c Copyright: 2004, Eric Anholt License: MIT~X11 -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapitemp.h - nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glprocs.h +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h Copyright: 1999-2001, Brian Paul 1999-2003, Brian Paul IBM Corporation 2004 License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.c - nx-X11/extras/Mesa_6.4.2/src/mesa/swrast/s_atifragshader.h +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h Copyright: 1999-2003, David Airlie 2004, David Airlie License: Expat @@ -2270,10 +2270,10 @@ Comment: as Expat. Later contributions by FUJITSU LIMITED and Sony Corporation have been licensed under MIT~X11. -Files: nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.c - nx-X11/extras/Mesa_6.4.2/src/glx/x11/indirect_size.h - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c - nx-X11/extras/Mesa_6.4.2/src/mesa/drivers/dri/common/glcontextmodes.h +Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa/src/glx/x11/indirect_size.h + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h Copyright: 2003, IBM Corporation IBM Corporation 2004 License: Expat @@ -2294,8 +2294,8 @@ Copyright: 2000, The XFree86 Project, Inc. 2001, The XFree86 Project, Inc. License: Expat~NoAdvert -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.c - nx-X11/extras/Mesa_6.4.2/src/mesa/tnl/t_vp_build.h +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h Copyright: 2005, Tungsten Graphics License: Expat @@ -2447,12 +2447,12 @@ Files: nx-X11/programs/Xserver/os/xprintf.c Copyright: 2004, Alexander Gottwald License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/glapioffsets.h +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h Copyright: 1999-2001, Brian Paul IBM Corporation 2004, License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/simple_list.h +Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h Copyright: 1997, Keith Whitwell 1999-2001, Brian Paul License: Expat @@ -2492,7 +2492,7 @@ Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h Copyright: 1989-1995, GROUPE BULL License: Expat~NoAdvert -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/glapi/dispatch.h +Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h Copyright: 2005, IBM Corporation License: Expat @@ -2507,7 +2507,7 @@ Comment: Later contributions by Oracle and/or its affiliates and Red Hat, Inc. have been licensed under Expat. -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.h +Files: nx-X11/extras/Mesa/src/mesa/main/mm.h Copyright: 1999, Keith Whitwell License: Expat @@ -2552,11 +2552,11 @@ Files: nx-X11/programs/Xserver/composite/compositeext.h Copyright: 2009, NVIDIA Corporation License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/texenvprogram.c +Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas License: Expat -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/main/mm.c +Files: nx-X11/extras/Mesa/src/mesa/main/mm.c Copyright: 1999, Wittawat Yamwong License: Expat @@ -2639,7 +2639,7 @@ Comment: Contributions by Data General Corporation and OMRON Corporation have been licnsed under MIT~X11. -Files: nx-X11/extras/Mesa_6.4.2/src/mesa/shader/atifragshader.h +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h Copyright: 2004, David Airlie License: Expat Comment: @@ -2885,18 +2885,26 @@ Copyright: Mike Gabriel License: GPL-3+ Files: m4/nx-macros.m4 + nx-X11/lib/m4/nx-macros.m4 + nxcomp/m4/nx-macros.m4 + nxcompshad/m4/nx-macros.m4 + nxproxy/m4/nx-macros.m4 Copyright: 2005, 2006, Oracle and/or its affiliates 2017, Mike Gabriel License: Expat Files: m4/nx-xtrans.m4 + nx-X11/lib/m4/nx-xtrans.m4 Copyright: 2005, 2006, Oracle and/or its affiliates License: Expat Files: ChangeLog Makefile - README.md + doc/README.NX-development VERSION + nxcomp/VERSION + nxcompshad/VERSION + nxproxy/VERSION doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt @@ -2957,7 +2965,7 @@ Comment: . Contributions by Daniel Stone have been licensed under MIT~X11. -Files: nx-X11/extras/Mesa.patches_6.4.2/* +Files: nx-X11/extras/Mesa.patches/* Copyright: 2017, Mike Gabriel */ 2017, Mihai Moldovan 2017, Ulrich Sibiller @@ -3003,11 +3011,6 @@ Copyright: 2011-2016, Mike Gabriel 2015-2016, Mihai Moldovan License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause -Files: nx-libs.spec -Copyright: 2011-2017, Mike Gabriel - 2015-2017, Mihai Moldovan -License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause - License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff --git a/debian/copyright.in b/debian/copyright.in index 98dfbdc9b..e4237628d 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -4,13 +4,506 @@ Upstream-Contact: FIXME Source: FIXME Disclaimer: Autogenerated by CDBS +Files: nx-X11/include/DECkeysym.h + nx-X11/include/HPkeysym.h + nx-X11/include/X.h + nx-X11/include/XWDFile.h + nx-X11/include/Xalloca.h + nx-X11/include/Xauth.h + nx-X11/include/Xfuncproto.h + nx-X11/include/Xfuncs.h + nx-X11/include/Xmd.h + nx-X11/include/Xos.h + nx-X11/include/Xos_r.h + nx-X11/include/Xosdefs.h + nx-X11/include/Xproto.h + nx-X11/include/Xprotostr.h + nx-X11/include/Xthreads.h + nx-X11/include/Xwindows.h + nx-X11/include/Xwinsock.h + nx-X11/include/extensions/XI.h + nx-X11/include/extensions/XIproto.h + nx-X11/include/extensions/bigreqstr.h + nx-X11/include/extensions/security.h + nx-X11/include/extensions/securstr.h + nx-X11/include/extensions/sync.h + nx-X11/include/extensions/syncstr.h + nx-X11/include/extensions/xcmiscstr.h + nx-X11/include/extensions/xtestconst.h + nx-X11/include/extensions/xteststr.h + nx-X11/include/keysym.h + nx-X11/include/keysymdef.h + nx-X11/lib/include/X11/Xlib.h + nx-X11/lib/include/X11/Xlocale.h + nx-X11/lib/include/X11/Xregion.h + nx-X11/lib/include/X11/Xresource.h + nx-X11/lib/include/X11/Xutil.h + nx-X11/lib/include/X11/cursorfont.h + nx-X11/lib/modules/im/ximcp/imThaiFlt.c + nx-X11/lib/src/AllCells.c + nx-X11/lib/src/AllPlanes.c + nx-X11/lib/src/AllowEv.c + nx-X11/lib/src/AuDispose.c + nx-X11/lib/src/AuFileName.c + nx-X11/lib/src/AuGetBest.c + nx-X11/lib/src/AuRead.c + nx-X11/lib/src/AutoRep.c + nx-X11/lib/src/Backgnd.c + nx-X11/lib/src/BdrWidth.c + nx-X11/lib/src/Bell.c + nx-X11/lib/src/Border.c + nx-X11/lib/src/ChAccCon.c + nx-X11/lib/src/ChActPGb.c + nx-X11/lib/src/ChClMode.c + nx-X11/lib/src/ChCmap.c + nx-X11/lib/src/ChGC.c + nx-X11/lib/src/ChKeyCon.c + nx-X11/lib/src/ChPntCon.c + nx-X11/lib/src/ChProp.c + nx-X11/lib/src/ChSaveSet.c + nx-X11/lib/src/ChWAttrs.c + nx-X11/lib/src/ChWindow.c + nx-X11/lib/src/ChkIfEv.c + nx-X11/lib/src/ChkMaskEv.c + nx-X11/lib/src/ChkTypEv.c + nx-X11/lib/src/ChkTypWEv.c + nx-X11/lib/src/ChkWinEv.c + nx-X11/lib/src/CirWin.c + nx-X11/lib/src/CirWinDn.c + nx-X11/lib/src/CirWinUp.c + nx-X11/lib/src/ClDisplay.c + nx-X11/lib/src/Clear.c + nx-X11/lib/src/ClearArea.c + nx-X11/lib/src/ConfWind.c + nx-X11/lib/src/ConvSel.c + nx-X11/lib/src/CopyArea.c + nx-X11/lib/src/CopyCmap.c + nx-X11/lib/src/CopyGC.c + nx-X11/lib/src/CopyPlane.c + nx-X11/lib/src/CrBFData.c + nx-X11/lib/src/CrCmap.c + nx-X11/lib/src/CrCursor.c + nx-X11/lib/src/CrGC.c + nx-X11/lib/src/CrGlCur.c + nx-X11/lib/src/CrPFBData.c + nx-X11/lib/src/CrPixmap.c + nx-X11/lib/src/CrWindow.c + nx-X11/lib/src/Cursor.c + nx-X11/lib/src/DefCursor.c + nx-X11/lib/src/DelProp.c + nx-X11/lib/src/Depths.c + nx-X11/lib/src/DestSubs.c + nx-X11/lib/src/DestWind.c + nx-X11/lib/src/DisName.c + nx-X11/lib/src/DrArc.c + nx-X11/lib/src/DrArcs.c + nx-X11/lib/src/DrLine.c + nx-X11/lib/src/DrLines.c + nx-X11/lib/src/DrPoint.c + nx-X11/lib/src/DrPoints.c + nx-X11/lib/src/DrRect.c + nx-X11/lib/src/DrRects.c + nx-X11/lib/src/DrSegs.c + nx-X11/lib/src/ErrDes.c + nx-X11/lib/src/ErrHndlr.c + nx-X11/lib/src/EvToWire.c + nx-X11/lib/src/FSSaver.c + nx-X11/lib/src/FetchName.c + nx-X11/lib/src/FillArc.c + nx-X11/lib/src/FillArcs.c + nx-X11/lib/src/FillPoly.c + nx-X11/lib/src/FillRct.c + nx-X11/lib/src/FillRcts.c + nx-X11/lib/src/Flush.c + nx-X11/lib/src/FontInfo.c + nx-X11/lib/src/FontNames.c + nx-X11/lib/src/FreeCmap.c + nx-X11/lib/src/FreeCols.c + nx-X11/lib/src/FreeCurs.c + nx-X11/lib/src/FreeEData.c + nx-X11/lib/src/FreeGC.c + nx-X11/lib/src/FreePix.c + nx-X11/lib/src/GCMisc.c + nx-X11/lib/src/Geom.c + nx-X11/lib/src/GetAtomNm.c + nx-X11/lib/src/GetColor.c + nx-X11/lib/src/GetDflt.c + nx-X11/lib/src/GetFPath.c + nx-X11/lib/src/GetFProp.c + nx-X11/lib/src/GetGCVals.c + nx-X11/lib/src/GetGeom.c + nx-X11/lib/src/GetHColor.c + nx-X11/lib/src/GetHints.c + nx-X11/lib/src/GetIFocus.c + nx-X11/lib/src/GetImage.c + nx-X11/lib/src/GetKCnt.c + nx-X11/lib/src/GetMoEv.c + nx-X11/lib/src/GetPCnt.c + nx-X11/lib/src/GetPntMap.c + nx-X11/lib/src/GetProp.c + nx-X11/lib/src/GetRGBCMap.c + nx-X11/lib/src/GetSOwner.c + nx-X11/lib/src/GetSSaver.c + nx-X11/lib/src/GetStCmap.c + nx-X11/lib/src/GetWAttrs.c + nx-X11/lib/src/GetWMCMapW.c + nx-X11/lib/src/GetWMProto.c + nx-X11/lib/src/GrButton.c + nx-X11/lib/src/GrKey.c + nx-X11/lib/src/GrKeybd.c + nx-X11/lib/src/GrPointer.c + nx-X11/lib/src/GrServer.c + nx-X11/lib/src/IfEvent.c + nx-X11/lib/src/ImText.c + nx-X11/lib/src/ImText16.c + nx-X11/lib/src/ImUtil.c + nx-X11/lib/src/InitExt.c + nx-X11/lib/src/InsCmap.c + nx-X11/lib/src/IntAtom.c + nx-X11/lib/src/KeyBind.c + nx-X11/lib/src/KeysymStr.c + nx-X11/lib/src/KillCl.c + nx-X11/lib/src/LiICmaps.c + nx-X11/lib/src/LiProps.c + nx-X11/lib/src/ListExt.c + nx-X11/lib/src/LoadFont.c + nx-X11/lib/src/LockDis.c + nx-X11/lib/src/LookupCol.c + nx-X11/lib/src/LowerWin.c + nx-X11/lib/src/Macros.c + nx-X11/lib/src/MapRaised.c + nx-X11/lib/src/MapSubs.c + nx-X11/lib/src/MapWindow.c + nx-X11/lib/src/MaskEvent.c + nx-X11/lib/src/Misc.c + nx-X11/lib/src/ModMap.c + nx-X11/lib/src/MoveWin.c + nx-X11/lib/src/NextEvent.c + nx-X11/lib/src/ParseCmd.c + nx-X11/lib/src/ParseCol.c + nx-X11/lib/src/ParseGeom.c + nx-X11/lib/src/PeekEvent.c + nx-X11/lib/src/PeekIfEv.c + nx-X11/lib/src/Pending.c + nx-X11/lib/src/PixFormats.c + nx-X11/lib/src/PmapBgnd.c + nx-X11/lib/src/PmapBord.c + nx-X11/lib/src/PolyReg.c + nx-X11/lib/src/PolyTxt.c + nx-X11/lib/src/PolyTxt16.c + nx-X11/lib/src/PropAlloc.c + nx-X11/lib/src/PutBEvent.c + nx-X11/lib/src/PutImage.c + nx-X11/lib/src/QuBest.c + nx-X11/lib/src/QuColor.c + nx-X11/lib/src/QuColors.c + nx-X11/lib/src/QuCurShp.c + nx-X11/lib/src/QuExt.c + nx-X11/lib/src/QuKeybd.c + nx-X11/lib/src/QuPntr.c + nx-X11/lib/src/QuStipShp.c + nx-X11/lib/src/QuTextE16.c + nx-X11/lib/src/QuTextExt.c + nx-X11/lib/src/QuTileShp.c + nx-X11/lib/src/QuTree.c + nx-X11/lib/src/RaiseWin.c + nx-X11/lib/src/RdBitF.c + nx-X11/lib/src/RecolorC.c + nx-X11/lib/src/ReconfWM.c + nx-X11/lib/src/ReconfWin.c + nx-X11/lib/src/Region.c + nx-X11/lib/src/RepWindow.c + nx-X11/lib/src/RestackWs.c + nx-X11/lib/src/RotProp.c + nx-X11/lib/src/ScrResStr.c + nx-X11/lib/src/SelInput.c + nx-X11/lib/src/SendEvent.c + nx-X11/lib/src/SetBack.c + nx-X11/lib/src/SetCRects.c + nx-X11/lib/src/SetClMask.c + nx-X11/lib/src/SetClOrig.c + nx-X11/lib/src/SetDashes.c + nx-X11/lib/src/SetFPath.c + nx-X11/lib/src/SetFont.c + nx-X11/lib/src/SetFore.c + nx-X11/lib/src/SetFunc.c + nx-X11/lib/src/SetHints.c + nx-X11/lib/src/SetIFocus.c + nx-X11/lib/src/SetLStyle.c + nx-X11/lib/src/SetPMask.c + nx-X11/lib/src/SetPntMap.c + nx-X11/lib/src/SetRGBCMap.c + nx-X11/lib/src/SetSOwner.c + nx-X11/lib/src/SetSSaver.c + nx-X11/lib/src/SetStCmap.c + nx-X11/lib/src/SetState.c + nx-X11/lib/src/SetStip.c + nx-X11/lib/src/SetTSOrig.c + nx-X11/lib/src/SetTile.c + nx-X11/lib/src/SetWMCMapW.c + nx-X11/lib/src/SetWMProto.c + nx-X11/lib/src/StBytes.c + nx-X11/lib/src/StColor.c + nx-X11/lib/src/StColors.c + nx-X11/lib/src/StNColor.c + nx-X11/lib/src/StName.c + nx-X11/lib/src/StrKeysym.c + nx-X11/lib/src/StrToText.c + nx-X11/lib/src/Sync.c + nx-X11/lib/src/Synchro.c + nx-X11/lib/src/Text.c + nx-X11/lib/src/Text16.c + nx-X11/lib/src/TextExt.c + nx-X11/lib/src/TextExt16.c + nx-X11/lib/src/TextToStr.c + nx-X11/lib/src/TrCoords.c + nx-X11/lib/src/UndefCurs.c + nx-X11/lib/src/UngrabBut.c + nx-X11/lib/src/UngrabKbd.c + nx-X11/lib/src/UngrabKey.c + nx-X11/lib/src/UngrabPtr.c + nx-X11/lib/src/UngrabSvr.c + nx-X11/lib/src/UninsCmap.c + nx-X11/lib/src/UnldFont.c + nx-X11/lib/src/UnmapSubs.c + nx-X11/lib/src/UnmapWin.c + nx-X11/lib/src/VisUtil.c + nx-X11/lib/src/WMGeom.c + nx-X11/lib/src/WMProps.c + nx-X11/lib/src/WarpPtr.c + nx-X11/lib/src/WinEvent.c + nx-X11/lib/src/Window.c + nx-X11/lib/src/WrBitF.c + nx-X11/lib/src/XErrorDB + nx-X11/lib/src/Xatomtype.h + nx-X11/lib/src/evtomask.c + nx-X11/lib/src/globals.c + nx-X11/lib/src/locking.c + nx-X11/lib/src/locking.h + nx-X11/lib/src/pathmax.h + nx-X11/lib/src/poly.h + nx-X11/lib/src/util/makekeys.c + nx-X11/lib/src/xcms/cmsMath.c + nx-X11/lib/src/xkb/XKBBind.c + nx-X11/lib/src/xkb/XKBCvt.c + nx-X11/lib/src/xlibi18n/XimThai.h + nx-X11/lib/src/xlibi18n/mbWMProps.c + nx-X11/programs/Xserver/Xext/bigreq.c + nx-X11/programs/Xserver/Xext/shape.c + nx-X11/programs/Xserver/Xext/shm.c + nx-X11/programs/Xserver/Xext/sleepuntil.c + nx-X11/programs/Xserver/Xext/xcmisc.c + nx-X11/programs/Xserver/Xext/xtest.c + nx-X11/programs/Xserver/Xi/allowev.c + nx-X11/programs/Xserver/Xi/chgdctl.c + nx-X11/programs/Xserver/Xi/chgfctl.c + nx-X11/programs/Xserver/Xi/chgkbd.c + nx-X11/programs/Xserver/Xi/chgkmap.c + nx-X11/programs/Xserver/Xi/chgprop.c + nx-X11/programs/Xserver/Xi/chgptr.c + nx-X11/programs/Xserver/Xi/closedev.c + nx-X11/programs/Xserver/Xi/devbell.c + nx-X11/programs/Xserver/Xi/exevents.c + nx-X11/programs/Xserver/Xi/extinit.c + nx-X11/programs/Xserver/Xi/getbmap.c + nx-X11/programs/Xserver/Xi/getdctl.c + nx-X11/programs/Xserver/Xi/getfctl.c + nx-X11/programs/Xserver/Xi/getfocus.c + nx-X11/programs/Xserver/Xi/getkmap.c + nx-X11/programs/Xserver/Xi/getmmap.c + nx-X11/programs/Xserver/Xi/getprop.c + nx-X11/programs/Xserver/Xi/getselev.c + nx-X11/programs/Xserver/Xi/getvers.c + nx-X11/programs/Xserver/Xi/grabdev.c + nx-X11/programs/Xserver/Xi/grabdevb.c + nx-X11/programs/Xserver/Xi/grabdevk.c + nx-X11/programs/Xserver/Xi/gtmotion.c + nx-X11/programs/Xserver/Xi/listdev.c + nx-X11/programs/Xserver/Xi/opendev.c + nx-X11/programs/Xserver/Xi/queryst.c + nx-X11/programs/Xserver/Xi/selectev.c + nx-X11/programs/Xserver/Xi/sendexev.c + nx-X11/programs/Xserver/Xi/setbmap.c + nx-X11/programs/Xserver/Xi/setdval.c + nx-X11/programs/Xserver/Xi/setfocus.c + nx-X11/programs/Xserver/Xi/setmmap.c + nx-X11/programs/Xserver/Xi/setmode.c + nx-X11/programs/Xserver/Xi/stubs.c + nx-X11/programs/Xserver/Xi/ungrdev.c + nx-X11/programs/Xserver/Xi/ungrdevb.c + nx-X11/programs/Xserver/Xi/ungrdevk.c + nx-X11/programs/Xserver/dix/atom.c + nx-X11/programs/Xserver/dix/colormap.c + nx-X11/programs/Xserver/dix/cursor.c + nx-X11/programs/Xserver/dix/devices.c + nx-X11/programs/Xserver/dix/dispatch.c + nx-X11/programs/Xserver/dix/dixutils.c + nx-X11/programs/Xserver/dix/events.c + nx-X11/programs/Xserver/dix/extension.c + nx-X11/programs/Xserver/dix/ffs.c + nx-X11/programs/Xserver/dix/gc.c + nx-X11/programs/Xserver/dix/globals.c + nx-X11/programs/Xserver/dix/glyphcurs.c + nx-X11/programs/Xserver/dix/grabs.c + nx-X11/programs/Xserver/dix/main.c + nx-X11/programs/Xserver/dix/pixmap.c + nx-X11/programs/Xserver/dix/privates.c + nx-X11/programs/Xserver/dix/property.c + nx-X11/programs/Xserver/dix/region.c + nx-X11/programs/Xserver/dix/resource.c + nx-X11/programs/Xserver/dix/swaprep.c + nx-X11/programs/Xserver/dix/swapreq.c + nx-X11/programs/Xserver/dix/tables.c + nx-X11/programs/Xserver/dix/window.c + nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h + nx-X11/programs/Xserver/include/closestr.h + nx-X11/programs/Xserver/include/closure.h + nx-X11/programs/Xserver/include/colormap.h + nx-X11/programs/Xserver/include/colormapst.h + nx-X11/programs/Xserver/include/cursor.h + nx-X11/programs/Xserver/include/cursorstr.h + nx-X11/programs/Xserver/include/dix.h + nx-X11/programs/Xserver/include/extension.h + nx-X11/programs/Xserver/include/extnsionst.h + nx-X11/programs/Xserver/include/gc.h + nx-X11/programs/Xserver/include/gcstruct.h + nx-X11/programs/Xserver/include/input.h + nx-X11/programs/Xserver/include/inputstr.h + nx-X11/programs/Xserver/include/miscstruct.h + nx-X11/programs/Xserver/include/opaque.h + nx-X11/programs/Xserver/include/os.h + nx-X11/programs/Xserver/include/pixmap.h + nx-X11/programs/Xserver/include/pixmapstr.h + nx-X11/programs/Xserver/include/property.h + nx-X11/programs/Xserver/include/propertyst.h + nx-X11/programs/Xserver/include/region.h + nx-X11/programs/Xserver/include/regionstr.h + nx-X11/programs/Xserver/include/resource.h + nx-X11/programs/Xserver/include/rgb.h + nx-X11/programs/Xserver/include/screenint.h + nx-X11/programs/Xserver/include/scrnintstr.h + nx-X11/programs/Xserver/include/selection.h + nx-X11/programs/Xserver/include/servermd.h + nx-X11/programs/Xserver/include/site.h + nx-X11/programs/Xserver/include/validate.h + nx-X11/programs/Xserver/include/window.h + nx-X11/programs/Xserver/include/windowstr.h + nx-X11/programs/Xserver/mi/cbrt.c + nx-X11/programs/Xserver/mi/mi.h + nx-X11/programs/Xserver/mi/miarc.c + nx-X11/programs/Xserver/mi/mibitblt.c + nx-X11/programs/Xserver/mi/mibstorest.h + nx-X11/programs/Xserver/mi/miclipn.c + nx-X11/programs/Xserver/mi/micursor.c + nx-X11/programs/Xserver/mi/midash.c + nx-X11/programs/Xserver/mi/midispcur.c + nx-X11/programs/Xserver/mi/mieq.c + nx-X11/programs/Xserver/mi/miexpose.c + nx-X11/programs/Xserver/mi/mifillarc.c + nx-X11/programs/Xserver/mi/mifillarc.h + nx-X11/programs/Xserver/mi/mifillrct.c + nx-X11/programs/Xserver/mi/mifpoly.h + nx-X11/programs/Xserver/mi/mifpolycon.c + nx-X11/programs/Xserver/mi/migc.c + nx-X11/programs/Xserver/mi/migc.h + nx-X11/programs/Xserver/mi/miglblt.c + nx-X11/programs/Xserver/mi/miinitext.c + nx-X11/programs/Xserver/mi/miline.h + nx-X11/programs/Xserver/mi/mipointer.c + nx-X11/programs/Xserver/mi/mipointer.h + nx-X11/programs/Xserver/mi/mipointrst.h + nx-X11/programs/Xserver/mi/mipoly.c + nx-X11/programs/Xserver/mi/mipoly.h + nx-X11/programs/Xserver/mi/mipolycon.c + nx-X11/programs/Xserver/mi/mipolygen.c + nx-X11/programs/Xserver/mi/mipolypnt.c + nx-X11/programs/Xserver/mi/mipolyrect.c + nx-X11/programs/Xserver/mi/mipolyseg.c + nx-X11/programs/Xserver/mi/mipolytext.c + nx-X11/programs/Xserver/mi/mipolyutil.c + nx-X11/programs/Xserver/mi/mipushpxl.c + nx-X11/programs/Xserver/mi/miscanfill.h + nx-X11/programs/Xserver/mi/miscrinit.c + nx-X11/programs/Xserver/mi/mispans.c + nx-X11/programs/Xserver/mi/mispans.h + nx-X11/programs/Xserver/mi/misprite.c + nx-X11/programs/Xserver/mi/misprite.h + nx-X11/programs/Xserver/mi/mispritest.h + nx-X11/programs/Xserver/mi/mistruct.h + nx-X11/programs/Xserver/mi/mivalidate.h + nx-X11/programs/Xserver/mi/mivaltree.c + nx-X11/programs/Xserver/mi/miwideline.c + nx-X11/programs/Xserver/mi/miwideline.h + nx-X11/programs/Xserver/mi/miwindow.c + nx-X11/programs/Xserver/mi/mizerarc.c + nx-X11/programs/Xserver/mi/mizerarc.h + nx-X11/programs/Xserver/mi/mizerclip.c + nx-X11/programs/Xserver/mi/mizerline.c + nx-X11/programs/Xserver/os/connection.c + nx-X11/programs/Xserver/os/io.c + nx-X11/programs/Xserver/os/mitauth.c + nx-X11/programs/Xserver/os/oscolor.c + nx-X11/programs/Xserver/os/osdep.h + nx-X11/programs/Xserver/os/osinit.c + nx-X11/programs/Xserver/os/rpcauth.c + nx-X11/programs/Xserver/os/secauth.c + nx-X11/programs/Xserver/os/xdmauth.c + nx-X11/programs/Xserver/record/record.c + nx-X11/programs/Xserver/record/set.c + nx-X11/programs/Xserver/record/set.h + nxcompshad/src/X11/include/XTest_nxcompshad.h +Copyright: 1985, 1987, 1990, 1998, The Open Group + 1985, 1987, 1994, 1998, The Open Group + 1985, 1987, 1998, The Open Group + 1985, 1990, 1998, The Open Group + 1985, 1998, The Open Group + 1985-1986, 1998, The Open Group + 1985-1987, 1991, 1998, The Open Group + 1985-1987, 1998, The Open Group + 1986, 1990, 1998, The Open Group + 1986, 1998, The Open Group + 1986-1987, 1998, The Open Group + 1987, 1989, 1998, The Open Group + 1987, 1994, 1998, The Open Group + 1987, 1998, The Open Group + 1987-1988, 1993, 1998, The Open Group + 1987-1988, 1998, The Open Group + 1987-1989, 1998, The Open Group + 1988, 1998, The Open Group + 1988-1989, 1998, The Open Group + 1989, 1991, 1998, The Open Group + 1989, 1998, The Open Group + 1990, 1994, 1998, The Open Group + 1990, 1998, The Open Group + 1991, 1993-1994, 1998, The Open Group + 1991, 1998, The Open Group + 1992, 1998, The Open Group + 1993, 1995, 1998, The Open Group + 1993, 1998, The Open Group + 1993-1994, 1998, The Open Group + 1994, 1998, The Open Group + 1995, 1998, The Open Group + 1996, 1998, The Open Group + 1998, The Open Group + 2003, The Open Group +License: UNKNOWN + FIXME + Files: nx-X11/Imakefile nx-X11/config/cf/host.def - nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h - nx-X11/lib/X11/Imakefile + nx-X11/lib/include/X11/Xlibint.h + nx-X11/lib/include/xtrans/Xtranssock.c + nx-X11/lib/src/ConnDis.c + nx-X11/lib/src/OpenDis.c + nx-X11/lib/src/XlibAsync.c + nx-X11/lib/src/XlibInt.c nx-X11/programs/Imakefile + nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h nx-X11/programs/Xserver/Imakefile nx-X11/programs/Xserver/Xext/Imakefile + nx-X11/programs/Xserver/Xext/security.c nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.h nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -43,6 +536,18 @@ Files: nx-X11/Imakefile nx-X11/programs/Xserver/hw/nxagent/Literals.h nx-X11/programs/Xserver/hw/nxagent/Millis.c nx-X11/programs/Xserver/hw/nxagent/Millis.h + nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c + nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c + nx-X11/programs/Xserver/hw/nxagent/NXevents.c + nx-X11/programs/Xserver/hw/nxagent/NXextension.c + nx-X11/programs/Xserver/hw/nxagent/NXglxext.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c + nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c + nx-X11/programs/Xserver/hw/nxagent/NXproperty.c + nx-X11/programs/Xserver/hw/nxagent/NXresource.c + nx-X11/programs/Xserver/hw/nxagent/NXshm.c + nx-X11/programs/Xserver/hw/nxagent/NXwindow.c + nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c nx-X11/programs/Xserver/hw/nxagent/Options.c nx-X11/programs/Xserver/hw/nxagent/Options.h nx-X11/programs/Xserver/hw/nxagent/Pixels.c @@ -54,7 +559,6 @@ Files: nx-X11/Imakefile nx-X11/programs/Xserver/hw/nxagent/Render.c nx-X11/programs/Xserver/hw/nxagent/Render.h nx-X11/programs/Xserver/hw/nxagent/Rootless.c - nx-X11/programs/Xserver/hw/nxagent/Rootless.h nx-X11/programs/Xserver/hw/nxagent/Splash.c nx-X11/programs/Xserver/hw/nxagent/Splash.h nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -90,266 +594,263 @@ Files: nx-X11/Imakefile nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm nx-X11/programs/Xserver/hw/nxagent/screensaver nx-X11/programs/Xserver/mi/Imakefile - nx-X11/programs/Xserver/os/Imakefile + nx-X11/programs/Xserver/os/WaitFor.c + nx-X11/programs/Xserver/os/auth.c + nx-X11/programs/Xserver/os/log.c + nx-X11/programs/Xserver/os/utils.c nx-X11/programs/Xserver/randr/Imakefile - nxcomp/ActionCache.cpp - nxcomp/ActionCache.h - nxcomp/Agent.cpp - nxcomp/Agent.h - nxcomp/Alpha.cpp - nxcomp/Alpha.h - nxcomp/Auth.cpp - nxcomp/Auth.h - nxcomp/Bitmap.cpp - nxcomp/Bitmap.h - nxcomp/BlockCache.cpp - nxcomp/BlockCache.h - nxcomp/BlockCacheSet.cpp - nxcomp/BlockCacheSet.h - nxcomp/ChangeGC.cpp - nxcomp/ChangeGC.h - nxcomp/ChangeProperty.cpp - nxcomp/ChangeProperty.h - nxcomp/Channel.cpp - nxcomp/Channel.h - nxcomp/ChannelCache.cpp - nxcomp/ChannelCache.h - nxcomp/ChannelEndPoint.cpp - nxcomp/ChannelEndPoint.h - nxcomp/ChannelStore.h - nxcomp/CharCache.cpp - nxcomp/CharCache.h - nxcomp/Children.cpp - nxcomp/ClearArea.cpp - nxcomp/ClearArea.h - nxcomp/ClientCache.cpp - nxcomp/ClientCache.h - nxcomp/ClientChannel.cpp - nxcomp/ClientChannel.h - nxcomp/ClientProxy.cpp - nxcomp/ClientProxy.h - nxcomp/ClientReadBuffer.cpp - nxcomp/ClientReadBuffer.h - nxcomp/ClientStore.cpp - nxcomp/ClientStore.h - nxcomp/Colormap.cpp - nxcomp/Colormap.h - nxcomp/ConfigureWindow.cpp - nxcomp/ConfigureWindow.h - nxcomp/Control.cpp - nxcomp/Control.h - nxcomp/CopyArea.cpp - nxcomp/CopyArea.h - nxcomp/CreateGC.cpp - nxcomp/CreateGC.h - nxcomp/CreatePixmap.cpp - nxcomp/CreatePixmap.h - nxcomp/DecodeBuffer.cpp - nxcomp/DecodeBuffer.h - nxcomp/EncodeBuffer.cpp - nxcomp/EncodeBuffer.h - nxcomp/FillPoly.cpp - nxcomp/FillPoly.h - nxcomp/Fork.cpp - nxcomp/Fork.h - nxcomp/FreeCache.h - nxcomp/GenericChannel.cpp - nxcomp/GenericChannel.h - nxcomp/GenericReadBuffer.cpp - nxcomp/GenericReadBuffer.h - nxcomp/GenericReply.cpp - nxcomp/GenericReply.h - nxcomp/GenericRequest.cpp - nxcomp/GenericRequest.h - nxcomp/GetImage.cpp - nxcomp/GetImage.h - nxcomp/GetImageReply.cpp - nxcomp/GetImageReply.h - nxcomp/GetProperty.cpp - nxcomp/GetProperty.h - nxcomp/GetPropertyReply.cpp - nxcomp/GetPropertyReply.h - nxcomp/ImageText16.cpp - nxcomp/ImageText16.h - nxcomp/ImageText8.cpp - nxcomp/ImageText8.h - nxcomp/IntCache.cpp - nxcomp/IntCache.h - nxcomp/InternAtom.cpp - nxcomp/InternAtom.h - nxcomp/Jpeg.cpp - nxcomp/Jpeg.h - nxcomp/Keeper.cpp - nxcomp/Keeper.h - nxcomp/List.cpp - nxcomp/List.h - nxcomp/ListFontsReply.cpp - nxcomp/ListFontsReply.h - nxcomp/Loop.cpp - nxcomp/Makefile.in - nxcomp/Message.cpp - nxcomp/Message.h - nxcomp/Misc.cpp - nxcomp/Misc.h - nxcomp/NX.h - nxcomp/NXalert.h - nxcomp/NXmitshm.h - nxcomp/NXpack.h - nxcomp/NXproto.h - nxcomp/NXrender.h - nxcomp/NXvars.h - nxcomp/OpcodeCache.h - nxcomp/OpcodeStore.cpp - nxcomp/OpcodeStore.h - nxcomp/Pack.c - nxcomp/Pgn.cpp - nxcomp/Pgn.h - nxcomp/Pipe.cpp - nxcomp/Pipe.h - nxcomp/PolyArc.cpp - nxcomp/PolyArc.h - nxcomp/PolyFillArc.cpp - nxcomp/PolyFillArc.h - nxcomp/PolyFillRectangle.cpp - nxcomp/PolyFillRectangle.h - nxcomp/PolyLine.cpp - nxcomp/PolyLine.h - nxcomp/PolyPoint.cpp - nxcomp/PolyPoint.h - nxcomp/PolySegment.cpp - nxcomp/PolySegment.h - nxcomp/PolyText16.cpp - nxcomp/PolyText16.h - nxcomp/PolyText8.cpp - nxcomp/PolyText8.h - nxcomp/Proxy.cpp - nxcomp/Proxy.h - nxcomp/ProxyReadBuffer.cpp - nxcomp/ProxyReadBuffer.h - nxcomp/PutImage.cpp - nxcomp/PutImage.h - nxcomp/PutPackedImage.cpp - nxcomp/PutPackedImage.h - nxcomp/QueryFontReply.cpp - nxcomp/QueryFontReply.h - nxcomp/ReadBuffer.cpp - nxcomp/ReadBuffer.h - nxcomp/RenderAddGlyphs.cpp - nxcomp/RenderAddGlyphs.h - nxcomp/RenderChangePicture.cpp - nxcomp/RenderChangePicture.h - nxcomp/RenderComposite.cpp - nxcomp/RenderComposite.h - nxcomp/RenderCompositeGlyphs.cpp - nxcomp/RenderCompositeGlyphs.h - nxcomp/RenderCreateGlyphSet.cpp - nxcomp/RenderCreateGlyphSet.h - nxcomp/RenderCreatePicture.cpp - nxcomp/RenderCreatePicture.h - nxcomp/RenderExtension.cpp - nxcomp/RenderExtension.h - nxcomp/RenderFillRectangles.cpp - nxcomp/RenderFillRectangles.h - nxcomp/RenderFreeGlyphSet.cpp - nxcomp/RenderFreeGlyphSet.h - nxcomp/RenderFreePicture.cpp - nxcomp/RenderFreePicture.h - nxcomp/RenderGenericRequest.cpp - nxcomp/RenderGenericRequest.h - nxcomp/RenderMinorExtensionHeaders.h - nxcomp/RenderMinorExtensionMethods.h - nxcomp/RenderMinorExtensionTags.h - nxcomp/RenderPictureClip.cpp - nxcomp/RenderPictureClip.h - nxcomp/RenderPictureFilter.cpp - nxcomp/RenderPictureFilter.h - nxcomp/RenderPictureTransform.cpp - nxcomp/RenderPictureTransform.h - nxcomp/RenderTrapezoids.cpp - nxcomp/RenderTrapezoids.h - nxcomp/RenderTriangles.cpp - nxcomp/RenderTriangles.h - nxcomp/Rgb.cpp - nxcomp/Rgb.h - nxcomp/Rle.cpp - nxcomp/Rle.h - nxcomp/SendEvent.cpp - nxcomp/SendEvent.h - nxcomp/SequenceQueue.cpp - nxcomp/SequenceQueue.h - nxcomp/ServerCache.cpp - nxcomp/ServerCache.h - nxcomp/ServerChannel.cpp - nxcomp/ServerChannel.h - nxcomp/ServerProxy.cpp - nxcomp/ServerProxy.h - nxcomp/ServerReadBuffer.cpp - nxcomp/ServerReadBuffer.h - nxcomp/ServerStore.cpp - nxcomp/ServerStore.h - nxcomp/SetClipRectangles.cpp - nxcomp/SetClipRectangles.h - nxcomp/SetUnpackAlpha.cpp - nxcomp/SetUnpackAlpha.h - nxcomp/SetUnpackColormap.cpp - nxcomp/SetUnpackColormap.h - nxcomp/SetUnpackGeometry.cpp - nxcomp/SetUnpackGeometry.h - nxcomp/ShapeExtension.cpp - nxcomp/ShapeExtension.h - nxcomp/Socket.cpp - nxcomp/Socket.h - nxcomp/Split.cpp - nxcomp/Split.h - nxcomp/StaticCompressor.cpp - nxcomp/StaticCompressor.h - nxcomp/Statistics.cpp - nxcomp/Statistics.h - nxcomp/Timestamp.cpp - nxcomp/Timestamp.h - nxcomp/TranslateCoords.cpp - nxcomp/TranslateCoords.h - nxcomp/Transport.cpp - nxcomp/Transport.h - nxcomp/Types.h - nxcomp/Unpack.cpp - nxcomp/Unpack.h - nxcomp/Vars.c - nxcomp/WriteBuffer.cpp - nxcomp/WriteBuffer.h - nxcomp/XidCache.cpp - nxcomp/XidCache.h - nxcomp/Z.cpp - nxcomp/Z.h - nxcomp/configure.in - nxcompshad/Core.cpp - nxcompshad/Core.h - nxcompshad/Input.cpp - nxcompshad/Input.h - nxcompshad/Logger.cpp - nxcompshad/Logger.h - nxcompshad/Makefile.in - nxcompshad/Manager.cpp - nxcompshad/Manager.h - nxcompshad/Misc.h - nxcompshad/Poller.h - nxcompshad/Regions.h - nxcompshad/Shadow.cpp - nxcompshad/Shadow.h - nxcompshad/Updater.cpp - nxcompshad/Updater.h - nxcompshad/Win.cpp - nxcompshad/Win.h - nxcompshad/X11.cpp - nxcompshad/X11.h - nxcompshad/configure.in -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ + nxcomp/include/NX.h + nxcomp/include/NXalert.h + nxcomp/include/NXpack.h + nxcomp/include/NXproto.h + nxcomp/include/NXvars.h + nxcomp/src/ActionCache.cpp + nxcomp/src/ActionCache.h + nxcomp/src/Agent.cpp + nxcomp/src/Agent.h + nxcomp/src/Alpha.cpp + nxcomp/src/Alpha.h + nxcomp/src/Auth.cpp + nxcomp/src/Auth.h + nxcomp/src/Bitmap.cpp + nxcomp/src/Bitmap.h + nxcomp/src/BlockCache.cpp + nxcomp/src/BlockCache.h + nxcomp/src/BlockCacheSet.cpp + nxcomp/src/BlockCacheSet.h + nxcomp/src/ChangeGC.cpp + nxcomp/src/ChangeGC.h + nxcomp/src/ChangeProperty.cpp + nxcomp/src/ChangeProperty.h + nxcomp/src/Channel.cpp + nxcomp/src/Channel.h + nxcomp/src/ChannelCache.cpp + nxcomp/src/ChannelCache.h + nxcomp/src/ChannelEndPoint.cpp + nxcomp/src/ChannelEndPoint.h + nxcomp/src/ChannelStore.h + nxcomp/src/CharCache.cpp + nxcomp/src/CharCache.h + nxcomp/src/Children.cpp + nxcomp/src/ClearArea.cpp + nxcomp/src/ClearArea.h + nxcomp/src/ClientCache.cpp + nxcomp/src/ClientCache.h + nxcomp/src/ClientChannel.cpp + nxcomp/src/ClientChannel.h + nxcomp/src/ClientProxy.cpp + nxcomp/src/ClientProxy.h + nxcomp/src/ClientReadBuffer.cpp + nxcomp/src/ClientReadBuffer.h + nxcomp/src/ClientStore.cpp + nxcomp/src/ClientStore.h + nxcomp/src/Colormap.cpp + nxcomp/src/Colormap.h + nxcomp/src/ConfigureWindow.cpp + nxcomp/src/ConfigureWindow.h + nxcomp/src/Control.cpp + nxcomp/src/Control.h + nxcomp/src/CopyArea.cpp + nxcomp/src/CopyArea.h + nxcomp/src/CreateGC.cpp + nxcomp/src/CreateGC.h + nxcomp/src/CreatePixmap.cpp + nxcomp/src/CreatePixmap.h + nxcomp/src/DecodeBuffer.cpp + nxcomp/src/DecodeBuffer.h + nxcomp/src/EncodeBuffer.cpp + nxcomp/src/EncodeBuffer.h + nxcomp/src/FillPoly.cpp + nxcomp/src/FillPoly.h + nxcomp/src/Fork.cpp + nxcomp/src/Fork.h + nxcomp/src/FreeCache.h + nxcomp/src/GenericChannel.cpp + nxcomp/src/GenericChannel.h + nxcomp/src/GenericReadBuffer.cpp + nxcomp/src/GenericReadBuffer.h + nxcomp/src/GenericReply.cpp + nxcomp/src/GenericReply.h + nxcomp/src/GenericRequest.cpp + nxcomp/src/GenericRequest.h + nxcomp/src/GetImage.cpp + nxcomp/src/GetImage.h + nxcomp/src/GetImageReply.cpp + nxcomp/src/GetImageReply.h + nxcomp/src/GetProperty.cpp + nxcomp/src/GetProperty.h + nxcomp/src/GetPropertyReply.cpp + nxcomp/src/GetPropertyReply.h + nxcomp/src/ImageText16.cpp + nxcomp/src/ImageText16.h + nxcomp/src/ImageText8.cpp + nxcomp/src/ImageText8.h + nxcomp/src/IntCache.cpp + nxcomp/src/IntCache.h + nxcomp/src/InternAtom.cpp + nxcomp/src/InternAtom.h + nxcomp/src/Jpeg.cpp + nxcomp/src/Jpeg.h + nxcomp/src/Keeper.cpp + nxcomp/src/Keeper.h + nxcomp/src/List.cpp + nxcomp/src/List.h + nxcomp/src/ListFontsReply.cpp + nxcomp/src/ListFontsReply.h + nxcomp/src/Loop.cpp + nxcomp/src/Message.cpp + nxcomp/src/Message.h + nxcomp/src/Misc.cpp + nxcomp/src/Misc.h + nxcomp/src/NXmitshm.h + nxcomp/src/NXrender.h + nxcomp/src/OpcodeCache.h + nxcomp/src/OpcodeStore.cpp + nxcomp/src/OpcodeStore.h + nxcomp/src/Pack.c + nxcomp/src/Pgn.cpp + nxcomp/src/Pgn.h + nxcomp/src/Pipe.cpp + nxcomp/src/Pipe.h + nxcomp/src/PolyArc.cpp + nxcomp/src/PolyArc.h + nxcomp/src/PolyFillArc.cpp + nxcomp/src/PolyFillArc.h + nxcomp/src/PolyFillRectangle.cpp + nxcomp/src/PolyFillRectangle.h + nxcomp/src/PolyLine.cpp + nxcomp/src/PolyLine.h + nxcomp/src/PolyPoint.cpp + nxcomp/src/PolyPoint.h + nxcomp/src/PolySegment.cpp + nxcomp/src/PolySegment.h + nxcomp/src/PolyText16.cpp + nxcomp/src/PolyText16.h + nxcomp/src/PolyText8.cpp + nxcomp/src/PolyText8.h + nxcomp/src/Proxy.cpp + nxcomp/src/Proxy.h + nxcomp/src/ProxyReadBuffer.cpp + nxcomp/src/ProxyReadBuffer.h + nxcomp/src/PutImage.cpp + nxcomp/src/PutImage.h + nxcomp/src/PutPackedImage.cpp + nxcomp/src/PutPackedImage.h + nxcomp/src/QueryFontReply.cpp + nxcomp/src/QueryFontReply.h + nxcomp/src/ReadBuffer.cpp + nxcomp/src/ReadBuffer.h + nxcomp/src/RenderAddGlyphs.cpp + nxcomp/src/RenderAddGlyphs.h + nxcomp/src/RenderChangePicture.cpp + nxcomp/src/RenderChangePicture.h + nxcomp/src/RenderComposite.cpp + nxcomp/src/RenderComposite.h + nxcomp/src/RenderCompositeGlyphs.cpp + nxcomp/src/RenderCompositeGlyphs.h + nxcomp/src/RenderCreateGlyphSet.cpp + nxcomp/src/RenderCreateGlyphSet.h + nxcomp/src/RenderCreatePicture.cpp + nxcomp/src/RenderCreatePicture.h + nxcomp/src/RenderExtension.cpp + nxcomp/src/RenderExtension.h + nxcomp/src/RenderFillRectangles.cpp + nxcomp/src/RenderFillRectangles.h + nxcomp/src/RenderFreeGlyphSet.cpp + nxcomp/src/RenderFreeGlyphSet.h + nxcomp/src/RenderFreePicture.cpp + nxcomp/src/RenderFreePicture.h + nxcomp/src/RenderGenericRequest.cpp + nxcomp/src/RenderGenericRequest.h + nxcomp/src/RenderMinorExtensionHeaders.h + nxcomp/src/RenderMinorExtensionMethods.h + nxcomp/src/RenderMinorExtensionTags.h + nxcomp/src/RenderPictureClip.cpp + nxcomp/src/RenderPictureClip.h + nxcomp/src/RenderPictureFilter.cpp + nxcomp/src/RenderPictureFilter.h + nxcomp/src/RenderPictureTransform.cpp + nxcomp/src/RenderPictureTransform.h + nxcomp/src/RenderTrapezoids.cpp + nxcomp/src/RenderTrapezoids.h + nxcomp/src/RenderTriangles.cpp + nxcomp/src/RenderTriangles.h + nxcomp/src/Rgb.cpp + nxcomp/src/Rgb.h + nxcomp/src/Rle.cpp + nxcomp/src/Rle.h + nxcomp/src/SendEvent.cpp + nxcomp/src/SendEvent.h + nxcomp/src/SequenceQueue.cpp + nxcomp/src/SequenceQueue.h + nxcomp/src/ServerCache.cpp + nxcomp/src/ServerCache.h + nxcomp/src/ServerChannel.cpp + nxcomp/src/ServerChannel.h + nxcomp/src/ServerProxy.cpp + nxcomp/src/ServerProxy.h + nxcomp/src/ServerReadBuffer.cpp + nxcomp/src/ServerReadBuffer.h + nxcomp/src/ServerStore.cpp + nxcomp/src/ServerStore.h + nxcomp/src/SetClipRectangles.cpp + nxcomp/src/SetClipRectangles.h + nxcomp/src/SetUnpackAlpha.cpp + nxcomp/src/SetUnpackAlpha.h + nxcomp/src/SetUnpackColormap.cpp + nxcomp/src/SetUnpackColormap.h + nxcomp/src/SetUnpackGeometry.cpp + nxcomp/src/SetUnpackGeometry.h + nxcomp/src/ShapeExtension.cpp + nxcomp/src/ShapeExtension.h + nxcomp/src/Socket.cpp + nxcomp/src/Socket.h + nxcomp/src/Split.cpp + nxcomp/src/Split.h + nxcomp/src/StaticCompressor.cpp + nxcomp/src/StaticCompressor.h + nxcomp/src/Statistics.cpp + nxcomp/src/Statistics.h + nxcomp/src/Timestamp.cpp + nxcomp/src/Timestamp.h + nxcomp/src/TranslateCoords.cpp + nxcomp/src/TranslateCoords.h + nxcomp/src/Transport.cpp + nxcomp/src/Transport.h + nxcomp/src/Types.h + nxcomp/src/Unpack.cpp + nxcomp/src/Unpack.h + nxcomp/src/Vars.c + nxcomp/src/WriteBuffer.cpp + nxcomp/src/WriteBuffer.h + nxcomp/src/XidCache.cpp + nxcomp/src/XidCache.h + nxcomp/src/Z.cpp + nxcomp/src/Z.h + nxcompshad/include/Shadow.h + nxcompshad/src/Core.cpp + nxcompshad/src/Core.h + nxcompshad/src/Input.cpp + nxcompshad/src/Input.h + nxcompshad/src/Logger.cpp + nxcompshad/src/Logger.h + nxcompshad/src/Manager.cpp + nxcompshad/src/Manager.h + nxcompshad/src/Misc.h + nxcompshad/src/Poller.h + nxcompshad/src/Regions.h + nxcompshad/src/Shadow.cpp + nxcompshad/src/Updater.cpp + nxcompshad/src/Updater.h + nxcompshad/src/X11.cpp + nxcompshad/src/X11.h +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. License: UNKNOWN FIXME @@ -415,7 +916,6 @@ Files: nx-X11/extras/Mesa/include/GL/gl.h nx-X11/extras/Mesa/src/mesa/main/drawpix.h nx-X11/extras/Mesa/src/mesa/main/enable.c nx-X11/extras/Mesa/src/mesa/main/enable.h - nx-X11/extras/Mesa/src/mesa/main/enums.c nx-X11/extras/Mesa/src/mesa/main/enums.h nx-X11/extras/Mesa/src/mesa/main/eval.c nx-X11/extras/Mesa/src/mesa/main/eval.h @@ -656,348 +1156,18 @@ Copyright: 1999-2001, Brian Paul 1999-2003, Brian Paul 1999-2004, Brian Paul 1999-2005, Brian Paul + 1999-2006, Brian Paul 2004-2005, Brian Paul 2005, Brian Paul -License: Expat +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/include/XWDFile.h - nx-X11/include/Xalloca.h - nx-X11/include/Xauth.h - nx-X11/include/Xfuncproto.h - nx-X11/include/Xfuncs.h - nx-X11/include/Xos.h - nx-X11/include/Xos_r.h - nx-X11/include/Xosdefs.h - nx-X11/include/Xthreads.h - nx-X11/include/Xwindows.h - nx-X11/include/Xwinsock.h - nx-X11/include/extensions/bigreqstr.h - nx-X11/include/extensions/security.h - nx-X11/include/extensions/securstr.h - nx-X11/include/extensions/xcmiscstr.h - nx-X11/include/extensions/xtestconst.h - nx-X11/include/extensions/xteststr.h - nx-X11/lib/X11/AllCells.c - nx-X11/lib/X11/AllPlanes.c - nx-X11/lib/X11/AllowEv.c - nx-X11/lib/X11/AuDispose.c - nx-X11/lib/X11/AuFileName.c - nx-X11/lib/X11/AuGetBest.c - nx-X11/lib/X11/AuRead.c - nx-X11/lib/X11/AutoRep.c - nx-X11/lib/X11/Backgnd.c - nx-X11/lib/X11/BdrWidth.c - nx-X11/lib/X11/Bell.c - nx-X11/lib/X11/Border.c - nx-X11/lib/X11/ChAccCon.c - nx-X11/lib/X11/ChActPGb.c - nx-X11/lib/X11/ChClMode.c - nx-X11/lib/X11/ChCmap.c - nx-X11/lib/X11/ChGC.c - nx-X11/lib/X11/ChKeyCon.c - nx-X11/lib/X11/ChPntCon.c - nx-X11/lib/X11/ChProp.c - nx-X11/lib/X11/ChSaveSet.c - nx-X11/lib/X11/ChWAttrs.c - nx-X11/lib/X11/ChWindow.c - nx-X11/lib/X11/ChkIfEv.c - nx-X11/lib/X11/ChkMaskEv.c - nx-X11/lib/X11/ChkTypEv.c - nx-X11/lib/X11/ChkTypWEv.c - nx-X11/lib/X11/ChkWinEv.c - nx-X11/lib/X11/CirWin.c - nx-X11/lib/X11/CirWinDn.c - nx-X11/lib/X11/CirWinUp.c - nx-X11/lib/X11/ClDisplay.c - nx-X11/lib/X11/Clear.c - nx-X11/lib/X11/ClearArea.c - nx-X11/lib/X11/ConfWind.c - nx-X11/lib/X11/ConvSel.c - nx-X11/lib/X11/CopyArea.c - nx-X11/lib/X11/CopyCmap.c - nx-X11/lib/X11/CopyGC.c - nx-X11/lib/X11/CopyPlane.c - nx-X11/lib/X11/CrBFData.c - nx-X11/lib/X11/CrCmap.c - nx-X11/lib/X11/CrCursor.c - nx-X11/lib/X11/CrGC.c - nx-X11/lib/X11/CrGlCur.c - nx-X11/lib/X11/CrPFBData.c - nx-X11/lib/X11/CrPixmap.c - nx-X11/lib/X11/CrWindow.c - nx-X11/lib/X11/Cursor.c - nx-X11/lib/X11/DefCursor.c - nx-X11/lib/X11/DelProp.c - nx-X11/lib/X11/Depths.c - nx-X11/lib/X11/DestSubs.c - nx-X11/lib/X11/DestWind.c - nx-X11/lib/X11/DisName.c - nx-X11/lib/X11/DrArc.c - nx-X11/lib/X11/DrArcs.c - nx-X11/lib/X11/DrLine.c - nx-X11/lib/X11/DrLines.c - nx-X11/lib/X11/DrPoint.c - nx-X11/lib/X11/DrPoints.c - nx-X11/lib/X11/DrRect.c - nx-X11/lib/X11/DrRects.c - nx-X11/lib/X11/DrSegs.c - nx-X11/lib/X11/ErrHndlr.c - nx-X11/lib/X11/EvToWire.c - nx-X11/lib/X11/FSSaver.c - nx-X11/lib/X11/FetchName.c - nx-X11/lib/X11/FillArc.c - nx-X11/lib/X11/FillArcs.c - nx-X11/lib/X11/FillPoly.c - nx-X11/lib/X11/FillRct.c - nx-X11/lib/X11/FillRcts.c - nx-X11/lib/X11/Flush.c - nx-X11/lib/X11/FontInfo.c - nx-X11/lib/X11/FontNames.c - nx-X11/lib/X11/FreeCmap.c - nx-X11/lib/X11/FreeCols.c - nx-X11/lib/X11/FreeCurs.c - nx-X11/lib/X11/FreeEData.c - nx-X11/lib/X11/FreeGC.c - nx-X11/lib/X11/FreePix.c - nx-X11/lib/X11/GCMisc.c - nx-X11/lib/X11/Geom.c - nx-X11/lib/X11/GetAtomNm.c - nx-X11/lib/X11/GetColor.c - nx-X11/lib/X11/GetFPath.c - nx-X11/lib/X11/GetFProp.c - nx-X11/lib/X11/GetGCVals.c - nx-X11/lib/X11/GetGeom.c - nx-X11/lib/X11/GetHColor.c - nx-X11/lib/X11/GetIFocus.c - nx-X11/lib/X11/GetImage.c - nx-X11/lib/X11/GetKCnt.c - nx-X11/lib/X11/GetMoEv.c - nx-X11/lib/X11/GetPCnt.c - nx-X11/lib/X11/GetPntMap.c - nx-X11/lib/X11/GetProp.c - nx-X11/lib/X11/GetRGBCMap.c - nx-X11/lib/X11/GetSOwner.c - nx-X11/lib/X11/GetSSaver.c - nx-X11/lib/X11/GetWAttrs.c - nx-X11/lib/X11/GrButton.c - nx-X11/lib/X11/GrKey.c - nx-X11/lib/X11/GrKeybd.c - nx-X11/lib/X11/GrPointer.c - nx-X11/lib/X11/GrServer.c - nx-X11/lib/X11/IfEvent.c - nx-X11/lib/X11/ImText.c - nx-X11/lib/X11/ImText16.c - nx-X11/lib/X11/ImUtil.c - nx-X11/lib/X11/InitExt.c - nx-X11/lib/X11/InsCmap.c - nx-X11/lib/X11/IntAtom.c - nx-X11/lib/X11/KeyBind.c - nx-X11/lib/X11/KeysymStr.c - nx-X11/lib/X11/KillCl.c - nx-X11/lib/X11/LiICmaps.c - nx-X11/lib/X11/LiProps.c - nx-X11/lib/X11/ListExt.c - nx-X11/lib/X11/LoadFont.c - nx-X11/lib/X11/LockDis.c - nx-X11/lib/X11/LookupCol.c - nx-X11/lib/X11/LowerWin.c - nx-X11/lib/X11/Macros.c - nx-X11/lib/X11/MapRaised.c - nx-X11/lib/X11/MapSubs.c - nx-X11/lib/X11/MapWindow.c - nx-X11/lib/X11/MaskEvent.c - nx-X11/lib/X11/Misc.c - nx-X11/lib/X11/ModMap.c - nx-X11/lib/X11/MoveWin.c - nx-X11/lib/X11/NextEvent.c - nx-X11/lib/X11/ParseCol.c - nx-X11/lib/X11/ParseGeom.c - nx-X11/lib/X11/PeekEvent.c - nx-X11/lib/X11/PeekIfEv.c - nx-X11/lib/X11/Pending.c - nx-X11/lib/X11/PixFormats.c - nx-X11/lib/X11/PmapBgnd.c - nx-X11/lib/X11/PmapBord.c - nx-X11/lib/X11/PolyTxt.c - nx-X11/lib/X11/PolyTxt16.c - nx-X11/lib/X11/PropAlloc.c - nx-X11/lib/X11/PutBEvent.c - nx-X11/lib/X11/PutImage.c - nx-X11/lib/X11/QuBest.c - nx-X11/lib/X11/QuColor.c - nx-X11/lib/X11/QuColors.c - nx-X11/lib/X11/QuCurShp.c - nx-X11/lib/X11/QuExt.c - nx-X11/lib/X11/QuKeybd.c - nx-X11/lib/X11/QuPntr.c - nx-X11/lib/X11/QuStipShp.c - nx-X11/lib/X11/QuTextE16.c - nx-X11/lib/X11/QuTextExt.c - nx-X11/lib/X11/QuTileShp.c - nx-X11/lib/X11/QuTree.c - nx-X11/lib/X11/RaiseWin.c - nx-X11/lib/X11/RdBitF.c - nx-X11/lib/X11/RecolorC.c - nx-X11/lib/X11/ReconfWM.c - nx-X11/lib/X11/ReconfWin.c - nx-X11/lib/X11/RepWindow.c - nx-X11/lib/X11/RestackWs.c - nx-X11/lib/X11/RotProp.c - nx-X11/lib/X11/ScrResStr.c - nx-X11/lib/X11/SelInput.c - nx-X11/lib/X11/SendEvent.c - nx-X11/lib/X11/SetBack.c - nx-X11/lib/X11/SetCRects.c - nx-X11/lib/X11/SetClMask.c - nx-X11/lib/X11/SetClOrig.c - nx-X11/lib/X11/SetDashes.c - nx-X11/lib/X11/SetFPath.c - nx-X11/lib/X11/SetFont.c - nx-X11/lib/X11/SetFore.c - nx-X11/lib/X11/SetFunc.c - nx-X11/lib/X11/SetIFocus.c - nx-X11/lib/X11/SetLStyle.c - nx-X11/lib/X11/SetPMask.c - nx-X11/lib/X11/SetPntMap.c - nx-X11/lib/X11/SetRGBCMap.c - nx-X11/lib/X11/SetSOwner.c - nx-X11/lib/X11/SetSSaver.c - nx-X11/lib/X11/SetState.c - nx-X11/lib/X11/SetStip.c - nx-X11/lib/X11/SetTSOrig.c - nx-X11/lib/X11/SetTile.c - nx-X11/lib/X11/StBytes.c - nx-X11/lib/X11/StColor.c - nx-X11/lib/X11/StColors.c - nx-X11/lib/X11/StNColor.c - nx-X11/lib/X11/StName.c - nx-X11/lib/X11/StrKeysym.c - nx-X11/lib/X11/StrToText.c - nx-X11/lib/X11/Sync.c - nx-X11/lib/X11/Synchro.c - nx-X11/lib/X11/Text.c - nx-X11/lib/X11/Text16.c - nx-X11/lib/X11/TextToStr.c - nx-X11/lib/X11/TrCoords.c - nx-X11/lib/X11/UndefCurs.c - nx-X11/lib/X11/UngrabBut.c - nx-X11/lib/X11/UngrabKbd.c - nx-X11/lib/X11/UngrabKey.c - nx-X11/lib/X11/UngrabPtr.c - nx-X11/lib/X11/UngrabSvr.c - nx-X11/lib/X11/UninsCmap.c - nx-X11/lib/X11/UnldFont.c - nx-X11/lib/X11/UnmapSubs.c - nx-X11/lib/X11/UnmapWin.c - nx-X11/lib/X11/VisUtil.c - nx-X11/lib/X11/WMGeom.c - nx-X11/lib/X11/WarpPtr.c - nx-X11/lib/X11/WinEvent.c - nx-X11/lib/X11/Window.c - nx-X11/lib/X11/WrBitF.c - nx-X11/lib/X11/XErrorDB - nx-X11/lib/X11/XKBBind.c - nx-X11/lib/X11/XKBCvt.c - nx-X11/lib/X11/Xlib.h - nx-X11/lib/X11/Xlocale.h - nx-X11/lib/X11/cmsMath.c - nx-X11/lib/X11/cursorfont.h - nx-X11/lib/X11/evtomask.c - nx-X11/lib/X11/globals.c - nx-X11/lib/X11/locking.c - nx-X11/lib/X11/locking.h - nx-X11/lib/X11/mbWMProps.c - nx-X11/lib/X11/util/makekeys.c - nx-X11/programs/Xserver/Xext/bigreq.c - nx-X11/programs/Xserver/Xext/shape.c - nx-X11/programs/Xserver/Xext/shm.c - nx-X11/programs/Xserver/Xext/sleepuntil.c - nx-X11/programs/Xserver/Xext/xcmisc.c - nx-X11/programs/Xserver/Xext/xtest.c - nx-X11/programs/Xserver/Xi/queryst.c - nx-X11/programs/Xserver/dix/ffs.c - nx-X11/programs/Xserver/dix/pixmap.c - nx-X11/programs/Xserver/dix/privates.c - nx-X11/programs/Xserver/dix/xpstubs.c - nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c - nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h - nx-X11/programs/Xserver/include/closestr.h - nx-X11/programs/Xserver/include/opaque.h - nx-X11/programs/Xserver/include/validate.h - nx-X11/programs/Xserver/mi/cbrt.c - nx-X11/programs/Xserver/mi/mibstorest.h - nx-X11/programs/Xserver/mi/miclipn.c - nx-X11/programs/Xserver/mi/midispcur.c - nx-X11/programs/Xserver/mi/mieq.c - nx-X11/programs/Xserver/mi/mifillarc.c - nx-X11/programs/Xserver/mi/mifillarc.h - nx-X11/programs/Xserver/mi/migc.c - nx-X11/programs/Xserver/mi/migc.h - nx-X11/programs/Xserver/mi/miline.h - nx-X11/programs/Xserver/mi/mipointer.c - nx-X11/programs/Xserver/mi/mipointer.h - nx-X11/programs/Xserver/mi/mipointrst.h - nx-X11/programs/Xserver/mi/mipoly.h - nx-X11/programs/Xserver/mi/miscanfill.h - nx-X11/programs/Xserver/mi/miscrinit.c - nx-X11/programs/Xserver/mi/misprite.c - nx-X11/programs/Xserver/mi/misprite.h - nx-X11/programs/Xserver/mi/mispritest.h - nx-X11/programs/Xserver/mi/mivalidate.h - nx-X11/programs/Xserver/mi/miwideline.c - nx-X11/programs/Xserver/mi/miwideline.h - nx-X11/programs/Xserver/mi/mizerarc.c - nx-X11/programs/Xserver/mi/mizerarc.h - nx-X11/programs/Xserver/os/mitauth.c - nx-X11/programs/Xserver/os/rpcauth.c - nx-X11/programs/Xserver/os/secauth.c - nx-X11/programs/Xserver/os/xdmauth.c - nx-X11/programs/Xserver/record/record.c - nx-X11/programs/Xserver/record/set.c - nx-X11/programs/Xserver/record/set.h - nxcompshad/X11/include/XTest_nxcompshad.h -Copyright: 1985, 1987, 1990, 1998 The Open Group - 1985, 1987, 1994, 1998 The Open Group - 1985, 1987, 1998, The Open Group - 1985, 1990, 1998, The Open Group - 1985, 1998 The Open Group - 1985-1986, 1998 The Open Group - 1985-1987, 1991, 1998, The Open Group - 1985-1987, 1998 The Open Group - 1985-1987,1998, The Open Group - 1986, 1990, 1998, The Open Group - 1986, 1998 The Open Group - 1986,1998, The Open Group - 1986-1987, 1998 The Open Group - 1987, 1998 The Open Group - 1988, 1998 The Open Group - 1988-1989, 1998 The Open Group - 1989, 1991, 1998, The Open Group - 1989, 1998 The Open Group - 1990, 1994, 1998, The Open Group - 1990, 1998 The Open Group - 1991, 1998 The Open Group - 1992, 1998 The Open Group - 1993, 1995, 1998, The Open Group - 1993, 1998 The Open Group - 1993-1994, 1998 The Open Group - 1994, 1998 The Open Group - 1995, 1998 The Open Group - 1996, 1998 The Open Group - 1998, 1998 The Open Group - 2003, The Open Group -License: UNKNOWN - FIXME - -Files: ChangeLog - Makefile +Files: Makefile VERSION debian/README.source debian/compat debian/control - debian/copyright - debian/copyright.in + debian/files debian/libnx-x11-6.install debian/libnx-x11-6.symbols debian/libnx-x11-6.triggers @@ -1018,6 +1188,7 @@ Files: ChangeLog debian/nx-x11proto-damage-dev.install debian/nx-x11proto-randr-dev.install debian/nx-x11proto-render-dev.install + debian/nx-x11proto-scrnsaver-dev.install debian/nx-x11proto-xext-dev.install debian/nx-x11proto-xfixes-dev.install debian/nx-x11proto-xinerama-dev.install @@ -1039,7 +1210,6 @@ Files: ChangeLog debian/watch doc/README.NX-development doc/libNX_X11/lcUniConv/8bit_tab_to_h.c - doc/libNX_X11/lcUniConv/README doc/libNX_X11/lcUniConv/cjk_tab_to_h.c doc/nxagent/README.keystrokes doc/nxagent/README.keystrokes.debug @@ -1049,8 +1219,6 @@ Files: ChangeLog nx-X11/Makefile nx-X11/config/Imakefile nx-X11/config/cf/Imake.cf - nx-X11/config/cf/Imake.rules - nx-X11/config/cf/Imake.tmpl nx-X11/config/cf/Imakefile nx-X11/config/cf/Library.tmpl nx-X11/config/cf/README @@ -1058,9 +1226,11 @@ Files: ChangeLog nx-X11/config/cf/ServerLib.tmpl nx-X11/config/cf/Threads.tmpl nx-X11/config/cf/X11.rules - nx-X11/config/cf/X11.tmpl nx-X11/config/cf/cross.def nx-X11/config/cf/cross.rules + nx-X11/config/cf/gnu.cf + nx-X11/config/cf/gnuLib.rules + nx-X11/config/cf/gnuLib.tmpl nx-X11/config/cf/linux.cf nx-X11/config/cf/lnxLib.rules nx-X11/config/cf/lnxLib.tmpl @@ -1072,9 +1242,13 @@ Files: ChangeLog nx-X11/config/cf/xorg.tmpl nx-X11/config/cf/xorgsite.def nx-X11/config/cf/xorgversion.def - nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch + nx-X11/extras/Mesa.patches/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch + nx-X11/extras/Mesa.patches/4002_no-special-glx-memfunctions.patch + nx-X11/extras/Mesa.patches/4003_CreatePixmap-AllocationHints.patch + nx-X11/extras/Mesa.patches/4004_define-USE_IEEE-macro-for-more-platforms.patch + nx-X11/extras/Mesa.patches/5001_nasty-typo-fixes.patch nx-X11/extras/Mesa.patches/series - nx-X11/extras/Mesa/src/mesa/main/get.c + nx-X11/extras/Mesa/src/mesa/main/KNOWN_BUGS nx-X11/extras/Mesa/src/mesa/main/texrender.c nx-X11/extras/Mesa/src/mesa/main/texrender.h nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h @@ -1092,67 +1266,83 @@ Files: ChangeLog nx-X11/include/GL/Imakefile nx-X11/include/Imakefile nx-X11/include/XF86keysym.h - nx-X11/include/Xatom.h nx-X11/include/Xw32defs.h nx-X11/include/extensions/Imakefile nx-X11/include/extensions/XvMC.h nx-X11/include/extensions/XvMCproto.h - nx-X11/lib/Imakefile - nx-X11/lib/X11/Cmap.h - nx-X11/lib/X11/Cr.h - nx-X11/lib/X11/Cv.h - nx-X11/lib/X11/ImUtil.h - nx-X11/lib/X11/Key.h - nx-X11/lib/X11/Xintatom.h - nx-X11/lib/X11/Xintconn.h - nx-X11/lib/X11/XlibConf.h - nx-X11/lib/X11/Xresinternal.h - nx-X11/lib/X11/imKStoUCS.c - nx-X11/lib/X11/lcUniConv/armscii_8.h - nx-X11/lib/X11/lcUniConv/big5.h - nx-X11/lib/X11/lcUniConv/big5_emacs.h - nx-X11/lib/X11/lcUniConv/big5hkscs.h - nx-X11/lib/X11/lcUniConv/cp1133.h - nx-X11/lib/X11/lcUniConv/cp1251.h - nx-X11/lib/X11/lcUniConv/cp1255.h - nx-X11/lib/X11/lcUniConv/cp1256.h - nx-X11/lib/X11/lcUniConv/gb2312.h - nx-X11/lib/X11/lcUniConv/gbk.h - nx-X11/lib/X11/lcUniConv/georgian_academy.h - nx-X11/lib/X11/lcUniConv/georgian_ps.h - nx-X11/lib/X11/lcUniConv/iso8859_1.h - nx-X11/lib/X11/lcUniConv/iso8859_10.h - nx-X11/lib/X11/lcUniConv/iso8859_11.h - nx-X11/lib/X11/lcUniConv/iso8859_13.h - nx-X11/lib/X11/lcUniConv/iso8859_14.h - nx-X11/lib/X11/lcUniConv/iso8859_15.h - nx-X11/lib/X11/lcUniConv/iso8859_16.h - nx-X11/lib/X11/lcUniConv/iso8859_2.h - nx-X11/lib/X11/lcUniConv/iso8859_3.h - nx-X11/lib/X11/lcUniConv/iso8859_4.h - nx-X11/lib/X11/lcUniConv/iso8859_5.h - nx-X11/lib/X11/lcUniConv/iso8859_6.h - nx-X11/lib/X11/lcUniConv/iso8859_7.h - nx-X11/lib/X11/lcUniConv/iso8859_8.h - nx-X11/lib/X11/lcUniConv/iso8859_9.h - nx-X11/lib/X11/lcUniConv/iso8859_9e.h - nx-X11/lib/X11/lcUniConv/jisx0201.h - nx-X11/lib/X11/lcUniConv/jisx0208.h - nx-X11/lib/X11/lcUniConv/jisx0212.h - nx-X11/lib/X11/lcUniConv/koi8_c.h - nx-X11/lib/X11/lcUniConv/koi8_r.h - nx-X11/lib/X11/lcUniConv/koi8_u.h - nx-X11/lib/X11/lcUniConv/ksc5601.h - nx-X11/lib/X11/lcUniConv/mulelao.h - nx-X11/lib/X11/lcUniConv/tatar_cyr.h - nx-X11/lib/X11/lcUniConv/tcvn.h - nx-X11/lib/X11/lcUniConv/tis620.h - nx-X11/lib/X11/lcUniConv/ucs2be.h - nx-X11/lib/X11/lcUniConv/utf8.h - nx-X11/lib/X11/lcUniConv/viscii.h - nx-X11/lib/xtrans/Imakefile + nx-X11/lib/Makefile.am + nx-X11/lib/configure.ac + nx-X11/lib/include/Makefile.am + nx-X11/lib/include/X11/ImUtil.h + nx-X11/lib/modules/Makefile.am + nx-X11/lib/modules/im/Makefile.am + nx-X11/lib/modules/im/ximcp/Makefile.am + nx-X11/lib/modules/lc/Makefile.am + nx-X11/lib/modules/lc/Utf8/Makefile.am + nx-X11/lib/modules/lc/def/Makefile.am + nx-X11/lib/modules/lc/gen/Makefile.am + nx-X11/lib/modules/om/Makefile.am + nx-X11/lib/modules/om/generic/Makefile.am + nx-X11/lib/nx-x11.pc.in + nx-X11/lib/src/Cmap.h + nx-X11/lib/src/Cr.h + nx-X11/lib/src/Key.h + nx-X11/lib/src/Makefile.am + nx-X11/lib/src/Xintatom.h + nx-X11/lib/src/Xintconn.h + nx-X11/lib/src/Xresinternal.h + nx-X11/lib/src/util/Makefile.am + nx-X11/lib/src/xcms/Cv.h + nx-X11/lib/src/xcms/Makefile.am + nx-X11/lib/src/xkb/Makefile.am + nx-X11/lib/src/xlibi18n/Makefile.am + nx-X11/lib/src/xlibi18n/imKStoUCS.c + nx-X11/lib/src/xlibi18n/lcUniConv/armscii_8.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5_emacs.h + nx-X11/lib/src/xlibi18n/lcUniConv/big5hkscs.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1133.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1251.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1255.h + nx-X11/lib/src/xlibi18n/lcUniConv/cp1256.h + nx-X11/lib/src/xlibi18n/lcUniConv/gb2312.h + nx-X11/lib/src/xlibi18n/lcUniConv/gbk.h + nx-X11/lib/src/xlibi18n/lcUniConv/georgian_academy.h + nx-X11/lib/src/xlibi18n/lcUniConv/georgian_ps.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_1.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_10.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_11.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_13.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_14.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_15.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_16.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_2.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_3.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_4.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_5.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_6.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_7.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_8.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9.h + nx-X11/lib/src/xlibi18n/lcUniConv/iso8859_9e.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0201.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0208.h + nx-X11/lib/src/xlibi18n/lcUniConv/jisx0212.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_c.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_r.h + nx-X11/lib/src/xlibi18n/lcUniConv/koi8_u.h + nx-X11/lib/src/xlibi18n/lcUniConv/ksc5601.h + nx-X11/lib/src/xlibi18n/lcUniConv/mulelao.h + nx-X11/lib/src/xlibi18n/lcUniConv/tatar_cyr.h + nx-X11/lib/src/xlibi18n/lcUniConv/tcvn.h + nx-X11/lib/src/xlibi18n/lcUniConv/tis620.h + nx-X11/lib/src/xlibi18n/lcUniConv/ucs2be.h + nx-X11/lib/src/xlibi18n/lcUniConv/utf8.h + nx-X11/lib/src/xlibi18n/lcUniConv/viscii.h nx-X11/programs/Xserver/GL/Imakefile nx-X11/programs/Xserver/GL/glx/Imakefile + nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h + nx-X11/programs/Xserver/GL/include/GL/xf86glx.h nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile nx-X11/programs/Xserver/GL/mesa/Imakefile nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -1190,8 +1380,6 @@ Files: ChangeLog nx-X11/programs/Xserver/damageext/Imakefile nx-X11/programs/Xserver/dbe/Imakefile nx-X11/programs/Xserver/dix/Imakefile - nx-X11/programs/Xserver/dix/buildatoms - nx-X11/programs/Xserver/dix/initatoms.c nx-X11/programs/Xserver/fb/Imakefile nx-X11/programs/Xserver/fix-miregion nx-X11/programs/Xserver/fix-miregion-private @@ -1212,147 +1400,25 @@ Files: ChangeLog nx-X11/programs/Xserver/xkb/Imakefile nx-X11/programs/Xserver/xkb/ddxPrivate.c nx-X11/programs/Xserver/xkb/xkb.h - nx-X11/programs/Xserver/xkb/xkbDflts.h nx-X11/x-indent-all.sh nx-X11/x-indent.sh + nxcomp/Makefile.am nxcomp/VERSION - nxcomp/install-sh - nxcomp/mkinstalldirs + nxcomp/configure.ac nxcomp/nxcomp.pc.in + nxcomp/src/Makefile.am + nxcompshad/Makefile.am nxcompshad/VERSION - nxcompshad/install-sh + nxcompshad/configure.ac nxcompshad/nxcompshad.pc.in - nxproxy/Makefile.in + nxcompshad/src/Makefile.am + nxproxy/Makefile.am nxproxy/VERSION - nxproxy/configure.in - nxproxy/install-sh + nxproxy/configure.ac + nxproxy/man/Makefile.am nxproxy/man/nxproxy.1 - nxproxy/mkinstalldirs -Copyright: *No copyright* -License: UNKNOWN - FIXME - -Files: nx-X11/include/DECkeysym.h - nx-X11/include/HPkeysym.h - nx-X11/include/X.h - nx-X11/include/Xmd.h - nx-X11/include/Xproto.h - nx-X11/include/Xprotostr.h - nx-X11/include/extensions/sync.h - nx-X11/include/extensions/syncstr.h - nx-X11/include/keysym.h - nx-X11/include/keysymdef.h - nx-X11/lib/X11/ErrDes.c - nx-X11/lib/X11/GetDflt.c - nx-X11/lib/X11/GetHints.c - nx-X11/lib/X11/GetStCmap.c - nx-X11/lib/X11/GetWMCMapW.c - nx-X11/lib/X11/GetWMProto.c - nx-X11/lib/X11/ParseCmd.c - nx-X11/lib/X11/PolyReg.c - nx-X11/lib/X11/Region.c - nx-X11/lib/X11/SetHints.c - nx-X11/lib/X11/SetStCmap.c - nx-X11/lib/X11/SetWMCMapW.c - nx-X11/lib/X11/SetWMProto.c - nx-X11/lib/X11/Xatomtype.h - nx-X11/lib/X11/XimThai.h - nx-X11/lib/X11/Xregion.h - nx-X11/lib/X11/Xresource.h - nx-X11/lib/X11/Xutil.h - nx-X11/lib/X11/imThaiFlt.c - nx-X11/lib/X11/pathmax.h - nx-X11/lib/X11/poly.h - nx-X11/programs/Xserver/Xext/sync.c - nx-X11/programs/Xserver/dix/atom.c - nx-X11/programs/Xserver/dix/colormap.c - nx-X11/programs/Xserver/dix/cursor.c - nx-X11/programs/Xserver/dix/devices.c - nx-X11/programs/Xserver/dix/extension.c - nx-X11/programs/Xserver/dix/gc.c - nx-X11/programs/Xserver/dix/globals.c - nx-X11/programs/Xserver/dix/glyphcurs.c - nx-X11/programs/Xserver/dix/grabs.c - nx-X11/programs/Xserver/dix/property.c - nx-X11/programs/Xserver/dix/swaprep.c - nx-X11/programs/Xserver/dix/swapreq.c - nx-X11/programs/Xserver/dix/tables.c - nx-X11/programs/Xserver/include/closure.h - nx-X11/programs/Xserver/include/colormap.h - nx-X11/programs/Xserver/include/colormapst.h - nx-X11/programs/Xserver/include/cursor.h - nx-X11/programs/Xserver/include/cursorstr.h - nx-X11/programs/Xserver/include/dix.h - nx-X11/programs/Xserver/include/extension.h - nx-X11/programs/Xserver/include/extnsionst.h - nx-X11/programs/Xserver/include/gc.h - nx-X11/programs/Xserver/include/gcstruct.h - nx-X11/programs/Xserver/include/input.h - nx-X11/programs/Xserver/include/inputstr.h - nx-X11/programs/Xserver/include/miscstruct.h - nx-X11/programs/Xserver/include/os.h - nx-X11/programs/Xserver/include/pixmap.h - nx-X11/programs/Xserver/include/pixmapstr.h - nx-X11/programs/Xserver/include/property.h - nx-X11/programs/Xserver/include/propertyst.h - nx-X11/programs/Xserver/include/region.h - nx-X11/programs/Xserver/include/regionstr.h - nx-X11/programs/Xserver/include/resource.h - nx-X11/programs/Xserver/include/rgb.h - nx-X11/programs/Xserver/include/screenint.h - nx-X11/programs/Xserver/include/scrnintstr.h - nx-X11/programs/Xserver/include/selection.h - nx-X11/programs/Xserver/include/servermd.h - nx-X11/programs/Xserver/include/site.h - nx-X11/programs/Xserver/include/window.h - nx-X11/programs/Xserver/include/windowstr.h - nx-X11/programs/Xserver/mi/mi.h - nx-X11/programs/Xserver/mi/miarc.c - nx-X11/programs/Xserver/mi/mibitblt.c - nx-X11/programs/Xserver/mi/micursor.c - nx-X11/programs/Xserver/mi/midash.c - nx-X11/programs/Xserver/mi/mifillrct.c - nx-X11/programs/Xserver/mi/mifpoly.h - nx-X11/programs/Xserver/mi/mifpolycon.c - nx-X11/programs/Xserver/mi/miglblt.c - nx-X11/programs/Xserver/mi/miinitext.c - nx-X11/programs/Xserver/mi/mipoly.c - nx-X11/programs/Xserver/mi/mipolycon.c - nx-X11/programs/Xserver/mi/mipolygen.c - nx-X11/programs/Xserver/mi/mipolypnt.c - nx-X11/programs/Xserver/mi/mipolyrect.c - nx-X11/programs/Xserver/mi/mipolyseg.c - nx-X11/programs/Xserver/mi/mipolytext.c - nx-X11/programs/Xserver/mi/mipolyutil.c - nx-X11/programs/Xserver/mi/mipushpxl.c - nx-X11/programs/Xserver/mi/mispans.c - nx-X11/programs/Xserver/mi/mispans.h - nx-X11/programs/Xserver/mi/mistruct.h - nx-X11/programs/Xserver/mi/miwindow.c - nx-X11/programs/Xserver/mi/mizerclip.c - nx-X11/programs/Xserver/mi/mizerline.c - nx-X11/programs/Xserver/os/connection.c - nx-X11/programs/Xserver/os/io.c - nx-X11/programs/Xserver/os/oscolor.c - nx-X11/programs/Xserver/os/osdep.h - nx-X11/programs/Xserver/os/osinit.c -Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts - 1987, 1989, 1998, The Open Group - 1987, 1994, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1987-1988, 1998 The Open Group - 1987-1988, Digital Equipment Corporation, Maynard, Massachusetts - 1988, 1998 The Open Group - 1988, Digital Equipment Corporation, Maynard, Massachusetts - 1989, 1998 The Open Group - 1989, Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1993 Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1993, 1998, The Open Group - 1991, 1993-1994, 1998 The Open Group - 1991,1993, Digital Equipment Corporation, Maynard, Massachusetts - 1993, 1998 The Open Group - 1993, Digital Equipment Corporation, Maynard, Massachusetts + nxproxy/src/Makefile.am +Copyright: NONE License: UNKNOWN FIXME @@ -1360,8 +1426,9 @@ Files: nx-X11/include/extensions/composite.h nx-X11/include/extensions/compositeproto.h nx-X11/include/extensions/damageproto.h nx-X11/include/extensions/damagewire.h - nx-X11/lib/X11/x11_trans.c - nx-X11/lib/X11/xim_trans.c + nx-X11/lib/include/X11/XlibConf.h.in + nx-X11/lib/src/x11_trans.c + nx-X11/lib/src/xlibi18n/xim_trans.c nx-X11/programs/Xserver/Xext/shmint.h nx-X11/programs/Xserver/composite/compalloc.c nx-X11/programs/Xserver/composite/compext.c @@ -1427,16 +1494,17 @@ Files: nx-X11/include/extensions/composite.h nx-X11/programs/Xserver/xfixes/xfixes.c nx-X11/programs/Xserver/xfixes/xfixes.h nx-X11/programs/Xserver/xfixes/xfixesint.h - nxcompshad/X11/include/Xdamage_nxcompshad.h + nxcompshad/src/X11/include/Xdamage_nxcompshad.h Copyright: 1998, Keith Packard 1999, Keith Packard 2002, Keith Packard 2003, Keith Packard 2004, Keith Packard + 2005, Keith Packard 2006, Keith Packard 2007, Keith Packard 2014, Keith Packard -License: UNKNOWN +License: NTP (legal disclaimer) FIXME Files: nx-X11/include/extensions/XKB.h @@ -1449,27 +1517,27 @@ Files: nx-X11/include/extensions/XKB.h nx-X11/include/extensions/XKBstr.h nx-X11/include/extensions/XKM.h nx-X11/include/extensions/XKMformat.h - nx-X11/lib/X11/XKB.c - nx-X11/lib/X11/XKBAlloc.c - nx-X11/lib/X11/XKBBell.c - nx-X11/lib/X11/XKBCompat.c - nx-X11/lib/X11/XKBCtrls.c - nx-X11/lib/X11/XKBExtDev.c - nx-X11/lib/X11/XKBGAlloc.c - nx-X11/lib/X11/XKBGeom.c - nx-X11/lib/X11/XKBGetByName.c - nx-X11/lib/X11/XKBGetMap.c - nx-X11/lib/X11/XKBList.c - nx-X11/lib/X11/XKBMAlloc.c - nx-X11/lib/X11/XKBMisc.c - nx-X11/lib/X11/XKBNames.c - nx-X11/lib/X11/XKBRdBuf.c - nx-X11/lib/X11/XKBSetGeom.c - nx-X11/lib/X11/XKBSetMap.c - nx-X11/lib/X11/XKBUse.c - nx-X11/lib/X11/XKBleds.c - nx-X11/lib/X11/XKBlib.h - nx-X11/lib/X11/XKBlibint.h + nx-X11/lib/include/X11/XKBlib.h + nx-X11/lib/src/xkb/XKB.c + nx-X11/lib/src/xkb/XKBAlloc.c + nx-X11/lib/src/xkb/XKBBell.c + nx-X11/lib/src/xkb/XKBCompat.c + nx-X11/lib/src/xkb/XKBCtrls.c + nx-X11/lib/src/xkb/XKBExtDev.c + nx-X11/lib/src/xkb/XKBGAlloc.c + nx-X11/lib/src/xkb/XKBGeom.c + nx-X11/lib/src/xkb/XKBGetByName.c + nx-X11/lib/src/xkb/XKBGetMap.c + nx-X11/lib/src/xkb/XKBList.c + nx-X11/lib/src/xkb/XKBMAlloc.c + nx-X11/lib/src/xkb/XKBMisc.c + nx-X11/lib/src/xkb/XKBNames.c + nx-X11/lib/src/xkb/XKBRdBuf.c + nx-X11/lib/src/xkb/XKBSetGeom.c + nx-X11/lib/src/xkb/XKBSetMap.c + nx-X11/lib/src/xkb/XKBUse.c + nx-X11/lib/src/xkb/XKBleds.c + nx-X11/lib/src/xkb/XKBlibint.h nx-X11/programs/Xserver/include/xkbfile.h nx-X11/programs/Xserver/include/xkbrules.h nx-X11/programs/Xserver/include/xkbsrv.h @@ -1509,77 +1577,78 @@ Files: nx-X11/include/extensions/XKB.h nx-X11/programs/Xserver/xkb/xkbout.c nx-X11/programs/Xserver/xkb/xkbtext.c nx-X11/programs/Xserver/xkb/xkmread.c -Copyright: 1993, Silicon Graphics Computer Systems, Inc - 1994, Silicon Graphics Computer Systems, Inc - 1995, Silicon Graphics Computer Systems, Inc - 1996, Silicon Graphics Computer Systems, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/AddDIC.c - nx-X11/lib/X11/AddSF.c - nx-X11/lib/X11/CvColW.c - nx-X11/lib/X11/CvCols.c - nx-X11/lib/X11/HVC.c - nx-X11/lib/X11/HVCGcC.c - nx-X11/lib/X11/HVCGcV.c - nx-X11/lib/X11/HVCGcVC.c - nx-X11/lib/X11/HVCMnV.c - nx-X11/lib/X11/HVCMxC.c - nx-X11/lib/X11/HVCMxV.c - nx-X11/lib/X11/HVCMxVC.c - nx-X11/lib/X11/HVCMxVs.c - nx-X11/lib/X11/HVCWpAj.c - nx-X11/lib/X11/IdOfPr.c - nx-X11/lib/X11/LRGB.c - nx-X11/lib/X11/Lab.c - nx-X11/lib/X11/LabGcC.c - nx-X11/lib/X11/LabGcL.c - nx-X11/lib/X11/LabGcLC.c - nx-X11/lib/X11/LabMnL.c - nx-X11/lib/X11/LabMxC.c - nx-X11/lib/X11/LabMxL.c - nx-X11/lib/X11/LabMxLC.c - nx-X11/lib/X11/LabWpAj.c - nx-X11/lib/X11/Luv.c - nx-X11/lib/X11/LuvGcC.c - nx-X11/lib/X11/LuvGcL.c - nx-X11/lib/X11/LuvGcLC.c - nx-X11/lib/X11/LuvMnL.c - nx-X11/lib/X11/LuvMxC.c - nx-X11/lib/X11/LuvMxL.c - nx-X11/lib/X11/LuvMxLC.c - nx-X11/lib/X11/LuvWpAj.c - nx-X11/lib/X11/OfCCC.c - nx-X11/lib/X11/PrOfId.c - nx-X11/lib/X11/QBlack.c - nx-X11/lib/X11/QBlue.c - nx-X11/lib/X11/QGreen.c - nx-X11/lib/X11/QRed.c - nx-X11/lib/X11/QWhite.c - nx-X11/lib/X11/QuCol.c - nx-X11/lib/X11/QuCols.c - nx-X11/lib/X11/SetCCC.c - nx-X11/lib/X11/SetGetCols.c - nx-X11/lib/X11/StCol.c - nx-X11/lib/X11/StCols.c - nx-X11/lib/X11/UNDEFINED.c - nx-X11/lib/X11/XRGB.c - nx-X11/lib/X11/XYZ.c - nx-X11/lib/X11/Xcms.h - nx-X11/lib/X11/Xcmsint.h - nx-X11/lib/X11/cmsAllCol.c - nx-X11/lib/X11/cmsAllNCol.c - nx-X11/lib/X11/cmsCmap.c - nx-X11/lib/X11/cmsColNm.c - nx-X11/lib/X11/cmsGlobls.c - nx-X11/lib/X11/cmsInt.c - nx-X11/lib/X11/cmsLkCol.c - nx-X11/lib/X11/cmsProp.c - nx-X11/lib/X11/cmsTrig.c - nx-X11/lib/X11/uvY.c - nx-X11/lib/X11/xyY.c -Copyright: 1990, 1991 Tektronix, Inc +Copyright: 1993, Silicon Graphics Computer Systems, Inc. + 1994, Silicon Graphics Computer Systems, Inc. + 1995, Silicon Graphics Computer Systems, Inc. + 1996, Silicon Graphics Computer Systems, Inc. +License: UNKNOWN + FIXME + +Files: nx-X11/lib/include/X11/Xcms.h + nx-X11/lib/src/xcms/AddDIC.c + nx-X11/lib/src/xcms/AddSF.c + nx-X11/lib/src/xcms/CCC.c + nx-X11/lib/src/xcms/CvColW.c + nx-X11/lib/src/xcms/CvCols.c + nx-X11/lib/src/xcms/HVC.c + nx-X11/lib/src/xcms/HVCGcC.c + nx-X11/lib/src/xcms/HVCGcV.c + nx-X11/lib/src/xcms/HVCGcVC.c + nx-X11/lib/src/xcms/HVCMnV.c + nx-X11/lib/src/xcms/HVCMxC.c + nx-X11/lib/src/xcms/HVCMxV.c + nx-X11/lib/src/xcms/HVCMxVC.c + nx-X11/lib/src/xcms/HVCMxVs.c + nx-X11/lib/src/xcms/HVCWpAj.c + nx-X11/lib/src/xcms/IdOfPr.c + nx-X11/lib/src/xcms/LRGB.c + nx-X11/lib/src/xcms/Lab.c + nx-X11/lib/src/xcms/LabGcC.c + nx-X11/lib/src/xcms/LabGcL.c + nx-X11/lib/src/xcms/LabGcLC.c + nx-X11/lib/src/xcms/LabMnL.c + nx-X11/lib/src/xcms/LabMxC.c + nx-X11/lib/src/xcms/LabMxL.c + nx-X11/lib/src/xcms/LabMxLC.c + nx-X11/lib/src/xcms/LabWpAj.c + nx-X11/lib/src/xcms/Luv.c + nx-X11/lib/src/xcms/LuvGcC.c + nx-X11/lib/src/xcms/LuvGcL.c + nx-X11/lib/src/xcms/LuvGcLC.c + nx-X11/lib/src/xcms/LuvMnL.c + nx-X11/lib/src/xcms/LuvMxC.c + nx-X11/lib/src/xcms/LuvMxL.c + nx-X11/lib/src/xcms/LuvMxLC.c + nx-X11/lib/src/xcms/LuvWpAj.c + nx-X11/lib/src/xcms/OfCCC.c + nx-X11/lib/src/xcms/PrOfId.c + nx-X11/lib/src/xcms/QBlack.c + nx-X11/lib/src/xcms/QBlue.c + nx-X11/lib/src/xcms/QGreen.c + nx-X11/lib/src/xcms/QRed.c + nx-X11/lib/src/xcms/QWhite.c + nx-X11/lib/src/xcms/QuCol.c + nx-X11/lib/src/xcms/QuCols.c + nx-X11/lib/src/xcms/SetCCC.c + nx-X11/lib/src/xcms/SetGetCols.c + nx-X11/lib/src/xcms/StCol.c + nx-X11/lib/src/xcms/StCols.c + nx-X11/lib/src/xcms/UNDEFINED.c + nx-X11/lib/src/xcms/XRGB.c + nx-X11/lib/src/xcms/XYZ.c + nx-X11/lib/src/xcms/Xcmsint.h + nx-X11/lib/src/xcms/cmsAllCol.c + nx-X11/lib/src/xcms/cmsAllNCol.c + nx-X11/lib/src/xcms/cmsCmap.c + nx-X11/lib/src/xcms/cmsColNm.c + nx-X11/lib/src/xcms/cmsGlobls.c + nx-X11/lib/src/xcms/cmsInt.c + nx-X11/lib/src/xcms/cmsLkCol.c + nx-X11/lib/src/xcms/cmsProp.c + nx-X11/lib/src/xcms/cmsTrig.c + nx-X11/lib/src/xcms/uvY.c + nx-X11/lib/src/xcms/xyY.c +Copyright: 1990-1991, Tektronix, Inc. License: UNKNOWN FIXME @@ -1591,11 +1660,6 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h nx-X11/include/GL/glxmd.h nx-X11/include/GL/glxproto.h nx-X11/include/GL/glxtokens.h - nx-X11/programs/Xserver/GL/glx/g_disptab.c - nx-X11/programs/Xserver/GL/glx/g_disptab.h - nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c - nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h - nx-X11/programs/Xserver/GL/glx/g_render.c nx-X11/programs/Xserver/GL/glx/g_renderswap.c nx-X11/programs/Xserver/GL/glx/g_single.c nx-X11/programs/Xserver/GL/glx/g_singleswap.c @@ -1636,9 +1700,9 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h nx-X11/programs/Xserver/GL/glx/singlesize.h nx-X11/programs/Xserver/GL/glx/unpack.h nx-X11/programs/Xserver/GL/glx/xfont.c -Copyright: 1991-2000, Silicon Graphics, Inc - 1991-2004, Silicon Graphics, Inc -License: UNKNOWN +Copyright: 1991-2000, Silicon Graphics, Inc. + 1991-2004, Silicon Graphics, Inc. +License: SGI Free Software License B (v1.1) FIXME Files: nx-X11/programs/Xserver/Xext/xtest1dd.h @@ -1690,51 +1754,39 @@ Copyright: 1996, Thomas E. Dickey License: UNKNOWN FIXME -Files: nx-X11/include/extensions/XI.h - nx-X11/include/extensions/XIproto.h - nx-X11/programs/Xserver/Xi/allowev.c - nx-X11/programs/Xserver/Xi/chgdctl.c - nx-X11/programs/Xserver/Xi/chgfctl.c - nx-X11/programs/Xserver/Xi/chgkbd.c - nx-X11/programs/Xserver/Xi/chgkmap.c - nx-X11/programs/Xserver/Xi/chgprop.c - nx-X11/programs/Xserver/Xi/chgptr.c - nx-X11/programs/Xserver/Xi/closedev.c - nx-X11/programs/Xserver/Xi/devbell.c - nx-X11/programs/Xserver/Xi/exevents.c - nx-X11/programs/Xserver/Xi/extinit.c - nx-X11/programs/Xserver/Xi/getbmap.c - nx-X11/programs/Xserver/Xi/getdctl.c - nx-X11/programs/Xserver/Xi/getfctl.c - nx-X11/programs/Xserver/Xi/getfocus.c - nx-X11/programs/Xserver/Xi/getkmap.c - nx-X11/programs/Xserver/Xi/getmmap.c - nx-X11/programs/Xserver/Xi/getprop.c - nx-X11/programs/Xserver/Xi/getselev.c - nx-X11/programs/Xserver/Xi/getvers.c - nx-X11/programs/Xserver/Xi/grabdev.c - nx-X11/programs/Xserver/Xi/grabdevb.c - nx-X11/programs/Xserver/Xi/grabdevk.c - nx-X11/programs/Xserver/Xi/gtmotion.c - nx-X11/programs/Xserver/Xi/listdev.c - nx-X11/programs/Xserver/Xi/opendev.c - nx-X11/programs/Xserver/Xi/selectev.c - nx-X11/programs/Xserver/Xi/sendexev.c - nx-X11/programs/Xserver/Xi/setbmap.c - nx-X11/programs/Xserver/Xi/setdval.c - nx-X11/programs/Xserver/Xi/setfocus.c - nx-X11/programs/Xserver/Xi/setmmap.c - nx-X11/programs/Xserver/Xi/setmode.c - nx-X11/programs/Xserver/Xi/stubs.c - nx-X11/programs/Xserver/Xi/ungrdev.c - nx-X11/programs/Xserver/Xi/ungrdevb.c - nx-X11/programs/Xserver/Xi/ungrdevk.c -Copyright: 1989, 1998 The Open Group - 1989, Hewlett-Packard Company, Palo Alto, California -License: UNKNOWN +Files: nx-X11/lib/modules/lc/def/lcDefConv.c + nx-X11/lib/modules/lc/gen/lcGenConv.c + nx-X11/lib/modules/om/generic/omDefault.c + nx-X11/lib/modules/om/generic/omGeneric.c + nx-X11/lib/modules/om/generic/omImText.c + nx-X11/lib/modules/om/generic/omText.c + nx-X11/lib/modules/om/generic/omTextEsc.c + nx-X11/lib/modules/om/generic/omTextExt.c + nx-X11/lib/modules/om/generic/omTextPer.c + nx-X11/lib/modules/om/generic/omXChar.c + nx-X11/lib/src/OCWrap.c + nx-X11/lib/src/OMWrap.c + nx-X11/lib/src/XomGeneric.h + nx-X11/lib/src/xlibi18n/XlcGeneric.h + nx-X11/lib/src/xlibi18n/XlcPubI.h + nx-X11/lib/src/xlibi18n/XlcPublic.h + nx-X11/lib/src/xlibi18n/lcCT.c + nx-X11/lib/src/xlibi18n/lcCharSet.c + nx-X11/lib/src/xlibi18n/lcConv.c + nx-X11/lib/src/xlibi18n/lcGeneric.c + nx-X11/lib/src/xlibi18n/lcPrTxt.c + nx-X11/lib/src/xlibi18n/lcPubWrap.c + nx-X11/lib/src/xlibi18n/lcPublic.c + nx-X11/lib/src/xlibi18n/lcRM.c + nx-X11/lib/src/xlibi18n/lcStd.c + nx-X11/lib/src/xlibi18n/lcTxtPr.c + nx-X11/lib/src/xlibi18n/lcUtil.c +Copyright: 1992-1993, TOSHIBA Corp. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/Args.c +Files: nx-X11/include/Xpoll.h.in + nx-X11/programs/Xserver/hw/nxagent/Args.c nx-X11/programs/Xserver/hw/nxagent/Args.h nx-X11/programs/Xserver/hw/nxagent/Colormap.c nx-X11/programs/Xserver/hw/nxagent/Colormap.h @@ -1758,36 +1810,14 @@ Files: nx-X11/programs/Xserver/hw/nxagent/Args.c nx-X11/programs/Xserver/hw/nxagent/Screen.h nx-X11/programs/Xserver/hw/nxagent/TestExt.c nx-X11/programs/Xserver/hw/nxagent/Visual.c - nx-X11/programs/Xserver/hw/nxagent/Visual.h -Copyright: 1993, Davor Matic - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/OCWrap.c - nx-X11/lib/X11/OMWrap.c - nx-X11/lib/X11/XlcPubI.h - nx-X11/lib/X11/lcCharSet.c - nx-X11/lib/X11/lcConv.c - nx-X11/lib/X11/lcDefConv.c - nx-X11/lib/X11/lcPrTxt.c - nx-X11/lib/X11/lcPubWrap.c - nx-X11/lib/X11/lcPublic.c - nx-X11/lib/X11/lcRM.c - nx-X11/lib/X11/lcStd.c - nx-X11/lib/X11/lcTxtPr.c - nx-X11/lib/X11/lcUtil.c - nx-X11/lib/X11/omImText.c - nx-X11/lib/X11/omTextExt.c - nx-X11/lib/X11/omTextPer.c -Copyright: 1992-1993, TOSHIBA Corp -License: UNKNOWN +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. +License: NTP FIXME Files: nx-X11/include/extensions/render.h @@ -1805,8 +1835,8 @@ Files: nx-X11/include/extensions/render.h nx-X11/programs/Xserver/render/picture.h nx-X11/programs/Xserver/render/picturestr.h nx-X11/programs/Xserver/render/render.c -Copyright: 2000, SuSE, Inc -License: UNKNOWN +Copyright: 2000, SuSE, Inc. +License: NTP (legal disclaimer) FIXME Files: nx-X11/include/extensions/dpms.h @@ -1820,83 +1850,106 @@ Files: nx-X11/include/extensions/dpms.h nx-X11/programs/Xserver/Xext/panoramiXSwap.c nx-X11/programs/Xserver/Xext/panoramiXprocs.c nx-X11/programs/Xserver/dix/dixfonts.c + nx-X11/programs/Xserver/include/dixfont.h + nx-X11/programs/Xserver/include/dixfontstr.h + nx-X11/programs/Xserver/include/dixstruct.h nx-X11/programs/Xserver/randr/panoramiXproto.h -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts - 1996, Digital Equipment Corporation, Maynard, Massachusetts -License: Expat - FIXME - -Files: nx-X11/lib/X11/XimImSw.h - nx-X11/lib/X11/XimProto.h - nx-X11/lib/X11/imDefFlt.c - nx-X11/lib/X11/imDefLkup.c - nx-X11/lib/X11/imDispch.c - nx-X11/lib/X11/imExten.c - nx-X11/lib/X11/imInt.c - nx-X11/lib/X11/imLcGIc.c - nx-X11/lib/X11/imLcIc.c - nx-X11/lib/X11/imLcSIc.c - nx-X11/lib/X11/imRmAttr.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts. + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts. + 1996, Digital Equipment Corporation, Maynard, Massachusetts. +License: UNKNOWN + FIXME + +Files: nx-X11/lib/include/xtrans/Xtrans.c + nx-X11/lib/include/xtrans/Xtrans.h + nx-X11/lib/include/xtrans/Xtransint.h + nx-X11/lib/include/xtrans/Xtranslcl.c + nx-X11/lib/include/xtrans/Xtransutil.c + nx-X11/lib/include/xtrans/transport.c + nx-X11/lib/src/xlibi18n/Xlcint.h + nx-X11/lib/src/xlibi18n/lcWrap.c + nx-X11/lib/src/xlibi18n/mbWrap.c + nx-X11/lib/src/xlibi18n/utf8WMProps.c + nx-X11/lib/src/xlibi18n/utf8Wrap.c + nx-X11/lib/src/xlibi18n/wcWrap.c + nx-X11/programs/Xserver/Xext/sync.c + nx-X11/programs/Xserver/include/misc.h +Copyright: 1987, 1998, The Open Group + 1991, 1993, 1998, The Open Group + 1991, 1998, The Open Group + 1993-1994, 1998, The Open Group +License: NTP (legal disclaimer) + FIXME + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c + nx-X11/programs/Xserver/hw/nxagent/NXglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h + nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c + nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h + nx-X11/programs/Xserver/hw/nxagent/NXrender.c + nx-X11/programs/Xserver/randr/randr.c + nx-X11/programs/Xserver/randr/rrcrtc.c + nx-X11/programs/Xserver/randr/rrmode.c + nx-X11/programs/Xserver/randr/rrscreen.c + nx-X11/programs/Xserver/randr/rrxinerama.c +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. +License: NTP (legal disclaimer) + FIXME + +Files: nx-X11/lib/modules/im/ximcp/imDefFlt.c + nx-X11/lib/modules/im/ximcp/imDefLkup.c + nx-X11/lib/modules/im/ximcp/imDispch.c + nx-X11/lib/modules/im/ximcp/imExten.c + nx-X11/lib/modules/im/ximcp/imInt.c + nx-X11/lib/modules/im/ximcp/imLcGIc.c + nx-X11/lib/modules/im/ximcp/imLcIc.c + nx-X11/lib/modules/im/ximcp/imLcSIc.c + nx-X11/lib/modules/im/ximcp/imRmAttr.c + nx-X11/lib/src/xlibi18n/XimImSw.h + nx-X11/lib/src/xlibi18n/XimProto.h Copyright: 1990-1994, FUJITSU LIMITED 1992-1993, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993-1994, FUJITSU LIMITED -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/XlcGeneric.h - nx-X11/lib/X11/XlcPublic.h - nx-X11/lib/X11/XomGeneric.h - nx-X11/lib/X11/lcCT.c - nx-X11/lib/X11/lcGenConv.c - nx-X11/lib/X11/lcGeneric.c - nx-X11/lib/X11/omDefault.c - nx-X11/lib/X11/omGeneric.c - nx-X11/lib/X11/omText.c - nx-X11/lib/X11/omTextEsc.c - nx-X11/lib/X11/omXChar.c -Copyright: 1992-1993, TOSHIBA Corp - 1995, FUJITSU LIMITED -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/Xv.h - nx-X11/include/extensions/Xvproto.h - nx-X11/lib/X11/imEvToWire.c - nx-X11/programs/Xserver/Xext/xvdisp.c - nx-X11/programs/Xserver/Xext/xvdix.h - nx-X11/programs/Xserver/Xext/xvmain.c - nx-X11/programs/Xserver/include/dixfont.h - nx-X11/programs/Xserver/include/dixfontstr.h - nx-X11/programs/Xserver/include/dixstruct.h -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, Digital Equipment Corporation, Maynard, Massachusetts - 1993, Digital Equipment Corporation, Maynard, Massachusetts -License: UNKNOWN +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c - nx-X11/programs/Xserver/hw/nxagent/NXevents.c - nx-X11/programs/Xserver/hw/nxagent/NXextension.c - nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c - nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c - nx-X11/programs/Xserver/hw/nxagent/NXproperty.c - nx-X11/programs/Xserver/hw/nxagent/NXresource.c - nx-X11/programs/Xserver/hw/nxagent/NXwindow.c - nx-X11/programs/Xserver/os/WaitFor.c -Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts - 1987, 1989, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: doc/libNX_X11/lcUniConv/README + nx-X11/config/cf/Imake.rules + nx-X11/config/cf/Imake.tmpl + nx-X11/config/cf/X11.tmpl + nx-X11/extras/Mesa/src/mesa/main/get.c + nx-X11/include/Xatom.h + nx-X11/lib/src/util/mkks.sh + nx-X11/programs/Xserver/dix/buildatoms + nx-X11/programs/Xserver/dix/initatoms.c + nx-X11/programs/Xserver/xkb/xkbDflts.h +Copyright: NONE +License: GENERATED FILE + FIXME + +Files: nx-X11/lib/modules/im/ximcp/imDefIc.c + nx-X11/lib/modules/im/ximcp/imTrX.c + nx-X11/lib/modules/im/ximcp/imTrans.c + nx-X11/lib/modules/im/ximcp/imTransR.c + nx-X11/lib/src/xlibi18n/XimTrInt.h + nx-X11/lib/src/xlibi18n/XimTrX.h + nx-X11/lib/src/xlibi18n/XimTrans.h + nx-X11/lib/src/xlibi18n/XimintP.h + nx-X11/programs/Xserver/composite/compoverlay.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h +Copyright: 1991-1992, Oracle and/or its affiliates. + 1992, Oracle and/or its affiliates. + 2006, Oracle and/or its affiliates. +License: NTP (legal disclaimer) FIXME Files: nx-X11/include/extensions/xfixesproto.h @@ -1908,35 +1961,10 @@ Files: nx-X11/include/extensions/xfixesproto.h nx-X11/programs/Xserver/render/mirect.c nx-X11/programs/Xserver/render/mitrap.c nx-X11/programs/Xserver/render/mitri.c -Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc - 2001, Keith Packard, member of The XFree86 Project, Inc - 2002, Keith Packard, member of The XFree86 Project, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/ConnDis.c - nx-X11/lib/X11/OpenDis.c - nx-X11/lib/X11/XlibAsync.c - nx-X11/lib/X11/XlibInt.c - nx-X11/lib/X11/Xlibint.h - nx-X11/programs/Xserver/Xext/security.c - nx-X11/programs/Xserver/hw/nxagent/NXshm.c - nx-X11/programs/Xserver/os/auth.c -Copyright: 1984-1985, 1987, 1989, 1998 The Open Group - 1985-1986, 1998 The Open Group - 1985-1987, 1998 The Open Group - 1988, 1998 The Open Group - 1989, 1998 The Open Group - 1992, 1998 The Open Group - 1996, 1998 The Open Group - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc. + 2001, Keith Packard, member of The XFree86 Project, Inc. + 2002, Keith Packard, member of The XFree86 Project, Inc. +License: NTP (legal disclaimer) FIXME Files: @@ -1946,24 +1974,10 @@ Files: -Copyright: +Copyright: NONE License: FIXME -Files: nx-X11/lib/X11/XimTrInt.h - nx-X11/lib/X11/XimTrX.h - nx-X11/lib/X11/XimTrans.h - nx-X11/lib/X11/imDefIc.c - nx-X11/lib/X11/imTrX.c - nx-X11/lib/X11/imTrans.c - nx-X11/lib/X11/imTransR.c -Copyright: 1991-1992, Oracle and/or its affiliates. - 1992, Oracle and/or its affiliates. - 1992-1994, FUJITSU LIMITED - 1993-1994, FUJITSU LIMITED -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c @@ -1971,23 +1985,9 @@ Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S -Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas - 2004, Tungsten Graphics Inc., Cedar Park, Texas -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/dix/dispatch.c - nx-X11/programs/Xserver/dix/events.c - nx-X11/programs/Xserver/dix/main.c - nx-X11/programs/Xserver/dix/resource.c - nx-X11/programs/Xserver/dix/window.c - nx-X11/programs/Xserver/mi/miexpose.c -Copyright: 1987, 1989 Digital Equipment Corporation, Maynard, Massachusetts - 1987, 1989, 1998, The Open Group - 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts -License: Expat +Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas. + 2004, Tungsten Graphics Inc., Cedar Park, Texas. +License: UNKNOWN FIXME Files: nx-X11/include/extensions/Xdbeproto.h @@ -1997,55 +1997,49 @@ Files: nx-X11/include/extensions/Xdbeproto.h nx-X11/programs/Xserver/dbe/midbe.h nx-X11/programs/Xserver/dbe/midbestr.h Copyright: 1994-1995, Hewlett-Packard Company -License: Expat +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/lib/xtrans/Xtrans.c - nx-X11/lib/xtrans/Xtrans.h - nx-X11/lib/xtrans/Xtransint.h - nx-X11/lib/xtrans/Xtranslcl.c - nx-X11/lib/xtrans/Xtransutil.c - nx-X11/lib/xtrans/transport.c -Copyright: 1993-1994, 1998 The Open Group - 1993-1994, NCR Corporation - Dayton, Ohio, USA +Files: nx-X11/include/extensions/Xv.h + nx-X11/include/extensions/Xvproto.h + nx-X11/lib/modules/im/ximcp/imEvToWire.c + nx-X11/programs/Xserver/Xext/xvdisp.c + nx-X11/programs/Xserver/Xext/xvdix.h + nx-X11/programs/Xserver/Xext/xvmain.c +Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts, + 1993, Digital Equipment Corporation, Maynard, Massachusetts, License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas -License: Expat +Files: m4/nx-macros.m4 + nx-X11/lib/m4/nx-macros.m4 + nxcomp/m4/nx-macros.m4 + nxcompshad/m4/nx-macros.m4 + nxproxy/m4/nx-macros.m4 +Copyright: 2005-2006, Oracle and/or its affiliates. + 2017, Mike Gabriel +License: GENERATED FILE FIXME -Files: nx-X11/lib/X11/XimintL.h - nx-X11/lib/X11/imImSw.c - nx-X11/lib/X11/imLcIm.c - nx-X11/lib/X11/imThaiIc.c - nx-X11/lib/X11/imThaiIm.c +Files: nx-X11/lib/modules/im/ximcp/imImSw.c + nx-X11/lib/modules/im/ximcp/imLcIm.c + nx-X11/lib/modules/im/ximcp/imThaiIc.c + nx-X11/lib/modules/im/ximcp/imThaiIm.c + nx-X11/lib/src/xlibi18n/XimintL.h Copyright: 1991-1994, FUJITSU LIMITED 1992-1993, FUJITSU LIMITED 1992-1994, FUJITSU LIMITED 1993, Digital Equipment Corporation -License: UNKNOWN +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c - nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h - nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h - nx-X11/programs/Xserver/hw/nxagent/NXpicture.c - nx-X11/programs/Xserver/hw/nxagent/NXrender.c -Copyright: 2000, SuSE, Inc - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/programs/Xserver/GL/glx/g_disptab.c + nx-X11/programs/Xserver/GL/glx/g_disptab.h + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h + nx-X11/programs/Xserver/GL/glx/g_render.c +Copyright: 1991-2000, Silicon Graphics, Inc. +License: SGI Free Software License B (v1.1) GENERATED FILE FIXME Files: testscripts/run-nxproxy2nxagent-on-localhost @@ -2053,31 +2047,29 @@ Files: testscripts/run-nxproxy2nxagent-on-localhost testscripts/run-nxproxy2nxagent-over-sockets testscripts/run-nxproxy2nxproxy testscripts/run-nxproxy2nxproxy-over-sockets -Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ - 2015-2016, Mike Gabriel */ - of the aforementioned persons and companies. */ +Copyright: 2001, 2011, NoMachine, http:www.nomachine.com/. + 2015-2016, Mike Gabriel + of the aforementioned persons and companies. License: UNKNOWN FIXME -Files: nx-X11/include/Sunkeysym.h - nx-X11/lib/X11/Host.c - nx-X11/lib/X11/LiHosts.c - nx-X11/lib/X11/lcInit.c -Copyright: 1985-1987, 1991, 1998, The Open Group - 1986, 1998 The Open Group - 1991, 1998 The Open Group - 1991, Oracle and/or its affiliates. - 2000, Oracle and/or its affiliates. - 2004, Oracle and/or its affiliates. -License: Expat +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas. +License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c - nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c -Copyright: 2003, Tungsten Graphics, inc -License: Expat +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 +License: GENERATED FILE FIXME Files: nx-X11/include/extensions/saver.h @@ -2085,7 +2077,16 @@ Files: nx-X11/include/extensions/saver.h nx-X11/include/extensions/scrnsaver.h nx-X11/programs/Xserver/Xext/saver.c Copyright: 1992, X Consortium -License: Expat +License: MIT/X11 (BSD like) + FIXME + +Files: nx-X11/include/extensions/xtestext1.h + nx-X11/programs/Xserver/Xext/xtest1dd.c + nx-X11/programs/Xserver/Xext/xtest1di.c + nx-X11/programs/Xserver/mi/mibstore.c +Copyright: 1986-1988, 1998, The Open Group + 1987, 1998, The Open Group +License: NTP FIXME Files: nx-X11/programs/Xserver/miext/cw/cw.c @@ -2093,22 +2094,25 @@ Files: nx-X11/programs/Xserver/miext/cw/cw.c nx-X11/programs/Xserver/miext/cw/cw_ops.c nx-X11/programs/Xserver/miext/cw/cw_render.c Copyright: 2004, Eric Anholt -License: UNKNOWN +License: NTP (legal disclaimer) FIXME -Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c - nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h -Copyright: 1999-2003, David Airlie - 2004, David Airlie -License: Expat +Files: m4/nx-xtrans.m4 + nx-X11/include/Sunkeysym.h + nx-X11/lib/m4/nx-xtrans.m4 + nx-X11/lib/modules/im/ximcp/imDefIm.c +Copyright: 1990-1992, Oracle and/or its affiliates. + 1991, Oracle and/or its affiliates. + 2005, Oracle and/or its affiliates. +License: UNKNOWN FIXME -Files: nx-X11/lib/X11/FreeEventData.c - nx-X11/lib/X11/GetEventData.c - nx-X11/programs/Xserver/include/protocol-versions.h -Copyright: 2009, Red Hat, Inc -License: Expat +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c +Copyright: 2003, Tungsten Graphics, inc. +License: UNKNOWN FIXME Files: bin/nxagent.in @@ -2116,137 +2120,100 @@ Files: bin/nxagent.in mesa-quilt Copyright: 2012, Mike Gabriel 2017, Mike Gabriel -License: GPL-3+ - FIXME - -Files: nx-X11/include/extensions/xf86bigfont.h - nx-X11/include/extensions/xf86bigfproto.h - nx-X11/programs/Xserver/Xext/xf86bigfont.c -Copyright: 1999-2000, Bruno Haible - 1999-2000, The XFree86 Project, Inc -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/Context.c - nx-X11/lib/X11/Quarks.c - nx-X11/lib/X11/Xrm.c -Copyright: 1987-1988, 1990 Digital Equipment Corporation, Maynard - 1987-1988, 1990, 1994, 1998 The Open Group - 1987-1988, 1990, 1998, The Open Group -License: UNKNOWN - FIXME - -Files: nx-X11/include/extensions/xtestext1.h - nx-X11/programs/Xserver/Xext/xtest1dd.c - nx-X11/programs/Xserver/Xext/xtest1di.c -Copyright: 1986-1988, 1998 The Open Group - 1986-1988, Hewlett-Packard Corporation -License: UNKNOWN +License: GPL (v3 or later) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c - nx-X11/programs/Xserver/randr/rrmode.c - nx-X11/programs/Xserver/randr/rrscreen.c -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2003, Keith Packard - 2006, Keith Packard - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h +Copyright: 1999-2003, David Airlie + 2004, David Airlie +License: MIT/X11 (BSD like) FIXME Files: nx-X11/programs/Xserver/include/bstore.h nx-X11/programs/Xserver/include/bstorestr.h nx-X11/programs/Xserver/mi/mibstore.h Copyright: 1987, the Regents of the University of California +License: NTP + FIXME + +Files: nx-X11/include/extensions/xf86bigfont.h + nx-X11/include/extensions/xf86bigfproto.h + nx-X11/programs/Xserver/Xext/xf86bigfont.c +Copyright: 1999-2000, Bruno Haible + 1999-2000, The XFree86 Project, Inc. License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004 -License: Expat +Files: nx-X11/lib/src/FreeEventData.c + nx-X11/lib/src/GetEventData.c + nx-X11/programs/Xserver/include/protocol-versions.h +Copyright: 2009, Red Hat, Inc. +License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h -Copyright: 1999-2001, Brian Paul - 1999-2003, Brian Paul - IBM Corporation 2004, -License: Expat +Files: nx-X11/programs/Xserver/hw/nxagent/Rootless.h + nx-X11/programs/Xserver/os/Imakefile +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. +License: GENERATED FILE FIXME -Files: nx-X11/programs/Xserver/dix/region.c - nx-X11/programs/Xserver/mi/mivaltree.c -Copyright: 1987-1989, 1998 The Open Group - 1987-1989, by - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts -License: Expat +Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa/src/glx/x11/indirect_size.h +Copyright: IBM Corporation 2004 +License: GENERATED FILE FIXME -Files: nx-X11/lib/X11/XimintP.h - nx-X11/lib/X11/imDefIm.c -Copyright: 1990-1992, Oracle and/or its affiliates. - 1991-1992, Oracle and/or its affiliates. - 1992-1994, FUJITSU LIMITED - 1993-1994, Sony Corporation -License: Expat +Files: make-changelog.sh + regenerate-symbol-docs.sh +Copyright: 2016, Mike Gabriel +License: GPL (v2 or later) FIXME -Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c - nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h -Copyright: IBM Corporation 2003 -License: Expat +Files: nx-X11/lib/src/Host.c + nx-X11/lib/src/LiHosts.c +Copyright: 1986, 1998, The Open Group +License: ICU FIXME -Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c - nx-X11/extras/Mesa/src/glx/x11/indirect_size.h -Copyright: IBM Corporation 2004 -License: Expat +Files: nx-X11/programs/Xserver/os/strlcat.c + nx-X11/programs/Xserver/os/strlcpy.c +Copyright: 1998, Todd C. Miller +License: ISC FIXME -Files: nx-X11/programs/Xserver/composite/compoverlay.c - nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h -Copyright: 2003, Keith Packard - 2006, Oracle and/or its affiliates. -License: Expat +Files: nx-X11/extras/Mesa/src/mesa/main/mm.h + nx-X11/extras/Mesa/src/mesa/main/simple_list.h +Copyright: 1997, Keith Whitwell + 1999, Keith Whitwell +License: MIT/X11 (BSD like) FIXME Files: nx-X11/programs/Xserver/Xext/sleepuntil.h nx-X11/programs/Xserver/mi/micoord.h Copyright: 2000, The XFree86 Project, Inc. 2001, The XFree86 Project, Inc. -License: Expat +License: MIT/X11 (BSD like) FIXME Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h Copyright: 2005, Tungsten Graphics -License: Expat +License: MIT/X11 (BSD like) FIXME -Files: make-changelog.sh - regenerate-symbol-docs.sh -Copyright: 2016, Mike Gabriel -License: GPL-2+ - FIXME - -Files: nx-X11/programs/Xserver/os/strlcat.c - nx-X11/programs/Xserver/os/strlcpy.c -Copyright: 1998, Todd C. Miller -License: ISC - FIXME - -Files: nx-X11/lib/X11/lcUTF8.c - nx-X11/lib/X11/lcUTF8Load.c -Copyright: 1993, SunSoft, Inc +Files: nx-X11/lib/modules/lc/Utf8/lcUTF8Load.c + nx-X11/lib/src/xlibi18n/lcUTF8.c +Copyright: 1993, SunSoft, Inc. 1999-2000, Bruno Haible -License: UNKNOWN +License: NTP (legal disclaimer) FIXME Files: nx-X11/include/extensions/randrproto.h @@ -2254,62 +2221,57 @@ Files: nx-X11/include/extensions/randrproto.h Copyright: 2000, Compaq Computer Corporation 2002, Hewlett-Packard Company 2006, Intel Corporation - 2008, Red Hat, Inc -License: UNKNOWN + 2008, Red Hat, Inc. +License: NTP (legal disclaimer) FIXME Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h - nxcompshad/X11/include/Xrandr_nxcompshad.h -Copyright: 2000, Compaq Computer Corporation, Inc - 2002, Hewlett-Packard Company, Inc + nxcompshad/src/X11/include/Xrandr_nxcompshad.h +Copyright: 2000, Compaq Computer Corporation, Inc. + 2002, Hewlett-Packard Company, Inc. 2006, Intel Corporation - 2008, Red Hat, Inc -License: UNKNOWN + 2008, Red Hat, Inc. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/os/log.c - nx-X11/programs/Xserver/os/utils.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1994, Quarterdeck Office Systems - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/lib/modules/im/ximcp/imLcFlt.c + nx-X11/lib/modules/im/ximcp/imLcLkup.c +Copyright: 1992, 1994, FUJITSU LIMITED + 1992, Fuji Xerox Co., Ltd. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/GetNrmHint.c - nx-X11/lib/X11/SetNrmHint.c -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1987-1988, 1998 The Open Group - 1988, Wyse Technology, Inc., San Jose, Ca -License: UNKNOWN +Files: nx-X11/lib/modules/im/ximcp/imRm.c + nx-X11/lib/src/xlibi18n/Ximint.h +Copyright: 1990-1994, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation + 1994, Sony Corporation +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/imLcFlt.c - nx-X11/lib/X11/imLcLkup.c -Copyright: 1992, 1994 FUJITSU LIMITED - 1992, Fuji Xerox Co., Ltd +Files: nx-X11/lib/src/FilterEv.c + nx-X11/lib/src/RegstFlt.c +Copyright: 1990-1991, OMRON Corporation +License: NTP (legal disclaimer) + FIXME + +Files: nx-X11/include/GL/glxint.h + nx-X11/programs/Xserver/GL/glx/glxext.c +Copyright: 1991, -9 Silicon Graphics, Inc. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/Ximint.h - nx-X11/lib/X11/imRm.c -Copyright: 1990-1994, FUJITSU LIMITED - 1992-1994, FUJITSU LIMITED - 1993-1994, Sony Corporation - 1994, Sony Corporation +Files: nx-X11/lib/src/Context.c + nx-X11/lib/src/Quarks.c +Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard, License: UNKNOWN FIXME -Files: nx-X11/lib/X11/TextExt.c - nx-X11/lib/X11/TextExt16.c -Copyright: 1989, 1998 The Open Group - 1995, FUJITSU LIMITED +Files: nx-X11/lib/src/GetNrmHint.c + nx-X11/lib/src/SetNrmHint.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts, + 1988, Wyse Technology, Inc., San Jose, Ca, License: UNKNOWN FIXME @@ -2319,60 +2281,28 @@ Copyright: 1995, Network Computing Devices License: UNKNOWN FIXME -Files: nx-X11/lib/X11/FilterEv.c - nx-X11/lib/X11/RegstFlt.c -Copyright: 1990-1991, 1998 The Open Group - 1990-1991, OMRON Corporation - 1991, 1998 The Open Group -License: UNKNOWN - FIXME - Files: testscripts/slave-agent testscripts/slave-client -Copyright: 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN - FIXME - -Files: nx-X11/include/GL/glxint.h - nx-X11/programs/Xserver/GL/glx/glxext.c -Copyright: 1991-9 Silicon Graphics, Inc. +Copyright: 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. License: UNKNOWN FIXME Files: nx-X11/programs/Xserver/fb/fbcmap.c nx-X11/programs/Xserver/mi/micmap.c -Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA - no- -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/Iconify.c - nx-X11/lib/X11/SetTxtProp.c -Copyright: 1988, 1998 The Open Group - 1988, Wyse Technology, Inc., San Jose, Ca -License: UNKNOWN - FIXME - -Files: nx-X11/lib/X11/GetTxtProp.c - nx-X11/lib/X11/Withdraw.c -Copyright: 1988, 1998 The Open Group - 1988, Wyse Technology, Inc., San Jose, Ca. +Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/mbWrap.c - nx-X11/lib/X11/wcWrap.c -Copyright: 1991, 1998 The Open Group - 1991, the Open Software Foundation +Files: nx-X11/lib/src/Iconify.c + nx-X11/lib/src/SetTxtProp.c +Copyright: 1988, Wyse Technology, Inc., San Jose, Ca. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/FSWrap.c - nx-X11/lib/X11/lcWrap.c -Copyright: 1991, 1998 The Open Group - 1991, the Open Software Foundation - 1993, the TOSHIBA Corp +Files: nx-X11/lib/src/GetTxtProp.c + nx-X11/lib/src/Withdraw.c +Copyright: 1988, Wyse Technology, Inc., San Jose, Ca., License: UNKNOWN FIXME @@ -2382,189 +2312,112 @@ Copyright: 2002, XFree86 Inc License: UNKNOWN FIXME -Files: nxcomp/MD5.c - nxcomp/MD5.h -Copyright: 1999, 2002 Aladdin Enterprises. - 1999-2000, 2002 Aladdin Enterprises. -License: Zlib - FIXME - -Files: nx-X11/lib/X11/utlist.h -Copyright: 2007-2009, Troy D. Hanson -License: BSD-2-clause - FIXME - -Files: nx-X11/programs/Xserver/os/xprintf.c -Copyright: 2004, Alexander Gottwald -License: Expat +Files: nx-X11/lib/src/xlibi18n/lcDB.c + nx-X11/lib/src/xlibi18n/lcFile.c +Copyright: IBM Corporation 1993 +License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h -Copyright: 1997, Keith Whitwell - 1999-2001, Brian Paul -License: Expat +Files: nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h +Copyright: IBM Corporation 2003 +License: UNKNOWN FIXME -Files: nx-X11/lib/X11/UIThrStubs.c -Copyright: 1995, David E. Wexelblat. -License: Expat +Files: doc/nxcomp/DXPC_re-licensed_debug_784565.mbox + doc/nxcomp/README.on-retroactive-DXPC-license +Copyright: states: +License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: Expat +Files: nxcomp/include/MD5.h + nxcomp/src/MD5.c +Copyright: 1999, 2002, Aladdin Enterprises. + 1999-2000, 2002, Aladdin Enterprises. +License: zlib/libpng FIXME -Files: nx-X11/programs/Xserver/os/access.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 2004, Sun Microsystems, Inc -License: Expat +Files: nx-X11/lib/src/utlist.h +Copyright: 2007-2009, Troy D. Hanson +License: BSD (unspecified) FIXME -Files: nx-X11/programs/Xserver/include/list.h -Copyright: 2010, Francisco Jerez - 2010, Intel Corporation -License: Expat +Files: nx-X11/lib/m4/ax_define_dir.m4 +Copyright: 2008, Alexandre Oliva + 2008, Andreas Schwab + 2008, Guido U. Draheim + 2008, Stepan Kasal +License: FSF All Permissive FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h -Copyright: 1989-95 GROUPE BULL -License: Expat +Files: nx-X11/extras/Mesa/src/mesa/main/enums.c +Copyright: 1999-2005, Brian Paul +License: GENERATED FILE FIXME Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h Copyright: IBM Corporation 2005 -License: Expat - FIXME - -Files: fix-patch-whitespace -Copyright: 2010, Keith Packard -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h -Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc - 2006, Oracle and/or its affiliates. - 2011, Red Hat, Inc -License: Expat - FIXME - -Files: nx-X11/extras/Mesa/src/mesa/main/mm.h -Copyright: 1999, Keith Whitwell -License: Expat - FIXME - -Files: nx-X11/lib/xtrans/Xtranssock.c -Copyright: 1993-1994, 1998 The Open Group - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2002, Oracle and/or its affiliates. - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h -Copyright: 1995, X Consortium - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/composite/compositeext.h -Copyright: 2009, NVIDIA Corporation -License: Expat - FIXME - -Files: nx-X11/programs/Xserver/include/client.h -Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All -License: Expat +License: GENERATED FILE FIXME -Files: nx-X11/programs/Xserver/os/client.c -Copyright: 1993, 2010, Oracle and/or its affiliates. - 2010, Nokia Corporation and/or its subsidiary(-ies). All -License: Expat +Files: debian/changelog +Copyright: attributions. +License: GENERATED FILE FIXME -Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c -Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas -License: Expat +Files: replace.sh +Copyright: 2013, Jan Engelhardt +License: GPL (v2 or later) FIXME -Files: nx-X11/extras/Mesa/src/mesa/main/mm.c -Copyright: 1999, Wittawat Yamwong -License: Expat +Files: version.sh +Copyright: 2015, Mihai Moldovan + 2015, Mike Gabriel +License: GPL (v2 or later) FIXME Files: LICENSE.nxcomp -Copyright: 1995-1996,2000,2006, Brian Pane - 1996-1997, Zachary Vonler and Brian Pane - 1999, Kevin Vigor and Brian Pane - 2000,2003, Gian Filippo Pinzari - 2000,2006, Gian Filippo Pinzari and Brian Pane - 2001,2010, NoMachine (http://www.nomachine.com) +Copyright: 2000, 2003, Gian Filippo Pinzari + 2001, 2010, NoMachine (http:www.nomachine.com) 2008-2014, Oleksandr Shneyder 2011-2016, Mike Gabriel 2014-2016, Mihai Moldovan 2014-2016, Ulrich Sibiller - 2015-2016, Qindel Group (http://www.qindel.com) + 2015-2016, Qindel Group (http:www.qindel.com) of the aforementioned -License: GPL +License: GPL (v2) FIXME Files: LICENSE -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) 2008-2014, Oleksandr Shneyder 2011-2016, Mike Gabriel 2014-2016, Mihai Moldovan 2014-2016, Ulrich Sibiller - 2015-2016, Qindel Group (http://www.qindel.com) - of the aforementioned holders -License: GPL - FIXME - -Files: nxcomp/Version.c -Copyright: 2015, Qindel Formacion y Servicios SL. */ -License: GPL-2 - FIXME - -Files: replace.sh -Copyright: 2013, Jan Engelhardt -License: GPL-2+ + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned copyright holders. +License: GPL (v2) FIXME -Files: version.sh -Copyright: 2015, Mihai Moldovan - 2015, Mike Gabriel -License: GPL-2+ +Files: nxcomp/src/Version.c +Copyright: 2015, Qindel Formacion y Servicios SL. +License: GPL (v2) FIXME Files: roll-tarballs.sh Copyright: 2011-2016, Mike Gabriel 2012, Reinhard Tartler -License: GPL-3+ +License: GPL (v3 or later) + FIXME + +Files: nx-X11/programs/Xserver/os/access.c +Copyright: 1987, 1998, The Open Group + 2004, Sun Microsystems, Inc. +License: ICU FIXME Files: nx-X11/programs/Xserver/os/timingsafe_memcmp.c -Copyright: 2014, Google Inc +Copyright: 2014, Google Inc. License: ISC FIXME @@ -2573,308 +2426,234 @@ Copyright: 2008, Otto Moerbeek License: ISC FIXME -Files: doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf -Copyright: +œ7óY9Ø»¢TŽ÷x²ÛÐ`>+‡ºUNcf / -License: UNKNOWN - FIXME - -Files: nx-X11/programs/Xserver/dix/dixutils.c -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1988,1991, Adobe Systems Incorporated. -License: UNKNOWN - FIXME - -Files: doc/nxcomp/README.on-retroactive-DXPC-license -Copyright: 1995-1996, Brian Pane - 1996-1997, Zachary Vonler and Brian Pane - 1999, Kevin Vigor and Brian Pane - 2000-2001, Gian Filippo Pinzari and Brian Pane - states: -License: UNKNOWN +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +Copyright: 1989, -95 GROUPE BULL +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/lib/X11/utf8WMProps.c -Copyright: 1991, 1998 The Open Group - 2000, Bruno Haible -License: UNKNOWN +Files: nx-X11/programs/Xserver/os/xprintf.c +Copyright: 2004, Alexander Gottwald +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/lib/X11/utf8Wrap.c -Copyright: 1991, 1998 The Open Group - 1991, the Open Software Foundation - 2000, Bruno Haible -License: UNKNOWN +Files: nx-X11/lib/src/UIThrStubs.c +Copyright: 1995, David E. Wexelblat. +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/include/extensions/randr.h -Copyright: 2000, Compaq Computer Corporation - 2002, Hewlett Packard Company - 2006, Intel Corporation - 2008, Red Hat, Inc -License: UNKNOWN +Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/programs/Xserver/randr/randr.c -Copyright: 2000, Compaq Computer Corporation - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2002, Hewlett-Packard Company - 2006, Intel Corporation - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/programs/Xserver/include/client.h +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/include/Xpoll.h.in -Copyright: 1994, 1998 The Open Group - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2005, Daniel Stone - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/programs/Xserver/os/client.c +Copyright: 1993, 2010, Oracle and/or its affiliates. + 2010, Nokia Corporation and/or its subsidiary(-ies). All +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/programs/Xserver/include/misc.h -Copyright: 1987, 1998 The Open Group - 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1992-1993, Data General Corporation; - 1992-1993, OMRON Corporation -License: UNKNOWN +Files: nx-X11/lib/src/xlibi18n/lcInit.c +Copyright: 1985-1987, 1991, 1998, The Open Group +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h -Copyright: 2004, David Airlie -License: UNKNOWN +Files: nx-X11/extras/Mesa/src/mesa/main/mm.c +Copyright: 1999, Wittawat Yamwong +License: MIT/X11 (BSD like) FIXME -Files: nx-X11/lib/X11/imCallbk.c -Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts - 1994, FUJITSU LIMITED - 1994, Sony Corporation -License: UNKNOWN +Files: nx-X11/include/Xarch.h +Copyright: 1997, Metro Link Incorporated +License: NTP FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c -Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/programs/Xserver/os/xdmcp.c +Copyright: 1989, Network Computing Devices, Inc., Mountain View, California. +License: NTP FIXME -Files: nx-X11/lib/X11/WMProps.c -Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts - 1987-1988, 1993, 1998, The Open Group - 1988, Wyse Technology, Inc., San Jose, Ca. -License: UNKNOWN +Files: nx-X11/include/extensions/randr.h +Copyright: 2000, Compaq Computer Corporation + 2002, Hewlett Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/imConv.c -Copyright: 1991-1992, Fuji Xerox Co.,Ltd +Files: nx-X11/lib/src/imConv.c +Copyright: 1991-1992, Fuji Xerox Co.,Ltd. 1993-1994, FUJITSU LIMITED -License: UNKNOWN +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/lcDB.c -Copyright: 1995, FUJITSU LIMITED - IBM Corporation 1993 -License: UNKNOWN +Files: nx-X11/lib/modules/im/ximcp/imLcPrs.c +Copyright: 1992, Fuji Xerox Co., Ltd. + 1992, Oki Technosystems Laboratory, Inc. +License: NTP (legal disclaimer) FIXME -Files: COPYING -Copyright: 1989, 1991 Free Software Foundation, Inc. - the software, and -License: UNKNOWN +Files: nx-X11/programs/Xserver/randr/rroutput.c +Copyright: 2006, Keith Packard + 2008, Red Hat, Inc. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/imLcPrs.c -Copyright: 1992, Fuji Xerox Co., Ltd - 1992, Oki Technosystems Laboratory, Inc -License: UNKNOWN +Files: nx-X11/lib/src/SetLocale.c +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation, +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/x2go.xpm -Copyright: 2008, Heinz-M. Graesing */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/lib/src/xlibi18n/ICWrap.c +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation, + 1991, the Open Software Foundation + 1993, the FUJITSU LIMITED +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/lcFile.c -Copyright: IBM Corporation 1993 -License: UNKNOWN +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h +Copyright: 2006, Oracle and/or its affiliates. + 2011, Red Hat, Inc. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/lib/X11/Xprivate.h -Copyright: 2008, Jamey Sharp, Josh Triplett -License: UNKNOWN +Files: nx-X11/programs/Xserver/randr/rrprovider.c +Copyright: 2012, Red Hat Inc. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/randr/rrcrtc.c -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2006, Keith Packard - 2008-2014, Oleksandr Shneyder */ - 2010, Red Hat, Inc - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/lib/modules/im/ximcp/imInsClbk.c +Copyright: 1993-1994, Sony Corporation +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/randr/rrxinerama.c -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2001-2005, Thomas Winischhofer, Vienna, Austria - 2006, Keith Packard - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/lib/src/xlibi18n/IMWrap.c +Copyright: 1991, the Open Software Foundation + 1993-1994, the Sony Corporation +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/randr/rroutput.c -Copyright: 2006, Keith Packard - 2008, Red Hat, Inc -License: UNKNOWN +Files: nx-X11/lib/src/FSWrap.c +Copyright: 1991, the Open Software Foundation + 1993, the TOSHIBA Corp. +License: NTP (legal disclaimer) FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c -Copyright: 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2002, Keith Packard, member of The XFree86 Project, Inc - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ -License: UNKNOWN +Files: nx-X11/programs/Xserver/hw/nxagent/Visual.h +Copyright: 2001, 2011, NoMachine (http:www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http:www.qindel.com) + of the aforementioned persons and companies. +License: NTP GENERATED FILE FIXME -Files: nx-X11/include/Xarch.h -Copyright: 1997, Metro Link Incorporated +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h +Copyright: 2004, David Airlie License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/NXglxext.c -Copyright: 1991-9 Silicon Graphics, Inc. - 2001, 2011 NoMachine (http://www.nomachine.com) */ - 2008-2014, Oleksandr Shneyder */ - 2011-2016, Mike Gabriel */ - 2014-2016, Mihai Moldovan */ - 2014-2016, Ulrich Sibiller */ - 2015-2016, Qindel Group (http://www.qindel.com) */ - of the aforementioned persons and companies. */ +Files: nx-X11/lib/src/Xrm.c +Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 -Copyright: 1984, - 1991, 1993-1994, 1998 The Open Group - 2011, - 2016, Mike Gabriel +Files: nx-X11/lib/modules/im/ximcp/imCallbk.c +Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts, + 1994, FUJITSU LIMITED + 1994, Sony Corporation License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/os/xdmcp.c -Copyright: 1989, Network Computing Devices, Inc., Mountain View, California +Files: nx-X11/programs/Xserver/include/list.h +Copyright: 2010, Francisco Jerez + 2010, Intel Corporation License: UNKNOWN FIXME -Files: nxproxy/Main.c -Copyright: 2001, 2011 NoMachine, http://www.nomachine.com/. */ - of NoMachine. Redistribution and use of the present */ +Files: COPYING +Copyright: 1989, 1991, Free Software Foundation, Inc., License: UNKNOWN FIXME -Files: nx-X11/lib/X11/Xlcint.h -Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation - 1991, 1998 The Open Group - 1991, the Open Software Foundation - 1993, the TOSHIBA Corp - 1993-1994, Sony Corporation - 1993-1994, the FUJITSU LIMITED +Files: nx-X11/programs/Xserver/hw/nxagent/x2go.xpm +Copyright: 2008, Heinz-M. Graesing + of the aforementioned persons and companies. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/SetLocale.c -Copyright: 1987,1998, The Open Group - 1990-1991, OMRON Corporation, NTT Software Corporation +Files: nx-X11/lib/src/Xprivate.h +Copyright: 2008, Jamey Sharp, Josh Triplett License: UNKNOWN FIXME -Files: nx-X11/lib/X11/ICWrap.c -Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation - 1991, 1998 The Open Group - 1991, the Open Software Foundation - 1993, the FUJITSU LIMITED +Files: fix-patch-whitespace +Copyright: 2010, Keith Packard License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/randr/rrprovider.c -Copyright: 2012, Red Hat Inc +Files: nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +Copyright: 1984-1991, 1993-1994, 1998, The Open Group + 2011-2016, Mike Gabriel License: UNKNOWN FIXME -Files: nx-X11/lib/X11/imInsClbk.c -Copyright: 1993-1994, Sony Corporation +Files: nx-X11/programs/Xserver/composite/compositeext.h +Copyright: 2009, NVIDIA Corporation License: UNKNOWN FIXME -Files: nx-X11/lib/X11/Xcms.txt -Copyright: 1990, 1991 Tektronix Inc +Files: nxproxy/src/Main.c +Copyright: 2001, 2011, NoMachine, http:www.nomachine.com/. + of NoMachine. Redistribution and use of the present License: UNKNOWN FIXME -Files: nx-X11/lib/X11/CCC.c -Copyright: 1990, 1991 Tektronix, Inc - 1994, 1998 The Open Group +Files: nx-X11/lib/src/xcms/Xcms.txt +Copyright: 1990-1991, Tektronix Inc. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/Font.c -Copyright: 1986, 1998 The Open Group - 2000, The XFree86 Project, Inc +Files: nx-X11/lib/src/Font.c +Copyright: 1986, 1998, The Open Group + 2000, The XFree86 Project, Inc. License: UNKNOWN FIXME -Files: nx-X11/lib/X11/IMWrap.c -Copyright: 1991, 1998 The Open Group - 1991, the Open Software Foundation - 1993-1994, the Sony Corporation +Files: nx-X11/include/Xdefs.h +Copyright: 1999, The XFree86 Project Inc. License: UNKNOWN FIXME -Files: nx-X11/programs/Xserver/mi/mibstore.c -Copyright: 1987, 1998 The Open Group - 1987, the Regents of the University of California +Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas. License: UNKNOWN FIXME -Files: nx-X11/include/Xdefs.h -Copyright: 1999, The XFree86 Project Inc +Files: debian/copyright +Copyright: -format/1.0/ License: UNKNOWN FIXME -Files: debian/changelog -Copyright: attributions +Files: ChangeLog +Copyright: Update copyright attributions. License: UNKNOWN FIXME -Files: doc/nxcomp/DXPC_re-licensed_debug_784565.mbox -Copyright: states: +Files: doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf +Copyright: ê²Ã#züÂ7VSٌB§Ùܾ»Q,ì¯ñ—¥7»²À5s License: UNKNOWN FIXME diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 2901c1d83..ed6bcf8e5 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -134,7 +134,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XEHeadOfExtensionList@Base 3.5.0.29 XESetBeforeFlush@Base 3.5.0.29 XESetCloseDisplay@Base 3.5.0.29 - XESetCopyEventCookie@Base 2:3.5.99.2 + XESetCopyEventCookie@Base 3.5.99.2 XESetCopyGC@Base 3.5.0.29 XESetCreateFont@Base 3.5.0.29 XESetCreateGC@Base 3.5.0.29 @@ -147,7 +147,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XESetPrintErrorValues@Base 3.5.0.29 XESetWireToError@Base 3.5.0.29 XESetWireToEvent@Base 3.5.0.29 - XESetWireToEventCookie@Base 2:3.5.99.2 + XESetWireToEventCookie@Base 3.5.99.2 XEmptyRegion@Base 3.5.0.29 XEnableAccessControl@Base 3.5.0.29 XEqualRegion@Base 3.5.0.29 @@ -174,7 +174,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XFreeColormap@Base 3.5.0.29 XFreeColors@Base 3.5.0.29 XFreeCursor@Base 3.5.0.29 - XFreeEventData@Base 2:3.5.99.2 + XFreeEventData@Base 3.5.99.2 XFreeExtensionList@Base 3.5.0.29 XFreeFont@Base 3.5.0.29 XFreeFontInfo@Base 3.5.0.29 @@ -194,7 +194,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XGetDefault@Base 3.5.0.29 XGetErrorDatabaseText@Base 3.5.0.29 XGetErrorText@Base 3.5.0.29 - XGetEventData@Base 2:3.5.99.2 + XGetEventData@Base 3.5.99.2 XGetFontPath@Base 3.5.0.29 XGetFontProperty@Base 3.5.0.29 XGetGCValues@Base 3.5.0.29 @@ -819,7 +819,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XCloseLC@Base 3.5.0.29 _XColor_to_XcmsRGB@Base 3.5.0.29 _XConnectDisplay@Base 3.5.0.29 - _XCopyEventCookie@Base 2:3.5.99.2 + _XCopyEventCookie@Base 3.5.99.2 _XCopyToArg@Base 3.5.0.29 _XCreateMutex_fn@Base 3.5.0.29 (arch=amd64 ia64 alpha ppc64 arm64)_XData32@Base 3.5.0.29 @@ -838,13 +838,13 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XEventsQueued@Base 3.5.0.29 _XF86BigfontFreeFontMetrics@Base 3.5.0.29 _XF86LoadQueryLocaleFont@Base 3.5.0.29 - _XFetchEventCookie@Base 2:3.5.99.2 + _XFetchEventCookie@Base 3.5.99.2 _XFlush@Base 3.5.0.29 _XFlushGCCache@Base 3.5.0.29 _XFreeAtomTable@Base 3.5.0.29 _XFreeDisplayLock_fn@Base 3.5.0.29 _XFreeDisplayStructure@Base 3.5.0.29 - _XFreeEventCookies@Base 2:3.5.99.2 + _XFreeEventCookies@Base 3.5.99.2 _XFreeExtData@Base 3.5.0.29 _XFreeMutex_fn@Base 3.5.0.29 _XFreeTemp@Base 3.5.0.29 @@ -857,7 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XGetScanlinePad@Base 3.5.0.29 _XGetWindowAttributes@Base 3.5.0.29 _XHeadOfDisplayList@Base 3.5.0.29 -#MISSING: 3.5.99.2# _XIDHandler@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XIDHandler@Base 3.5.99.2 _XIMCompileResourceList@Base 3.5.0.29 _XIOError@Base 3.5.0.29 _XIOErrorFunction@Base 3.5.0.29 @@ -866,7 +866,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XInitImageFuncPtrs@Base 3.5.0.29 _XInitKeysymDB@Base 3.5.0.29 _XInitOM@Base 3.5.0.29 - _XIsEventCookie@Base 2:3.5.99.2 + _XIsEventCookie@Base 3.5.99.2 _XKeyInitialize@Base 3.5.0.29 _XKeycodeToKeysym@Base 3.5.0.29 _XKeysymToKeycode@Base 3.5.0.29 @@ -881,7 +881,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XPollfdCacheAdd@Base 3.5.0.29 _XPollfdCacheDel@Base 3.5.0.29 _XPollfdCacheInit@Base 3.5.0.29 - _XProcessInternalConnection@Base 2:3.5.99.2 + _XProcessInternalConnection@Base 3.5.99.2 _XProcessWindowAttributes@Base 3.5.0.29 _XPutBackEvent@Base 3.5.0.29 (arch=amd64 ia64 alpha ppc64 arm64)_XRead32@Base 3.5.0.29 @@ -898,22 +898,22 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XSelect@Base 3.5.0.29 _XSend@Base 3.5.0.29 _XSendClientPrefix@Base 3.5.0.29 -#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 3.5.99.2 _XSetClipRectangles@Base 3.5.0.29 _XSetImage@Base 3.5.0.29 _XSetLastRequestRead@Base 3.5.0.29 -#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 2:3.5.99.2 -#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 2:3.5.99.2 - _XStoreEventCookie@Base 2:3.5.99.2 +#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 3.5.99.2 +#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 3.5.99.2 + _XStoreEventCookie@Base 3.5.99.2 _XTextHeight16@Base 3.5.0.29 _XTextHeight@Base 3.5.0.29 _XTranslateKey@Base 3.5.0.29 _XTranslateKeySym@Base 3.5.0.29 #MISSING: 2:3.5.99.9# _XTryShapeBitmapCursor@Base 3.5.0.29 - _XUnknownCopyEventCookie@Base 2:3.5.99.2 + _XUnknownCopyEventCookie@Base 3.5.99.2 _XUnknownNativeEvent@Base 3.5.0.29 _XUnknownWireEvent@Base 3.5.0.29 - _XUnknownWireEventCookie@Base 2:3.5.99.2 + _XUnknownWireEventCookie@Base 3.5.99.2 _XUnlockMutex_fn@Base 3.5.0.29 _XUnregisterFilter@Base 3.5.0.29 _XUnregisterInternalConnection@Base 3.5.0.29 @@ -1017,7 +1017,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XimGetICValueData@Base 3.5.0.29 _XimGetIMValueData@Base 3.5.0.29 _XimGetLocaleCode@Base 3.5.0.29 - _XimGetMyEndian@Base 2:3.5.99.2 + _XimGetMyEndian@Base 3.5.99.2 _XimGetResourceListRec@Base 3.5.0.29 _XimGetResourceListRecByQuark@Base 3.5.0.29 _XimGetWindowEventmask@Base 3.5.0.29 @@ -1156,7 +1156,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XkeyTable@Base 3.5.0.29 _XlcAddCT@Base 3.5.0.29 _XlcAddCharSet@Base 3.5.0.29 - _XlcAddGB18030LocaleConverters@Base 2:3.5.99.2 + _XlcAddGB18030LocaleConverters@Base 3.5.99.2 _XlcAddLoader@Base 3.5.0.29 _XlcAddUtf8Converters@Base 3.5.0.29 _XlcAddUtf8LocaleConverters@Base 3.5.0.29 @@ -1189,7 +1189,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XlcInitCTInfo@Base 3.5.0.29 _XlcInitLoader@Base 3.5.0.29 _XlcLocaleDirName@Base 3.5.0.29 - _XlcLocaleLibDirName@Base 2:3.5.99.2 + _XlcLocaleLibDirName@Base 3.5.99.2 _XlcMapOSLocaleName@Base 3.5.0.29 _XlcNCompareISOLatin1@Base 3.5.0.29 _XlcOpenConverter@Base 3.5.0.29 @@ -1271,4 +1271,4 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _qfree@Base 3.5.0.29 #MISSING: 3.5.99.2# in6addr_any@Base 3.5.0.29 read_EncodingInfo@Base 3.5.0.29 - xlocaledir@Base 2:3.5.99.2 + xlocaledir@Base 3.5.99.2 diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 169f0f6ef..6767e4d19 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,8 +1,6 @@ -usr/lib/*/libNX_X11.so -usr/lib/*/libNX_X11.a usr/include/*/nx-X11/ImUtil.h -usr/include/*/nx-X11/Xauth.h usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xauth.h usr/include/*/nx-X11/Xcms.h usr/include/*/nx-X11/Xlib.h usr/include/*/nx-X11/XlibConf.h @@ -14,4 +12,6 @@ usr/include/*/nx-X11/Xutil.h usr/include/*/nx-X11/cursorfont.h usr/include/*/nx-X11/misc.h usr/include/*/nx-X11/os.h +usr/lib/*/libNX_X11.a +usr/lib/*/libNX_X11.so usr/lib/*/pkgconfig/nx-x11.pc diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install index f73422f40..89f20a453 100644 --- a/debian/libxcomp-dev.install +++ b/debian/libxcomp-dev.install @@ -1,9 +1,9 @@ -usr/lib/*/libXcomp.so -usr/lib/*/libXcomp.a +usr/include/*/nx/MD5.h usr/include/*/nx/NX.h usr/include/*/nx/NXalert.h usr/include/*/nx/NXpack.h usr/include/*/nx/NXproto.h usr/include/*/nx/NXvars.h -usr/include/*/nx/MD5.h -usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file +usr/lib/*/libXcomp.a +usr/lib/*/libXcomp.so +usr/lib/*/pkgconfig/nxcomp.pc diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs index 8861756ba..0b15e2cfc 100644 --- a/debian/libxcomp3.docs +++ b/debian/libxcomp3.docs @@ -1,2 +1,2 @@ -doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf doc/nxcomp/README.on-retroactive-DXPC-license +doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install index 68318ee03..e0114c1e6 100644 --- a/debian/libxcompshad-dev.install +++ b/debian/libxcompshad-dev.install @@ -1,4 +1,4 @@ -usr/lib/*/libXcompshad.so -usr/lib/*/libXcompshad.a usr/include/*/nx/Shadow.h +usr/lib/*/libXcompshad.a +usr/lib/*/libXcompshad.so usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad-dev.links b/debian/libxcompshad-dev.links index adeb7ecb5..68e40471c 100644 --- a/debian/libxcompshad-dev.links +++ b/debian/libxcompshad-dev.links @@ -1,2 +1 @@ usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad3-dev - diff --git a/debian/nx-x11proto-composite-dev.install b/debian/nx-x11proto-composite-dev.install index cf2c77e36..2e2a8ca3b 100644 --- a/debian/nx-x11proto-composite-dev.install +++ b/debian/nx-x11proto-composite-dev.install @@ -1,2 +1,2 @@ usr/include/*/nx-X11/extensions/composite.h -usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file +usr/include/*/nx-X11/extensions/compositeproto.h diff --git a/debian/nx-x11proto-damage-dev.install b/debian/nx-x11proto-damage-dev.install index 1503260cf..8fc4e6668 100644 --- a/debian/nx-x11proto-damage-dev.install +++ b/debian/nx-x11proto-damage-dev.install @@ -1,2 +1,2 @@ -usr/include/*/nx-X11/extensions/damagewire.h usr/include/*/nx-X11/extensions/damageproto.h +usr/include/*/nx-X11/extensions/damagewire.h diff --git a/debian/nx-x11proto-render-dev.install b/debian/nx-x11proto-render-dev.install index f2222d234..c0cde3eb3 100644 --- a/debian/nx-x11proto-render-dev.install +++ b/debian/nx-x11proto-render-dev.install @@ -1,3 +1,2 @@ usr/include/*/nx-X11/extensions/render.h usr/include/*/nx-X11/extensions/renderproto.h - diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install index 952a6c52f..5a04b360b 100644 --- a/debian/nx-x11proto-scrnsaver-dev.install +++ b/debian/nx-x11proto-scrnsaver-dev.install @@ -1,3 +1,3 @@ usr/include/*/nx-X11/extensions/saver.h usr/include/*/nx-X11/extensions/saverproto.h -usr/include/*/nx-X11/extensions/scrnsaver.h \ No newline at end of file +usr/include/*/nx-X11/extensions/scrnsaver.h diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install index 26a719b01..fb97e99cb 100644 --- a/debian/nx-x11proto-xext-dev.install +++ b/debian/nx-x11proto-xext-dev.install @@ -1,3 +1,4 @@ +usr/include/*/nx-X11/extensions/Xdbeproto.h usr/include/*/nx-X11/extensions/bigreqstr.h usr/include/*/nx-X11/extensions/dpms.h usr/include/*/nx-X11/extensions/dpmsstr.h @@ -6,10 +7,9 @@ usr/include/*/nx-X11/extensions/security.h usr/include/*/nx-X11/extensions/securstr.h usr/include/*/nx-X11/extensions/sync.h usr/include/*/nx-X11/extensions/syncstr.h -usr/include/*/nx-X11/extensions/xf86bigfproto.h -usr/include/*/nx-X11/extensions/xf86bigfont.h usr/include/*/nx-X11/extensions/xcmiscstr.h -usr/include/*/nx-X11/extensions/Xdbeproto.h +usr/include/*/nx-X11/extensions/xf86bigfont.h +usr/include/*/nx-X11/extensions/xf86bigfproto.h usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/xtestext1.h usr/include/*/nx-X11/extensions/xteststr.h diff --git a/debian/nx-x11proto-xfixes-dev.install b/debian/nx-x11proto-xfixes-dev.install index 91eae0306..b276f09a7 100644 --- a/debian/nx-x11proto-xfixes-dev.install +++ b/debian/nx-x11proto-xfixes-dev.install @@ -1,3 +1,2 @@ -usr/include/*/nx-X11/extensions/xfixeswire.h usr/include/*/nx-X11/extensions/xfixesproto.h - +usr/include/*/nx-X11/extensions/xfixeswire.h diff --git a/debian/nxagent.install b/debian/nxagent.install index 87ba3583f..3f9525906 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,9 +1,9 @@ etc/nxagent/keystrokes.cfg -usr/share/nx/VERSION.nxagent -usr/share/man/man1/nxagent.1* -usr/lib/*/nx/X11/ +etc/nxagent/nxagent.keyboard usr/bin/nxagent +usr/lib/*/nx/X11/ +usr/share/man/man1/nxagent.1* +usr/share/nx/VERSION.nxagent usr/share/pixmaps/nxagent.xpm -etc/nxagent/nxagent.keyboard # FIXME: compatibility symlink, drop for 3.6.0 release usr/lib/*/nx/bin/nxagent diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch deleted file mode 100644 index a2a0f9f45..000000000 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: FHS adaptation for Debian packaging -Abstract: - On Debian, binaries are installed to /usr//nx. - . - Also, a fake-libX11 library symlink is placed into - /usr//nx/X11. - . - The given paths will be overridden by the Debian packaging - and modified into multi-arch paths. - -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2017-02-08 - ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -736,7 +736,7 @@ - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -754,7 +754,7 @@ - #define AlternateUsrDataDir YES - #endif - #else --#define UsrDataDir Concat4(/usr/local,/,share,/nx) -+#define UsrDataDir Concat4(/usr,/,share,/nx) - #ifndef AlternateUsrDataDir - #define AlternateUsrDataDir NO - #endif ---- a/nx-X11/config/cf/site.def -+++ b/nx-X11/config/cf/site.def -@@ -69,7 +69,7 @@ - #ifdef AfterVendorCF - - #ifndef ProjectRoot --#define ProjectRoot /usr/local -+#define ProjectRoot /usr - #endif - - /* diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch deleted file mode 100644 index b3186a9b4..000000000 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: FHS path fix for SecurityPolicy file - This patch is needed on Debian only, not reporting this path - change to upstream. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-01-12 ---- a/nx-X11/programs/Xserver/Xext/security.c -+++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -84,7 +84,7 @@ - - #ifdef NXAGENT_SERVER - --#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" -+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" - - #endif - diff --git a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch b/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch deleted file mode 100644 index ab16864df..000000000 --- a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch +++ /dev/null @@ -1,1870 +0,0 @@ ---- a/nxcomp/ClientChannel.cpp -+++ b/nxcomp/ClientChannel.cpp -@@ -447,6 +447,26 @@ - } - } - -+ // Get other bits of the header, so will not need to refer to them again -+ unsigned char inputDataByte = inputMessage[1]; -+ unsigned int buffer2 = GetUINT(inputMessage + 2, bigEndian_); -+ unsigned int inputDataSize = buffer2 - 1; -+ if (buffer2 == 0) -+ { -+ // BIG-REQUESTS -+ inputMessage += 4; -+ inputLength -= 4; -+ inputDataSize = GetULONG(inputMessage, bigEndian_) - 2; -+ } -+ if (inputLength != (4 * (inputDataSize + 1))) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead: inputLength=" << inputLength -+ << " mismatch inputDataSize=" << inputDataSize -+ << ".\n" << logofs_flush; -+ #endif -+ } -+ - // - // Go to the message's specific encoding. - // -@@ -455,6 +475,11 @@ - { - case X_AllocColor: - { -+ #ifdef WARNING -+ if (inputLength < 14) -+ *logofs << "handleRead: X_AllocColor inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> colormapCache); - const unsigned char *nextSrc = inputMessage + 8; -@@ -476,6 +501,11 @@ - break; - case X_ReparentWindow: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_ReparentWindow inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), -@@ -486,6 +516,11 @@ - break; - case X_ChangeProperty: - { -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: X_ChangeProperty inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_ChangeProperty); - -@@ -501,8 +536,36 @@ - encodeBuffer.encodeCachedValue(format, 8, - clientCache_ -> changePropertyFormatCache); - unsigned int dataLength = GetULONG(inputMessage + 20, bigEndian_); -+ -+ // Self-preserving sanity check (otherwise we crash and dump core): -+ // some clients do this when not getting their beloved BIG-REQUESTS. -+ unsigned int maxLength = 0; -+ if (format == 8) -+ { -+ maxLength = inputLength - 24; -+ } -+ else if (format == 32) -+ { -+ maxLength = (inputLength - 24) >> 2; -+ } -+ else if (format == 16) -+ { -+ maxLength = (inputLength - 24) >> 1; -+ } -+ if (dataLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_ChangeProperty bogus dataLength=" << dataLength -+ << " set to " << maxLength -+ << " when format=" << (int)format -+ << " inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ dataLength = maxLength; -+ } -+ - encodeBuffer.encodeValue(dataLength, 32, 6); -- encodeBuffer.encodeValue(inputMessage[1], 2); -+ encodeBuffer.encodeValue(inputDataByte, 2); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29, -@@ -533,7 +596,7 @@ - nextSrc += 4; - } - } -- else -+ else if (format == 16) - { - for (unsigned int i = 0; i < dataLength; i++) - { -@@ -541,6 +604,13 @@ - nextSrc += 2; - } - } -+ else -+ { -+ #ifdef WARNING -+ *logofs << "ChangeProperty bogus format=" << (int)format -+ << ".\n" << logofs_flush; -+ #endif -+ } - } - break; - case X_SendEvent: -@@ -551,6 +621,11 @@ - // ratio. - // - -+ #ifdef WARNING -+ if (inputLength < 44) -+ *logofs << "handleRead: X_SendEvent inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_SendEvent); - -@@ -562,7 +637,7 @@ - break; - } - -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - unsigned int window = GetULONG(inputMessage + 4, bigEndian_); - - if (window == 0 || window == 1) -@@ -599,7 +674,12 @@ - break; - case X_ChangeWindowAttributes: - { -- encodeBuffer.encodeValue((inputLength - 12) >> 2, 4); -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_ChangeWindowAttributes inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeValue(inputDataSize - 2, 4); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - unsigned int bitmask = GetULONG(inputMessage + 8, bigEndian_); -@@ -621,6 +701,11 @@ - break; - case X_ClearArea: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_ClearArea inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -654,7 +739,7 @@ - break; - } - -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - const unsigned char *nextSrc = inputMessage + 8; -@@ -668,6 +753,11 @@ - break; - case X_CloseFont: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_CloseFont inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int font = GetULONG(inputMessage + 4, bigEndian_); - encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); - clientCache_ -> lastFont = font; -@@ -675,6 +765,11 @@ - break; - case X_ConfigureWindow: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_ConfigureWindow inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_ConfigureWindow); - -@@ -708,6 +803,11 @@ - break; - case X_ConvertSelection: - { -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: X_ConvertSelection inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> convertSelectionRequestorCache, 9); - const unsigned char* nextSrc = inputMessage + 8; -@@ -725,6 +825,11 @@ - break; - case X_CopyArea: - { -+ #ifdef WARNING -+ if (inputLength < 28) -+ *logofs << "handleRead: X_CopyArea inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -793,6 +898,11 @@ - break; - case X_CopyGC: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_CopyGC inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -814,6 +924,11 @@ - break; - case X_CopyPlane: - { -+ #ifdef WARNING -+ if (inputLength < 32) -+ *logofs << "handleRead: X_CopyPlane inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, -@@ -833,6 +948,11 @@ - break; - case X_CreateGC: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_CreateGC inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -917,6 +1037,11 @@ - break; - case X_ChangeGC: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_ChangeGC inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -998,14 +1123,19 @@ - break; - case X_CreatePixmap: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_CreatePixmap inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - -- *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputMessage[1] -+ *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputDataByte - << ", pixmap id " << GetULONG(inputMessage + 4, bigEndian_) - << ", drawable " << GetULONG(inputMessage + 8, bigEndian_) - << ", width " << GetUINT(inputMessage + 12, bigEndian_) - << ", height " << GetUINT(inputMessage + 14, bigEndian_) -- << ", size " << GetUINT(inputMessage + 2, bigEndian_) << 2 -+ << ", length " << inputLength - << ".\n" << logofs_flush; - - unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1042,6 +1172,11 @@ - break; - case X_CreateWindow: - { -+ #ifdef WARNING -+ if (inputLength < 32) -+ *logofs << "handleRead: X_CreateWindow inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1054,7 +1189,7 @@ - #endif - - unsigned bitmask = GetULONG(inputMessage + 28, bigEndian_); -- encodeBuffer.encodeCachedValue((unsigned int) inputMessage[1], 8, -+ encodeBuffer.encodeCachedValue((unsigned int) inputDataByte, 8, - clientCache_ -> depthCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), - clientCache_ -> windowCache); -@@ -1098,6 +1233,11 @@ - break; - case X_DeleteProperty: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_DeleteProperty inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9); -@@ -1105,6 +1245,11 @@ - break; - case X_FillPoly: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_FillPoly inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1138,7 +1283,7 @@ - break; - } - -- unsigned int numPoints = ((inputLength - 16) >> 2); -+ unsigned int numPoints = (inputDataSize - 3); - - if (control -> isProtoStep10() == 1) - { -@@ -1209,7 +1354,12 @@ - break; - case X_FreeColors: - { -- unsigned int numPixels = GetUINT(inputMessage + 2, bigEndian_) - 3; -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_FreeColors inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ unsigned int numPixels = inputDataSize - 2; - encodeBuffer.encodeValue(numPixels, 16, 4); - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> colormapCache); -@@ -1225,12 +1375,22 @@ - break; - case X_FreeCursor: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_FreeCursor inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), - 29, clientCache_ -> cursorCache, 9); - } - break; - case X_FreeGC: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_FreeGC inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1284,6 +1444,11 @@ - break; - case X_FreePixmap: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_FreePixmap inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1318,6 +1483,11 @@ - break; - case X_GetAtomName: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_GetAtomName inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 29, 9); - - sequenceQueue_.push(clientSequence_, inputOpcode); -@@ -1327,6 +1497,11 @@ - break; - case X_GetGeometry: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_GetGeometry inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> drawableCache); - -@@ -1351,6 +1526,11 @@ - break; - case X_GetKeyboardMapping: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_GetKeyboardMapping inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeValue((unsigned int) inputMessage[4], 8); - encodeBuffer.encodeValue((unsigned int) inputMessage[5], 8); - -@@ -1361,6 +1541,11 @@ - break; - case X_GetProperty: - { -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: X_GetProperty inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_GetProperty); - -@@ -1378,7 +1563,7 @@ - break; - } - -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - unsigned int property = GetULONG(inputMessage + 8, bigEndian_); -@@ -1394,6 +1579,11 @@ - break; - case X_GetSelectionOwner: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_GetSelectionOwner inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> getSelectionOwnerSelectionCache, 9); - -@@ -1404,7 +1594,12 @@ - break; - case X_GrabButton: - { -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: X_GrabButton inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, -@@ -1423,7 +1618,12 @@ - break; - case X_GrabPointer: - { -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: X_GrabPointer inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, -@@ -1448,7 +1648,12 @@ - break; - case X_GrabKeyboard: - { -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_GrabKeyboard inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> windowCache); - unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_); -@@ -1471,6 +1676,11 @@ - break; - case X_PolyText8: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_PolyText8 inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1555,6 +1765,11 @@ - break; - case X_PolyText16: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_PolyText16 inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1639,6 +1854,11 @@ - break; - case X_ImageText8: - { -+ #ifdef WARNING -+ if (inputLength < 16 + (unsigned int)inputDataByte) -+ *logofs << "handleRead: X_ImageText8 inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1673,7 +1893,7 @@ - break; - } - -- unsigned int textLength = (unsigned int) inputMessage[1]; -+ unsigned int textLength = (unsigned int) inputDataByte; - encodeBuffer.encodeCachedValue(textLength, 8, - clientCache_ -> imageTextLengthCache, 4); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, -@@ -1706,6 +1926,11 @@ - break; - case X_ImageText16: - { -+ #ifdef WARNING -+ if (inputLength < 16 + (unsigned int)inputDataByte) -+ *logofs << "handleRead: X_ImageText16 inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -1740,7 +1965,7 @@ - break; - } - -- unsigned int textLength = (unsigned int) inputMessage[1]; -+ unsigned int textLength = (unsigned int) inputDataByte; - encodeBuffer.encodeCachedValue(textLength, 8, - clientCache_ -> imageTextLengthCache, 4); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, -@@ -1773,6 +1998,11 @@ - break; - case X_InternAtom: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_InternAtom inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_InternAtom); - -@@ -1796,8 +2026,18 @@ - } - - unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_); -+ unsigned int maxLength = inputLength - 8; -+ if (nameLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ nameLength = maxLength; -+ } - encodeBuffer.encodeValue(nameLength, 16, 6); -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - const unsigned char *nextSrc = inputMessage + 8; - - if (control -> isProtoStep7() == 1) -@@ -1827,7 +2067,22 @@ - break; - case X_ListFonts: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_ListFonts inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int textLength = GetUINT(inputMessage + 6, bigEndian_); -+ unsigned int maxLength = inputLength - 8; -+ if (textLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_ListFonts bogus textLength=" << textLength -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ textLength = maxLength; -+ } - encodeBuffer.encodeValue(textLength, 16, 6); - encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6); - const unsigned char* nextSrc = inputMessage + 8; -@@ -1853,7 +2108,22 @@ - case X_LookupColor: - case X_AllocNamedColor: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_AllocNamedColor inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int textLength = GetUINT(inputMessage + 8, bigEndian_); -+ unsigned int maxLength = inputLength - 12; -+ if (textLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_AllocNamedColor bogus textLength=" << textLength -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ textLength = maxLength; -+ } - encodeBuffer.encodeValue(textLength, 16, 6); - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), - 29, clientCache_ -> colormapCache); -@@ -1886,6 +2156,11 @@ - case X_QueryPointer: - case X_QueryTree: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_MapWindow...X_QueryTree inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - if (inputOpcode == X_DestroyWindow) -@@ -1923,7 +2198,22 @@ - break; - case X_OpenFont: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_OpenFont inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_); -+ unsigned int maxLength = inputLength - 12; -+ if (nameLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_InternAtom bogus nameLength=" << nameLength -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ nameLength = maxLength; -+ } - encodeBuffer.encodeValue(nameLength, 16, 7); - unsigned int font = GetULONG(inputMessage + 4, bigEndian_); - encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); -@@ -1947,6 +2237,11 @@ - break; - case X_PolyFillRectangle: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyFillRectangle inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2034,6 +2329,11 @@ - break; - case X_PolyFillArc: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyFillArc inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2135,6 +2435,11 @@ - break; - case X_PolyArc: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyArc inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2236,6 +2541,11 @@ - break; - case X_PolyPoint: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyPoint inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2269,8 +2579,8 @@ - break; - } - -- encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4); -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeValue(inputDataSize - 2, 32, 4); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> drawableCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_), -@@ -2303,6 +2613,11 @@ - break; - case X_PolyLine: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyLine inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2336,8 +2651,8 @@ - break; - } - -- encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4); -- encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]); -+ encodeBuffer.encodeValue(inputDataSize - 2, 32, 4); -+ encodeBuffer.encodeBoolValue((unsigned int) inputDataByte); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, -@@ -2370,8 +2685,12 @@ - break; - case X_PolyRectangle: - { -- encodeBuffer.encodeValue((GetUINT(inputMessage + 2, -- bigEndian_) - 3) >> 1, 16, 3); -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolyRectangle inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 3); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, -@@ -2391,6 +2710,11 @@ - break; - case X_PolySegment: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_PolySegment inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2424,8 +2748,7 @@ - break; - } - -- encodeBuffer.encodeValue((GetUINT(inputMessage + 2, -- bigEndian_) - 3) >> 1, 16, 4); -+ encodeBuffer.encodeValue((inputDataSize - 2) >> 1, 32, 4); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, -@@ -2491,6 +2814,11 @@ - break; - case X_PutImage: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_PutImage inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2522,7 +2850,12 @@ - break; - case X_QueryBestSize: - { -- encodeBuffer.encodeValue((unsigned int)inputMessage[1], 2); -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_QueryBestSize inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif -+ encodeBuffer.encodeValue((unsigned int)inputDataByte, 2); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); - encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8); -@@ -2535,10 +2868,15 @@ - break; - case X_QueryColors: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_QueryColors inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - // Differential encoding. - encodeBuffer.encodeBoolValue(1); - -- unsigned int numColors = ((inputLength - 8) >> 2); -+ unsigned int numColors = (inputDataSize - 1); - encodeBuffer.encodeValue(numColors, 16, 5); - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> colormapCache); -@@ -2567,15 +2905,20 @@ - break; - case X_QueryExtension: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_QueryExtension inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TEST - - char data[256]; - - int length = GetUINT(inputMessage + 4, bigEndian_); - -- if (length > 256) -+ if (length > 255) - { -- length = 256; -+ length = 255; - } - - strncpy(data, (char *) inputMessage + 8, length); -@@ -2588,6 +2931,16 @@ - #endif - - unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_); -+ unsigned int maxLength = inputLength - 8; -+ if (nameLength > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_QueryExtension bogus nameLength=" << nameLength -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ nameLength = maxLength; -+ } - encodeBuffer.encodeValue(nameLength, 16, 6); - const unsigned char *nextSrc = inputMessage + 8; - -@@ -2614,6 +2967,11 @@ - break; - case X_QueryFont: - { -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: X_QueryFont inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int font = GetULONG(inputMessage + 4, bigEndian_); - encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5); - clientCache_ -> lastFont = font; -@@ -2625,6 +2983,11 @@ - break; - case X_SetClipRectangles: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_SetClipRectangles inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - MessageStore *messageStore = clientStore_ -> - getRequestStore(X_SetClipRectangles); - -@@ -2636,7 +2999,7 @@ - break; - } - -- unsigned int numRectangles = ((inputLength - 12) >> 3); -+ unsigned int numRectangles = ((inputDataSize - 2) >> 1); - - if (control -> isProtoStep9() == 1) - { -@@ -2647,7 +3010,7 @@ - encodeBuffer.encodeValue(numRectangles, 13, 4); - } - -- encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2); -+ encodeBuffer.encodeValue((unsigned int) inputDataByte, 2); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), - clientCache_ -> gcCache); - encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16, -@@ -2668,7 +3031,22 @@ - break; - case X_SetDashes: - { -+ #ifdef WARNING -+ if (inputLength < 12) -+ *logofs << "handleRead: X_SetDashes inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - unsigned int numDashes = GetUINT(inputMessage + 10, bigEndian_); -+ unsigned int maxLength = inputLength - 12; -+ if (numDashes > maxLength) -+ { -+ #ifdef WARNING -+ *logofs << "handleRead X_SetDashes bogus numDashes=" << numDashes -+ << " set to " << maxLength -+ << ".\n" << logofs_flush; -+ #endif -+ numDashes = maxLength; -+ } - encodeBuffer.encodeCachedValue(numDashes, 16, - clientCache_ -> setDashesLengthCache, 5); - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_), -@@ -2683,6 +3061,11 @@ - break; - case X_SetSelectionOwner: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_SetSelectionOwner inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29, - clientCache_ -> setSelectionOwnerCache, 9); - encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29, -@@ -2693,6 +3076,11 @@ - break; - case X_TranslateCoords: - { -+ #ifdef WARNING -+ if (inputLength < 16) -+ *logofs << "handleRead: X_TranslateCoords inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2764,6 +3152,11 @@ - break; - case X_GetImage: - { -+ #ifdef WARNING -+ if (inputLength < 20) -+ *logofs << "handleRead: X_GetImage inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -2802,7 +3195,7 @@ - } - - // Format. -- encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2); -+ encodeBuffer.encodeValue((unsigned int) inputDataByte, 2); - // Drawable. - encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, - bigEndian_), clientCache_ -> drawableCache); -@@ -2869,6 +3262,11 @@ - } - else if (inputOpcode == opcodeStore_ -> putPackedImage) - { -+ #ifdef WARNING -+ if (inputLength < 24) -+ *logofs << "handleRead: putPackedImage inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - #ifdef TARGETS - - unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_); -@@ -3004,7 +3402,7 @@ - << ".\n" << logofs_flush; - #endif - -- encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8, -+ encodeBuffer.encodeCachedValue(inputDataByte, 8, - clientCache_ -> resourceCache); - } - else if (inputOpcode == opcodeStore_ -> freeUnpack) -@@ -3015,7 +3413,7 @@ - << ".\n" << logofs_flush; - #endif - -- encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8, -+ encodeBuffer.encodeCachedValue(inputDataByte, 8, - clientCache_ -> resourceCache); - } - else if (inputOpcode == opcodeStore_ -> getControlParameters) -@@ -3130,6 +3528,11 @@ - // Enable or disable expose events - // coming from the real server. - // -+ #ifdef WARNING -+ if (inputLength < 8) -+ *logofs << "handleRead: setExposeParameters inputLength=" << inputLength -+ << ".\n" << logofs_flush; -+ #endif - - encodeBuffer.encodeBoolValue(*(inputMessage + 4)); - encodeBuffer.encodeBoolValue(*(inputMessage + 5)); -@@ -3198,10 +3601,10 @@ - { - if (hit) - { -- statistics -> addRenderCachedRequest(*(inputMessage + 1)); -+ statistics -> addRenderCachedRequest(inputDataByte); - } - -- statistics -> addRenderRequestBits(*(inputMessage + 1), inputLength << 3, bits); -+ statistics -> addRenderRequestBits(inputDataByte, inputLength << 3, bits); - } - - } // End if (firstRequest_)... else ... -@@ -4548,10 +4951,10 @@ - // - - /* --FIXME: Recover the sequence number if the proxy -+Fixed as below? - FIXME: Recover the sequence number if the proxy - is not connected to an agent. - */ -- if (serverSequence_ > lastSequence_ || -+ if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_) || - control -> SessionMode != session_proxy) - { - #ifdef DEBUG -@@ -4564,7 +4967,7 @@ - lastSequence_ = serverSequence_; - } - #ifdef DEBUG -- else if (serverSequence_ < lastSequence_) -+ else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_)) - { - // - // Use our last auto-generated sequence. -@@ -5003,6 +5406,12 @@ - break; - default: - { -+ // BEWARE: not only inputOpcode == GenericEvent but also -+ // others not handled above, at least: -+ // GraphicsExpose 13 -+ // MapRequest 20 -+ // ConfigureRequest 23 -+ // and any beyond LASTEvent. - #ifdef TEST - *logofs << "handleWrite: Using generic event compression " - << "for OPCODE#" << (unsigned int) outputOpcode -@@ -5014,11 +5423,51 @@ - - for (unsigned int i = 0; i < 14; i++) - { -- decodeBuffer.decodeCachedValue(value, 16, -- *serverCache_ -> genericEventIntCache[i]); -+ //decodeBuffer.decodeCachedValue(value, 16, -+ // *serverCache_ -> genericEventIntCache[i]); -+ if ( ! (decodeBuffer.decodeCachedValue(value, 16, -+ *serverCache_ -> genericEventIntCache[i])) ) -+ { -+ #ifdef WARNING -+ *logofs << "decodeCachedValue failed for GenEvt:" -+ << " buffer length=" << length -+ << " i=" << i -+ << "\n" << logofs_flush; -+ #endif -+ break; -+ } - - PutUINT(value, outputMessage + i * 2 + 4, bigEndian_); - } -+ // Handle "X Generic Event Extension" -+ // Extra data is not cached... -+ if (outputOpcode == GenericEvent && *(outputMessage+1) != 0 && outputLength == 32) -+ { -+ unsigned int extraOutputLength = (GetULONG(outputMessage + 4, bigEndian_) << 2); -+ if (extraOutputLength > 0 && extraOutputLength < 100*1024*1024) -+ { -+ // Extend buffer for the extra data -+ outputMessage = writeBuffer_.addMessage(extraOutputLength); -+ // Decode data and write into buffer at new position -+ for (unsigned int i = 0; i < (extraOutputLength>>1); i++) -+ { -+ //decodeBuffer.decodeValue(value, 16); -+ if ( ! (decodeBuffer.decodeValue(value, 16)) ) -+ { -+ #ifdef WARNING -+ *logofs << "decodeValue failed for GenEvt:" -+ << " extraOutputLength=" << extraOutputLength -+ << " buffer length=" << length -+ << " i=" << i -+ << "\n" << logofs_flush; -+ #endif -+ break; -+ } -+ PutUINT(value, outputMessage + i * 2, bigEndian_); -+ } -+ } -+ } -+ - } - } // End of switch (outputOpcode)... - -@@ -6892,7 +7341,7 @@ - } - else - { -- if (serverSequence_ > lastSequence_) -+ if (SequenceNumber_x_gt_y(serverSequence_, lastSequence_)) - { - #ifdef DEBUG - *logofs << "handleNotify: Updating last event's sequence " -@@ -6904,7 +7353,7 @@ - lastSequence_ = serverSequence_; - } - #ifdef DEBUG -- else if (serverSequence_ < lastSequence_) -+ else if (SequenceNumber_x_gt_y(lastSequence_, serverSequence_)) - { - // - // Use our last auto-generated sequence. ---- a/nxcomp/ClientReadBuffer.cpp -+++ b/nxcomp/ClientReadBuffer.cpp -@@ -119,15 +119,34 @@ - - dataLength = (GetUINT(start + 2, bigEndian_) << 2); - -- if (dataLength < 4) -+ if (dataLength == 0) // or equivalently (dataLength < 4) - { -- #ifdef TEST -- *logofs << "ClientReadBuffer: WARNING! Assuming length 4 " -- << "for suspicious message of length " << dataLength -- << ".\n" << logofs_flush; -- #endif -+ // BIG-REQUESTS extension -+ if (size < 8) -+ { -+ remaining_ = 8 - size; -+ return 0; -+ } - -- dataLength = 4; -+ dataLength = (GetULONG(start + 4, bigEndian_) << 2); -+ -+// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere -+// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE. -+ if (dataLength < 8 || dataLength > 100*1024*1024) -+ { -+ #ifdef WARNING -+ *logofs << "BIG-REQUESTS with unacceptable dataLength=" -+ << dataLength << ", now set to 8.\n" << logofs_flush; -+ #endif -+ dataLength = 8; -+ } -+ else if (dataLength < 4*64*1024) -+ { -+ #ifdef WARNING -+ *logofs << "BIG-REQUESTS with silly dataLength=" -+ << dataLength << ".\n" << logofs_flush; -+ #endif -+ } - } - } - ---- a/nxcomp/DecodeBuffer.cpp -+++ b/nxcomp/DecodeBuffer.cpp -@@ -78,34 +78,45 @@ - { - if (!endOkay) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [A] in decodeValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- // -- // Label "context" is just used to identify -- // the routine which detected the problem in -- // present source file. -- // -- -- cerr << "Error" << ": Failure decoding data in context [A].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //// -+ //// Label "context" is just used to identify -+ //// the routine which detected the problem in -+ //// present source file. -+ //// -+ //cerr << "Error" << ": Failure decoding data in context [A].\n"; -+ //HandleAbort(); - } - -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [B] in decodeValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [B].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [B].\n"; -+ //HandleAbort(); - } - - lastBit = (nextSrcChar & srcMask_); -@@ -134,28 +145,40 @@ - { - if (!endOkay) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [C] in decodeValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [C].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [C].\n"; -+ //HandleAbort(); - } - -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [D] in decodeValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [D].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [D].\n"; -+ //HandleAbort(); - } - - unsigned char moreData = (nextSrcChar & srcMask_); -@@ -212,16 +235,24 @@ - - if (nextSrc_ >= end_) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [E] in decodeCachedValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [E].\n"; -- -- HandleAbort(); -+ // Failed: return value 0 -+ value = 0; -+ // Failed: return 0, though our callers do not check that... -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [E].\n"; -+ //HandleAbort(); - } - - unsigned int index = 0; -@@ -237,30 +268,33 @@ - nextSrc_++; - if (nextSrc_ >= end_) - { -- if (!endOkay) -- { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] " -- << "in decodeCachedValue() nextSrc_ = " -- << (nextSrc_ - buffer_) << " end_ = " -- << (end_ - buffer_) << ".\n" << logofs_flush; -- #endif -- -- cerr << "Error" << ": Failure decoding data in context [F].\n"; -- -- HandleAbort(); -- } -- -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] " -- << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -- << " end_ = " << (end_ - buffer_) << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [G] in decodeCachedValue(), returning 0:" -+ << " nextSrc_ = " << (nextSrc_ - buffer_) -+ << " end_ = " << (end_ - buffer_) -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [G].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //if (!endOkay) -+ //{ -+ // #ifdef PANIC -+ // *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] " -+ // << "in decodeCachedValue() nextSrc_ = " -+ // << (nextSrc_ - buffer_) << " end_ = " -+ // << (end_ - buffer_) << ".\n" << logofs_flush; -+ // #endif -+ // cerr << "Error" << ": Failure decoding data in context [F].\n"; -+ // HandleAbort(); -+ //} -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] " -+ // << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_) -+ // << " end_ = " << (end_ - buffer_) << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [G].\n"; -+ //HandleAbort(); - } - - nextSrcChar = *nextSrc_; -@@ -288,15 +322,20 @@ - return 1; - } - -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " -- << "in decodeCacheValue() with no value found.\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [H] in decodeCachedValue(), returning 0:" -+ << " no value found" -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [H].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " -+ // << "in decodeCacheValue() with no value found.\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [H].\n"; -+ //HandleAbort(); - } - else - { -@@ -323,15 +362,20 @@ - return 1; - } - -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " -- << "in decodeCacheValue() with no value found.\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [F] in decodeCachedValue(), returning 0:" -+ << " no value found" -+ << " .\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [H].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] " -+ // << "in decodeCacheValue() with no value found.\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [H].\n"; -+ //HandleAbort(); - } - } - } -@@ -344,16 +388,22 @@ - - if (index > cache.getSize()) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] " -- << "in decodeCachedValue() index = " << index -- << " cache size = " << cache.getSize() << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [I] in decodeCachedValue(), returning 0:" -+ << " index = " << index -+ << " cache size = " << cache.getSize() -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [I].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] " -+ // << "in decodeCachedValue() index = " << index -+ // << " cache size = " << cache.getSize() << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [I].\n"; -+ //HandleAbort(); - } - - value = cache.get(index); -@@ -401,16 +451,22 @@ - { - if (!endOkay) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] " -- << "in decodeCachedValue() nextSrc_ " -- << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_) -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [K] in decodeCachedValue(), returning 0:" -+ << " nextSrc_ " << (nextSrc_ - buffer_) -+ << " end_ " << (end_ - buffer_) - << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [K].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] " -+ // << "in decodeCachedValue() nextSrc_ " -+ // << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_) -+ // << ".\n" << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [K].\n"; -+ //HandleAbort(); - } - - #ifdef TEST -@@ -446,15 +502,20 @@ - } - else - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] " -- << "in decodeValue() with index = 2.\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [M] in decodeCachedValue(), returning 0:" -+ << "with index = 2" -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [M].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] " -+ // << "in decodeValue() with index = 2.\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [M].\n"; -+ //HandleAbort(); - } - } - else -@@ -466,16 +527,22 @@ - - if (index > cache.getSize()) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] " -- << "in decodeCachedValue() " << "index = " << index -- << " cache size = " << cache.getSize() << ".\n" -- << logofs_flush; -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [N] in decodeCachedValue(), returning 0:" -+ << " index = " << index -+ << " cache size = " << cache.getSize() -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [N].\n"; -- -- HandleAbort(); -+ value = 0; -+ return 0; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] " -+ // << "in decodeCachedValue() " << "index = " << index -+ // << " cache size = " << cache.getSize() << ".\n" -+ // << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [N].\n"; -+ //HandleAbort(); - } - - value = cache.get(index); -@@ -538,16 +605,22 @@ - } - else if (end_ - nextSrc_ < (int) numBytes) - { -- #ifdef PANIC -- *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] " -- << "in decodeMemory() " << "with length " << numBytes -+ #ifdef WARNING -+ *logofs << "DecodeBuffer: Error [P] in decodeMemory(), returning NULL:" -+ << " with length " << numBytes - << " and " << (end_ - nextSrc_) -- << " bytes remaining.\n" << logofs_flush; -+ << " bytes remaining" -+ << ".\n" << logofs_flush; - #endif -- -- cerr << "Error" << ": Failure decoding data in context [P].\n"; -- -- HandleAbort(); -+ return NULL; -+ //#ifdef PANIC -+ //*logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] " -+ // << "in decodeMemory() " << "with length " << numBytes -+ // << " and " << (end_ - nextSrc_) -+ // << " bytes remaining.\n" << logofs_flush; -+ //#endif -+ //cerr << "Error" << ": Failure decoding data in context [P].\n"; -+ //HandleAbort(); - } - - nextSrc_ += numBytes; ---- a/nxcomp/DecodeBuffer.h -+++ b/nxcomp/DecodeBuffer.h -@@ -30,7 +30,8 @@ - #include "ActionCacheCompat.h" - #include "PositionCacheCompat.h" - --#define DECODE_BUFFER_OVERFLOW_SIZE 4194304 -+// See WriteBuffer.h and EncodeBuffer.h -+#define DECODE_BUFFER_OVERFLOW_SIZE 104857600 - - #define DECODE_BUFFER_POSTFIX_SIZE 1 - ---- a/nxcomp/EncodeBuffer.h -+++ b/nxcomp/EncodeBuffer.h -@@ -33,10 +33,10 @@ - // - // This should match the maximum size of - // a single message added to write buffer --// (see WriteBuffer.h). -+// (see WriteBuffer.h and DecodeBuffer.h). - // - --#define ENCODE_BUFFER_OVERFLOW_SIZE 4194304 -+#define ENCODE_BUFFER_OVERFLOW_SIZE 104857600 - - // - // Adjust for the control messages and the ---- a/nxcomp/SequenceQueue.h -+++ b/nxcomp/SequenceQueue.h -@@ -18,6 +18,22 @@ - #ifndef SequenceQueue_H - #define SequenceQueue_H - -+inline int SequenceNumber_x_gt_y(unsigned int x, unsigned int y) -+{ -+ // For two sequence numbers x and y, determine whether (x > y). -+ // Sequence numbers are the trailing 16 bits of a bigger number: -+ // need to handle wraparound, e.g. 0 is 65536, just after 65535. -+ if (x != (x & 0x00ffff)) return 0; -+ if (y != (y & 0x00ffff)) return 0; -+ // Closeness when comparison makes sense: arbitrarily set at 16*1024 -+ if ((x > y) && ((x-y) < 16*1024)) return 1; -+ // Wrapped value -+ unsigned int w = x + 64*1024; -+ // We know that w>y but test left for symmetry -+ if ((w > y) && ((w-y) < 16*1024)) return 1; -+ return 0; -+} -+ - // - // List of outstanding request messages which - // are waiting for a reply. This class is used ---- a/nxcomp/ServerChannel.cpp -+++ b/nxcomp/ServerChannel.cpp -@@ -104,7 +104,8 @@ - // - - #define HIDE_MIT_SHM_EXTENSION --#define HIDE_BIG_REQUESTS_EXTENSION -+// HIDE_BIG_REQUESTS_EXTENSION : No good to hide, some clients may send crap instead... -+#undef HIDE_BIG_REQUESTS_EXTENSION - #define HIDE_XFree86_Bigfont_EXTENSION - #undef HIDE_SHAPE_EXTENSION - #undef HIDE_XKEYBOARD_EXTENSION -@@ -1412,6 +1413,9 @@ - - unsigned int inputSequence = GetUINT(inputMessage + 2, bigEndian_); - -+ // Sometimes we get inputSequence=0 or =256 when inputOpcode=11=X_UnmapSubwindows -+ // Seems weird... but is "normal" and is to be accepted. -+ - // - // Check if this is an event which we can discard. - // -@@ -1905,6 +1909,12 @@ - break; - default: - { -+ // BEWARE: not only inputOpcode == GenericEvent but also -+ // others not handled above, at least: -+ // GraphicsExpose 13 -+ // MapRequest 20 -+ // ConfigureRequest 23 -+ // and any beyond LASTEvent. - #ifdef TEST - *logofs << "handleRead: Using generic event compression " - << "for OPCODE#" << (unsigned int) inputOpcode -@@ -1919,6 +1929,16 @@ - encodeBuffer.encodeCachedValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_), - 16, *serverCache_ -> genericEventIntCache[i]); - } -+ // Handle "X Generic Event Extension" -+ // Cannot cache extra data... -+// FIXME: BUG ALERT: is it OK to have the first 32 bytes cached, but not the rest? -+ if (inputOpcode == GenericEvent && inputLength > 32) -+ { -+ for (unsigned int i = 14; i < ((inputLength-4)>>1); i++) -+ { -+ encodeBuffer.encodeValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_), 16); -+ } -+ } - } - - } // switch (inputOpcode)... -@@ -3756,7 +3776,7 @@ - } - - unsigned int numPoints; -- decodeBuffer.decodeValue(numPoints, 16, 4); -+ decodeBuffer.decodeValue(numPoints, 32, 4); - outputLength = (numPoints << 2) + 12; - outputMessage = writeBuffer_.addMessage(outputLength); - unsigned int relativeCoordMode; -@@ -3802,7 +3822,7 @@ - } - - unsigned int numPoints; -- decodeBuffer.decodeValue(numPoints, 16, 4); -+ decodeBuffer.decodeValue(numPoints, 32, 4); - outputLength = (numPoints << 2) + 12; - outputMessage = writeBuffer_.addMessage(outputLength); - unsigned int relativeCoordMode; -@@ -3839,7 +3859,7 @@ - case X_PolyRectangle: - { - unsigned int numRectangles; -- decodeBuffer.decodeValue(numRectangles, 16, 3); -+ decodeBuffer.decodeValue(numRectangles, 32, 3); - outputLength = (numRectangles << 3) + 12; - outputMessage = writeBuffer_.addMessage(outputLength); - decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache); -@@ -3869,7 +3889,7 @@ - } - - unsigned int numSegments; -- decodeBuffer.decodeValue(numSegments, 16, 4); -+ decodeBuffer.decodeValue(numSegments, 32, 4); - outputLength = (numSegments << 3) + 12; - outputMessage = writeBuffer_.addMessage(outputLength); - decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache); -@@ -4590,7 +4610,29 @@ - - *outputMessage = (unsigned char) outputOpcode; - -- PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_); -+ if (outputLength < 4*64*1024) -+ PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_); -+ else -+ { -+ // Handle BIG-REQUESTS -+ PutUINT(0, outputMessage + 2, bigEndian_); -+// FIXME: BUG ALERT: following write may not work well, -+// particularly with un-flushed messages. -+if (outputMessage != writeBuffer_.getData()) -+{ -+*logofs << "PSz BUG handleWrite BIG-REQUESTS:" -+ << " have " << (unsigned int)(outputMessage - writeBuffer_.getData()) -+ << " bytes in buffer" -+ << ", write immediate of 4-byte header will not work well" -+ << "\n" << logofs_flush; -+} -+// But, it works well enough in my testing... -+ // Write first four bytes -+ if (transport_ -> write(write_immediate, outputMessage, 4) < 0) -+ return -1; -+ // Replace with new 4-byte length -+ PutULONG(1 + (outputLength >> 2), outputMessage, bigEndian_); -+ } - - #if defined(TEST) || defined(OPCODES) - *logofs << "handleWrite: Handled request OPCODE#" -@@ -5912,7 +5954,7 @@ - unsigned char opcode = *lastMotion_; - unsigned int size = 32; - -- if (GetUINT(buffer + 2, bigEndian_) < serverSequence_) -+ if (SequenceNumber_x_gt_y(serverSequence_, GetUINT(buffer + 2, bigEndian_))) - { - PutUINT(serverSequence_, (unsigned char *) buffer + 2, bigEndian_); - } ---- a/nxcomp/ServerReadBuffer.cpp -+++ b/nxcomp/ServerReadBuffer.cpp -@@ -108,14 +108,21 @@ - { - dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2); - } -+ else if (*start == GenericEvent && *(start+1) != 0) -+ { -+ // X Generic Event Extension -+ dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2); -+ } - else - { - dataLength = 32; - } - -- if (dataLength < 32) -+// See WRITE_BUFFER_OVERFLOW_SIZE elsewhere -+// and also ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE. -+ if (dataLength < 32 || dataLength > 100*1024*1024) - { -- #ifdef TEST -+ #ifdef WARNING - *logofs << "ServerReadBuffer: WARNING! Assuming length 32 " - << "for suspicious message of length " << dataLength - << ".\n" << logofs_flush; ---- a/nxcomp/WriteBuffer.h -+++ b/nxcomp/WriteBuffer.h -@@ -32,8 +32,14 @@ - // This is likely to be a reply to a X_ListFonts where - // user has a large amount of installed fonts. - // -+// Used also for messages sent, and should accommodate any BIG-REQUESTS. -+// Value was 4MB = 4194304, changed to 100MB = 104857600. -+// See also sanity check limits (set same, to 100*1024*1024) in -+// ClientReadBuffer.cpp ServerReadBuffer.cpp and ClientChannel.cpp, and -+// ENCODE_BUFFER_OVERFLOW_SIZE DECODE_BUFFER_OVERFLOW_SIZE elsewhere. -+// - --#define WRITE_BUFFER_OVERFLOW_SIZE 4194304 -+#define WRITE_BUFFER_OVERFLOW_SIZE 104857600 - - class WriteBuffer - { diff --git a/debian/patches/series b/debian/patches/series index 1a9405986..79df3658e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -016_nx-X11_install-location.debian.patch -102_xserver-xext_set-securitypolicy-path.debian.patch +2001_nx-X11_install-location.debian.patch +2002_xserver-xext_set-securitypolicy-path.debian.patch diff --git a/debian/rules b/debian/rules index 61ff2d934..ab69da2d8 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,53 @@ override_dh_auto_clean: rm -Rf nx-X11/.build-exports dh_auto_clean +override_dh_clean: + rm nx-X11/config/Makefile + rm nx-X11/config/cf/Makefile + rm nx-X11/config/cf/date.def + rm nx-X11/config/cf/nxversion.def + rm nx-X11/include/GL/Makefile + rm nx-X11/include/Makefile + rm nx-X11/include/extensions/Makefile + rm nx-X11/programs/Makefile + rm nx-X11/programs/Xserver/GL/Makefile + rm nx-X11/programs/Xserver/GL/glx/Makefile + rm nx-X11/programs/Xserver/GL/mesa/GLcore/Makefile + rm nx-X11/programs/Xserver/GL/mesa/Makefile + rm nx-X11/programs/Xserver/GL/mesa/X/Makefile + rm nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile + rm nx-X11/programs/Xserver/GL/mesa/main/Makefile + rm nx-X11/programs/Xserver/GL/mesa/math/Makefile + rm nx-X11/programs/Xserver/GL/mesa/shader/Makefile + rm nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile + rm nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile + rm nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Makefile + rm nx-X11/programs/Xserver/GL/mesa/swrast/Makefile + rm nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile + rm nx-X11/programs/Xserver/GL/mesa/tnl/Makefile + rm nx-X11/programs/Xserver/Makefile + rm nx-X11/programs/Xserver/Xext/Makefile + rm nx-X11/programs/Xserver/Xi/Makefile + rm nx-X11/programs/Xserver/composite/Makefile + rm nx-X11/programs/Xserver/damageext/Makefile + rm nx-X11/programs/Xserver/dbe/Makefile + rm nx-X11/programs/Xserver/dix/Makefile + rm nx-X11/programs/Xserver/fb/Makefile + rm nx-X11/programs/Xserver/hw/nxagent/Makefile + rm nx-X11/programs/Xserver/hw/nxagent/compext/Makefile + rm nx-X11/programs/Xserver/include/Makefile + rm nx-X11/programs/Xserver/mi/Makefile + rm nx-X11/programs/Xserver/miext/cw/Makefile + rm nx-X11/programs/Xserver/miext/damage/Makefile + rm nx-X11/programs/Xserver/os/Makefile + rm nx-X11/programs/Xserver/randr/Makefile + rm nx-X11/programs/Xserver/record/Makefile + rm nx-X11/programs/Xserver/render/Makefile + rm nx-X11/programs/Xserver/xfixes/Makefile + rm nx-X11/programs/Xserver/xkb/Makefile + rm nx-X11/xmakefile + dh_clean + override_dh_install: # strip static libs and remove .la files diff --git a/debian/watch b/debian/watch index 4ca027c1b..3620348df 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/nx-libs-$1.tar.gz/ \ -https://github.com/ArcticaProject/nx-libs/tags .*/archive/.*?([\d\.]+).tar.gz +opts=pgpsigurlmangle=s/$/.asc/ \ +http://releases.arctica-project.org/source/nx-libs/nx-libs-(.+)-full\.tar\.gz -- cgit v1.2.3 From f17d4eb2638c80cc9a02735201b2958fcfd97dc0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 00:19:04 +0100 Subject: debian/control: All Priority: extras packages are required to be changed to Priority: optional by recent Debian Policy. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 0ab6dffe3..9b807d2d4 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: nx-libs Section: x11 -Priority: extra +Priority: optional Maintainer: Artica Project Uploaders: Mike Gabriel , Mihai Moldovan Build-Depends: -- cgit v1.2.3 From 5000ded309f7653aa90a2c3450b645f3b506e002 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 00:21:42 +0100 Subject: debian/control: Set Section: to "libs" for libnx-x11-6. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 9b807d2d4..196c51b22 100644 --- a/debian/control +++ b/debian/control @@ -66,6 +66,7 @@ Description: nx-X11 core wire protocol and auxiliary headers used to abstract OS-specific functions. Package: libnx-x11-6 +Section: libs Architecture: any Multi-Arch: same Depends: -- cgit v1.2.3 From 542b5b461b2ed67db51f33533e0b09959207eec7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 01:08:34 +0100 Subject: Add missing/renamed patches. (Ouch!). --- .../2001_nx-X11_install-location.debian.patch | 37 ++++++++++++++++++++++ ...erver-xext_set-securitypolicy-path.debian.patch | 19 +++++++++++ 2 files changed, 56 insertions(+) create mode 100644 debian/patches/2001_nx-X11_install-location.debian.patch create mode 100644 debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch (limited to 'debian') diff --git a/debian/patches/2001_nx-X11_install-location.debian.patch b/debian/patches/2001_nx-X11_install-location.debian.patch new file mode 100644 index 000000000..f71b0ace2 --- /dev/null +++ b/debian/patches/2001_nx-X11_install-location.debian.patch @@ -0,0 +1,37 @@ +Description: FHS adaptation for Debian packaging + On Debian, NX libraries and binaries are installed to + /usr/lib/nx. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-12-31 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -722,7 +722,7 @@ + #define AlternateUsrLibDir YES + #endif + #else +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) + #ifndef AlternateUsrLibDir + #define AlternateUsrLibDir NO + #endif +@@ -740,7 +740,7 @@ + #define AlternateUsrDataDir YES + #endif + #else +-#define UsrDataDir Concat4(/usr/local,/,share,/nx) ++#define UsrDataDir Concat4(/usr,/,share,/nx) + #ifndef AlternateUsrDataDir + #define AlternateUsrDataDir NO + #endif +--- a/nx-X11/config/cf/site.def ++++ b/nx-X11/config/cf/site.def +@@ -69,7 +69,7 @@ + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/local ++#define ProjectRoot /usr + #endif + + /* diff --git a/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch new file mode 100644 index 000000000..b3186a9b4 --- /dev/null +++ b/debian/patches/2002_xserver-xext_set-securitypolicy-path.debian.patch @@ -0,0 +1,19 @@ +Description: FHS path fix for SecurityPolicy file + This patch is needed on Debian only, not reporting this path + change to upstream. + . + Originally contributed by Marcelo Boveto Shima . +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-01-12 +--- a/nx-X11/programs/Xserver/Xext/security.c ++++ b/nx-X11/programs/Xserver/Xext/security.c +@@ -84,7 +84,7 @@ + + #ifdef NXAGENT_SERVER + +-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy" ++#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" + + #endif + -- cgit v1.2.3 From 346c59516273e19df130c1bcf593191cfd33ef26 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 07:44:20 +0100 Subject: debian/rules: Fix override_dh_clean target for older Debian/Ubuntu versions. --- debian/rules | 108 +++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 44 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index ab69da2d8..e5e134f06 100755 --- a/debian/rules +++ b/debian/rules @@ -22,50 +22,70 @@ override_dh_auto_clean: dh_auto_clean override_dh_clean: - rm nx-X11/config/Makefile - rm nx-X11/config/cf/Makefile - rm nx-X11/config/cf/date.def - rm nx-X11/config/cf/nxversion.def - rm nx-X11/include/GL/Makefile - rm nx-X11/include/Makefile - rm nx-X11/include/extensions/Makefile - rm nx-X11/programs/Makefile - rm nx-X11/programs/Xserver/GL/Makefile - rm nx-X11/programs/Xserver/GL/glx/Makefile - rm nx-X11/programs/Xserver/GL/mesa/GLcore/Makefile - rm nx-X11/programs/Xserver/GL/mesa/Makefile - rm nx-X11/programs/Xserver/GL/mesa/X/Makefile - rm nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile - rm nx-X11/programs/Xserver/GL/mesa/main/Makefile - rm nx-X11/programs/Xserver/GL/mesa/math/Makefile - rm nx-X11/programs/Xserver/GL/mesa/shader/Makefile - rm nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile - rm nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile - rm nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Makefile - rm nx-X11/programs/Xserver/GL/mesa/swrast/Makefile - rm nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile - rm nx-X11/programs/Xserver/GL/mesa/tnl/Makefile - rm nx-X11/programs/Xserver/Makefile - rm nx-X11/programs/Xserver/Xext/Makefile - rm nx-X11/programs/Xserver/Xi/Makefile - rm nx-X11/programs/Xserver/composite/Makefile - rm nx-X11/programs/Xserver/damageext/Makefile - rm nx-X11/programs/Xserver/dbe/Makefile - rm nx-X11/programs/Xserver/dix/Makefile - rm nx-X11/programs/Xserver/fb/Makefile - rm nx-X11/programs/Xserver/hw/nxagent/Makefile - rm nx-X11/programs/Xserver/hw/nxagent/compext/Makefile - rm nx-X11/programs/Xserver/include/Makefile - rm nx-X11/programs/Xserver/mi/Makefile - rm nx-X11/programs/Xserver/miext/cw/Makefile - rm nx-X11/programs/Xserver/miext/damage/Makefile - rm nx-X11/programs/Xserver/os/Makefile - rm nx-X11/programs/Xserver/randr/Makefile - rm nx-X11/programs/Xserver/record/Makefile - rm nx-X11/programs/Xserver/render/Makefile - rm nx-X11/programs/Xserver/xfixes/Makefile - rm nx-X11/programs/Xserver/xkb/Makefile - rm nx-X11/xmakefile + -rm Makefile + -rm nx-X11/Makefile + -rm nx-X11/lib/Makefile + -rm nx-X11/lib/src/Makefile + -rm nx-X11/lib/src/xkb/Makefile + -rm nx-X11/lib/src/util/Makefile + -rm nx-X11/lib/src/xcms/Makefile + -rm nx-X11/lib/src/xlibi18n/Makefile + -rm nx-X11/lib/modules/Makefile + -rm nx-X11/lib/modules/om/Makefile + -rm nx-X11/lib/modules/om/generic/Makefile + -rm nx-X11/lib/modules/im/Makefile + -rm nx-X11/lib/modules/im/ximcp/Makefile + -rm nx-X11/lib/modules/lc/Makefile + -rm nx-X11/lib/modules/lc/gen/Makefile + -rm nx-X11/lib/modules/lc/def/Makefile + -rm nx-X11/lib/modules/lc/Utf8/Makefile + -rm nx-X11/lib/include/Makefile + -rm nx-X11/config/Makefile + -rm nx-X11/config/cf/Makefile + -rm nx-X11/programs/Makefile + -rm nx-X11/programs/Xserver/Makefile + -rm nx-X11/programs/Xserver/os/Makefile + -rm nx-X11/programs/Xserver/damageext/Makefile + -rm nx-X11/programs/Xserver/miext/cw/Makefile + -rm nx-X11/programs/Xserver/miext/damage/Makefile + -rm nx-X11/programs/Xserver/xfixes/Makefile + -rm nx-X11/programs/Xserver/composite/Makefile + -rm nx-X11/programs/Xserver/Xi/Makefile + -rm nx-X11/programs/Xserver/render/Makefile + -rm nx-X11/programs/Xserver/randr/Makefile + -rm nx-X11/programs/Xserver/record/Makefile + -rm nx-X11/programs/Xserver/dix/Makefile + -rm nx-X11/programs/Xserver/xkb/Makefile + -rm nx-X11/programs/Xserver/hw/nxagent/Makefile + -rm nx-X11/programs/Xserver/hw/nxagent/compext/Makefile + -rm nx-X11/programs/Xserver/mi/Makefile + -rm nx-X11/programs/Xserver/fb/Makefile + -rm nx-X11/programs/Xserver/Xext/Makefile + -rm nx-X11/programs/Xserver/include/Makefile + -rm nx-X11/programs/Xserver/dbe/Makefile + -rm nx-X11/programs/Xserver/GL/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/main/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/X/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/GLcore/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/math/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/swrast/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/shader/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/tnl/Makefile + -rm nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile + -rm nx-X11/programs/Xserver/GL/glx/Makefile + -rm nx-X11/include/Makefile + -rm nx-X11/include/GL/Makefile + -rm nx-X11/include/extensions/Makefile + + -rm nx-X11/config/cf/date.def + -rm nx-X11/config/cf/nxversion.def + -rm nx-X11/xmakefile + dh_clean override_dh_install: -- cgit v1.2.3 From 8cade97b08ac471b33d695f468fc0d58882503f1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 09:51:12 +0100 Subject: debian/rules: Don't remove our main Makefile. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index e5e134f06..0ad6174b3 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,6 @@ override_dh_auto_clean: dh_auto_clean override_dh_clean: - -rm Makefile -rm nx-X11/Makefile -rm nx-X11/lib/Makefile -rm nx-X11/lib/src/Makefile -- cgit v1.2.3 From 91ca51bffc299519f723cc3adeb207bbad8a26c3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 14 Dec 2017 10:39:47 +0100 Subject: debian/rules: Neither overzealously remove nx-X11/Makefile. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 0ad6174b3..9bda99719 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,6 @@ override_dh_auto_clean: dh_auto_clean override_dh_clean: - -rm nx-X11/Makefile -rm nx-X11/lib/Makefile -rm nx-X11/lib/src/Makefile -rm nx-X11/lib/src/xkb/Makefile -- cgit v1.2.3 From cfbb0382027f482568651e6e0cd96ce897e4dbf4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Dec 2017 12:02:36 +0100 Subject: debian/changelog: post-release version bump to 3.5.99.11 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ea0c2db2c..810c28e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.11-0) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 15 Dec 2017 12:01:56 +0100 + nx-libs (2:3.5.99.10-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3 From 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 15 Dec 2017 12:40:31 +0100 Subject: release 3.5.99.12 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 810c28e6e..c37029bae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.12-0) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 15 Dec 2017 12:23:12 +0100 + nx-libs (2:3.5.99.11-0) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. -- cgit v1.2.3