author | Alan Coopersmith <Alan.Coopersmith@Sun.COM> |
Fri, 08 Aug 2008 16:27:37 -0700 | |
changeset 493 | f43507b5737d |
parent 87 | f16a51e60f1c |
child 919 | 425233ae7236 |
permissions | -rw-r--r-- |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
/* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
* Copyright 2006 Sun Microsystems, Inc. All rights reserved. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
* Permission is hereby granted, free of charge, to any person obtaining a |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
* copy of this software and associated documentation files (the |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
* "Software"), to deal in the Software without restriction, including |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
7 |
* without limitation the rights to use, copy, modify, merge, publish, |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
* distribute, and/or sell copies of the Software, and to permit persons |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
* to whom the Software is furnished to do so, provided that the above |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
* copyright notice(s) and this permission notice appear in all copies of |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
* the Software and that both the above copyright notice(s) and this |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
* permission notice appear in supporting documentation. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
16 |
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
17 |
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
18 |
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
19 |
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
20 |
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
21 |
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
* Except as contained in this notice, the name of a copyright holder |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
* shall not be used in advertising or otherwise to promote the sale, use |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
26 |
* or other dealings in this Software without prior written authorization |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
* of the copyright holder. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
*/ |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
Somehow we shipped in Solaris libXfixes.so.1 the same version the open |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
source community shipped as libXfixes.so.3. This thus maintains ABI |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
compatibility with the existing Solaris binaries. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
34 |
|
87
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
35 |
diff -urp -x '*~' src/Makefile.am src/Makefile.am |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
36 |
--- src/Makefile.am 2006-11-08 06:13:02.000000000 -0800 |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
37 |
+++ src/Makefile.am 2006-12-13 19:38:50.783922000 -0800 |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
38 |
@@ -13,7 +13,7 @@ AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@ |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
INCLUDES = -I$(top_srcdir)/include/X11/extensions |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
|
87
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
42 |
-libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
+libXfixes_la_LDFLAGS = -version-number 1 -no-undefined |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
libXfixesincludedir = $(includedir)/X11/extensions |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h |
87
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
47 |
diff -urp -x '*~' src/Makefile.in src/Makefile.in |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
48 |
--- src/Makefile.in 2006-11-08 06:13:53.000000000 -0800 |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
49 |
+++ src/Makefile.in 2006-12-13 19:38:50.785094000 -0800 |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
50 |
@@ -218,7 +218,7 @@ libXfixes_la_SOURCES = \ |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
51 |
libXfixes_la_LIBADD = @X_LIBS@ |
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
52 |
AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@ |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
INCLUDES = -I$(top_srcdir)/include/X11/extensions |
87
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
54 |
-libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
+libXfixes_la_LDFLAGS = -version-number 1 -no-undefined |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
libXfixesincludedir = $(includedir)/X11/extensions |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h |
87
f16a51e60f1c
6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
68
diff
changeset
|
58 |
all: all-am |