diff options
| author | François Andriot <[email protected]> | 2018-07-20 12:41:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-07-20 12:41:46 +0900 |
| commit | 9fa6391b3fb8853c6cd7f717f117c62189e266ec (patch) | |
| tree | aecd1928da21a2f62bab3fe5ff344026bd072c7b /admin/kde.py | |
| parent | ef18cc16faccdac7bee9a7e2c2cbaf4a0eaf30f1 (diff) | |
| download | kstreamripper-9fa6391b3fb8853c6cd7f717f117c62189e266ec.tar.gz kstreamripper-9fa6391b3fb8853c6cd7f717f117c62189e266ec.zip | |
Fixed FTBFS in OpenSUSE (all versions) and Fedora 28.
Signed-off-by: François Andriot <[email protected]>
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'admin/kde.py')
| -rw-r--r-- | admin/kde.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/admin/kde.py b/admin/kde.py index e6cbdb1..8a70106 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -124,18 +124,18 @@ def detect_kde(env): env['QT_UIC'] = uic print("Checking for moc : ") - moc = qtdir + "/bin/moc" + moc = qtdir + "/bin/tmoc" if os.path.isfile(moc): print(GREEN+"moc was found as "+moc+NORMAL) else: - moc = os.popen("which moc 2>/dev/null").read().strip() + moc = os.popen("which tmoc 2>/dev/null").read().strip() if len(moc): print(YELLOW+"moc was found as "+moc+NORMAL) - elif os.path.isfile("/usr/share/tqt3/bin/moc"): - moc = "/usr/share/tqt3/bin/moc" + elif os.path.isfile("/usr/share/tqt3/bin/tmoc"): + moc = "/usr/share/tqt3/bin/tmoc" print(YELLOW+"moc was found as "+moc+NORMAL) - elif os.path.isfile("/usr/share/qt3/bin/moc"): - moc = "/usr/share/qt3/bin/moc" + elif os.path.isfile("/usr/share/qt3/bin/tmoc"): + moc = "/usr/share/qt3/bin/tmoc" print(YELLOW+"moc was found as "+moc+NORMAL) else: print(RED+"moc was not found - set QTDIR or put it in your PATH ?"+NORMAL) @@ -245,7 +245,7 @@ def detect_kde(env): ## qt libs and includes env['QTINCLUDEPATH']= qtincludes - env['TQTINCLUDEPATH']=tqtincludes + env['TQTINCLUDEPATH']= tqtincludes if not qtlibs: qtlibs = qtdir+"/lib" env['QTLIBPATH']= qtlibs @@ -271,7 +271,7 @@ def mocscan(target, source, env): if os.path.isfile(uiname): continue - hname = splitext(cpp.name)[0] + ".h" + hname = splitext(cpp.name)[0] + ".h" h = SCons.Node.FS.find_file(hname, (cpp.get_dir(),) ) if h: @@ -319,6 +319,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ( 'QTDIR', 'root of qt directory' ), ( 'QTLIBPATH', 'path to the qt libraries' ), ( 'QTINCLUDEPATH', 'path to the qt includes' ), + ( 'TQTINCLUDEPATH', 'path to the tqt includes' ), ( 'QT_UIC', 'moc directory'), ( 'QT_MOC', 'moc executable command'), ( 'QTPLUGINS', 'uic executable command'), @@ -530,7 +531,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt shared_obj.src_builder.append('Transfiles') ## find the files to moc, dcop, and link against kde and qt - env.AppendUnique(PROGEMITTER=[mocscan], SHLIBEMITTER=[mocscan], LIBEMITTER =[mocscan]) + env.AppendUnique(PROGEMITTER=[mocscan], SHLIBEMITTER=[mocscan], LIBEMITTER =[mocscan]) ########################################### ## Handy helpers for building kde programs @@ -568,7 +569,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt kcfg_files.append(bs) elif ext == '.skel': skel_files.append(bs) - else: + else: other_files.append(bs) return src |