From bc01e3f0313ed70efec8ac63c689af01607d7bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 21 Oct 2020 22:17:23 +0700 Subject: [PATCH] gpsd: build with Python 3 --- srcpkgs/gpsd/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index a5f3628ea42..b4a1d8d5f6e 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,13 +1,13 @@ # Template file for 'gpsd' pkgname=gpsd version=3.20 -revision=1 +revision=2 build_style=scons make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC} qt_versioned=5" make_install_args="$make_build_args" make_install_target=udev-install -hostmakedepends="pkg-config bc python-pyserial libxslt xmlto asciidoc ncurses" +hostmakedepends="pkg-config bc python3-pyserial libxslt xmlto asciidoc ncurses" makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel pps-tools-devel libcap-devel libbluetooth-devel qt5-devel" short_desc="GPS/AIS receiver monitoring daemon" @@ -16,13 +16,13 @@ license="BSD-3-Clause" homepage="http://www.catb.org/gpsd/" distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.xz" checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571 -python_version=2 # Must be same version as scons +python_version=3 # Must be same version as scons system_accounts="gpsd" subpackages="gpsd-devel gpsd-qt gpsd-qt-devel" if [ -z "$CROSS_BUILD" ]; then subpackages+=" gpsd-python gpsd-xgps" - makedepends+=" python-devel python-gobject-devel" + makedepends+=" python3-devel python3-gobject-devel" else # xxx scons uses its environment to build python stuff; so arch # and python version must match. This should be fixed. @@ -51,7 +51,7 @@ post_install() { gpsd-python_package() { short_desc+=" - Python tools/bindings" - depends="python python-pyserial gnuplot ${sourcepkg}>=${version}_${revision}" + depends="python3 python3-pyserial gnuplot ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove "usr/lib/python*" vmove usr/bin/gegps @@ -71,7 +71,7 @@ gpsd-python_package() { gpsd-xgps_package() { short_desc+=" - PyGI based clients" - depends="${sourcepkg}-python>=${version}_${revision} gtk+3 python-gobject" + depends="${sourcepkg}-python>=${version}_${revision} gtk+3 python3-gobject" pkg_install() { vmove usr/bin/xgps vmove usr/bin/xgpsspeed