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

[Andreas Radke]

    Date: Wednesday, August 8, 2018 @ 17:58:59
  Author: andyrtr
Revision: 331251

upgpkg: hplip 3.18.7-2

install missing library - FS#59548

Added:
  hplip/trunk/fix_install.patch
Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/hplip-colorlaserjet-mfp-m278-m281.patch

-----------------------------------------+
 PKGBUILD                                |   10 ++--
 fix_install.patch                       |   23 ++++++++++
 hplip-colorlaserjet-mfp-m278-m281.patch |   64 ------------------------------
 3 files changed, 28 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-08 16:28:25 UTC (rev 331250)
+++ PKGBUILD	2018-08-08 17:58:59 UTC (rev 331251)
@@ -6,7 +6,7 @@
 
 pkgname=hplip
 pkgver=3.18.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
 url="http://hplipopensource.com"
@@ -29,13 +29,13 @@
         disable_upgrade.patch
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
-        hplip-colorlaserjet-mfp-m278-m281.patch)
+        fix_install.patch)
 sha1sums=('bb40807ac77fb9b1f6d80a53d5409a22f5d2d197'
           'SKIP'
           '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
           '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5'
           '0e36f31b98faf2f14137431bc8f82b74de22705b'
-          '89e0ed0ed9acc6e50812c843ffb5f996fffb829e')
+          '759de18bfef699ac2f605962dafee1431e7b5e3b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
 prepare() {
@@ -48,8 +48,8 @@
  patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
  # fix some handling unicode file names FS#58412
  patch -Np1 -i ${srcdir}/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
- # add support for some missing models - FS#57683
-# patch -Np1 -i ${srcdir}/hplip-colorlaserjet-mfp-m278-m281.patch
+ # fix installation of missing library - FS#59548
+ patch -Np1 -i ${srcdir}/fix_install.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install

Added: fix_install.patch
===================================================================
--- fix_install.patch	                        (rev 0)
+++ fix_install.patch	2018-08-08 17:58:59 UTC (rev 331251)
@@ -0,0 +1,23 @@
+--- hplip-3.18.7/Makefile.am	2018-07-15 22:08:37.000000000 +0200
++++ hplip-3.18.7/Makefile.am.new	2018-08-08 19:54:20.671794852 +0200
+@@ -680,14 +680,14 @@
+ install-data-hook:
+ if HPLIP_BUILD
+ 	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
++		cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \
++		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_64.so ; \
++		ln -sf $(libdir)/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ 	fi; \
+ 	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
++		cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \
++		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_32.so ; \
++		ln -sf $(libdir)/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ 	fi
+ if !HPLIP_CLASS_DRIVER
+ #	   If scanner build, add hpaio entry to sane dll.conf.

Deleted: hplip-colorlaserjet-mfp-m278-m281.patch
===================================================================
--- hplip-colorlaserjet-mfp-m278-m281.patch	2018-08-08 16:28:25 UTC (rev 331250)
+++ hplip-colorlaserjet-mfp-m278-m281.patch	2018-08-08 17:58:59 UTC (rev 331251)
@@ -1,64 +0,0 @@
-diff -up hplip-3.17.11/data/models/models.dat.colorlaserjet-mfp-m278-m281 hplip-3.17.11/data/models/models.dat
---- hplip-3.17.11/data/models/models.dat.colorlaserjet-mfp-m278-m281	2017-11-23 13:10:17.000000000 +0100
-+++ hplip-3.17.11/data/models/models.dat	2018-01-19 08:24:21.554788787 +0100
-@@ -58516,6 +58516,59 @@ usb-pid=3c2a
- usb-vid=3f0
- wifi-config=3
- 
-+[hp_colorlaserjet_mfp_m278-m281]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=7
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=1
-+io-mode=1
-+io-support=14
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP Color LaserJet MFP M278-281
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+ppd-name=hp-color_laserjet_pro_mfp_m277
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CF400A/CF400X
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CF401A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CF403A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CF402A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=48c3
-+support-type=2
-+support-ver=3.15.4
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=3c2a
-+usb-vid=3f0
-+wifi-config=3
-+
- [hp_color_laserjet_m553]
- align-type=0
- clean-type=0
-