Github messages for voidlinux
 help / color / mirror / Atom feed
From: pbui <pbui@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] hplip: add patch to fix scanning
Date: Wed, 14 Oct 2020 04:45:48 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25585@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

There is a new pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages hplip
https://github.com/void-linux/void-packages/pull/25585

hplip: add patch to fix scanning
This replaces the deprecated isAlive() method with is_alive().  This was
only made evident with the transition to Python 3.9.

A patch file from https://github.com/void-linux/void-packages/pull/25585.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hplip-25585.patch --]
[-- Type: text/x-diff, Size: 2223 bytes --]

From 53e20b02ab58376293166b985bd2eab373fce907 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Tue, 13 Oct 2020 22:43:49 -0400
Subject: [PATCH] hplip: add patch to fix scanning

This replaces the deprecated isAlive() method with is_alive().  This was
only made evident with the transition to Python 3.9.
---
 srcpkgs/hplip/patches/sane.patch | 31 +++++++++++++++++++++++++++++++
 srcpkgs/hplip/template           |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hplip/patches/sane.patch

diff --git a/srcpkgs/hplip/patches/sane.patch b/srcpkgs/hplip/patches/sane.patch
new file mode 100644
index 00000000000..b30660952df
--- /dev/null
+++ b/srcpkgs/hplip/patches/sane.patch
@@ -0,0 +1,31 @@
+--- scan/sane.py.orig	2020-10-13 22:29:59.456276307 -0400
++++ scan/sane.py	2020-10-13 22:32:44.663586789 -0400
+@@ -378,14 +378,14 @@
+ 
+     def isScanActive(self):
+         if self.scan_thread is not None:
+-            return self.scan_thread.isAlive() and self.scan_thread.scan_active
++            return self.scan_thread.is_alive() and self.scan_thread.scan_active
+         else:
+             return False
+ 
+ 
+     def waitForScanDone(self):
+         if self.scan_thread is not None and \
+-            self.scan_thread.isAlive() and \
++            self.scan_thread.is_alive() and \
+             self.scan_thread.scan_active:
+ 
+             try:
+@@ -398,9 +398,9 @@
+         #time.sleep(0.5)
+         if self.scan_thread is not None:
+             while True:
+-                #print self.scan_thread.isAlive()
++                #print self.scan_thread.is_alive()
+                 #print self.scan_thread.scan_active
+-                if self.scan_thread.isAlive() and \
++                if self.scan_thread.is_alive() and \
+                     self.scan_thread.scan_active:
+                     return
+ 
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 527d16a7b5d..bf66601fe64 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="

             reply	other threads:[~2020-10-14  2:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-14  2:45 pbui [this message]
2020-10-15  2:43 ` [PR PATCH] [Merged]: " ahesford

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-25585@inbox.vuxu.org \
    --to=pbui@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).