From 783a7544685afd4b690b2d337428d39c16f9e49a Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 10 Dec 2017 22:43:19 +0100 Subject: [PATCH] hplip: update to 3.17.11, allow building Qt5 GUI, add patch Closes: #9902 [via git-merge-pr] --- srcpkgs/hplip/patches/disable_upgrade.patch | 14 ++++++++++++++ srcpkgs/hplip/template | 12 +++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/hplip/patches/disable_upgrade.patch diff --git a/srcpkgs/hplip/patches/disable_upgrade.patch b/srcpkgs/hplip/patches/disable_upgrade.patch new file mode 100644 index 00000000000..6c057c7bdcf --- /dev/null +++ b/srcpkgs/hplip/patches/disable_upgrade.patch @@ -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 for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use xbps.") ++clean_exit(1) ++ ++ + for o, a in opts: + if o in ('-h', '--help'): + usage() diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 5a54c3b5f73..fdd6e5a674d 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,24 +1,26 @@ # Template file for 'hplip' pkgname=hplip -version=3.17.10 +version=3.17.11 revision=1 +configure_args="--enable-qt5 --disable-qt4" #XXX: pyqt pkgs for python gui hostmakedepends="pkg-config automake libtool python" makedepends="libressl-devel python-devel libxml2-python cups-devel sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel" -depends="python-gobject2 python-dbus $(vopt_if gui python-PyQt4) foomatic-db foomatic-db-engine desktop-file-utils" +depends="python-gobject2 python-dbus $(vopt_if gui python-PyQt5-dbus) + foomatic-db foomatic-db-engine desktop-file-utils" conf_files="/etc/hp/hplip.conf" make_dirs="/var/lib/hp 0755 root root" pycompile_dirs="usr/share/hplip" short_desc="HP Linux Imaging and Printing" maintainer="Juan RP " -homepage="http://hplipopensource.com/" +homepage="https://developers.hp.com/hp-linux-imaging-and-printing" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" -checksum=0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c +checksum=2f91be9489a50e4c929b2b9d3c72c09905c1195f9b360568b07fcbde4f3faa75 build_options="gui" -desc_option_gui="Build with Qt4 gui support" +desc_option_gui="Build with Qt5 gui support" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/usr/include/python2.7"