tjh.dev
1diff --color -ur a/wscript b/wscript
2--- a/wscript 2020-08-17 19:49:43.389864343 +0200
3+++ b/wscript 2020-08-18 00:22:51.172556519 +0200
4@@ -149,6 +149,26 @@
5 if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)')
6 conf.find_program('python3', var='PYTHON')
7 conf.load('python')
8+ conf.env.HAVE_QT5SVG = 1
9+ conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ]
10+ conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ]
11+ conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib'
12+ conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ]
13+ conf.env.HAVE_QT5WEBENGINEWIDGETS = 1
14+ conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ]
15+ conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ]
16+ conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib'
17+ conf.env.LIB_QT5WEBENGINEWIDGETS = [
18+ 'Qt5WebEngineWidgets',
19+ 'Qt5Core',
20+ 'Qt5Gui',
21+ 'Qt5WebEngineCore',
22+ 'Qt5Widgets',
23+ 'Qt5Network',
24+ 'Qt5Quick',
25+ 'Qt5PrintSupport'
26+ ]
27+ print("conf.env.LIB_QT5SVG : ",conf.env)
28 if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5')
29 if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`')
30 if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus')
31@@ -186,7 +206,11 @@
32 raise ValueError('Could not find QT_HOST_DATA')
33
34 specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True)
35+ path = "@Qt5Base_dev@"
36+ print("\n\n[log] specpath = ",specpath,"\n")
37+ print("\n\n[log] path = ",path,"\n")
38 specpath = os.path.join(path, 'mkspecs', specpath.strip())
39+ print("\n\n[log] specpath = ",specpath,"\n")
40 if not os.path.exists(specpath):
41 raise ValueError('No spec path, cannot build')
42
43@@ -196,17 +220,29 @@
44
45 conf.env.append_value('INCLUDES_KDECORE', specpath)
46
47- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
48- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
49- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
50- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
51+ libs = {
52+ 'KF5KIOCore': '@KF5KIOCore_dev@',
53+ 'KF5Auth': '@KF5Auth_dev@',
54+ 'KF5KIOWidgets': '@KF5KIOCore_dev@',
55+ 'KF5IconThemes': '@KF5IconThemes_dev@',
56+ 'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@',
57+ 'KF5XmlGui': '@KF5XmlGui_dev@',
58+ 'KF5CoreAddons': '@KF5CoreAddons_dev@',
59+ 'KF5ConfigGui': '@KF5Config_dev@',
60+ 'KF5ConfigCore': '@KF5Config_dev@',
61+ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
62+ 'KF5I18n': '@KF5I18n_dev@',
63+ 'KF5SonnetUi': '@KF5SonnetUi_dev@',
64+ 'KF5AuthCore': '@KF5Auth_dev@',
65+ }
66
67- for lib in libs:
68+ for lib,mkspec_path in libs.items():
69+ print("[log] mkspec : ", mkspec_path)
70 name = lib[3:]
71 if not name.startswith('K') and name != 'SonnetUi':
72 name = 'K' + name
73-
74- p = '%s/qt_%s.pri' % (path, name)
75+ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
76+ print("[log] path :",path,", name : ",name)
77 try:
78 code = Utils.readf(p)
79 except EnvironmentError: