diff --git a/pocketsphinx/default/PKGBUILD b/pocketsphinx/default/PKGBUILD index f6dc5d35..4414aa2e 100644 --- a/pocketsphinx/default/PKGBUILD +++ b/pocketsphinx/default/PKGBUILD @@ -4,28 +4,28 @@ pkgname=pocketsphinx pkgver=5prealpha -pkgrel=12 +pkgrel=13 pkgdesc='Lightweight speech recognition engine' arch=('i686' 'x86_64') url='http://cmusphinx.sourceforge.net' license=('BSD') makedepends=('swig' 'python') depends=('sphinxbase=5prealpha' 'gst-plugins-base-libs') -source=("http://downloads.sourceforge.net/cmusphinx/$pkgname-$pkgver.tar.gz") +source=("https://downloads.sourceforge.net/cmusphinx/$pkgname-$pkgver.tar.gz") sha256sums=('ef5bb5547e2712bdf571f256490ef42a47962033892efd9d7df8eed7fe573ed9') options=('!libtool') prepare() { cd "$pkgname-$pkgver" - msg2 "Reconfiguring project for current version of Automake" + echo "Reconfiguring project for current version of Automake" autoreconf -ivf > /dev/null } build() { cd "$pkgname-$pkgver" - export PYTHON=/usr/bin/python + export PYTHON=/usr/bin/python PYTHONWARNINGS=ignore ./configure --prefix=/usr make } diff --git a/sphinxbase/default/PKGBUILD b/sphinxbase/default/PKGBUILD index 74b5926e..821fff8c 100644 --- a/sphinxbase/default/PKGBUILD +++ b/sphinxbase/default/PKGBUILD @@ -5,9 +5,9 @@ pkgname=sphinxbase pkgver=5prealpha -pkgrel=12 +pkgrel=13 pkgdesc='Common library for sphinx speech recognition' -url='http://cmusphinx.sourceforge.net/' +url='https://cmusphinx.sourceforge.net/' arch=('i686' 'x86_64') license=('BSD') makedepends=('bison' 'swig') @@ -22,15 +22,16 @@ options=('!libtool') prepare() { cd "${pkgname}-${pkgver}" - msg2 "Reconfiguring project for current version of Automake" - autoreconf -ivf > /dev/null patch -p1 -b -i ../sphinxbase-5prealpha-fix-doxy2swig.patch + + echo "Reconfiguring project for current version of Automake" + autoreconf -ivf > /dev/null } build() { cd "${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python + export PYTHON=/usr/bin/python PYTHONWARNINGS=ignore ./configure --prefix=/usr make } diff --git a/sphinxbase/default/avoid-python3.10-warning.patch b/sphinxbase/default/avoid-python3.10-warning.patch new file mode 100644 index 00000000..0891f246 --- /dev/null +++ b/sphinxbase/default/avoid-python3.10-warning.patch @@ -0,0 +1,141 @@ +From e0221880ccdd79ed9bf42937a56a4c319b013576 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Thu, 11 Nov 2021 21:06:59 +0100 +Subject: [PATCH] Update ax_python_devel.m4 + +Notably python3.10's distutils emits a warning when getting imported. +This was making the old ax_python_devel.m4 fail. +--- + m4/ax_python_devel.m4 | 37 ++++++++++++++++++++----------------- + 1 file changed, 20 insertions(+), 17 deletions(-) + +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +index 59a2ff09..44dbd83e 100644 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html ++# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS +@@ -12,8 +12,8 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output ++# variables. It also exports $(PYTHON_EXTRA_LIBS) and + # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. + # + # You can search for some particular version of Python by passing a +@@ -52,7 +52,7 @@ + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along +-# with this program. If not, see . ++# with this program. If not, see . + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure +@@ -67,7 +67,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 17 ++#serial 21 + + AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) + AC_DEFUN([AX_PYTHON_DEVEL],[ +@@ -99,7 +99,7 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, + PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. +@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -172,7 +172,7 @@ $ac_distutils_result]) + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) +- if test -z "$PYTHON_LDFLAGS"; then ++ if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<