diff options
| -rw-r--r-- | libre/hplip/CommonDefinations.patch | 22 | ||||
| -rw-r--r-- | libre/hplip/PKGBUILD | 12 |
2 files changed, 3 insertions, 31 deletions
diff --git a/libre/hplip/CommonDefinations.patch b/libre/hplip/CommonDefinations.patch deleted file mode 100644 index 8ee662432..000000000 --- a/libre/hplip/CommonDefinations.patch +++ /dev/null @@ -1,22 +0,0 @@ -*** 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 ad647d05c..1cc55302f 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=hplip -pkgver=3.15.7 -pkgrel=2.parabola1 +pkgver=3.15.9 +pkgrel=1.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,11 +28,9 @@ 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' +sha1sums=('564a37d39269fee9c938b7fe9f2b31c4f9c4db06' 'SKIP' - 'a0131125ce82308db5127505a4c4e5fd89fcf189' '4ef1b506ff5930ab841945ae9178f28fca1997ad') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com> @@ -60,10 +58,6 @@ 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 |