From f87926b702fd30b8ceb139fc07d307c207a07df1 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 23 Aug 2020 19:40:23 -0700 Subject: [PATCH 1/2] scons: update to 4.0.1. Switch to Python3. --- srcpkgs/scons/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template index 52c8013f7d6c03..a527bc6b69e947 100644 --- a/srcpkgs/scons/template +++ b/srcpkgs/scons/template @@ -1,19 +1,19 @@ # Template file for 'scons' pkgname=scons -version=3.1.2 -revision=3 -build_style=python2-module -make_install_args="--standard-lib --install-data=/usr/share" -hostmakedepends="python python-setuptools" -depends="python" +version=4.0.1 +revision=1 +wrksrc="SCons-${version}" +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3" short_desc="Software construction tool" maintainer="Orphaned " license="MIT" homepage="https://www.scons.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum="7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb" +checksum=722ed104b5c624ecdc89bd4e02b094d2b14d99d47b5d0501961e47f579a2007c post_install() { - vlicense LICENSE.txt + vlicense LICENSE } From df984ea954d7c11023c7b0d513149214513d3e64 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 23 Aug 2020 19:48:31 -0700 Subject: [PATCH 2/2] gpsd: update to 3.21. Switch to Python3. --- common/shlibs | 2 +- srcpkgs/gpsd/patches/SConstruct-cross.patch | 13 ------------- srcpkgs/gpsd/template | 14 +++++++------- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/gpsd/patches/SConstruct-cross.patch diff --git a/common/shlibs b/common/shlibs index 676eb94366b11e..ad64444f04c077 100644 --- a/common/shlibs +++ b/common/shlibs @@ -437,7 +437,7 @@ libdca.so.0 libdca-0.0.5_1 libmpeg2.so.0 libmpeg2-0.5.1_1 libmpeg2convert.so.0 libmpeg2-0.5.1_1 libmng.so.2 libmng-2.0.2_1 -libQgpsmm.so.25 gpsd-qt-3.20_1 +libQgpsmm.so.27 gpsd-qt-3.21_1 libQtAssistantClient.so qt-4.5.3_1 libQtXmlPatterns.so.4 qt-4.5.3_1 libQtScriptTools.so.4 qt-4.5.3_1 diff --git a/srcpkgs/gpsd/patches/SConstruct-cross.patch b/srcpkgs/gpsd/patches/SConstruct-cross.patch deleted file mode 100644 index 42b0748209e76d..00000000000000 --- a/srcpkgs/gpsd/patches/SConstruct-cross.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- SConstruct~ 2020-01-01 02:31:27.000000000 +0100 -+++ SConstruct 2020-05-17 11:20:07.334411693 +0200 -@@ -629,6 +629,10 @@ - - # run it - ret = context.TryRun(program, '.c') -+ if not ret[1]: -+ # Assume 8 -+ context.Result("unchecked") -+ return '8' - context.Result(ret[0]) - return ret[1] - diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index a5f3628ea42210..29498fe1d54f44 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,13 +1,13 @@ # Template file for 'gpsd' pkgname=gpsd -version=3.20 +version=3.21 revision=1 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" @@ -15,14 +15,14 @@ maintainer="uriahheep " 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 +checksum=5512a7d3c2e86be83c5555652e5b4cc9049e8878a4320be7f039eb1a7203e5f0 +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