From 95fa41a7f3a3a49bfef07ea5e6b03c8266625204 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:10 -0400 Subject: [PATCH] brltty: use python3 build_helper, clean up --- srcpkgs/brltty/template | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index 08707f8dc86..cf7c198b525 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,8 +1,9 @@ # Template file for 'brltty' pkgname=brltty version=6.4 -revision=5 +revision=6 build_style=gnu-configure +build_helper=python3 configure_args="--enable-gpm --with-screen-driver=lx,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" hostmakedepends="pkg-config python3-Cython" @@ -10,8 +11,8 @@ makedepends="ncurses-devel alsa-lib-devel gpm-devel icu-devel python3-devel libb short_desc="Braille display driver for Linux/Unix" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://mielke.cc/brltty/" -distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz" +homepage="https://brltty.app" +distfiles="https://brltty.app/archive/brltty-${version}.tar.xz" checksum=bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6 python_version=3 @@ -25,8 +26,8 @@ esac pre_configure() { case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no ldconfig in musl libc - sed -e "s;/sbin/ldconfig -n;echo;" -i configure + *-musl) # There is no ldconfig in musl libc + sed -e "s;/sbin/ldconfig -n;echo;" -i configure ;; esac export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" @@ -34,31 +35,17 @@ pre_configure() { post_configure() { case "$XBPS_TARGET_MACHINE" in - arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" - sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" + arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" + sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" ;; esac } -pre_build() { - if [ "$CROSS_BUILD" ]; then - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} - fi -} - -pre_install() { - pre_build -} - do_install() { make INSTALL_ROOT=${DESTDIR} install - vsv $pkgname + vsv brltty vsconf Documents/brltty.conf vdoc Documents/ChangeLog - vcopy Documents/Manual-BRLTTY usr/share/doc/${pkgname} + vcopy Documents/Manual-BRLTTY usr/share/doc/brltty } brltty-devel_package() {