commit: 87763181c76492da87562ce7ca9490ab6d3312df
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Oct 2 17:36:40 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
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 <cyber+gentoo <AT> 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
)
