components/x11/libXmu/patches/01-solaris-abi.patch

   1 ###############################################################################
   2 # Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 # Permission is hereby granted, free of charge, to any person obtaining a
   5 # copy of this software and associated documentation files (the "Software"),
   6 # to deal in the Software without restriction, including without limitation
   7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8 # and/or sell copies of the Software, and to permit persons to whom the
   9 # Software is furnished to do so, subject to the following conditions:
  10 #
  11 # The above copyright notice and this permission notice (including the next
  12 # paragraph) shall be included in all copies or substantial portions of the
  13 # Software.
  14 #
  15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21 # DEALINGS IN THE SOFTWARE.
  22 #
  23
  24 diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
  25 --- a/src/Makefile.am   2009-10-16 14:26:51.000000000 -0700
  26 +++ b/src/Makefile.am   2011-02-11 16:42:34.881458929 -0800
  27 @@ -9,11 +9,13 @@ AM_CPPFLAGS = \
  28
  29  AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
  30
  31 -libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
  32 -libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
  33 +libXmu_la_LDFLAGS = -version-number 4:0:0 -no-undefined -Wl,-M../../../mapfile-Xmu
  34 +libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -Wl,-M../../../mapfile-Xmuu
  35
  36 -libXmu_la_LIBADD = $(XMU_LIBS)
  37 -libXmuu_la_LIBADD = $(XMUU_LIBS)
  38 +libXmu_la_DEPENDENCIES = libXmuu.la
  39 +
  40 +libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.la -lX11 -lc -lm
  41 +libXmuu_la_LIBADD = $(XMUU_LIBS) -lc
  42
  43  libXmuu_la_SOURCES = \
  44         ClientWin.c \
  45 @@ -23,7 +25,8 @@ libXmuu_la_SOURCES = \
  46         Lower.c
  47
  48  libXmu_la_SOURCES = \
  49 -       $(libXmuu_la_SOURCES) \
  50 +       CmapEquiv.c \
  51 +       VisGamma.c \
  52         AllCmap.c \
  53         Atoms.c \
  54         Clip.c \
  55 @@ -79,7 +82,7 @@ lintlibdir = $(libdir)
  56
  57  lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
  58
  59 -$(LINTLIB): $(libXmu_la_SOURCES)
  60 +$(LINTLIB): $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES)
  61         $(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
  62
  63  $(LINTLIBUU): $(libXmuu_la_SOURCES)