Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/lib/libXi/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 1370 7a7a374453e5
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
     1
 
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 
     2
 
index fbbca45..eb24a4d 100644
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
     3
 
--- a/src/Makefile.am
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
     4
 
+++ 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 
     5
 
@@ -75,7 +75,7 @@ AM_CFLAGS = $(XI_CFLAGS) \
1072
88d1d779286d 7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     6
 
             $(CWARNFLAGS)
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     7
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     8
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     9
 
-libXi_la_LDFLAGS = -version-number 6:1:0 -no-undefined
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    10
 
+libXi_la_LDFLAGS = -version-number 5:0:0 -no-undefined
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    11
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    12
 
 libXiincludedir = $(includedir)/X11/extensions
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    13
 
 libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h \
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
    14
 
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 
    15
 
index 2f58bbb..6c0f927 100644
1179
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
    16
 
--- a/src/Makefile.in
4ad971e180c3 7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1072
diff changeset 
    17
 
+++ 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 
    18
 
@@ -430,7 +430,7 @@ AM_CFLAGS = $(XI_CFLAGS) \
1072
88d1d779286d 7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    19
 
             $(MALLOC_ZERO_CFLAGS) \
88d1d779286d 7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    20
 
             $(CWARNFLAGS)
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    21
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    22
 
-libXi_la_LDFLAGS = -version-number 6:1:0 -no-undefined
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    23
 
+libXi_la_LDFLAGS = -version-number 5:0:0 -no-undefined
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    24
 
 libXiincludedir = $(includedir)/X11/extensions
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
    25
 
 libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h \
1072
88d1d779286d 7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    26
 
 		       $(top_srcdir)/include/X11/extensions/XInput2.h
upstream/oracle/x-cons/x-s11-update-clone