From: 0x5c <0x5c@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] nutty: devendor speedtest-cli.
Date: Mon, 15 Aug 2022 10:48:10 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38681@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]
There is a new pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages fix/py-ver/nutty
https://github.com/void-linux/void-packages/pull/38681
nutty: devendor speedtest-cli.
Removes python2 remnants, see #38229
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38681.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/py-ver/nutty-38681.patch --]
[-- Type: text/x-diff, Size: 2524 bytes --]
From 18dd18f58874b27d7d74440677174f203a83f0c2 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 15 Aug 2022 03:16:54 -0400
Subject: [PATCH] nutty: devendor speedtest-cli.
Removes python2 remnants, see #38229
---
.../patches/use-system-speedtestcli.patch | 27 +++++++++++++++++++
srcpkgs/nutty/template | 4 +--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/nutty/patches/use-system-speedtestcli.patch
diff --git a/srcpkgs/nutty/patches/use-system-speedtestcli.patch b/srcpkgs/nutty/patches/use-system-speedtestcli.patch
new file mode 100644
index 000000000000..b707a0cadb3d
--- /dev/null
+++ b/srcpkgs/nutty/patches/use-system-speedtestcli.patch
@@ -0,0 +1,27 @@
+nutty vendors an old and broken python2-only version of speedtest-cli.
+Since it is already packaged (and python3 already), we can rely on it instead.
+
+--
+
+--- a/src/nutty.vala
++++ b/src/nutty.vala
+@@ -1682,9 +1682,6 @@
+ speedtest_list_store.clear();
+ TreeIter iter;
+ if(shouldExecute){
+- if(! COMMAND_FOR_SPEED_TEST[0].contains(Constants.NUTTY_SCRIPT_PATH)){
+- COMMAND_FOR_SPEED_TEST[0] = Constants.NUTTY_SCRIPT_PATH+ "/" + COMMAND_FOR_SPEED_TEST[0];
+- }
+ execute_sync_multiarg_command_pipes(COMMAND_FOR_SPEED_TEST);
+ //handle unsucessfull command execution and raise error on infobar
+ if(!Utils.isExpectedOutputPresent(
+--- a/data/scripts/meson.build
++++ b/data/scripts/meson.build
+@@ -23,7 +23,6 @@
+ 'nutty_vnstat_script.sh',
+ 'nutty_traceroute_script.sh',
+ 'nutty_ports_script.sh',
+- 'speedtest-cli'
+ ]
+ foreach a_script : script_names
+ install_data(
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index eb263a89af4d..8a27637d60ef 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
# Template file for 'nutty'
pkgname=nutty
version=1.1.1
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext vala glib-devel"
makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
sqlite-devel"
+depends="speedtest-cli"
short_desc="Network Utility"
maintainer="linarcx <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2
post_install() {
vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
next reply other threads:[~2022-08-15 8:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 8:48 0x5c [this message]
2022-08-17 15:44 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38681@inbox.vuxu.org \
--to=0x5c@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).