diff --git a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools.bb b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools.bb index 76141f23..3ac82864 100644 --- a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools.bb +++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools.bb @@ -9,7 +9,10 @@ do_configure:append() { sed -i 's:set(LXQT_ETC_XDG_DIR.*:set(LXQT_ETC_XDG_DIR "${sysconfdir}/xdg"):' ${B}/install/LXQtConfigVars.cmake } -SRC_URI = "git://github.com/lxde/${BPN}.git;branch=master;protocol=https" +SRC_URI = " \ + git://github.com/lxde/${BPN}.git;branch=master;protocol=https \ + file://0001-Fix-GLib-2.71.1.patch \ +" SRCREV = "a11ff29e32225194c0a0ccb554e39eb7c5322cde" PV = "0.10.0" S = "${WORKDIR}/git" diff --git a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools/0001-Fix-GLib-2.71.1.patch b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools/0001-Fix-GLib-2.71.1.patch new file mode 100644 index 00000000..de3fec6c --- /dev/null +++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools/0001-Fix-GLib-2.71.1.patch @@ -0,0 +1,28 @@ +From 62b77bb807aa2ac2c1df8eec372df771da8d2203 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Tue, 29 Mar 2022 00:29:49 +0300 +Subject: [PATCH] Replace gunixconnection.h file in gio-unix include dir check + (#74) + +That file was moved from gio-unix to gio in GLib 2.71.1: +https://gitlab.gnome.org/GNOME/glib/-/commit/83d45c4f35dc87ba + +Upstream-Status: Accepted[https://github.com/lxqt/lxqt-build-tools/commit/62b77bb807aa2ac2c1df8eec372df771da8d2203] +--- + cmake/find-modules/FindGLIB.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake +index 0564b8d..bb2336a 100644 +--- a/cmake/find-modules/FindGLIB.cmake ++++ b/cmake/find-modules/FindGLIB.cmake +@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS}) + elseif (${_component} STREQUAL "gio-unix") + pkg_check_modules(GIO_UNIX gio-unix-2.0) + find_path(GLIB_GIO_UNIX_INCLUDE_DIR +- NAMES gio/gunixconnection.h ++ NAMES gio/gunixfdlist.h + HINTS ${GIO_UNIX_INCLUDEDIR} + PATH_SUFFIXES gio-unix-2.0) + +