Sync with Ubuntu version 0.10.0-1ubuntu1.

ubuntu/jammy ubuntu/0.10.0-1ubuntu1
Simon Quigley 2 years ago
parent 057c7dac5c
commit 19375834f1

6
debian/changelog vendored

@ -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 lxqt-build-tools (0.10.0-1) unstable; urgency=medium
[ Andrew Lee (李健秋) ] [ Andrew Lee (李健秋) ]

3
debian/control vendored

@ -1,5 +1,6 @@
Source: lxqt-build-tools 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>, Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>, Andrew Lee (李健秋) <ajqlee@debian.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org> ChangZhuo Chen (陳昌倬) <czchen@debian.org>

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

@ -0,0 +1 @@
gio-unix-include-dir.patch
Loading…
Cancel
Save