Revert a non-backwards-compatible yet important change done for later releases, to adapt for a new glib2.0 version. We don't have the capacity to maintain glib2.0 in Backports, so simply revert it back to "the way it was."
This commit is contained in:
parent
5cfce1a0f5
commit
ef16819f1a
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,3 +1,12 @@
|
|||||||
|
lxqt-build-tools (0.12.0-0ubuntu1~ppa2) jammy; urgency=medium
|
||||||
|
|
||||||
|
* Revert a non-backwards-compatible yet important change done for later
|
||||||
|
releases, to adapt for a new glib2.0 version. We don't have the capacity
|
||||||
|
to maintain glib2.0 in Backports, so simply revert it back to "the way it
|
||||||
|
was."
|
||||||
|
|
||||||
|
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 16 Nov 2022 18:23:59 -0600
|
||||||
|
|
||||||
lxqt-build-tools (0.12.0-0ubuntu1~ppa1) jammy; urgency=medium
|
lxqt-build-tools (0.12.0-0ubuntu1~ppa1) jammy; urgency=medium
|
||||||
|
|
||||||
* Backport to Jammy.
|
* Backport to Jammy.
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -23,7 +23,7 @@ Architecture: all
|
|||||||
Depends: ${misc:Depends},
|
Depends: ${misc:Depends},
|
||||||
binutils,
|
binutils,
|
||||||
cmake,
|
cmake,
|
||||||
libglib2.0-dev (>= 2.73.1),
|
libglib2.0-dev,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
qttools5-dev,
|
qttools5-dev,
|
||||||
qttools5-dev-tools
|
qttools5-dev-tools
|
||||||
|
23
debian/patches/revert_glib_fix.patch
vendored
Normal file
23
debian/patches/revert_glib_fix.patch
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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
|
||||||
|
---
|
||||||
|
cmake/find-modules/FindGLIB.cmake | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/cmake/find-modules/FindGLIB.cmake
|
||||||
|
+++ b/cmake/find-modules/FindGLIB.cmake
|
||||||
|
@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONEN
|
||||||
|
elseif (${_component} STREQUAL "gio-unix")
|
||||||
|
pkg_check_modules(GIO_UNIX gio-unix-2.0)
|
||||||
|
find_path(GLIB_GIO_UNIX_INCLUDE_DIR
|
||||||
|
- NAMES gio/gdesktopappinfo.h
|
||||||
|
+ NAMES gio/gunixconnection.h
|
||||||
|
HINTS ${GIO_UNIX_INCLUDEDIR}
|
||||||
|
PATH_SUFFIXES gio-unix-2.0)
|
||||||
|
|
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
revert_glib_fix.patch
|
Loading…
x
Reference in New Issue
Block a user