Browse Source

Fix FTBFS

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
e9402471a2
2 changed files with 17 additions and 8 deletions
  1. +9
    -7
      bksys/kde.py
  2. +8
    -1
      src/SConscript

+ 9
- 7
bksys/kde.py View File

@@ -103,13 +103,8 @@ def detect_kde(env):
env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()

print "Checking for kde version : ",
kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1]
if int(kde_version[0]) != 3 or int(kde_version[2]) < 2:
print RED+kde_version
print RED+"Your kde version can be too old"+NORMAL
print RED+"Please make sure kde is at least 3.2"+NORMAL
else:
print GREEN+kde_version+NORMAL
kde_version = os.popen("kde-config --version|grep TDE|sed 's/R//g'").read().strip().split()[1]
print GREEN+kde_version+NORMAL

## Detect the qt library
print "Checking for the qt library : ",
@@ -158,6 +153,9 @@ def detect_kde(env):
moc = os.popen("which moc 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"
print YELLOW + "moc was found as " + moc + NORMAL
elif os.path.isfile("/usr/share/qt3/bin/moc"):
moc = "/usr/share/qt3/bin/moc"
print YELLOW + "moc was found as " + moc + NORMAL
@@ -176,6 +174,10 @@ def detect_kde(env):
# Automatic detection
print GREEN + "ok " + qtdir + "/include/ " + NORMAL
qtincludes = qtdir + "/include/"
elif os.path.isfile("/usr/include/tqt3/qlayout.h"):
# Debian probably
print YELLOW + "the native tqt headers were found in /usr/include/tqt3/ " + NORMAL
qtincludes = "/usr/include/tqt3"
elif os.path.isfile("/usr/include/qt3/qlayout.h"):
# Debian probably
print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL


+ 8
- 1
src/SConscript View File

@@ -16,6 +16,9 @@
Import( 'env' )
myenv=env.Clone()

import os
from SCons.Script.SConscript import SConsEnvironment

#############################
## the programs to build

@@ -66,7 +69,11 @@ myenv.Append(CXXFLAGS = '-Wno-non-virtual-dtor -I/usr/include/tqt -include tqt.h
myenv.KDEaddpaths_includes('#/src/ #/')

## Necessary libraries to link against
myenv.KDEaddlibs( 'qt-mt tqt kio tdecore tdeprint tdeui DCOP' )
## FIXME
if os.path.isfile("/usr/include/tqt3/qlayout.h"):
myenv.KDEaddlibs( 'tqt-mt tqt kio tdecore tdeprint tdeui DCOP' )
else:
myenv.KDEaddlibs( 'qt-mt tqt kio tdecore tdeprint tdeui DCOP' )

#############################
## Data to install


Loading…
Cancel
Save