Attachment #637524 for bug #721018

Lines 285-292 Link Here

(-)hplip-3.20.3_orig/base/utils.py (-2 / +2 lines)
285	except ValueError:	285	except ValueError:
286	yield fullname	286	yield fullname
287		287
288	#if os.path.islink(fullname):	288	if os.path.islink(fullname):
289	# fullname = os.path.realpath(os.readlink(fullname))	289	fullname = os.path.realpath(os.readlink(fullname))
290		290
291	if recurse and os.path.isdir(fullname): # or os.path.islink(fullname):	291	if recurse and os.path.isdir(fullname): # or os.path.islink(fullname):
292	for f in walkFiles(fullname, recurse, abs_paths, return_folders, pattern, path):	292	for f in walkFiles(fullname, recurse, abs_paths, return_folders, pattern, path):

Lines 762-768 Link Here

(-)hplip-3.20.3_orig/installer/core_install.py (-1 / +1 lines)
762	self.native_cups = self.get_distro_ver_data('native_cups', False)	762	self.native_cups = self.get_distro_ver_data('native_cups', False)
763		763
764	# Adjust required flag based on the distro ver ui_toolkit value	764	# Adjust required flag based on the distro ver ui_toolkit value
765	ui_toolkit = self.get_distro_ver_data('ui_toolkit', 'qt4').lower()	765	ui_toolkit = self.get_distro_ver_data('ui_toolkit', 'qt5').lower()
766		766
767	if ui_toolkit == 'qt4':	767	if ui_toolkit == 'qt4':
768	log.debug("Default UI toolkit: Qt4")	768	log.debug("Default UI toolkit: Qt4")

Lines 366-376 Link Here

(-)hplip-3.20.3_orig/installer/dcheck.py (-2 / +2 lines)
366		366
367	def get_pil_version():	367	def get_pil_version():
368	try:	368	try:
369	from PIL import Image	369	import PIL
370	except ImportError:	370	except ImportError:
371	return '-'	371	return '-'
372	else:	372	else:
373	return Image.PILLOW_VERSION	373	return PIL.__version__
374		374
375	def get_libpthread_version():	375	def get_libpthread_version():
376	try:	376	try:




udev_mode_fix=1
ppd_dir=
fix_ppd_symlink=0
drv_dir=/usr/share/cups/drv/hp

# ********************
[gentoo:any]

udev_mode_fix=1
ppd_dir=/usr/share/ppd/HP
fix_ppd_symlink=0
drv_dir=/usr/share/cups/drv/hp
ui_toolkit=qt5


# ****************************************

packages=python2-pillow

[manjarolinux:18.1.0:python3-reportlab]
packages=python-reportlab

[manjarolinux:18.1.0:autoconf]
packages=autoconf

Return to bug 721018

Lines 3406-3412 Link Here

(-)hplip-3.20.3_orig/installer/distros.dat (-4 / +4 lines)
3406	udev_mode_fix=1	3406	udev_mode_fix=1
3407	ppd_dir=	3407	ppd_dir=
3408	fix_ppd_symlink=0	3408	fix_ppd_symlink=0
3409	drv_dir=/usr/share/cups/drv/HP	3409	drv_dir=/usr/share/cups/drv/hp
3410		3410
3411	# ********************	3411	# ********************
3412	[gentoo:any]	3412	[gentoo:any]
Lines 3425-3432 Link Here
3425	udev_mode_fix=1	3425	udev_mode_fix=1
3426	ppd_dir=/usr/share/ppd/HP	3426	ppd_dir=/usr/share/ppd/HP
3427	fix_ppd_symlink=0	3427	fix_ppd_symlink=0
3428	drv_dir=/usr/share/cups/drv/HP	3428	drv_dir=/usr/share/cups/drv/hp
3429	ui_toolkit=none	3429	ui_toolkit=qt5
3430		3430
3431		3431
3432	# ****************************************	3432	# ****************************************
Lines 14047-14053 Link Here
14047	packages=python2-pillow	14047	packages=python2-pillow
14048		14048
14049	[manjarolinux:18.1.0:python3-reportlab]	14049	[manjarolinux:18.1.0:python3-reportlab]
14050	packages=python-reportlab	14050	packages=python-reportlab
14051		14051
14052	[manjarolinux:18.1.0:autoconf]	14052	[manjarolinux:18.1.0:autoconf]
14053	packages=autoconf	14053	packages=autoconf