diff --git a/trunk/3.18.7.patch b/trunk/3.18.7.patch new file mode 100644 index 0000000..b3d912f --- /dev/null +++ b/trunk/3.18.7.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.am b/Makefile.am +index 33417f8..1e9b48b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -680,14 +680,14 @@ endif #HPLIP_CLASS_DRIVER + install-data-hook: + if HPLIP_BUILD + if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ +- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ ++ cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \ + chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.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)/ ; \ ++ cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \ + chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.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. diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 7a59014..23a0726 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -29,13 +29,15 @@ source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.a 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) + hplip-colorlaserjet-mfp-m278-m281.patch + 3.18.7.patch) sha1sums=('bb40807ac77fb9b1f6d80a53d5409a22f5d2d197' 'SKIP' '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e' '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5' '0e36f31b98faf2f14137431bc8f82b74de22705b' - '89e0ed0ed9acc6e50812c843ffb5f996fffb829e') + '89e0ed0ed9acc6e50812c843ffb5f996fffb829e' + '50b24d5efb7fdf47ce13d17515ab96d4b07ac74e') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) prepare() { @@ -50,6 +52,7 @@ prepare() { 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 + patch -Np1 -i ${srcdir}/3.18.7.patch export AUTOMAKE='automake --foreign' autoreconf --force --install