aboutsummaryrefslogtreecommitdiff
path: root/deskutils/calibre/files
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2016-06-27 20:01:42 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2016-06-27 20:01:42 +0000
commit5af876fe2f48b2c6b8272ce39fe3e5c338f7ef33 (patch)
treedf1dfce160e04bc2e95ea658ec141e5a0a0b57db /deskutils/calibre/files
parent68065f6577f70d409731673eba90defbcea516bb (diff)
downloadports-5af876fe2f48b2c6b8272ce39fe3e5c338f7ef33.tar.gz
ports-5af876fe2f48b2c6b8272ce39fe3e5c338f7ef33.zip
Notes
Diffstat (limited to 'deskutils/calibre/files')
-rw-r--r--deskutils/calibre/files/patch-setup_build__environment.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/deskutils/calibre/files/patch-setup_build__environment.py b/deskutils/calibre/files/patch-setup_build__environment.py
index bf78f80baf70..4480f3a108df 100644
--- a/deskutils/calibre/files/patch-setup_build__environment.py
+++ b/deskutils/calibre/files/patch-setup_build__environment.py
@@ -1,11 +1,11 @@
---- setup/build_environment.py.orig 2016-05-20 11:45:27 UTC
+--- setup/build_environment.py.orig 2016-06-24 01:54:27 UTC
+++ setup/build_environment.py
-@@ -103,7 +103,7 @@ def get_sip_dir(q):
+@@ -98,7 +98,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BI
+ from PyQt5.QtCore import PYQT_CONFIGURATION
+ pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
+ def get_sip_dir():
+- q = os.environ.get('SIP_DIR', sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
++ q = os.environ.get('SIP_DIR', sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
+ for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
+ base = os.path.join(q, x)
if os.path.exists(os.path.join(base, 'QtWidgets')):
- return base
- raise EnvironmentError('Failed to find the location of the PyQt5 .sip files')
--pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
-+pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
- pyqt['sip_inc_dir'] = sysconfig.get_path('include')
-
- glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else ''