* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
@ 2015-12-27 16:48 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-12-27 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 3ffe920c7daee95c45cbdd9dc4d4ac1f22f27e25
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec 17 22:34:27 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 16:47:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffe920c
app-accessibility/simon: Fix build w/ opencv3, bug 558534
Package-Manager: portage-2.2.24
.../simon/files/simon-0.4.1-opencv-include.patch | 20 ++++++++++++++++++++
app-accessibility/simon/simon-0.4.1.ebuild | 11 ++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
new file mode 100644
index 0000000..b6a7d33
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
@@ -0,0 +1,20 @@
+From: Peter Grasch <me@bedahr.org>
+Date: Sat, 25 Jul 2015 08:45:03 +0000
+Subject: Adding OpenCV include directories to include path
+X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
+---
+Adding OpenCV include directories to include path
+---
+
+
+--- a/cmake/FindOpenCV.cmake
++++ b/cmake/FindOpenCV.cmake
+@@ -61,6 +61,7 @@
+
+ ## Include the standard CMake script
+ include("${OpenCV_DIR}/OpenCVConfig.cmake")
++ include_directories(${OpenCV_INCLUDE_DIRS})
+
+ ## Search for a specific version
+ set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index b2b9c34..d713e97 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -51,11 +51,12 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libdir.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-sphinx.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-libdir.patch
+ "${FILESDIR}"/${P}-linguas.patch
+ "${FILESDIR}"/${P}-sphinx.patch
+ "${FILESDIR}"/${P}-opencv-include.patch
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
@ 2015-12-27 16:48 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-12-27 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 09682387c1cb882175245e8497ede2b30b45dfd9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 16:42:29 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 16:47:50 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09682387
app-accessibility/simon: remove old
Package-Manager: portage-2.2.26
app-accessibility/simon/Manifest | 1 -
.../simon/files/simon-0.4.0-libdir.patch | 16 ----
.../simon/files/simon-0.4.0-linguas.patch | 84 --------------------
.../simon/files/simon-0.4.0-opencv.patch | 11 ---
.../simon/files/simon-0.4.0-sphinx.patch | 16 ----
app-accessibility/simon/simon-0.4.0.ebuild | 90 ----------------------
6 files changed, 218 deletions(-)
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index d6f5403..72ab878 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1 @@
-DIST simon-0.4.0.tar.bz2 22139378 SHA256 c7ef35cd28ecf294ceae63f4b0c53384bcf89fc2a6e67916dc9d4116decabc12 SHA512 541c22e09bb4234871707cd73e038a5ab0c68a6cb2a28993571c434edff639e4826554f922a4a188b5c2a70ff9a0d627f53af0954431b561adeedccf9c170c85 WHIRLPOOL c2e0cc8632bf089ed14ef53cae02c51166780692222b7f3c7a3583356e9669cbbcd3222507128b35f282b49de2f10a73c42f63e28596c6e8412ff766bb3febfb
DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
diff --git a/app-accessibility/simon/files/simon-0.4.0-libdir.patch b/app-accessibility/simon/files/simon-0.4.0-libdir.patch
deleted file mode 100644
index 18e12fc..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-libdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Mar 29 22:00:19 UTC 2013
-Subject: build system
-
-make libdir modifiable
-
---- simon-0.4.0/cmake/SimonDirs.cmake
-+++ simon-0.4.0/cmake/SimonDirs.cmake
-@@ -29,6 +29,6 @@
- #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- #set(SIMON_LIB_INSTALL_DIR lib64)
- #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-- set(SIMON_LIB_INSTALL_DIR lib)
-+ set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
- #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- ENDIF(WIN32)
diff --git a/app-accessibility/simon/files/simon-0.4.0-linguas.patch b/app-accessibility/simon/files/simon-0.4.0-linguas.patch
deleted file mode 100644
index bf60f16..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-linguas.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -14,6 +14,9 @@
-
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-+# NLS
-+option(ENABLE_NLS "Enable native language support" 1)
-+
- find_package(KDE4 "4.4" REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
- find_package(Qwt6 REQUIRED)
-@@ -143,4 +146,6 @@
- macro_display_feature_log()
-
- include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+if(ENABLE_NLS)
-+ macro_optional_add_subdirectory( po )
-+endif(ENABLE_NLS)
---- simon-0.4.0/po/CMakeLists.txt
-+++ simon-0.4.0/po/CMakeLists.txt
-@@ -11,24 +11,14 @@
- if (NOT GETTEXT_MSGFMT_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
- endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
--add_subdirectory(cs)
--add_subdirectory(de)
--add_subdirectory(da)
--add_subdirectory(fr)
--add_subdirectory(nl)
--add_subdirectory(uk)
--add_subdirectory(pt_BR)
--add_subdirectory(pl)
--add_subdirectory(es)
--add_subdirectory(ro)
--add_subdirectory(ca)
--add_subdirectory(sl)
--add_subdirectory(pt)
--add_subdirectory(hu)
--add_subdirectory(gl)
--add_subdirectory(sv)
--add_subdirectory(el)
--add_subdirectory(fi)
--add_subdirectory(it)
--add_subdirectory(zh_TW)
--add_subdirectory(et)
-+
-+# gettext behavior
-+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs cs de da fr nl uk pt_BR pl es ro ca sl pt hu gl sv el fi it zh_TW et)
-+
-+foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+endforeach()
---- simon-0.4.0/doc/CMakeLists.txt
-+++ simon-0.4.0/doc/CMakeLists.txt
-@@ -1,9 +1,15 @@
-+if(ENABLE_NLS)
-+ # gettext behavior
-+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs pt_BR ca nl de it pt sv uk)
-+
-+ foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+ endforeach()
-+endif(ENABLE_NLS)
-+
-+# default doc
- add_subdirectory(en_US)
--add_subdirectory(pt_BR)
--add_subdirectory(ca)
--add_subdirectory(nl)
--add_subdirectory(de)
--add_subdirectory(it)
--add_subdirectory(pt)
--add_subdirectory(sv)
--add_subdirectory(uk)
diff --git a/app-accessibility/simon/files/simon-0.4.0-opencv.patch b/app-accessibility/simon/files/simon-0.4.0-opencv.patch
deleted file mode 100644
index bdd4581..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-opencv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -68,7 +68,7 @@
- "PocketSphinx is a small-footprint continuous speech recognition system"
- "http://cmusphinx.sourceforge.net/" FALSE ""
- "Required to build Pocket Sphinx backend")
--find_package(OpenCV)
-+macro_optional_find_package(OpenCV)
- macro_log_feature(OpenCV_FOUND "OpenCV"
- "OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision" "http://http://opencv.willowgarage.com/"
- FALSE "" "Required for Simon Vision")
diff --git a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch b/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
deleted file mode 100644
index 0fe8aa2..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -59,11 +59,11 @@
- macro_optional_find_package(QAccessibilityClient)
- macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
-
--find_package(Sphinxbase)
-+macro_optional_find_package(Sphinxbase)
- macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
- "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
- FALSE "" "Required to build Sphinx backend")
--find_package(Pocketsphinx)
-+macro_optional_find_package(Pocketsphinx)
- macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
- "PocketSphinx is a small-footprint continuous speech recognition system"
- "http://cmusphinx.sourceforge.net/" FALSE ""
diff --git a/app-accessibility/simon/simon-0.4.0.ebuild b/app-accessibility/simon/simon-0.4.0.ebuild
deleted file mode 100644
index 3a9ecad..0000000
--- a/app-accessibility/simon/simon-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# KEEP KDE ECLASSES OUT OF HERE
-
-# TODO: qaccessibilityclient support (not in portage)
-# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
-# TODO: julius
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils cmake-utils
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kdepim libsamplerate nls opencv sphinx"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- kde-base/kdelibs:4
- media-libs/alsa-lib
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/qwt:6
- kdepim? ( kde-base/kdepimlibs:4 )
- libsamplerate? ( media-libs/libsamplerate )
- nls? (
- kde-apps/kde4-l10n
- virtual/libintl
- )
- opencv? ( media-libs/opencv )
- sphinx? (
- >=app-accessibility/pocketsphinx-0.8
- >=app-accessibility/sphinxbase-0.8
- >=app-accessibility/SphinxTrain-1
- )
- !sphinx? ( app-accessibility/julius )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libdir.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-opencv.patch \
- "${FILESDIR}"/${P}-sphinx.patch
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
- -DBackendType=$(usex sphinx "both" "jhtk")
- $(cmake-utils_use_with sphinx Sphinxbase)
- $(cmake-utils_use_with sphinx Pocketsphinx)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with libsamplerate LibSampleRate)
- $(cmake-utils_use_with opencv OpenCV)
- $(cmake-utils_use_enable nls NLS)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- elog "optional dependencies:"
- elog " kde-apps/jovie (support for Jovie TTS system)"
- use sphinx && elog " app-accessibility/julius (alternative backend)"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
@ 2017-06-24 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-06-24 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 255718186e9c8aff4184dc602bf962cab183e8f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 22:07:41 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 22:08:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25571818
app-accessibility/simon: Remove bogus Qt4WebKit header
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../simon/files/simon-0.4.1-no-qtwebkit.patch | 24 ++++++++++++++++++++++
app-accessibility/simon/simon-0.4.1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch b/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
new file mode 100644
index 00000000000..53a157be38e
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
@@ -0,0 +1,24 @@
+From 81bd3d089a19f1e23383e2da7376740152540f7f Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Mon, 6 Jul 2015 09:59:56 -0500
+Subject: omit unused reference to QWebView header
+
+no cmake checks for QtWebKit either
+---
+ simon/src/simonview.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/simon/src/simonview.cpp b/simon/src/simonview.cpp
+index 69673bc..7a1873d 100644
+--- a/simon/src/simonview.cpp
++++ b/simon/src/simonview.cpp
+@@ -60,7 +60,6 @@
+ #include <KDE/KComboBox>
+ #include <QDesktopServices>
+ #include <QTimeLine>
+-#include <QWebView>
+
+ #include <KMessageBox>
+ #include <KApplication>
+--
+cgit v0.11.2
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index cdd4206fef8..e8adbd97391 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
"${FILESDIR}"/${P}-linguas.patch
"${FILESDIR}"/${P}-sphinx.patch
"${FILESDIR}"/${P}-opencv-include.patch
+ "${FILESDIR}"/${P}-no-qtwebkit.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
@ 2017-08-27 11:43 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-08-27 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 0d87efc1ab8390dc25d6849df52c87eff403451e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 11:42:42 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 11:43:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d87efc1
app-accessibility/simon: 0.4.90 version bump
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-accessibility/simon/Manifest | 1 +
.../simon/files/simon-0.4.1-libdir.patch | 4 +-
app-accessibility/simon/simon-0.4.90.ebuild | 63 ++++++++++++++++++++++
3 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index 72ab878c0af..7c5ea4ef022 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1 +1,2 @@
DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
+DIST simon-0.4.90.tar.xz 25257276 SHA256 e3a947c3b0b3f033cce43e2e7a5df86e0e8beec0442b2c19397f69f39a33307b SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1 WHIRLPOOL dca0174065a8c06269a02fdfdd6133e10e3f944ab2574259d1330b6210db5ddc381bd0f19f7566e225c0a73b3e2ba716e6fccbcf938e9a89f94cfbfba177f7c4
diff --git a/app-accessibility/simon/files/simon-0.4.1-libdir.patch b/app-accessibility/simon/files/simon-0.4.1-libdir.patch
index b65e4fcb143..fae811bef6b 100644
--- a/app-accessibility/simon/files/simon-0.4.1-libdir.patch
+++ b/app-accessibility/simon/files/simon-0.4.1-libdir.patch
@@ -4,8 +4,8 @@ Subject: build system
make libdir modifiable
---- simon-0.4.1/cmake/SimonDirs.cmake
-+++ simon-0.4.1/cmake/SimonDirs.cmake
+--- a/cmake/SimonDirs.cmake
++++ b/cmake/SimonDirs.cmake
@@ -29,6 +29,6 @@
#IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
#set(SIMON_LIB_INSTALL_DIR lib64)
diff --git a/app-accessibility/simon/simon-0.4.90.ebuild b/app-accessibility/simon/simon-0.4.90.ebuild
new file mode 100644
index 00000000000..c5c349f0a26
--- /dev/null
+++ b/app-accessibility/simon/simon-0.4.90.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_LINGUAS="ast bs ca ca@valencia cs da de el en_GB es et fa fi fr ga gl
+hu ia ja kk lt mr nds nl pl pt pt_BR sk sl sv tr ug uk zh_CN zh_TW"
+SQL_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
+HOMEPAGE="http://simon-listens.org/"
+SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libsamplerate opencv sphinx"
+
+RDEPEND="
+ media-libs/alsa-lib
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/qwt:6[qt4(+)]
+ libsamplerate? ( media-libs/libsamplerate )
+ opencv? ( media-libs/opencv )
+ sphinx? (
+ >=app-accessibility/pocketsphinx-0.8
+ >=app-accessibility/sphinxbase-0.8
+ >=app-accessibility/SphinxTrain-1
+ )
+ !sphinx? ( app-accessibility/julius )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.1-libdir.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
+ -DWITH_KdepimLibs=OFF
+ -DUSE_PLASMA=OFF
+ -DWITH_LibSampleRate=$(usex libsamplerate)
+ -DWITH_OpenCV=$(usex opencv)
+ -DBackendType=$(usex sphinx "both" "jhtk")
+ $(cmake-utils_use_find_package sphinx Sphinxbase)
+ $(cmake-utils_use_find_package sphinx Pocketsphinx)
+ )
+
+ kde4-base_src_configure
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ elog "Optional dependencies:"
+ elog " kde-apps/jovie (support for Jovie TTS system)"
+ use sphinx && elog " app-accessibility/julius (alternative backend)"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
@ 2017-12-12 23:04 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-12-12 23:04 UTC (permalink / raw
To: gentoo-commits
commit: b9d84efe873cf1b2d596925bc078c188ffd8dccd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 23:02:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 23:02:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d84efe
app-accessibility/simon: Drop 0.4.1
Depends on kde-frameworks/kdelibs[plasma].
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-accessibility/simon/Manifest | 1 -
.../simon/files/simon-0.4.1-linguas.patch | 87 ---------------------
.../simon/files/simon-0.4.1-no-qtwebkit.patch | 24 ------
.../simon/files/simon-0.4.1-opencv-include.patch | 20 -----
.../simon/files/simon-0.4.1-sphinx.patch | 16 ----
app-accessibility/simon/simon-0.4.1.ebuild | 89 ----------------------
6 files changed, 237 deletions(-)
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index 015f5adf7b7..de01be68fa4 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1 @@
-DIST simon-0.4.1.tar.bz2 23856024 BLAKE2B 12b89f823ff9d13faed71d2ad5e61f3f9ca005589019687b39f79b6ff143efc1f578ebc4d36fae6f3bfa278f3fffcf5a73a411ffa403add906c51d8fab0795ab SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d
DIST simon-0.4.90.tar.xz 25257276 BLAKE2B d5f78c721dc55387db415a740b00831471d6325d3aa2a0282e476132d2c7e378c4b024500527fd54a4073e972494e6ecc6f094022b5651b163d78ff6fcb20fcf SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1
diff --git a/app-accessibility/simon/files/simon-0.4.1-linguas.patch b/app-accessibility/simon/files/simon-0.4.1-linguas.patch
deleted file mode 100644
index 01f25d6550c..00000000000
--- a/app-accessibility/simon/files/simon-0.4.1-linguas.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,6 +14,9 @@
-
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-+# NLS
-+option(ENABLE_NLS "Enable native language support" 1)
-+
- find_package(KDE4 "4.4" REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
- find_package(Qwt6 REQUIRED)
-@@ -143,4 +146,6 @@
- macro_display_feature_log()
-
- include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+if(ENABLE_NLS)
-+ macro_optional_add_subdirectory( po )
-+endif(ENABLE_NLS)
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,11 +1,15 @@
-+if(ENABLE_NLS)
-+ # gettext behavior
-+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs pt_BR ca nl et de it pt es sv uk)
-+
-+ foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+ endforeach()
-+endif(ENABLE_NLS)
-+
-+# default doc
- add_subdirectory(en_US)
--add_subdirectory(pt_BR)
--add_subdirectory(ca)
--add_subdirectory(nl)
--add_subdirectory(et)
--add_subdirectory(de)
--add_subdirectory(it)
--add_subdirectory(pt)
--add_subdirectory(es)
--add_subdirectory(sv)
--add_subdirectory(uk)
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -11,25 +11,14 @@ endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- if (NOT GETTEXT_MSGFMT_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
- endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
--add_subdirectory(de)
--add_subdirectory(da)
--add_subdirectory(fr)
--add_subdirectory(nl)
--add_subdirectory(uk)
--add_subdirectory(pt_BR)
--add_subdirectory(pl)
--add_subdirectory(es)
--add_subdirectory(cs)
--add_subdirectory(ro)
--add_subdirectory(ca)
--add_subdirectory(sk)
--add_subdirectory(sl)
--add_subdirectory(pt)
--add_subdirectory(gl)
--add_subdirectory(ca@valencia)
--add_subdirectory(sv)
--add_subdirectory(el)
--add_subdirectory(fi)
--add_subdirectory(it)
--add_subdirectory(zh_TW)
--add_subdirectory(et)
-+
-+# gettext behavior
-+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs ca@valencia cs de da fr nl uk pt_BR pl es ro ca sl pt gl sk sv el fi it zh_TW et)
-+
-+foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+endforeach()
diff --git a/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch b/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
deleted file mode 100644
index 53a157be38e..00000000000
--- a/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 81bd3d089a19f1e23383e2da7376740152540f7f Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Mon, 6 Jul 2015 09:59:56 -0500
-Subject: omit unused reference to QWebView header
-
-no cmake checks for QtWebKit either
----
- simon/src/simonview.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/simon/src/simonview.cpp b/simon/src/simonview.cpp
-index 69673bc..7a1873d 100644
---- a/simon/src/simonview.cpp
-+++ b/simon/src/simonview.cpp
-@@ -60,7 +60,6 @@
- #include <KDE/KComboBox>
- #include <QDesktopServices>
- #include <QTimeLine>
--#include <QWebView>
-
- #include <KMessageBox>
- #include <KApplication>
---
-cgit v0.11.2
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
deleted file mode 100644
index b6a7d33c409..00000000000
--- a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Peter Grasch <me@bedahr.org>
-Date: Sat, 25 Jul 2015 08:45:03 +0000
-Subject: Adding OpenCV include directories to include path
-X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
----
-Adding OpenCV include directories to include path
----
-
-
---- a/cmake/FindOpenCV.cmake
-+++ b/cmake/FindOpenCV.cmake
-@@ -61,6 +61,7 @@
-
- ## Include the standard CMake script
- include("${OpenCV_DIR}/OpenCVConfig.cmake")
-+ include_directories(${OpenCV_INCLUDE_DIRS})
-
- ## Search for a specific version
- set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
-
diff --git a/app-accessibility/simon/files/simon-0.4.1-sphinx.patch b/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
deleted file mode 100644
index 498475c81d0..00000000000
--- a/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- simon-0.4.1/CMakeLists.txt
-+++ simon-0.4.1/CMakeLists.txt
-@@ -59,11 +59,11 @@
- macro_optional_find_package(QAccessibilityClient)
- macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
-
--find_package(Sphinxbase)
-+macro_optional_find_package(Sphinxbase)
- macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
- "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
- FALSE "" "Required to build Sphinx backend")
--find_package(Pocketsphinx)
-+macro_optional_find_package(Pocketsphinx)
- macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
- "PocketSphinx is a small-footprint continuous speech recognition system"
- "http://cmusphinx.sourceforge.net/" FALSE ""
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
deleted file mode 100644
index 1fb96a7bf86..00000000000
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# KEEP KDE ECLASSES OUT OF HERE
-
-# TODO: qaccessibilityclient support (not in portage)
-# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
-# TODO: julius
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils cmake-utils
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libsamplerate nls opencv sphinx"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- kde-frameworks/kdelibs:4[plasma(+)]
- media-libs/alsa-lib
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/qwt:6[qt4(+)]
- libsamplerate? ( media-libs/libsamplerate )
- nls? (
- kde-apps/kde4-l10n
- virtual/libintl
- )
- opencv? ( media-libs/opencv )
- sphinx? (
- >=app-accessibility/pocketsphinx-0.8
- >=app-accessibility/sphinxbase-0.8
- >=app-accessibility/SphinxTrain-1
- )
- !sphinx? ( app-accessibility/julius )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libdir.patch
- "${FILESDIR}"/${P}-linguas.patch
- "${FILESDIR}"/${P}-sphinx.patch
- "${FILESDIR}"/${P}-opencv-include.patch
- "${FILESDIR}"/${P}-no-qtwebkit.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
- -DBackendType=$(usex sphinx "both" "jhtk")
- $(cmake-utils_use_with sphinx Sphinxbase)
- $(cmake-utils_use_with sphinx Pocketsphinx)
- -DWITH_KdepimLibs=OFF
- $(cmake-utils_use_with libsamplerate LibSampleRate)
- $(cmake-utils_use_with opencv OpenCV)
- $(cmake-utils_use_enable nls NLS)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- elog "optional dependencies:"
- elog " kde-apps/jovie (support for Jovie TTS system)"
- use sphinx && elog " app-accessibility/julius (alternative backend)"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-12 23:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-24 22:08 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-12-12 23:04 Andreas Sturmlechner
2017-08-27 11:43 Andreas Sturmlechner
2015-12-27 16:48 Michael Palimaka
2015-12-27 16:48 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox