[arch-commits] Commit in hplip/repos (7 files)
Felix Yan
felixonmars at archlinux.org
Tue Oct 9 18:15:35 UTC 2018
Date: Tuesday, October 9, 2018 @ 18:15:35
Author: felixonmars
Revision: 336070
archrelease: copy trunk to testing-x86_64
Added:
hplip/repos/testing-x86_64/
hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
(from rev 336069, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
hplip/repos/testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
(from rev 336069, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
hplip/repos/testing-x86_64/PKGBUILD
(from rev 336069, hplip/trunk/PKGBUILD)
hplip/repos/testing-x86_64/disable_upgrade.patch
(from rev 336069, hplip/trunk/disable_upgrade.patch)
hplip/repos/testing-x86_64/fix_install.patch
(from rev 336069, hplip/trunk/fix_install.patch)
hplip/repos/testing-x86_64/python.patch
(from rev 336069, hplip/trunk/python.patch)
-----------------------------------------------------------------+
0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 50 +++++
0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 29 +++
PKGBUILD | 90 ++++++++++
disable_upgrade.patch | 14 +
fix_install.patch | 23 ++
python.patch | 11 +
6 files changed, 217 insertions(+)
Copied: hplip/repos/testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 336069, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch)
===================================================================
--- testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0)
+++ testing-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2018-10-09 18:15:35 UTC (rev 336070)
@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter at canonical.com>
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
++++ b/configure.in
+@@ -554,7 +554,7 @@ fi
+
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+ AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
+- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
++ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
+ if test "$libusb01_build" = "yes"; then
+ AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
+ AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
++++ b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+
+ #include "dbuscomm.h"
+
++#include <cups/ppd.h>
++
+ #define DBITMAPFILEHEADER 14
+ #define DBITMAPINFOHEADER 40
+
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
++++ b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>
+ #include <math.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <cups/raster.h>
+ #include <string>
+ #ifdef FALSE
Copied: hplip/repos/testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 336069, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch)
===================================================================
--- testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (rev 0)
+++ testing-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch 2018-10-09 18:15:35 UTC (rev 336070)
@@ -0,0 +1,29 @@
+From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001
+From: Gaurav Sood <gaurav-sood at invalid-email.launchpad.net>
+Date: Thu, 4 May 2017 18:32:08 +0200
+Subject: Fix handling of unicode filenames in sixext.py
+
+LP: #1480152
+Closes: #861731
+---
+ base/sixext.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/sixext.py b/base/sixext.py
+index 0bf4fc4f4..311bf72c6 100644
+--- a/base/sixext.py
++++ b/base/sixext.py
+@@ -110,11 +110,11 @@ if PY3:
+
+
+ def to_string_utf8(s):
+- return s.decode("utf-8")
++ return s.decode("utf-8", 'ignore')
+
+
+ def to_string_latin(s):
+- return s.decode("latin-1")
++ return s.decode("latin-1", 'ignore')
+
+
+ def to_unicode(s, enc=None):
Copied: hplip/repos/testing-x86_64/PKGBUILD (from rev 336069, hplip/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-10-09 18:15:35 UTC (rev 336070)
@@ -0,0 +1,90 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor : Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
+
+pkgname=hplip
+pkgver=3.18.6
+pkgrel=2
+epoch=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+arch=('x86_64')
+url="http://hplipopensource.com"
+license=('GPL2' 'custom')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
+makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+optdepends=('cups: for printing support'
+ 'sane: for scanner support'
+ 'xsane: sane scanner frontend'
+ 'python-pillow: for commandline scanning support'
+ 'python-reportlab: for pdf output in hp-scan'
+ 'rpcbind: for network support'
+ 'python-pyqt5: for running GUI and hp-toolbox'
+ 'python-gobject: for running hp-toolbox'
+ 'libusb: for advanced usb support'
+ 'wget: for network support')
+# 'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin'
+backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
+source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
+ 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
+ fix_install.patch
+ python.patch)
+sha512sums=('deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f'
+ 'SKIP'
+ 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
+ '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
+ '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
+ '86ef78e5359b49a04b517654f44c1a89bf40ec36aed8b6034247fc327845c9f861fc937f04c11f937199be4fb59061677dfe9baf3d84a99c044f3629842cc438'
+ 'ebcc40cac00b9fb63d378d42ac258eeaf6e0967f34fd1e204c690f34457a0a2b634ef65f1deb79a0740d8c6047f718c10fa205ee2f239b667f7e06c065590528')
+validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
+ # add missing 'include <cups/ppd.h>' at various places
+ 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
+ # fix installation of missing library - FS#59548
+# patch -Np1 -i ${srcdir}/fix_install.patch
+ # fix python issue - FS#59548
+# patch -Np1 -i ${srcdir}/python.patch
+
+ export AUTOMAKE='automake --foreign'
+ autoreconf --force --install
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-qt5 \
+ --disable-qt4 \
+ --enable-hpcups-install \
+ --enable-cups-drv-install \
+ --enable-pp-build #--help
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ install -dm755 ${pkgdir}/etc/sane.d/dll.d
+ echo hpaio > ${pkgdir}/etc/sane.d/dll.d/hpaio
+
+ # remove HAL .fdi file because HAL is no longer used
+ rm -vrf "$pkgdir"/usr/share/hal
+
+ # remove rc script
+ rm -vrf "$pkgdir"/etc/init.d
+
+ # add mixed license file
+ install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING
+}
Copied: hplip/repos/testing-x86_64/disable_upgrade.patch (from rev 336069, hplip/trunk/disable_upgrade.patch)
===================================================================
--- testing-x86_64/disable_upgrade.patch (rev 0)
+++ testing-x86_64/disable_upgrade.patch 2018-10-09 18:15:35 UTC (rev 336070)
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Archlinux software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
Copied: hplip/repos/testing-x86_64/fix_install.patch (from rev 336069, hplip/trunk/fix_install.patch)
===================================================================
--- testing-x86_64/fix_install.patch (rev 0)
+++ testing-x86_64/fix_install.patch 2018-10-09 18:15:35 UTC (rev 336070)
@@ -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.
Copied: hplip/repos/testing-x86_64/python.patch (from rev 336069, hplip/trunk/python.patch)
===================================================================
--- testing-x86_64/python.patch (rev 0)
+++ testing-x86_64/python.patch 2018-10-09 18:15:35 UTC (rev 336070)
@@ -0,0 +1,11 @@
+--- hplip-3.18.7/base/utils.py 2018-07-15 22:08:37.000000000 +0200
++++ hplip-3.18.7/base/utils.py.new 2018-08-08 21:46:48.721947940 +0200
+@@ -265,7 +265,7 @@
+ try:
+ names = os.listdir(root)
+ except os.error:
+- raise StopIteration
++ return
+
+ pattern = pattern or '*'
+ pat_list = pattern.split(';')
More information about the arch-commits
mailing list