diff -Naur hplip-3.20.3_orig/base/utils.py hplip-3.20.3/base/utils.py --- hplip-3.20.3_orig/base/utils.py 2020-05-10 09:51:22.660145605 +0200 +++ hplip-3.20.3/base/utils.py 2020-05-10 09:52:13.738669066 +0200 @@ -285,8 +285,8 @@ except ValueError: yield fullname - #if os.path.islink(fullname): - # fullname = os.path.realpath(os.readlink(fullname)) + if os.path.islink(fullname): + fullname = os.path.realpath(os.readlink(fullname)) if recurse and os.path.isdir(fullname): # or os.path.islink(fullname): for f in walkFiles(fullname, recurse, abs_paths, return_folders, pattern, path): diff -Naur hplip-3.20.3_orig/installer/core_install.py hplip-3.20.3/installer/core_install.py --- hplip-3.20.3_orig/installer/core_install.py 2020-05-10 09:51:22.685158104 +0200 +++ hplip-3.20.3/installer/core_install.py 2020-05-10 14:18:41.840472948 +0200 @@ -762,7 +762,7 @@ self.native_cups = self.get_distro_ver_data('native_cups', False) # Adjust required flag based on the distro ver ui_toolkit value - ui_toolkit = self.get_distro_ver_data('ui_toolkit', 'qt4').lower() + ui_toolkit = self.get_distro_ver_data('ui_toolkit', 'qt5').lower() if ui_toolkit == 'qt4': log.debug("Default UI toolkit: Qt4") diff -Naur hplip-3.20.3_orig/installer/dcheck.py hplip-3.20.3/installer/dcheck.py --- hplip-3.20.3_orig/installer/dcheck.py 2020-05-10 09:51:22.685158104 +0200 +++ hplip-3.20.3/installer/dcheck.py 2020-05-10 12:25:59.488876015 +0200 @@ -366,11 +366,11 @@ def get_pil_version(): try: - from PIL import Image + import PIL except ImportError: return '-' else: - return Image.PILLOW_VERSION + return PIL.__version__ def get_libpthread_version(): try: diff -Naur hplip-3.20.3_orig/installer/distros.dat hplip-3.20.3/installer/distros.dat --- hplip-3.20.3_orig/installer/distros.dat 2020-05-10 09:51:22.685158104 +0200 +++ hplip-3.20.3/installer/distros.dat 2020-05-10 13:56:31.872552220 +0200 @@ -3406,7 +3406,7 @@ udev_mode_fix=1 ppd_dir= fix_ppd_symlink=0 -drv_dir=/usr/share/cups/drv/HP +drv_dir=/usr/share/cups/drv/hp # ******************** [gentoo:any] @@ -3425,8 +3425,8 @@ udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP fix_ppd_symlink=0 -drv_dir=/usr/share/cups/drv/HP -ui_toolkit=none +drv_dir=/usr/share/cups/drv/hp +ui_toolkit=qt5 # **************************************** @@ -14047,7 +14047,7 @@ packages=python2-pillow [manjarolinux:18.1.0:python3-reportlab] -packages=python-reportlab +packages=python-reportlab [manjarolinux:18.1.0:autoconf] packages=autoconf