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

[Andreas Radke]

    Date: Saturday, September 19, 2015 @ 18:48:44
  Author: andyrtr
Revision: 246659

upgpkg: hplip 3.15.9-1

upstream update 3.15.9

Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/CommonDefinations.patch

-------------------------+
 CommonDefinations.patch |   22 ----------------------
 PKGBUILD                |   12 +++---------
 2 files changed, 3 insertions(+), 31 deletions(-)

Deleted: CommonDefinations.patch
===================================================================
--- CommonDefinations.patch	2015-09-19 16:32:56 UTC (rev 246658)
+++ CommonDefinations.patch	2015-09-19 16:48:44 UTC (rev 246659)
@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-19 16:32:56 UTC (rev 246658)
+++ PKGBUILD	2015-09-19 16:48:44 UTC (rev 246659)
@@ -5,8 +5,8 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.15.7
-pkgrel=2
+pkgver=3.15.9
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -25,11 +25,9 @@
             'libusb: for advanced usb support')
 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'
           '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
@@ -36,10 +34,6 @@
 prepare() {
  cd $pkgname-$pkgver
  
- # 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