#

# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

# Use is 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.

#

# ident "@(#)soversion.patch 1.2 09/12/05 SMI"

#

On Solaris we shipped the Xsun libxkbfile as libxkbfile.so.4, so the Xorg

libxkbfile (which is ABI incompatible) was made to be libxkbfile.so.5.

diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

--- src/Makefile.am 2009-10-06 16:57:31.000000000 -0700

+++ src/Makefile.am 2009-11-12 16:46:59.845715257 -0800

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

libxkbfile_la_LIBADD = @XKBFILE_LIBS@

AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

libxkbfileincludedir = $(includedir)/X11/extensions

libxkbfileinclude_HEADERS = \

diff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in

--- src/Makefile.in 2009-10-06 17:09:31.000000000 -0700

+++ src/Makefile.in 2009-11-12 16:46:59.846258117 -0800

@@ -262,7 +262,7 @@ libxkbfile_la_SOURCES = \

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

libxkbfile_la_LIBADD = @XKBFILE_LIBS@

AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

libxkbfileincludedir = $(includedir)/X11/extensions

libxkbfileinclude_HEADERS = \

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