open-src/lib/libFS/solaris-abi.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 28 Apr 2010 18:08:17 -0700
changeset 943 294f64612d23
parent 919 425233ae7236
child 1276 52f85727ce94
permissions -rw-r--r--
6948254 Mass update of X gate sources to Oracle copyright format
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
943
294f64612d23 6948254 Mass update of X gate sources to Oracle copyright format
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 919
diff changeset
     1
# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     2
#
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     3
# 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: 425
diff changeset
     4
# 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: 425
diff changeset
     5
# 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: 425
diff changeset
     6
# 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: 425
diff changeset
     7
# 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: 425
diff changeset
     8
# Software is furnished to do so, subject to the following conditions:
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
     9
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    10
# 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: 425
diff changeset
    11
# 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: 425
diff changeset
    12
# Software.
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    13
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 425
diff changeset
    14
# 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: 425
diff changeset
    15
# 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: 425
diff changeset
    16
# 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: 425
diff changeset
    17
# 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: 425
diff changeset
    18
# 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: 425
diff changeset
    19
# 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: 425
diff changeset
    20
# DEALINGS IN THE SOFTWARE.
425
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    21
Change .so version to match existing Solaris libraries, since there's
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    22
no incompatible change since libFS.so.5
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    23
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    24
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
--- src/Makefile.am	2008-05-21 17:27:09.000000000 -0700
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    26
+++ src/Makefile.am	2008-05-21 19:03:29.651500000 -0700
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    27
@@ -35,7 +35,7 @@ libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LI
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    28
 
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    29
 INCLUDES = -I$(top_srcdir)/include/X11/fonts
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    30
 
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    31
-libFS_la_LDFLAGS = -version-number 6:0:0 -no-undefined
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    32
+libFS_la_LDFLAGS = -version-number 5 -no-undefined
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    33
 
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    34
 libFSincludedir = $(includedir)/X11/fonts
a0d3549d7d21 6707932 Xorg modularization: Font Server library and clients
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    35
 libFSinclude_HEADERS = \