Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lxqt-build-tools/, dev-util/lxqt-build-tools/files/
Date: Mon, 04 Apr 2022 21:44:17
Message-Id: 1649108635.1f21c0b5fc563408466284a7fcb06a1a5ce0974f.sam@gentoo
1 commit: 1f21c0b5fc563408466284a7fcb06a1a5ce0974f
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 13:49:48 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 4 21:43:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f21c0b5
7
8 dev-util/lxqt-build-tools: fix build-issues with glib-2.72
9
10 This patches in a fix for CMake-time issues with
11 'dev-libs/libqtxdg' and 'x11-libs/libfm-qt'.
12
13 Closes: https://bugs.gentoo.org/835648
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
16 Closes: https://github.com/gentoo/gentoo/pull/24835
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 .../files/lxqt-build-tools-0.10.0-glib-2.72.patch | 25 +++++++++++++++++++
20 .../lxqt-build-tools-0.10.0-r1.ebuild | 28 ++++++++++++++++++++++
21 2 files changed, 53 insertions(+)
22
23 diff --git a/dev-util/lxqt-build-tools/files/lxqt-build-tools-0.10.0-glib-2.72.patch b/dev-util/lxqt-build-tools/files/lxqt-build-tools-0.10.0-glib-2.72.patch
24 new file mode 100644
25 index 000000000000..359a4a966f40
26 --- /dev/null
27 +++ b/dev-util/lxqt-build-tools/files/lxqt-build-tools-0.10.0-glib-2.72.patch
28 @@ -0,0 +1,25 @@
29 +From 62b77bb807aa2ac2c1df8eec372df771da8d2203 Mon Sep 17 00:00:00 2001
30 +From: Dmitry Shachnev <mitya57@××××××××××××××××××××.com>
31 +Date: Tue, 29 Mar 2022 00:29:49 +0300
32 +Subject: [PATCH] Replace gunixconnection.h file in gio-unix include dir check
33 + (#74)
34 +
35 +That file was moved from gio-unix to gio in GLib 2.71.1:
36 +https://gitlab.gnome.org/GNOME/glib/-/commit/83d45c4f35dc87ba
37 +---
38 + cmake/find-modules/FindGLIB.cmake | 2 +-
39 + 1 file changed, 1 insertion(+), 1 deletion(-)
40 +
41 +diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake
42 +index 0564b8d..bb2336a 100644
43 +--- a/cmake/find-modules/FindGLIB.cmake
44 ++++ b/cmake/find-modules/FindGLIB.cmake
45 +@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
46 + elseif (${_component} STREQUAL "gio-unix")
47 + pkg_check_modules(GIO_UNIX gio-unix-2.0)
48 + find_path(GLIB_GIO_UNIX_INCLUDE_DIR
49 +- NAMES gio/gunixconnection.h
50 ++ NAMES gio/gunixfdlist.h
51 + HINTS ${GIO_UNIX_INCLUDEDIR}
52 + PATH_SUFFIXES gio-unix-2.0)
53 +
54
55 diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0-r1.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0-r1.ebuild
56 new file mode 100644
57 index 000000000000..1f28afe1af42
58 --- /dev/null
59 +++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0-r1.ebuild
60 @@ -0,0 +1,28 @@
61 +# Copyright 1999-2022 Gentoo Authors
62 +# Distributed under the terms of the GNU General Public License v2
63 +
64 +EAPI=8
65 +
66 +inherit cmake
67 +
68 +DESCRIPTION="LXQt Build Tools"
69 +HOMEPAGE="https://lxqt-project.org/"
70 +
71 +if [[ ${PV} = *9999* ]]; then
72 + inherit git-r3
73 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
74 +else
75 + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
76 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
77 +fi
78 +
79 +LICENSE="BSD"
80 +SLOT="0"
81 +
82 +DEPEND="
83 + >=dev-libs/glib-2.50.0
84 + >=dev-qt/qtcore-5.15:5
85 +"
86 +RDEPEND="${DEPEND}"
87 +
88 +PATCHES=( "${FILESDIR}/${PN}-0.10.0-glib-2.72.patch" ) # https://bugs.gentoo.org/835648