open-src/lib/libXfixes/soversion.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 1370 7a7a374453e5
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
68
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     1
/*
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
     2
 * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
68
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
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
     5
 * copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
     6
 * to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
     7
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
     8
 * and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
     9
 * Software is furnished to do so, subject to the following conditions:
68
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    10
 *
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    11
 * The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    12
 * paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    13
 * Software.
68
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    14
 *
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    15
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    16
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    17
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    18
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    19
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    20
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 87
diff changeset
    21
 * DEALINGS IN THE SOFTWARE.
68
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    22
 *
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
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
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
    26
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
    27
compatibility with the existing Solaris binaries.
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    28
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    29
diff --git a/src/Makefile.am b/src/Makefile.am
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    30
index 4e3f542..6c8842c 100644
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    31
--- a/src/Makefile.am
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    32
+++ b/src/Makefile.am
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    33
@@ -12,7 +12,7 @@ AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    34
 AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions
68
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    35
 
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    36
 libXfixes_la_LIBADD = @FIXESEXT_LIBS@
87
f16a51e60f1c 6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 68
diff changeset
    37
-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
    38
+libXfixes_la_LDFLAGS = -version-number 1 -no-undefined
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
 libXfixesincludedir = $(includedir)/X11/extensions
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    41
 libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    42
diff --git a/src/Makefile.in b/src/Makefile.in
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    43
index fbf8351..2077f2c 100644
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    44
--- a/src/Makefile.in
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1072
diff changeset
    45
+++ b/src/Makefile.in
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    46
@@ -342,7 +342,7 @@ libXfixes_la_SOURCES = \
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    47
 AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    48
 AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions
1072
88d1d779286d 7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    49
 libXfixes_la_LIBADD = @FIXESEXT_LIBS@
87
f16a51e60f1c 6504462 XFixes 4.0 [PSARC 2006/702]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 68
diff changeset
    50
-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
    51
+libXfixes_la_LDFLAGS = -version-number 1 -no-undefined
76d5bd5820f4 6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    52
 libXfixesincludedir = $(includedir)/X11/extensions
1370
7a7a374453e5 17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    53
 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
    54
 all: all-am