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

[Andreas Radke]

    Date: Tuesday, May 19, 2020 @ 11:32:07
  Author: andyrtr
Revision: 386941

upgpkg: hplip 1:3.20.5-2: fix configure not detecting system CFLAGS breaking scan - FS#66704

Modified:
  hplip/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-19 11:06:58 UTC (rev 386940)
+++ PKGBUILD	2020-05-19 11:32:07 UTC (rev 386941)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.20.5
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
@@ -29,6 +29,7 @@
         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
+        https://launchpadlibrarian.net/480406888/hplip-configure-python.patch
         python3.diff)
 sha512sums=('fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07'
             'SKIP'
@@ -36,6 +37,7 @@
             '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
             '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
             '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
+            'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe'
             '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
@@ -55,6 +57,10 @@
  # (pre-USB-storage) photo memory card support (pcardext) - Debian patch
  patch -Np1 -i "${srcdir}"/python3.diff
 
+ # https://bugs.launchpad.net/hplip/+bug/1879445
+ # broken scanning - https://bugs.archlinux.org/task/66704
+ patch -Np1 -i ../hplip-configure-python.patch
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 }
@@ -61,7 +67,7 @@
 
 build() {
  cd "$pkgname"-$pkgver
- export CFLAGS+=" $(python3-config --includes)" # Fix build with python 3.8
+# export CFLAGS+=" $(python3-config --includes)" # Fix build with python 3.8
  ./configure --prefix=/usr \
              --enable-qt5 \
              --disable-qt4 \