Module Name: src
Committed By: snj
Date: Wed Jun 6 03:09:12 UTC 2018
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/freetype: shlib_version
Log Message:
belatedly bump the shlib version for freetype-2.9.1, using the scheme
outlined in src/external/mit/xorg/lib/freetype/shlib_version.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/freetype/shlib_version
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.81 src/distrib/sets/lists/xbase/shl.mi:1.82
--- src/distrib/sets/lists/xbase/shl.mi:1.81 Sun Mar 11 09:43:39 2018
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jun 6 03:09:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.81 2018/03/11 09:43:39 mrg Exp $
+# $NetBSD: shl.mi,v 1.82 2018/06/06 03:09:12 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -181,7 +181,7 @@
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.18.0.13 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.18.16.1 -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.43 src/distrib/sets/lists/xdebug/shl.mi:1.44
--- src/distrib/sets/lists/xdebug/shl.mi:1.43 Sun Mar 11 09:43:39 2018
+++ src/distrib/sets/lists/xdebug/shl.mi Wed Jun 6 03:09:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.43 2018/03/11 09:43:39 mrg Exp $
+# $NetBSD: shl.mi,v 1.44 2018/06/06 03:09:12 snj Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -61,7 +61,7 @@
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.16.1.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.11 src/external/mit/xorg/lib/freetype/shlib_version:1.12
--- src/external/mit/xorg/lib/freetype/shlib_version:1.11 Wed May 9 07:01:59 2018
+++ src/external/mit/xorg/lib/freetype/shlib_version Wed Jun 6 03:09:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.11 2018/05/09 07:01:59 snj Exp $
+# $NetBSD: shlib_version,v 1.12 2018/06/06 03:09:12 snj Exp $
#
# XXX our freetype shlib versioning is insane. the rest of the world
# uses a major of 6. we used to, but it was bumped to 7 for 64 bit
@@ -8,5 +8,5 @@
# minor/teeny as indicated by xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT
major=18
-minor=0
-teeny=13
+minor=16
+teeny=1
