diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 14:10:43 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-29 19:24:38 +0200 |
| commit | 0350ba0db07237305a0a682fd7ecc5d78587be84 (patch) | |
| tree | 069b39648594208cbb5e13bc9d9ec08a5ae4f69b | |
| parent | 91ee6212ab9d9cbfe9e17f1c3cd83852cd07dab3 (diff) | |
| download | abakus-0350ba0db07237305a0a682fd7ecc5d78587be84.tar.gz abakus-0350ba0db07237305a0a682fd7ecc5d78587be84.zip | |
Fix FTBFS
(cherry picked from commit e9402471a2f87071f972ec8a19be33716d5ada5d)
| -rw-r--r-- | bksys/kde.py | 16 | ||||
| -rw-r--r-- | src/SConscript | 9 |
2 files changed, 17 insertions, 8 deletions
diff --git a/bksys/kde.py b/bksys/kde.py index 1f435da..b0e4b04 100644 --- a/bksys/kde.py +++ b/bksys/kde.py @@ -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 KDE|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 diff --git a/src/SConscript b/src/SConscript index 4040ca9..9933baf 100644 --- a/src/SConscript +++ b/src/SConscript @@ -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 kdecore kdeprint kdeui DCOP' ) +## FIXME +if os.path.isfile("/usr/include/tqt3/qlayout.h"): + myenv.KDEaddlibs( 'tqt-mt tqt kio kdecore kdeprint kdeui DCOP' ) +else: + myenv.KDEaddlibs( 'qt-mt tqt kio kdecore kdeprint kdeui DCOP' ) ############################# ## Data to install |