From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01273158023 for ; Tue, 25 Oct 2022 19:40:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C44BE0D68; Tue, 25 Oct 2022 19:40:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0862BE0D68 for ; Tue, 25 Oct 2022 19:40:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C529134117A for ; Tue, 25 Oct 2022 19:40:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12E1862B for ; Tue, 25 Oct 2022 19:40:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1666726666.15e71b212fbc628bf8f742192b6525f4d87cab6d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/telepathy-qt/, net-libs/telepathy-qt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild X-VCS-Directories: net-libs/telepathy-qt/files/ net-libs/telepathy-qt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 15e71b212fbc628bf8f742192b6525f4d87cab6d X-VCS-Branch: master Date: Tue, 25 Oct 2022 19:40:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2164e64d-b0a0-4b9d-9d97-ee78e8bbdce2 X-Archives-Hash: d3677d711f20283c8dd6f015c0b33cf6 commit: 15e71b212fbc628bf8f742192b6525f4d87cab6d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 25 19:37:46 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 25 19:37:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e71b21 net-libs/telepathy-qt: Fix building tests with newer glib Signed-off-by: Andreas Sturmlechner gentoo.org> ...lepathy-qt-0.9.8-fix-tests-finding-glib-2.patch | 23 ++++++++++++++++++++++ ....9.8-r1.ebuild => telepathy-qt-0.9.8-r2.ebuild} | 7 ++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch new file mode 100644 index 000000000000..0ac61c48a87a --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch @@ -0,0 +1,23 @@ +From 188dece432d090809c5ad88a91cd573c5af61c09 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Mon, 6 Jun 2022 09:44:53 +0200 +Subject: [PATCH] Fix build with newer glib + +gunixconnection.h is now at /usr/include/glib-2.0/gio/gunixconnection.h +--- + cmake/modules/FindGIOUnix.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindGIOUnix.cmake b/cmake/modules/FindGIOUnix.cmake +index 263c093e..7f5513b3 100644 +--- a/cmake/modules/FindGIOUnix.cmake ++++ b/cmake/modules/FindGIOUnix.cmake +@@ -21,7 +21,7 @@ pkg_check_modules(PC_LibGIOUnix gio-unix-2.0) + find_path(GIOUNIX_MAIN_INCLUDE_DIR + NAMES gio/gunixconnection.h + HINTS ${PC_LibGIOUnix_INCLUDEDIR} +- PATH_SUFFIXES gio-unix-2.0) ++ PATH_SUFFIXES gio-unix-2.0 glib-2.0) + + set(GIOUNIX_INCLUDE_DIR "${GIOUNIX_MAIN_INCLUDE_DIR}") + diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild similarity index 93% rename from net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild rename to net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild index af50e027063c..89e203b7332d 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="xml(+)" inherit python-any-r1 cmake virtualx @@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE="debug farstream test" REQUIRED_USE="test? ( farstream )" - RESTRICT="!test? ( test )" RDEPEND=" @@ -47,6 +46,8 @@ BDEPEND="${PYTHON_DEPS} ) " +PATCHES=( "${FILESDIR}/${P}-fix-tests-finding-glib-2.patch" ) + python_check_deps() { use test || return 0 python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"