Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6652122 Import libXRes from open source code base nv_82
authorJay Cotton <Jay.Cotton@Sun.COM>
Fri, 18 Jan 2008 16:10:38 -0800
changeset 287 56a831df2ac8
parent 286 d9eacaa3a109
child 288 8ac082c93add
6652122 Import libXRes from open source code base
open-src/lib/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libXres/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libXres/mapfile-vers file | annotate | diff | comparison | revisions
packages/SUNWxwplt/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwpmn/prototype file | annotate | diff | comparison | revisions 
--- a/open-src/lib/Makefile	Fri Jan 18 16:04:55 2008 -0800
+++ b/open-src/lib/Makefile	Fri Jan 18 16:10:38 2008 -0800
@@ -1,6 +1,6 @@
 # Makefile for X Consolidation Open Source Library modules
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.11	08/01/16
+# @(#)Makefile	1.12	08/01/20
 #
 ###############################################################################
 
@@ -54,6 +54,7 @@
 	libxkbfile \
 	libxkbui \
 	libXrandr \
+	libXres \
 	libXtst \
 	libXv \
 	libXvMC \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXres/Makefile	Fri Jan 18 16:10:38 2008 -0800
@@ -0,0 +1,66 @@
+###############################################################################
+#
+# libXres 1.x Makefile
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# 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, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# 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
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile	1.3	06/10/03
+#
+
+# Package name used in tarballs
+LIB_MODULE=libXres
+
+# Version number (used in path names)
+LIB_VERS=1.0.3
+
+# Link with version mapfile
+LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=XRes
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man
+SUN_PACKAGE=SUNWxwplt
+LIB_STABILITY=Volatile
+LIB_MAN_SUFFIX=3XRes
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/libXRes.so.1.0.0
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=xres.pc.in
+
+# Use proto area for building on older machines without /usr/X11/lib/libXfixes
+LIB_ADD_LD_OPTIONS += -L$(PROTODIR)$(X11_DIR)/lib$(LIBSUBDIR)
+
+include ../Makefile.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXres/mapfile-vers	Fri Jan 18 16:10:38 2008 -0800
@@ -0,0 +1,11 @@
+SUNWexternal_1.0 {
+    global:
+	XResQueryClients;
+	XResQueryClientResources;
+	XResQueryExtension;
+	XResQueryClientPixmapBytes;
+	XResQueryVersion;
+    local:
+	*;
+};
+
--- a/packages/SUNWxwplt/prototype_com	Fri Jan 18 16:04:55 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com	Fri Jan 18 16:10:38 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#	"@(#)prototype_com	35.139	08/01/18   Sun Microsystems" 
+#	"@(#)prototype_com	35.140	08/01/18   Sun Microsystems" 
 #
 # X Window System required core package
 
@@ -81,7 +81,6 @@
 f none openwin/bin/xpr 		0755 root bin
 f none openwin/bin/xprop 	0755 root bin
 f none openwin/bin/xrdb 	0755 root bin
-f none openwin/bin/xset 	0755 root bin
 f none openwin/bin/xstdcmap 	0755 root bin
 f none openwin/bin/xwd 		0755 root bin
 f none openwin/bin/xwud 	0755 root bin
@@ -119,6 +118,10 @@
 f none X11/bin/xmodmap 		0755 root bin
 s none openwin/bin/xmodmap=../../X11/bin/xmodmap
 
+# open-src/app/xset
+f none X11/bin/xset 		0755 root bin
+s none openwin/bin/xset=../../X11/bin/xset
+
 # open-src/app/xpm
 f none X11/bin/cxpm 	0755 root bin
 f none X11/bin/sxpm 	0755 root bin
@@ -335,7 +338,7 @@
 d none openwin/sfw				0755 root bin
 s none openwin/sfw/lib=../../X11/lib
 
-!search  $HOME/openwin/lib
+!search  $HOME/X11/lib
 s none X11/lib/libXRes.so=./libXRes.so.1
 f none X11/lib/libXRes.so.1 		0755 root bin
 
@@ -638,7 +641,7 @@
 s none openwin/lib/$plat_64/libXtsol.so=./libXtsol.so.1
 f none openwin/lib/$plat_64/libXtsol.so.1 	0755 root bin
 
-!search  $HOME/openwin/lib/$plat_64
+!search  $HOME/X11/lib/$plat_64
 s none X11/lib/$plat_64/libXRes.so=./libXRes.so.1
 f none X11/lib/$plat_64/libXRes.so.1 			0755 root bin
 
--- a/packages/SUNWxwpmn/prototype	Fri Jan 18 16:04:55 2008 -0800
+++ b/packages/SUNWxwpmn/prototype	Fri Jan 18 16:10:38 2008 -0800
@@ -1071,13 +1071,15 @@
 f none openwin/share/man/man3Xext/XmbufGetVersion.3Xext  0444 root bin
 f none openwin/share/man/man3Xext/XmbufGetWindowAttributes.3Xext  0444 root bin
 f none openwin/share/man/man3Xext/XmbufQueryExtension.3Xext  0444 root bin
-!search            $HOME/openwin/share/man/man3
-f none openwin/share/man/man3Xext/XRes.3 0444 root bin
-s none openwin/share/man/man3Xext/XResQueryExtension.3=XRes.3
-s none openwin/share/man/man3Xext/XResQueryVersion.3=XRes.3
-s none openwin/share/man/man3Xext/XResQueryClients.3=XRes.3
-s none openwin/share/man/man3Xext/XResQueryClientResources.3=XRes.3
-s none openwin/share/man/man3Xext/XResQueryClientPixmapBytes.3=XRes.3
+
+!search            $HOME/X11/share/man/man3XRes
+d none X11/share/man/man3XRes				0755 root bin
+f none X11/share/man/man3XRes/XRes.3XRes		0444 root bin
+s none X11/share/man/man3XRes/XResQueryExtension.3XRes=XRes3.3XRes
+s none X11/share/man/man3XRes/XResQueryVersion.3XRes=XRes3.3XRes
+s none X11/share/man/man3XRes/XResQueryClients.3XRes=XRes3.3XRes
+s none X11/share/man/man3XRes/XResQueryClientResources.3XRes=XRes3.3XRes
+s none X11/share/man/man3XRes/XResQueryClientPixmapBytes.3XRes=XRes3.3XRes
 
 !search            $HOME/X11/share/man/man3Xi
 d none X11/share/man/man3Xi   0755 root bin
upstream/oracle/x-cons/x-s12-clone