summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-09-05 15:20:36 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-22 16:15:01 -0300
commit80eb422bcbebb70d21f7be386dcb10e7e51ba7c7 (patch)
treef40c2af7743ef19797cb2ada87f994a31be3ccb4
parentd6a214d2ddb3276b858d172ee09c868b34dc0ec3 (diff)
libre/hplip: update pkg to 3.15.7-2.parabola1
-rw-r--r--libre/hplip/CommonDefinations.patch22
-rw-r--r--libre/hplip/PKGBUILD10
2 files changed, 30 insertions, 2 deletions
diff --git a/libre/hplip/CommonDefinations.patch b/libre/hplip/CommonDefinations.patch
new file mode 100644
index 000000000..8ee662432
--- /dev/null
+++ b/libre/hplip/CommonDefinations.patch
@@ -0,0 +1,22 @@
+*** hplip-3.15.7_original/prnt/hpcups/CommonDefinitions.h 2015-07-13 13:18:53.000000000 +0530
+--- hplip-3.15.7_latest/prnt/hpcups/CommonDefinitions.h 2015-07-28 20:07:24.018247373 +0530
+***************
+*** 441,447 ****
+ {
+ int media_source;
+ int color_mode;
+- int HPSPDClass;
+ DUPLEXMODE e_duplex_mode;
+ int print_borderless;
+ int krgb_mode;
+--- 441,446 ----
+***************
+*** 466,471 ****
+--- 465,471 ----
+ int integer_values[16];
+ int printer_platform_version;
+ int pre_process_raster;
++ int HPSPDClass;
+ } JobAttributes;
+
+ #endif // COMMON_DEFINITIONS_H
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD
index 4af2b979a..ad647d05c 100644
--- a/libre/hplip/PKGBUILD
+++ b/libre/hplip/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 243030 2015-08-04 17:12:04Z andyrtr $
# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
# Contributor (Arch): Rémy Oudompheng <remy@archlinux.org>
# Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Jorge López <jorginho@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=hplip
pkgver=3.15.7
-pkgrel=1.parabola1
+pkgrel=2.parabola1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
@@ -28,9 +28,11 @@ replaces=(${pkgname}-libre)
conflicts=(${pkgname}-libre)
install=hplip.install
source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ CommonDefinations.patch
disable_upgrade.patch)
sha1sums=('f84e33b749ef34939c11b253767686c00ca2c30c'
'SKIP'
+ 'a0131125ce82308db5127505a4c4e5fd89fcf189'
'4ef1b506ff5930ab841945ae9178f28fca1997ad')
validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>
@@ -58,6 +60,10 @@ prepare() {
rm -v mktemp{,1}
echo "Preparing source"
+
+ # fix crash with HP MFP M127fw
+ # https://bugs.archlinux.org/task/46110
+ patch -Np1 -i $srcdir/CommonDefinations.patch
# disable insecure update - https://bugs.archlinux.org/task/38083
patch -Np0 -i ${srcdir}/disable_upgrade.patch