Module Name: src
Committed By: mrg
Date: Mon May 4 23:51:25 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/external/mit/xorg/lib/libxcb/xkb: Makefile
Log Message:
libxcb-xkb.so has the wrong version, fix it. patch as provided by
Yorick Hardy in PR 49873.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/xkb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.60 src/distrib/sets/lists/xbase/shl.mi:1.61
--- src/distrib/sets/lists/xbase/shl.mi:1.60 Thu Mar 12 07:58:05 2015
+++ src/distrib/sets/lists/xbase/shl.mi Mon May 4 23:51:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.60 2015/03/12 07:58:05 snj Exp $
+# $NetBSD: shl.mi,v 1.61 2015/05/04 23:51:25 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -424,8 +424,8 @@
./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg
./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.0.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.1.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg
Index: src/external/mit/xorg/lib/libxcb/xkb/Makefile
diff -u src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.1 src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.2
--- src/external/mit/xorg/lib/libxcb/xkb/Makefile:1.1 Mon Mar 17 07:25:35 2014
+++ src/external/mit/xorg/lib/libxcb/xkb/Makefile Mon May 4 23:51:25 2015
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/03/17 07:25:35 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/05/04 23:51:25 mrg Exp $
XCBEXT= xkb
-.include "../xcb.mk"
-
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
+
+.include "../xcb.mk"
