[X2Go-Commits] [nx-libs] 31/40: library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore. It is not used anywhere.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 26 12:30:48 2015 +0200 library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore. It is not used anywhere. --- nx-X11/config/cf/X11.tmpl | 37 ------ nx-X11/config/cf/lnxLib.tmpl | 1 - nx-X11/config/cf/xfree86.cf | 3 - nx-X11/config/cf/xorg.cf | 3 - nx-X11/include/extensions/Imakefile | 4 +- nx-X11/include/extensions/XRes.h | 58 --------- nx-X11/lib/Imakefile | 5 - nx-X11/lib/XRes/Imakefile | 34 ----- nx-X11/lib/XRes/XRes-def.cpp | 9 -- nx-X11/lib/XRes/XRes.c | 233 ----------------------------------- nx-X11/lib/XRes/XRes.man | 140 --------------------- nx-libs.spec | 1 - 12 files changed, 2 insertions(+), 526 deletions(-) diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 37f8969..c1b278e 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -281,9 +281,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildXResExt #define BuildXResExt NO #endif -#ifndef BuildXResLibrary -#define BuildXResLibrary (BuildXResExt && !BuildServersOnly) -#endif #ifndef BuildXvExt #define BuildXvExt NO #endif @@ -1478,30 +1475,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXinerama NO #endif -#if BuildXResLibrary -#ifndef SharedLibXRes -#define SharedLibXRes HasSharedLibraries -#endif -#ifndef NormalLibXRes -#define NormalLibXRes (!SharedLibXRes || ForceNormalLib) -#endif -#ifndef DebugLibXRes -#define DebugLibXRes NO -#endif -#ifndef ProfileLibXRes -#define ProfileLibXRes NO -#endif -#else -#undef SharedLibXRes -#define SharedLibXRes NO -#undef NormalLibXRes -#define NormalLibXRes NO -#undef DebugLibXRes -#define DebugLibXRes NO -#undef ProfileLibXRes -#define ProfileLibXRes NO -#endif - #if BuildRenderLibrary #ifndef SharedLibXrender #define SharedLibXrender HasSharedLibraries @@ -1696,16 +1669,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif - XRESLIBSRC = $(LIBSRC)/XRes -#if SharedLibXRes -#ifndef SharedXResRev -#define SharedXResRev 1.0 -#endif -SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) -#else -ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) -#endif - GLXLIBSRC = $(LIBSRC)/GL #if SharedLibGlx #ifndef SharedGlxRev diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index 33c89e1..ee37270 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -19,7 +19,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #endif #define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs -#define SharedXResReqs $(LDPRELIB) $(XLIB) #define SharedXineramaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index dea9b74..6739021 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1541,9 +1541,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif -#ifndef BuildXResLibrary -# define BuildXResLibrary YES -#endif #endif /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index d4ef89f..1ef1260 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1105,9 +1105,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif -#ifndef BuildXResLibrary -# define BuildXResLibrary YES -#endif #endif /* diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 549c770..6819869 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -54,8 +54,8 @@ COMPOSITEHEADERS = composite.h compositeproto.h XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \ xtraplibp.h xtrapproto.h #endif -#if BuildXResExt || BuildXResLibrary -XRESHEADERS = XRes.h XResproto.h +#if BuildXResExt +XRESHEADERS = XResproto.h #endif #if BuildXevie XEVIEHEADERS = Xevie.h Xeviestr.h diff --git a/nx-X11/include/extensions/XRes.h b/nx-X11/include/extensions/XRes.h deleted file mode 100644 index 99a3643..0000000 --- a/nx-X11/include/extensions/XRes.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - Copyright (c) 2002 XFree86 Inc -*/ -/* $XdotOrg: xc/include/extensions/XRes.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */ -/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */ - -#ifndef _XRES_H -#define _XRES_H - -#include <X11/Xfuncproto.h> - -typedef struct { - XID resource_base; - XID resource_mask; -} XResClient; - -typedef struct { - Atom resource_type; - unsigned int count; -} XResType; - -_XFUNCPROTOBEGIN - - -Bool XResQueryExtension ( - Display *dpy, - int *event_base, - int *error_base -); - -Status XResQueryVersion ( - Display *dpy, - int *major_versionp, - int *minor_versionp -); - -Status XResQueryClients ( - Display *dpy, - int *num_clients, - XResClient **clients -); - -Status XResQueryClientResources ( - Display *dpy, - XID xid, - int *num_types, - XResType **types -); - -Status XResQueryClientPixmapBytes ( - Display *dpy, - XID xid, - unsigned long *bytes -); - -_XFUNCPROTOEND - -#endif /* _XRES_H */ diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 3e58dfe..76dfb83 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -39,10 +39,6 @@ XF86RUSHLIBDIR = Xxf86rush XINERAMADIR=Xinerama #endif -#if BuildXResLibrary -XRESLIBDIR = XRes -#endif - #if BuildGLXLibrary GLXLIBDIR = GL #endif @@ -99,7 +95,6 @@ LINTSUBDIRS = \ $(GLXLIBDIR) \ $(XINERAMADIR) \ $(RENDERLIBDIR) \ - $(XRESLIBDIR) \ $(XFIXESLIBDIR) \ $(COMPOSITELIBDIR) \ $(NULL) diff --git a/nx-X11/lib/XRes/Imakefile b/nx-X11/lib/XRes/Imakefile deleted file mode 100644 index fbc067a..0000000 --- a/nx-X11/lib/XRes/Imakefile +++ /dev/null @@ -1,34 +0,0 @@ -XCOMM $XFree86: xc/lib/XRes/Imakefile,v 1.3 2003/10/13 21:19:28 herrb Exp $ - -#define DoNormalLib NormalLibXRes -#define DoSharedLib SharedLibXRes -#define DoDebugLib DebugLibXRes -#define DoProfileLib ProfileLibXRes -#define LibName NX_XRes -#define SoRev SOXRESREV -#define LibHeaders NO - -#include <Threads.tmpl> - -#ifdef SharedXResReqs -REQUIREDLIBS = SharedXResReqs -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - - DEFINES = $(ALLOC_DEFINES) - SRCS = XRes.c - OBJS = XRes.o - LINTLIBS = $(LINTXLIB) - -#include <Library.tmpl> - -MANSUFFIX=$(LIBMANSUFFIX) -InstallManPage(LibName,$(LIBMANDIR)) -#if ExpandManNames -InstallManPageAliases(LibName,$(LIBMANDIR),XResQueryExtension XResQueryVersion XResQueryClients XResQueryClientResources XResQueryClientPixmapBytes) -#endif - -DependTarget() diff --git a/nx-X11/lib/XRes/XRes-def.cpp b/nx-X11/lib/XRes/XRes-def.cpp deleted file mode 100644 index 1da4ccc..0000000 --- a/nx-X11/lib/XRes/XRes-def.cpp +++ /dev/null @@ -1,9 +0,0 @@ -LIBRARY XRes -VERSION LIBRARY_VERSION -EXPORTS - XResQueryClientPixmapBytes - XResQueryClientResources - XResQueryClients - XResQueryExtension - XResQueryVersion -/* $XFree86$ */ diff --git a/nx-X11/lib/XRes/XRes.c b/nx-X11/lib/XRes/XRes.c deleted file mode 100644 index 06cc78d..0000000 --- a/nx-X11/lib/XRes/XRes.c +++ /dev/null @@ -1,233 +0,0 @@ -/* - Copyright (c) 2002 XFree86 Inc -*/ -/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */ - -#define NEED_EVENTS -#define NEED_REPLIES -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <stdlib.h> -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/XResproto.h> -#include <X11/extensions/XRes.h> - - -static XExtensionInfo _xres_ext_info_data; -static XExtensionInfo *xres_ext_info = &_xres_ext_info_data; -static char *xres_extension_name = XRES_NAME; - -#define XResCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xres_extension_name, val) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xres_ext_info) - -static XExtensionHooks xres_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xres_ext_info, - xres_extension_name, - &xres_extension_hooks, - 0, NULL) - -Bool XResQueryExtension ( - Display *dpy, - int *event_basep, - int *error_basep -) -{ - XExtDisplayInfo *info = find_display (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - -Status XResQueryVersion( - Display *dpy, - int *major_versionp, - int *minor_versionp -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXResQueryVersionReply rep; - xXResQueryVersionReq *req; - - XResCheckExtension (dpy, info, 0); - - LockDisplay (dpy); - GetReq (XResQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->XResReqType = X_XResQueryVersion; - req->client_major = XRES_MAJOR_VERSION; - req->client_minor = XRES_MINOR_VERSION; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - *major_versionp = rep.server_major; - *minor_versionp = rep.server_minor; - UnlockDisplay (dpy); - SyncHandle (); - return 1; -} - - -Status XResQueryClients ( - Display *dpy, - int *num_clients, - XResClient **clients -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXResQueryClientsReq *req; - xXResQueryClientsReply rep; - XResClient *clnts; - int result = 0; - - *num_clients = 0; - *clients = NULL; - - XResCheckExtension (dpy, info, 0); - - LockDisplay (dpy); - GetReq (XResQueryClients, req); - req->reqType = info->codes->major_opcode; - req->XResReqType = X_XResQueryClients; - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - - if(rep.num_clients) { - if((clnts = Xmalloc(sizeof(XResClient) * rep.num_clients))) { - xXResClient scratch; - int i; - - for(i = 0; i < rep.num_clients; i++) { - _XRead(dpy, (char*)&scratch, sz_xXResClient); - clnts[i].resource_base = scratch.resource_base; - clnts[i].resource_mask = scratch.resource_mask; - } - *clients = clnts; - *num_clients = rep.num_clients; - result = 1; - } else { - _XEatData(dpy, rep.length << 2); - } - } - - UnlockDisplay (dpy); - SyncHandle (); - return result; -} - -Status XResQueryClientResources ( - Display *dpy, - XID xid, - int *num_types, - XResType **types -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXResQueryClientResourcesReq *req; - xXResQueryClientResourcesReply rep; - XResType *typs; - int result = 0; - - *num_types = 0; - *types = NULL; - - XResCheckExtension (dpy, info, 0); - - LockDisplay (dpy); - GetReq (XResQueryClientResources, req); - req->reqType = info->codes->major_opcode; - req->XResReqType = X_XResQueryClientResources; - req->xid = xid; - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - - if(rep.num_types) { - if((typs = Xmalloc(sizeof(XResType) * rep.num_types))) { - xXResType scratch; - int i; - - for(i = 0; i < rep.num_types; i++) { - _XRead(dpy, (char*)&scratch, sz_xXResType); - typs[i].resource_type = scratch.resource_type; - typs[i].count = scratch.count; - } - *types = typs; - *num_types = rep.num_types; - result = 1; - } else { - _XEatData(dpy, rep.length << 2); - } - } - - UnlockDisplay (dpy); - SyncHandle (); - return result; -} - -Status XResQueryClientPixmapBytes ( - Display *dpy, - XID xid, - unsigned long *bytes -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXResQueryClientPixmapBytesReq *req; - xXResQueryClientPixmapBytesReply rep; - - *bytes = 0; - - XResCheckExtension (dpy, info, 0); - - LockDisplay (dpy); - GetReq (XResQueryClientPixmapBytes, req); - req->reqType = info->codes->major_opcode; - req->XResReqType = X_XResQueryClientPixmapBytes; - req->xid = xid; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - -#ifdef LONG64 - *bytes = (rep.bytes_overflow * 4294967295) + rep.bytes; -#else - *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes; -#endif - - UnlockDisplay (dpy); - SyncHandle (); - return 1; -} - diff --git a/nx-X11/lib/XRes/XRes.man b/nx-X11/lib/XRes/XRes.man deleted file mode 100644 index 25c27b9..0000000 --- a/nx-X11/lib/XRes/XRes.man +++ /dev/null @@ -1,140 +0,0 @@ -.\" -.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.2 2004/04/23 18:43:36 eich Exp $ -.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $ -.\" -.\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. -.\" -.\" 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 NON-INFRINGEMENT. -.\" IN NO EVENT SHALL THE XFREE86 PROJECT 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 -.\" 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. -.\" -.TH XRes 3 __vendorversion__ -.SH NAME -XRes \- X-Resource extension client library -.SH SYNOPSIS -.B #include <X11/extension/XRes.h> -.PP -.nf -.ta .5i 2i -typedef struct { - XID resource_base; - XID resource_mask; -} XResClient; - -typedef struct { - Atom resource_type; - unsigned int count; -} XResType; -.fi -.HP -Bool XResQueryExtension(Display *\fIdpy\fP, -int *\fIevent_basep\fP, int *\fIerror_basep\fP\^); -.HP -Status XResQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP, -int *\fIminor_versionp\fP\^); -.HP -Status XResQueryClients(Display *\fIdpy\fP, int *\fInum_clients\fP, -XResClient **\fIclients\fP\^); -.HP -Status XResQueryClientResources(Display *\fIdpy\fP, XID \fIxid\fP, -int *\fInum_types\fP, XResType **\fItypes\fP\^); -.HP -Status XResQueryClientPixmapBytes(Display *\fIdpy\fP, XID \fIxid\fP, -unsigned long *\fIbytes\fP\^); -.PP -.SH DESCRIPTION -.B X-Resource -is an extension that allows a client to query the X -server about its usage of various resources. It should not be mixed -with the X resource database access functions. -.PP -.B XResQueryExtension -returns -.B True -if the -.I XRes -extension is available on the given display. -A client must call -.B XResQueryExtension -before calling any other XRes function in order -to negotiate a compatible protocol version; otherwise the client will -get undefined behavior (XRes may or may not work). -.PP -.B XResQueryVersion -returns -.B True -if the request succeeded; the values of the major and minor protocol -versions supported by the server are returned in -.I major_versionp -and -.I minor_versionp . -.PP -.PP -.B XResQueryClients -fills a list of clients of the given display. For each client it -returns in the -.I XResClient -structure a mask and a base value of the resources used by these -clients. -Returns -.B True -on success or -.B False -on failure. -.PP -.B XResQueryClientResources -fills a list of -XResType -structures, indicating for each resource type allocated by the client its -name (as an Atom) and the number of resources of this type allocated. -Returns -.B True -on success or -.B False -on failure. -.PP -.B XresQueryClientPixmapBytes -gives, for resources of type -.I PIXMAP -the total number of bytes allocated in the X server by the given -client. -Returns -.B True -on success or -.B False -on failure. -.SH "ERRORS" -.B XResQueryClientResources -and -.B XResQueryClientPixmapBytes -will return -.I BadValue -if passed an illegal client identifier. -.SH "SEE ALSO" -X(__miscmansuffix__) -.SH AUTHOR -Mark Vojkovich, originally for The XFree86 Project Inc. -.SH STABILITY -This API is considered as experimental. The XRes library major -revision may be incremented whenever incompatible changes are done to -the API without notice. Use with care. diff --git a/nx-libs.spec b/nx-libs.spec index 327e59e..787b273 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -817,7 +817,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_libdir}/libNX_Xtst.so %{_includedir}/nx/X11/X10.h %dir %{_includedir}/nx/X11/extensions -%{_includedir}/nx/X11/extensions/XRes.h %{_includedir}/nx/X11/extensions/XTest.h %{_includedir}/nx/X11/extensions/Xcomposite.h %{_includedir}/nx/X11/extensions/Xevie.h -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git