1 # |
1 # |
2 # Copyright 2006 Sun Microsystems, Inc. All rights reserved. |
2 # Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
3 # Use subject to license terms. |
3 # Use is subject to license terms. |
4 # |
4 # |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
6 # copy of this software and associated documentation files (the |
6 # copy of this software and associated documentation files (the |
7 # "Software"), to deal in the Software without restriction, including |
7 # "Software"), to deal in the Software without restriction, including |
8 # without limitation the rights to use, copy, modify, merge, publish, |
8 # without limitation the rights to use, copy, modify, merge, publish, |
25 # Except as contained in this notice, the name of a copyright holder |
25 # Except as contained in this notice, the name of a copyright holder |
26 # shall not be used in advertising or otherwise to promote the sale, use |
26 # shall not be used in advertising or otherwise to promote the sale, use |
27 # or other dealings in this Software without prior written authorization |
27 # or other dealings in this Software without prior written authorization |
28 # of the copyright holder. |
28 # of the copyright holder. |
29 # |
29 # |
30 # @(#)soversion.patch 1.1 06/10/02 |
30 # ident "@(#)soversion.patch 1.2 09/12/05 SMI" |
31 # |
31 # |
32 |
32 |
33 On Solaris we shipped the Xsun libxkbfile as libxkbfile.so.4, so the Xorg |
33 On Solaris we shipped the Xsun libxkbfile as libxkbfile.so.4, so the Xorg |
34 libxkbfile (which is ABI incompatible) was made to be libxkbfile.so.5. |
34 libxkbfile (which is ABI incompatible) was made to be libxkbfile.so.5. |
35 |
35 |
36 --- src/Makefile.am 2006-02-28 14:44:54.000000000 -0800 |
36 diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am |
37 +++ src/Makefile.am 2006-09-28 13:36:49.520232000 -0700 |
37 --- src/Makefile.am 2009-10-06 16:57:31.000000000 -0700 |
38 @@ -22,7 +22,7 @@ |
38 +++ src/Makefile.am 2009-11-12 16:46:59.845715257 -0800 |
|
39 @@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/include/ -I$( |
39 libxkbfile_la_LIBADD = @XKBFILE_LIBS@ |
40 libxkbfile_la_LIBADD = @XKBFILE_LIBS@ |
40 AM_CFLAGS = @XKBFILE_CFLAGS@ |
41 AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@ |
41 |
42 |
42 -libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined |
43 -libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined |
43 +libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined |
44 +libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined |
44 |
45 |
45 libxkbfileincludedir = $(includedir)/X11/extensions |
46 libxkbfileincludedir = $(includedir)/X11/extensions |
46 libxkbfileinclude_HEADERS = \ |
47 libxkbfileinclude_HEADERS = \ |
47 |
48 diff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in |
48 --- src/Makefile.in 2006-04-26 12:58:32.000000000 -0700 |
49 --- src/Makefile.in 2009-10-06 17:09:31.000000000 -0700 |
49 +++ src/Makefile.in 2006-09-28 13:56:37.123309000 -0700 |
50 +++ src/Makefile.in 2009-11-12 16:46:59.846258117 -0800 |
50 @@ -203,7 +203,7 @@ |
51 @@ -262,7 +262,7 @@ libxkbfile_la_SOURCES = \ |
51 INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/ |
52 INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/ |
52 libxkbfile_la_LIBADD = @XKBFILE_LIBS@ |
53 libxkbfile_la_LIBADD = @XKBFILE_LIBS@ |
53 AM_CFLAGS = @XKBFILE_CFLAGS@ |
54 AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@ |
54 -libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined |
55 -libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined |
55 +libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined |
56 +libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined |
56 libxkbfileincludedir = $(includedir)/X11/extensions |
57 libxkbfileincludedir = $(includedir)/X11/extensions |
57 libxkbfileinclude_HEADERS = \ |
58 libxkbfileinclude_HEADERS = \ |
58 $(top_srcdir)/include/X11/extensions/XKM.h\ |
59 $(top_srcdir)/include/X11/extensions/XKM.h\ |