Bug 651306 – dev-qt/{qtgui,qtwidgets}-5.9999 (>=5.12): libXi / libxcb-xinput - related changes

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Arfrever Frehtes Taifersar Arahesis 2018-03-24 01:51:30 UTC]

https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=a692d7cd2804ead51aef8670c9fbb098c117ebf6

"""
xcb: Use XCB instead of Xlib for XInput

- Replace xinput2 feature by xcb-xinput, which doesn't
  depend on xcb-xlib
- Remove xi2PrepareXIGenericDeviceEvent() that was used to
  fix incompatibilty between XCB and libXi structs
- Drop XCB_USE_XINPUT21 and XCB_USE_XINPUT22 defines that were
  needed with libXi

Although xcb-xinput was released in version 1.13 of libxcb,
it was quite stable in version 1.12, and the parts that we
use did not change between versions, so require system
xcb-xinput 1.12.

[ChangeLog][X11] The xcb plugin was ported to use libxcb-xinput
instead of libXi for XInput2 support. The -xinput2 configure
option was replaced by -xcb-xinput.
"""


References to "xinput2" should be updated to "xcb-xinput":

# grep xinput2 eclass/qt5-build.eclass dev-qt/*/*-5.9999.ebuild
eclass/qt5-build.eclass:                -no-xinput2 -no-xcb-xlib
dev-qt/qtgui/qtgui-5.9999.ebuild:       xcb:xinput2:
dev-qt/qtgui/qtgui-5.9999.ebuild:               $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
dev-qt/qtwidgets/qtwidgets-5.9999.ebuild:               $(usex xcb '-xcb-xlib -xinput2 -xkb' '')


In dev-qt/qtgui-5.9999, dependency on ">=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb]" should be changed to ">=x11-libs/libxcb-1.12:=[xkb]" (maybe without ":=").


(Uncertain whether any other changes are needed.)

[Comment 1 Arfrever Frehtes Taifersar Arahesis 2018-08-15 11:32:23 UTC]

https://gitweb.gentoo.org/proj/qt.git/commit/?id=677153ee925d8324ec0bb9fc22dc07c139649337

commit 677153ee925d8324ec0bb9fc22dc07c139649337
Author:     Jimi Huotari <[e-mail]>
AuthorDate: Wed Aug 15 14:18:45 2018 +0300
Commit:     Jimi Huotari <[e-mail]>
CommitDate: Wed Aug 15 14:20:45 2018 +0300

    qt5-build.eclass: fix configure for 5.12
    
    The 'xinput2' configure option has been renamed to 'xcb-xinput' in:
    http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=a692d7cd

[Comment 2 Larry the Git Cow 2018-08-15 13:21:51 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6c63e189dedbc2cbd6aecf8881ea0632866663d

commit f6c63e189dedbc2cbd6aecf8881ea0632866663d
Author:     Jimi Huotari <[e-mail]>
AuthorDate: 2018-08-15 13:20:16 +0000
Commit:     Jimi Huotari <[e-mail]>
CommitDate: 2018-08-15 13:20:16 +0000

    dev-qt/qtwidgets: replace 'xinput2' with 'xcb-xinput'
    
    Closes: https://bugs.gentoo.org/651306
    Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-qt/qtwidgets/qtwidgets-5.12.9999.ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[Comment 3 Chiitoo 2018-08-15 13:23:47 UTC]

I was not too sure about removing the ':=', so I left it in place for now.

Thanks for the report, and apologies for not noticing it earlier!