From 9676bbb8058350a0f7b068c6cd52926fea9e6d1a Mon Sep 17 00:00:00 2001
From: mason <macebrooks@gmail.com>
Date: Mon, 2 Jan 2023 14:18:06 +0000
Subject: [PATCH] Add X11 QT5 packages for Xwayland

---
 packages/devel/qt5/package.mk                    |  4 +++-
 packages/x11/util/xcb-util-image/package.mk      | 13 +++++++++++++
 packages/x11/util/xcb-util-keysyms/package.mk    | 13 +++++++++++++
 packages/x11/util/xcb-util-renderutil/package.mk | 13 +++++++++++++
 packages/x11/util/xcb-util-wm/package.mk         | 11 +++++++++++
 packages/x11/util/xcb-util/package.mk            | 13 +++++++++++++
 6 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100755 packages/x11/util/xcb-util-image/package.mk
 create mode 100755 packages/x11/util/xcb-util-keysyms/package.mk
 create mode 100755 packages/x11/util/xcb-util-renderutil/package.mk
 create mode 100755 packages/x11/util/xcb-util-wm/package.mk
 create mode 100755 packages/x11/util/xcb-util/package.mk

diff --git a/packages/devel/qt5/package.mk b/packages/devel/qt5/package.mk
index ecdd3f705..4525f504f 100644
--- a/packages/devel/qt5/package.mk
+++ b/packages/devel/qt5/package.mk
@@ -42,7 +42,7 @@ configure_package() {
 
   # Wayland support
   if [ "${DISPLAYSERVER}" = "wl" ]; then
-    PKG_DEPENDS_TARGET+=" wayland"
+    PKG_DEPENDS_TARGET+=" wayland xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm"
   fi
 }
 
@@ -246,6 +246,8 @@ post_makeinstall_target() {
     cp -PR ${PKG_QT5_SYSROOT_PATH}/lib/libQt5XcbQpa.so*      ${INSTALL}/usr/lib
     cp -PR ${PKG_QT5_SYSROOT_PATH}/plugins/xcbglintegrations ${INSTALL}/usr/plugins
   elif [ ${DISPLAYSERVER} = "wl" ]; then
+    cp -PR ${PKG_QT5_SYSROOT_PATH}/lib/libQt5XcbQpa.so*      ${INSTALL}/usr/lib
+    cp -PR ${PKG_QT5_SYSROOT_PATH}/plugins/xcbglintegrations ${INSTALL}/usr/plugins
     cp -PR ${PKG_QT5_SYSROOT_PATH}/lib/libQt5WaylandClient.so*     ${INSTALL}/usr/lib
     cp -PR ${PKG_QT5_SYSROOT_PATH}/lib/libQt5WaylandCompositor.so* ${INSTALL}/usr/lib
 
diff --git a/packages/x11/util/xcb-util-image/package.mk b/packages/x11/util/xcb-util-image/package.mk
new file mode 100755
index 000000000..5b0aa9b22
--- /dev/null
+++ b/packages/x11/util/xcb-util-image/package.mk
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="xcb-util-image"
+PKG_VERSION="0.4.0"
+PKG_SHA256="2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
+PKG_LICENSE="GPL"
+PKG_SITE="https://xcb.freedesktop.org/XcbUtil/"
+PKG_URL="https://xcb.freedesktop.org/dist/xcb-util-image-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libxcb xcb-util xorgproto util-macros"
+PKG_LONGDESC="The xcb-util-image package provides additional extensions to the XCB library."
+
+
diff --git a/packages/x11/util/xcb-util-keysyms/package.mk b/packages/x11/util/xcb-util-keysyms/package.mk
new file mode 100755
index 000000000..5cdbe43b0
--- /dev/null
+++ b/packages/x11/util/xcb-util-keysyms/package.mk
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="xcb-util-keysyms"
+PKG_VERSION="0.4.0"
+PKG_SHA256="0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9"
+PKG_LICENSE="GPL"
+PKG_SITE="https://xcb.freedesktop.org/XcbUtil/"
+PKG_URL="https://xcb.freedesktop.org/dist/xcb-util-keysyms-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libxcb xorgproto util-macros"
+PKG_LONGDESC="The xcb-util-keysyms package contains a library for handling standard X key constants and conversion to/from keycodes."
+
+
diff --git a/packages/x11/util/xcb-util-renderutil/package.mk b/packages/x11/util/xcb-util-renderutil/package.mk
new file mode 100755
index 000000000..ef5b389c0
--- /dev/null
+++ b/packages/x11/util/xcb-util-renderutil/package.mk
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="xcb-util-renderutil"
+PKG_VERSION="0.3.9"
+PKG_SHA256="c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b"
+PKG_LICENSE="GPL"
+PKG_SITE="https://xcb.freedesktop.org/XcbUtil/"
+PKG_URL="https://xcb.freedesktop.org/dist/xcb-util-renderutil-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libxcb xorgproto util-macros"
+PKG_LONGDESC="The xcb-util-renderutil package provides additional extensions to the XCB library."
+
+
diff --git a/packages/x11/util/xcb-util-wm/package.mk b/packages/x11/util/xcb-util-wm/package.mk
new file mode 100755
index 000000000..ebfa9409a
--- /dev/null
+++ b/packages/x11/util/xcb-util-wm/package.mk
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="xcb-util-wm"
+PKG_VERSION="0.4.1"
+PKG_SHA256="28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f"
+PKG_LICENSE="GPL"
+PKG_SITE="https://xcb.freedesktop.org/XcbUtil/"
+PKG_URL="https://xcb.freedesktop.org/dist/xcb-util-wm-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libxcb xorgproto util-macros"
+PKG_LONGDESC="The xcb-util-wm package contains libraries which provide client and window-manager helpers for EWMH and ICCCM."
diff --git a/packages/x11/util/xcb-util/package.mk b/packages/x11/util/xcb-util/package.mk
new file mode 100755
index 000000000..2393ed70b
--- /dev/null
+++ b/packages/x11/util/xcb-util/package.mk
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="xcb-util"
+PKG_VERSION="0.4.0"
+PKG_SHA256="46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9"
+PKG_LICENSE="GPL"
+PKG_SITE="https://xcb.freedesktop.org/XcbUtil/"
+PKG_URL="https://xcb.freedesktop.org/dist/xcb-util-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libxcb xorgproto util-macros"
+PKG_LONGDESC="The xcb-util package provides additional extensions to the XCB library, many that were previously found in Xlib, but are not part of core X protocol."
+
+