xsrc/54249: pkg-conf ig --modversion xcb-xinput returns wrong version string.

[oshima-ya%yagoto-urayama.jp@localhost]

>Number:         54249
>Category:       xsrc
>Synopsis:       pkg-conf ig --modversion xcb-xinput returns wrong version string.
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 29 12:25:00 +0000 2019
>Originator:     Yasushi Oshima
>Release:        NetBSD/amd64 8.1_RC1
>Organization:
>Environment:
NetBSD yuzu 8.1_RC1 NetBSD 8.1_RC1 (GENERIC) #0: Sat May 25 12:22:52 JST 2019  oshima@sudachi:/export/netbsd-8/20190523/obj/amd64/sys/arch/amd64/compile/GENERIC amd64
>Description:
Even though xsrc's libxcb (in-tree) is 1.12 (netbsd-8) or 1.13 (-current), the xcb submodule's pkgconfig --modversion returns 1.10.

On netbsd-8:
pkg-config --modversion xcb
1.12
pkg-config --modversion xcb-xinput
1.10

On current:
% pkg-config --modversion xcb
1.13
% pkg-config --modversion xcb-xinput
1.10

Thus, x11/qt5-qtbase of pkgsrc requires xcb-xinput 1.12 or higher, but pkg-config (devel/pkgconf in pkgsrc) returns as 1.10, so xcb-xinput becomes 'no'.

[[configure log]]
:
Checking for XLib... yes
Checking for XCB Xlib... yes
Checking for XCB GLX... yes
Checking for XRender for native painting... no
Checking for X11 session management... yes
Checking for XCB XInput... no                       <<==HERE!
Checking for XCB XKB >= 1.10... yes


As a result, graphics/krita which uses this does not recognize mouse pointer (by xcb-xinput) and can not operate any more.

All the following xcb submodules return 1.10. I don't know if they should return 1.12 or 1.13, but there will be something wrong.

xcb-composite, xcb-damage, xcb-dpms, xcb-dri2, xcb-dri3, xcb-glx, 
xcb-present, xcb-randr, xcb-record, xcb-render, xcb-res, xcb-screensaver, xcb-shape, xcb-shm, xcb-sync, xcb-xf86dri, xcb-xfixes, 
xcb-xinerama, xcb-xinput, xcb-xkb, xcb-xtest, xcb-xv, xcb-xvmc

>How-To-Repeat:
1. Install devel/pkgconf from pkgsrc.
2. Run pkg-config --modversion xcb-xinput.

And more:
3. make install x11/qt5-qtbase from pkgsrc.
4. make install graphics/krita and run krita, create a new canvas, and trty to draw any with mouse in canvas.
>Fix:

This is because PKGCONFIG_VERSION.${PKGCONFIG} in src/external/mit/xorg/lib/libxcb/xcb.mk was not changed when import libxcb v1.12 or v1.13.
This should be changed when import new version libxcb.

This value shoud be set automatically from PACKAGE_VERSION in files/config.h rather than manually, but 'm sorry I do not know how to this.

netbsd-8:

diff --git a/external/mit/xorg/lib/libxcb/xcb.mk b/external/mit/xorg/lib/libxcb/xcb.mk
index 982f91279280..0899da6902b9 100644
--- a/external/mit/xorg/lib/libxcb/xcb.mk
+++ b/external/mit/xorg/lib/libxcb/xcb.mk
@@ -18,7 +18,7 @@ SHLIB_MAJOR?= 0
 SHLIB_MINOR?=  1

 PKGCONFIG=     xcb-${XCBEXT}
-PKGCONFIG_VERSION.${PKGCONFIG}=     1.10
+PKGCONFIG_VERSION.${PKGCONFIG}=     1.12

 .include <bsd.x11.mk>
 .include <bsd.lib.mk>


current:

diff --git a/external/mit/xorg/lib/libxcb/xcb.mk b/external/mit/xorg/lib/libxcb/xcb.mk
index 982f91279280..7e4ed2389255 100644
--- a/external/mit/xorg/lib/libxcb/xcb.mk
+++ b/external/mit/xorg/lib/libxcb/xcb.mk
@@ -18,7 +18,7 @@ SHLIB_MAJOR?= 0
 SHLIB_MINOR?=  1

 PKGCONFIG=     xcb-${XCBEXT}
-PKGCONFIG_VERSION.${PKGCONFIG}=     1.10
+PKGCONFIG_VERSION.${PKGCONFIG}=     1.13

 .include <bsd.x11.mk>
 .include <bsd.lib.mk>