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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E70DE1396D0 for ; Sat, 2 Sep 2017 18:00:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06A521FC098; Sat, 2 Sep 2017 18:00:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB0ED1FC098 for ; Sat, 2 Sep 2017 18:00:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A45A5341669 for ; Sat, 2 Sep 2017 18:00:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 187358B9E for ; Sat, 2 Sep 2017 18:00:52 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1504375247.1bafad73070bcd30a41c5a96c1dad04ea840f866.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-gabble/, net-voip/telepathy-gabble/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild X-VCS-Directories: net-voip/telepathy-gabble/ net-voip/telepathy-gabble/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 1bafad73070bcd30a41c5a96c1dad04ea840f866 X-VCS-Branch: master Date: Sat, 2 Sep 2017 18:00:52 +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-Archives-Salt: ab1e5271-c4b3-46fe-9e62-4ac90ce093c2 X-Archives-Hash: b21a740ab20b822df7324d4d5934f42a commit: 1bafad73070bcd30a41c5a96c1dad04ea840f866 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Sep 2 16:32:07 2017 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Sep 2 18:00:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bafad73 net-voip/telepathy-gabble: fix build with USE=-jingle, bug #523230 Package-Manager: Portage-2.3.8, Repoman-2.3.3 ...lepathy-gabble-0.18.4-build-fix-no-jingle.patch | 29 ++++++++++++++++++++++ .../telepathy-gabble-0.18.4.ebuild | 9 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch new file mode 100644 index 00000000000..6d25cde8f52 --- /dev/null +++ b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-build-fix-no-jingle.patch @@ -0,0 +1,29 @@ +From 8801beb5b64952fad15ff0c316bf1eddbde20ba9 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sat, 2 Sep 2017 18:23:10 +0200 +Subject: [PATCH] Add missing VOIP ifdef guards + +Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=523230 +--- + src/muc-channel.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/muc-channel.c b/src/muc-channel.c +index c0a27a490..9f6e01167 100644 +--- a/src/muc-channel.c ++++ b/src/muc-channel.c +@@ -1647,9 +1647,11 @@ gabble_muc_channel_can_be_closed (GabbleMucChannel *chan) + if (g_hash_table_size (priv->tubes) > 0) + return FALSE; + ++#ifdef ENABLE_VOIP + if (priv->calls != NULL || priv->call_requests != NULL + || priv->call_initiating) + return FALSE; ++#endif + + return TRUE; + } +-- +2.14.1 + diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild index d9f8cb96c3c..434def47dfb 100644 --- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild +++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild @@ -44,7 +44,9 @@ RDEPEND=" DEPEND="${RDEPEND} ${PYTHON_DEPS} >=dev-util/gtk-doc-am-1.17 - dev-libs/libxslt" + dev-libs/libxslt + virtual/pkgconfig +" # Twisted tests fail if bad ipv6 setup, upstream bug #30565 # Random twisted tests fail with org.freedesktop.DBus.Error.NoReply for some reason # pygobject:2 is needed by twisted-17 for gtk2reactor usage by gabble @@ -58,6 +60,11 @@ DEPEND="${RDEPEND} # ) ) #) +PATCHES=( + # Fix build with USE=-jingle, bug #523230 + "${FILESDIR}"/${P}-build-fix-no-jingle.patch +) + pkg_setup() { python-any-r1_pkg_setup }