70N/A#

943N/A# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

70N/A#

70N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

70N/A#

70N/A#

70N/A

70N/AOn Solaris we shipped the Xsun libxkbfile as libxkbfile.so.4, so the Xorg

70N/Alibxkbfile (which is ABI incompatible) was made to be libxkbfile.so.5.

70N/A

851N/Adiff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

1072N/A--- src/Makefile.am 2009-10-16 14:27:13.000000000 -0700

1072N/A+++ src/Makefile.am 2011-02-11 16:52:54.247433835 -0800

851N/A@@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/include/ -I$(

70N/A libxkbfile_la_LIBADD = @XKBFILE_LIBS@

851N/A AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

70N/A

70N/A-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

70N/A+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

70N/A

70N/A libxkbfileincludedir = $(includedir)/X11/extensions

70N/A libxkbfileinclude_HEADERS = \

851N/Adiff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in

1072N/A--- src/Makefile.in 2010-10-29 18:16:24.000000000 -0700

1072N/A+++ src/Makefile.in 2011-02-11 16:52:54.247908598 -0800

1072N/A@@ -265,7 +265,7 @@ libxkbfile_la_SOURCES = \

70N/A INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/

70N/A libxkbfile_la_LIBADD = @XKBFILE_LIBS@

851N/A AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

70N/A-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

70N/A+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

70N/A libxkbfileincludedir = $(includedir)/X11/extensions

70N/A libxkbfileinclude_HEADERS = \

70N/A $(top_srcdir)/include/X11/extensions/XKM.h\