summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2020-02-07 20:45:58 +0100
committerMichel Zou2020-02-07 20:45:58 +0100
commitd6f1d7a40548badae753bdcda57d52233f1b49d8 (patch)
tree9e8e3bc84417ff4a7fc8d339e46963a4c2f9925a
parent85e49af8a1022067606c20e34130b18bb796c70e (diff)
downloadaur-d6f1d7a40548badae753bdcda57d52233f1b49d8.tar.gz
1.0.06
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
-rw-r--r--unbundle_pocketsphinx.patch41
3 files changed, 42 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9da54a78559..bb682f32f4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nocomprendo
pkgdesc = Voice command application for X.org
- pkgver = 1.0.0
+ pkgver = 1.0.6
pkgrel = 1
url = http://be.root.free.fr/?soft=nocomprendo
arch = x86_64
@@ -9,9 +9,9 @@ pkgbase = nocomprendo
depends = espeak
depends = xdotool
depends = pocketsphinx
- source = http://be.root.free.fr/soft/nocomprendo/nocomprendo-1.0.0.tar.gz
+ source = http://be.root.free.fr/soft/nocomprendo/nocomprendo-1.0.6.tar.gz
source = unbundle_pocketsphinx.patch
- sha256sums = eb9469db940aaa8aae9b37b81035233687499fdc2fbc5b55dfb7a37b0e9a1d60
+ sha256sums = 84aa4d1431cacf17d68a5c8582e57750e8bb94e0a82faf49b63843ab36fd4aeb
sha256sums = SKIP
pkgname = nocomprendo
diff --git a/PKGBUILD b/PKGBUILD
index 4b166b7bb92..02455064ded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=nocomprendo
-pkgver=1.0.0
+pkgver=1.0.6
pkgrel=1
pkgdesc="Voice command application for X.org"
arch=('x86_64')
@@ -7,15 +7,16 @@ url="http://be.root.free.fr/?soft=nocomprendo"
license=('GPL3')
depends=('qt5-base' 'espeak' 'xdotool' 'pocketsphinx')
source=("http://be.root.free.fr/soft/nocomprendo/nocomprendo-${pkgver}.tar.gz" unbundle_pocketsphinx.patch)
-sha256sums=('eb9469db940aaa8aae9b37b81035233687499fdc2fbc5b55dfb7a37b0e9a1d60' SKIP)
+sha256sums=('84aa4d1431cacf17d68a5c8582e57750e8bb94e0a82faf49b63843ab36fd4aeb' SKIP)
prepare() {
cd ${pkgname}-${pkgver}
# nocomprendo builds its own copy of pocketsphinx
patch -p1 -i "${srcdir}"/unbundle_pocketsphinx.patch
- # nocomprendo looks in /usr/share/pocketsphinx/en_US
- sed -i 's|= QString("/usr/share/pocketsphinx/").append(params.lang)|= QString("/usr/share/pocketsphinx/model/en-us")|g' main.cpp
+ # nocomprendo looks in /usr/share/pocketsphinx/model/en_US
+ sed -i 's|QString(POCKET_PATH).append(params.lang)|QString(POCKET_PATH).append("model/en-us/en-us")|g' main.cpp
+ sed -i 's|settings.value("defLang", "")|settings.value("defLang", "en_US")|g' main.cpp
}
build() {
diff --git a/unbundle_pocketsphinx.patch b/unbundle_pocketsphinx.patch
index b38355719c6..9fb3c2318cc 100644
--- a/unbundle_pocketsphinx.patch
+++ b/unbundle_pocketsphinx.patch
@@ -1,8 +1,21 @@
+diff --git a/app_version.h b/app_version.h
+index 4da5503..2cad494 100644
+--- a/app_version.h
++++ b/app_version.h
+@@ -31,7 +31,7 @@
+ #define APP_MAIL "be.root@free.fr"
+ #define APP_LOCKFILE "nocomprendo.lock"
+
+-#define POCKET_PATH "/usr/share/nocomprendo/pocketsphinx/"
++#define POCKET_PATH "/usr/share/pocketsphinx/"
+
+ // Don't edit. Defines updated by "make version" from .pro variables.
+ #define APP_MAJOR 1
diff --git a/nocomprendo.pro b/nocomprendo.pro
-index 8a11648..ff530cf 100644
+index e6c85f7..9760dfb 100644
--- a/nocomprendo.pro
+++ b/nocomprendo.pro
-@@ -28,13 +28,13 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # Disables all the APIs depr
+@@ -28,10 +28,10 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # Disables all the APIs depr
INCLUDEPATH += \
$$BASEDIR/include \
@@ -15,12 +28,26 @@ index 8a11648..ff530cf 100644
+LIBS += -lpocketsphinx -lsphinxbase -lsphinxad
LIBS += -lpulse -lpulse-simple -lm -lutil -lxdo
--PRE_TARGETDEPS += libpocketsphinx.a libsphinxbase.a lmtools/idngram2lm
-+#PRE_TARGETDEPS += libpocketsphinx.a libsphinxbase.a lmtools/idngram2lm
-
use_espeak {
- DEFINES += ENABLE_ESPEAK
-@@ -148,7 +148,7 @@ INSTALLS += pocket tools userdata target icons desktop
+@@ -39,7 +39,7 @@ use_espeak {
+ LIBS += -lespeak -lasound -lpthread
+ }
+
+-PRE_TARGETDEPS += libpocketsphinx.a libsphinxbase.a
++#PRE_TARGETDEPS += libpocketsphinx.a libsphinxbase.a
+
+ SOURCES += \
+ editset.cpp \
+@@ -131,7 +131,7 @@ target.path = /usr/bin # Application installation dir
+ APP_PATH = /usr/share/$${TARGET}
+ USER_PATH = $(HOME)/.config/$${TARGET}
+
+-POCKET_PATH = $${APP_PATH}/pocketsphinx
++POCKET_PATH = /usr/share/pocketsphinx/
+ ACOUSTIC_DIR = pocketsphinx
+
+ tools.path = $${APP_PATH}
+@@ -155,7 +155,7 @@ INSTALLS += tools pocket userdata target icons desktop
# More make targets
include(more-make-targets.pri) # Additional targets : version, translation, files, count