[arch-commits] Commit in hplip/trunk (PKGBUILD python3.diff)

[Andreas Radke via arch-commits]

    Date: Wednesday, December 11, 2019 @ 11:25:46
  Author: andyrtr
Revision: 370666

upgpkg: hplip 1:3.19.11-6: fix python3 unsupported variable type - FS#64674

Added:
  hplip/trunk/python3.diff
Modified:
  hplip/trunk/PKGBUILD

--------------+
 PKGBUILD     |   12 ++++++++----
 python3.diff |   11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2019-12-11 09:46:10 UTC (rev 370665)
+++ PKGBUILD    2019-12-11 11:25:46 UTC (rev 370666)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.19.11
-pkgrel=5
+pkgrel=6
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('x86_64')
@@ -29,7 +29,8 @@
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
         0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
-        fix-broken-printer-naming.diff)
+        fix-broken-printer-naming.diff
+        python3.diff)
 
sha512sums=('f419de0e18937c93c2727f4d8b4f7bf1fcc24961a6b7a0d043ce8341c65d0c0332cd354c0cd907b85bc6ccc7735d23ba5f2c918dba5bf965540291cfcbe032d5'
             'SKIP'
             
'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
@@ -36,12 +37,13 @@
             
'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
             
'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
             
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
-            
'450e0e77954a9d919bbde0a4b9d630920a1225679121f94d6854e16ce9b2f8ed8c4de7ddf629012b9f9d24d075a407a4077d1710ad9d023742f402b4d139a111')
+            
'450e0e77954a9d919bbde0a4b9d630920a1225679121f94d6854e16ce9b2f8ed8c4de7ddf629012b9f9d24d075a407a4077d1710ad9d023742f402b4d139a111'
+            
'834cd60af0b938b1d930e63fa43ce21900a32bd4842b6a03902dfd0b8e99b295be152531873e09a46506ef4645d67f3d06b7e1339ba92c6d56373f8277ee53ea')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) <hp...@hp.com>
 
 prepare() {
  cd "$pkgname"-$pkgver
- 
+
  # disable insecure update - https://bugs.archlinux.org/task/38083
  patch -Np0 -i "${srcdir}"/disable_upgrade.patch
  
@@ -53,6 +55,8 @@
  patch -Np1 -i 
"${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
  # fix broken printer naming FS#64420, FS#64801
  patch -Np1 -i "${srcdir}"/fix-broken-printer-naming.diff
+ # fix unsupported old python variable
+ patch -Np1 -i "${srcdir}"/python3.diff
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install

Added: python3.diff
===================================================================
--- python3.diff                                (rev 0)
+++ python3.diff        2019-12-11 11:25:46 UTC (rev 370666)
@@ -0,0 +1,11 @@
+--- hplip-3.19.11/pcard/pcardext/pcardext.c    2019-11-04 11:31:08.000000000 
+0100
++++ hplip-3.19.11/pcard/pcardext/pcardext.c.new        2019-12-11 
12:13:20.710959557 +0100
+@@ -80,7 +80,7 @@
+     {
+         result = PyObject_CallFunction( writesectorFunc, "iis#", sector, 
nsector, buf, size );
+         
+-        return PyInt_AS_LONG( result );
++        return PyLong_AS_LONG( result );
+     }
+ 
+     return 1;