open-src/lib/libXmu/solaris-abi.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 1422 e9cadc0026d8
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb

###############################################################################
# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
#
# 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, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# 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.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#

diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am	2009-10-16 14:26:51.000000000 -0700
+++ src/Makefile.am	2011-02-11 16:42:34.881458929 -0800
@@ -9,11 +9,13 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
 
-libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
-libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libXmu_la_LDFLAGS = -version-number 4:0:0 -no-undefined -M ../../mapfile-Xmu
+libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -M ../../mapfile-Xmuu
 
-libXmu_la_LIBADD = $(XMU_LIBS)
-libXmuu_la_LIBADD = $(XMUU_LIBS)
+libXmu_la_DEPENDENCIES = libXmuu.so.1
+
+libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.so.1 -lX11 -lc -lm
+libXmuu_la_LIBADD = $(XMUU_LIBS) -lc
 
 libXmuu_la_SOURCES = \
 	ClientWin.c \
@@ -23,7 +25,8 @@ libXmuu_la_SOURCES = \
 	Lower.c
 
 libXmu_la_SOURCES = \
-	$(libXmuu_la_SOURCES) \
+	CmapEquiv.c \
+	VisGamma.c \
 	AllCmap.c \
 	Atoms.c \
 	Clip.c \
@@ -79,7 +82,7 @@ lintlibdir = $(libdir)
 
 lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
 
-$(LINTLIB): $(libXmu_la_SOURCES)
+$(LINTLIB): $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES)
 	$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
 
 $(LINTLIBUU): $(libXmuu_la_SOURCES)