--- a/open-src/Makefile Thu Sep 28 14:47:06 2006 -0700
+++ b/open-src/Makefile Fri Sep 29 13:30:42 2006 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 06/09/15
+# @(#)Makefile 1.8 06/09/28
#
###############################################################################
#
@@ -45,7 +45,8 @@
lib/fontconfig \
lib/libXau \
lib/libXdmcp \
- lib/Xft
+ lib/Xft \
+ lib/libXfixes
AFTERX = \
app/xscreensaver \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_32/x11.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,15 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+xthreadlib=
+
+Name: X11
+Description: X Library
+Version: 0.0
+Requires: xproto kbproto inputproto
+Requires.private: xau xdmcp
+Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+Libs: -L${libdir} -R${libdir} -lX11
+Libs.private:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_32/xext.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,12 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Xext
+Description: Misc X Extension Library
+Version: 0.0
+Requires: xextproto
+Requires.private: x11 xau
+Cflags: -I${includedir}
+Libs: -L${libdir} -R${libdir} -lXext
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_32/xrender.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,12 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/sfw/lib
+includedir=${prefix}/include
+
+Name: Xrender
+Description: X Render Library
+Version: 0.1
+Requires: xproto renderproto x11
+Requires.private: x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -R${libdir} -lXrender
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_64/x11.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,15 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/64
+includedir=${prefix}/include
+
+xthreadlib=
+
+Name: X11
+Description: X Library
+Version: 0.0
+Requires: xproto kbproto inputproto
+Requires.private: xau xdmcp
+Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+Libs: -L${libdir} -R${libdir} -lX11
+Libs.private:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_64/xext.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,12 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/64
+includedir=${prefix}/include
+
+Name: Xext
+Description: Misc X Extension Library
+Version: 0.0
+Requires: xextproto
+Requires.private: x11 xau
+Cflags: -I${includedir}
+Libs: -L${libdir} -R${libdir} -lXext
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/common/pc-files/build_64/xrender.pc Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,12 @@
+prefix=/usr/openwin
+exec_prefix=${prefix}
+libdir=${exec_prefix}/sfw/lib/64
+includedir=${prefix}/include
+
+Name: Xrender
+Description: X Render Library
+Version: 0.1
+Requires: xproto renderproto x11
+Requires.private: x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -R${libdir} -lXrender
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXfixes/5099413.patch Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2006 Sun Microsystems, 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, 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.
+ *
+ */
+
+From 6c4d82990973b02a756ab3ba83ea345fed4bf87e Mon Sep 17 00:00:00 2001
+From: Stuart Kreitman <[email protected]>
+Date: Wed, 27 Sep 2006 19:02:02 -0700
+Subject: [PATCH] Sun bug #5099413/Xorg bugzilla #1554: Gnopernicus full-screen mag not working
+
+Sun bug #5099413: Gnopernicus full-screen magnification not working
+<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=5099413>
+
+includes fix for Xorg bug #1554: rect defined in XFixesInvertRegion is not used
+<https://bugs.freedesktop.org/show_bug.cgi?id=1554>
+---
+ src/Region.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/Region.c b/src/Region.c
+index c9f5920..0bbc1a2 100644
+--- src/Region.c
++++ src/Region.c
+@@ -251,6 +251,10 @@ XFixesInvertRegion (Display *dpy, Xserve
+ GetReq (XFixesInvertRegion, req);
+ req->reqType = info->codes->major_opcode;
+ req->xfixesReqType = X_XFixesInvertRegion;
++ req->x = rect->x;
++ req->y = rect->y;
++ req->width = rect->width;
++ req->height = rect->height;
+ req->source = src;
+ req->destination = dst;
+ UnlockDisplay (dpy);
+@@ -320,6 +324,7 @@ XFixesFetchRegionAndBounds (Display
+ req->reqType = info->codes->major_opcode;
+ req->xfixesReqType = X_XFixesFetchRegion;
+ req->region = region;
++ *nrectanglesRet = 0;
+ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
+ {
+ UnlockDisplay (dpy);
+--
+1.4.1
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXfixes/Makefile Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,63 @@
+###############################################################################
+#
+# Xfixes 1.x Makefile
+#
+# Copyright 2006 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.2 06/10/03
+#
+
+# Package name used in tarballs
+LIB_MODULE=libXfixes
+
+# Version number (used in path names)
+LIB_VERS=3.0.1.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 5099413.patch soversion.patch
+
+# Library name
+LIBNAME=Xfixes
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man
+SUN_PACKAGE=SUNWxwplt
+LIB_STABILITY=Volatile
+LIB_MAN_SUFFIX=3
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/libXfixes.so.1.0.0
+
+# Link with version mapfile
+LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=xfixes.pc.in
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXfixes/mapfile-vers Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,66 @@
+#
+# Copyright 2006 Sun Microsystems, 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, 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.
+#
+#
+# ident "@(#)mapfile-vers 1.2 06/09/28 SMI"
+#
+
+XFIXES_0.0 {
+ global:
+ XFixesSelectSelectionInput;
+ XFixesCopyRegion;
+ XFixesUnionRegion;
+ XFixesSetPictureClipRegion;
+ XFixesCreateRegionFromBitmap;
+ XFixesQueryExtension;
+ XFixesInvertRegion;
+ XFixesGetCursorName;
+ XFixesQueryVersion;
+ XFixesIntersectRegion;
+ XFixesSetCursorName;
+ XFixesCreateRegionFromPicture;
+ XFixesChangeSaveSet;
+ XFixesSetGCClipRegion;
+ XFixesChangeCursor;
+ XFixesCreateRegionFromWindow;
+ XFixesSelectCursorInput;
+ XFixesSubtractRegion;
+ XFixesSetRegion;
+ XFixesCreateRegionFromGC;
+ XFixesGetCursorImage;
+ XFixesTranslateRegion;
+ XFixesSetWindowShapeRegion;
+ XFixesCreateRegion;
+ XFixesRegionExtents;
+ XFixesDestroyRegion;
+ XFixesFetchRegion;
+ XFixesChangeCursorByName;
+ local:
+ *;
+};
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXfixes/soversion.patch Fri Sep 29 13:30:42 2006 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006 Sun Microsystems, 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, 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.
+ *
+ */
+
+Somehow we shipped in Solaris libXfixes.so.1 the same version the open
+source community shipped as libXfixes.so.3. This thus maintains ABI
+compatibility with the existing Solaris binaries.
+
+--- src/Makefile.am 2005-11-01 07:11:51.000000000 -0800
++++ src/Makefile.am 2006-09-28 17:37:46.489002000 -0700
+@@ -13,8 +13,8 @@
+
+ INCLUDES = -I$(top_srcdir)/include/X11/extensions
+
+-libXfixes_la_LDFLAGS = -version-number 3:0:0 -no-undefined
++libXfixes_la_LDFLAGS = -version-number 1 -no-undefined
+
+ libXfixesincludedir = $(includedir)/X11/extensions
+ libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h
+
+--- src/Makefile.in 2005-12-20 23:09:06.000000000 -0800
++++ src/Makefile.in 2006-09-28 17:37:57.138130000 -0700
+@@ -167,7 +167,7 @@
+
+ INCLUDES = -I$(top_srcdir)/include/X11/extensions
+
+-libXfixes_la_LDFLAGS = -version-number 3:0:0 -no-undefined
++libXfixes_la_LDFLAGS = -version-number 1 -no-undefined
+
+ libXfixesincludedir = $(includedir)/X11/extensions
+ libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h