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 53C9F158018 for ; Sun, 3 Oct 2021 06:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78D0BE0871; Sun, 3 Oct 2021 06:55:41 +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-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57096E0878 for ; Sun, 3 Oct 2021 06:55:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E592342B4B for ; Sun, 3 Oct 2021 06:55:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEBCF129 for ; Sun, 3 Oct 2021 06:55:38 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1633198607.87763181c76492da87562ce7ca9490ab6d3312df.arthurzam@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-accessibility/rhvoice/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild X-VCS-Directories: app-accessibility/rhvoice/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 87763181c76492da87562ce7ca9490ab6d3312df X-VCS-Branch: master Date: Sun, 3 Oct 2021 06:55:38 +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: 319e50ae-72c6-4537-8274-0ce7ebd08e1a X-Archives-Hash: 6abef24780fe659332e52676deb2b1b9 commit: 87763181c76492da87562ce7ca9490ab6d3312df Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sat Oct 2 17:36:40 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Oct 2 18:16:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87763181 app-accessibility/rhvoice: use bundled rapidxml dev-libs/rapidxml is last-rited in ::gentoo Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild index 68ee79ca6..e3756dd73 100644 --- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild +++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild @@ -56,9 +56,9 @@ DEPEND=" RDEPEND="${DEPEND} !dev-libs/hts_engine " +# TODO: readd dev-libs/rapidxml in ::guru BDEPEND=" - dev-cpp/cli11:= - dev-libs/rapidxml + dev-cpp/cli11 dev-libs/utfcpp " REQUIRED_USE="|| ( ao portaudio pulseaudio )" @@ -99,13 +99,15 @@ src_prepare() { sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \ -i src/sd_module/CMakeLists.txt || die + # fix dbus service install path sed "s|/systemd/system||" \ -i src/service/CMakeLists.txt || die - sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \ - -i src/third-party/CMakeLists.txt || die + #sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \ + # -i src/third-party/CMakeLists.txt || die sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die + # fix build failure sed 's/ "RHVoice_question_match"//' \ -i src/third-party/mage/CMakeLists.txt || die @@ -145,7 +147,7 @@ src_configure() { -DWITH_PULSE=$(usex pulseaudio) -DWITH_PORTAUDIO=$(usex portaudio) # src/third-party/CMakeLists.txt - -DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml + #-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml -DUTF8_INCLUDE_DIR=/usr/include/utf8cpp )