zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lxqt-build-tools: Add upstream patch to fix libqtxdg with glib-2.0 >= 2.71.1

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-03-29 00:11:35 +02:00
parent 2ad5f1a7ea
commit 670d8f1e90
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-lxqt/lxqt-build-tools/lxqt-build-tools.bb
View File

@@ -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"

28
recipes-lxqt/lxqt-build-tools/lxqt-build-tools/0001-Fix-GLib-2.71.1.patch Normal file
View File

@@ -0,0 +1,28 @@
From 62b77bb807aa2ac2c1df8eec372df771da8d2203 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@users.noreply.github.com>
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)