forward upstream and dro icccm patch

xcb-icccm incompatibility was resolved upstream