From 19375834f1aed8d00b55d3dba3c4815d5c786d01 Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Wed, 16 Nov 2022 16:43:52 -0600
Subject: [PATCH] Sync with Ubuntu version 0.10.0-1ubuntu1.

---
 debian/changelog                          |  6 ++++++
 debian/control                            |  3 ++-
 debian/patches/gio-unix-include-dir.patch | 25 +++++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/gio-unix-include-dir.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 85ea02c..3b7c56c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxqt-build-tools (0.10.0-1ubuntu1) jammy; urgency=medium
+
+  * Add a patch to support GLib ≥ 2.71.1.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 19 Mar 2022 20:15:43 +0300
+
 lxqt-build-tools (0.10.0-1) unstable; urgency=medium
 
   [ Andrew Lee (李健秋) ]
diff --git a/debian/control b/debian/control
index 7f4b477..871245a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: lxqt-build-tools
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>
diff --git a/debian/patches/gio-unix-include-dir.patch b/debian/patches/gio-unix-include-dir.patch
new file mode 100644
index 0000000..fce67ab
--- /dev/null
+++ b/debian/patches/gio-unix-include-dir.patch
@@ -0,0 +1,25 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Sat, 19 Mar 2022 20:01:20 +0300
+Subject: Replace gunixconnection.h file in gio-unix include dir check
+
+That file was moved from gio-unix to gio in GLib 2.71.1:
+https://gitlab.gnome.org/GNOME/glib/-/commit/83d45c4f35dc87ba
+
+Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/74
+---
+ 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)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..569dca4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gio-unix-include-dir.patch