From 3258c464e78919af6ef0f5a7f9ebbc335e5dc6ab Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 21 Feb 2019 01:09:08 -0500 Subject: [PATCH] Port headless plugin to build on python2/python3 The only thing needed is to port the buildsystem to not pass strings starting with a "b" as build flags. --- setup/build_environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/build_environment.py b/setup/build_environment.py index 64badfbed4..c30e74631c 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -111,8 +111,8 @@ def get_sip_dir(): pyqt['pyqt_sip_dir'] = get_sip_dir() pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include')) -glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else '' -fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else '' +glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).decode().strip() if islinux or ishaiku else '' +fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).decode().strip() if islinux or ishaiku else '' qt_inc = pyqt['inc'] qt_lib = pyqt['lib'] ft_lib_dirs = []