Browse Source

Fix FTBFS

tags/r14.0.0
Timothy Pearson 7 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):
103 103
 	env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()
104 104
 
105 105
 	print "Checking for kde version          : ",
106
-	kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1]
107
-	if int(kde_version[0]) != 3 or int(kde_version[2]) < 2:
108
-		print RED+kde_version
109
-		print RED+"Your kde version can be too old"+NORMAL
110
-		print RED+"Please make sure kde is at least 3.2"+NORMAL
111
-	else:
112
-		print GREEN+kde_version+NORMAL
106
+	kde_version = os.popen("kde-config --version|grep TDE|sed 's/R//g'").read().strip().split()[1]
107
+	print GREEN+kde_version+NORMAL
113 108
 
114 109
 	## Detect the qt library
115 110
 	print "Checking for the qt library       : ",
@@ -158,6 +153,9 @@ def detect_kde(env):
158 153
 		moc = os.popen("which moc 2>/dev/null").read().strip()
159 154
 		if len(moc):
160 155
 			print YELLOW + "moc was found as " + moc + NORMAL
156
+		elif os.path.isfile("/usr/share/tqt3/bin/moc"):
157
+			moc = "/usr/share/tqt3/bin/moc"
158
+			print YELLOW + "moc was found as " + moc + NORMAL
161 159
 		elif os.path.isfile("/usr/share/qt3/bin/moc"):
162 160
 			moc = "/usr/share/qt3/bin/moc"
163 161
 			print YELLOW + "moc was found as " + moc + NORMAL
@@ -176,6 +174,10 @@ def detect_kde(env):
176 174
 			# Automatic detection
177 175
 			print GREEN + "ok " + qtdir + "/include/ " + NORMAL
178 176
 			qtincludes = qtdir + "/include/"
177
+		elif os.path.isfile("/usr/include/tqt3/qlayout.h"):
178
+			# Debian probably
179
+			print YELLOW + "the native tqt headers were found in /usr/include/tqt3/ " + NORMAL
180
+			qtincludes = "/usr/include/tqt3"
179 181
 		elif os.path.isfile("/usr/include/qt3/qlayout.h"):
180 182
 			# Debian probably
181 183
 			print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL

+ 8
- 1
src/SConscript View File

@@ -16,6 +16,9 @@
16 16
 Import( 'env' )
17 17
 myenv=env.Clone()
18 18
 
19
+import os
20
+from SCons.Script.SConscript import SConsEnvironment
21
+
19 22
 #############################
20 23
 ## the programs to build
21 24
 
@@ -66,7 +69,11 @@ myenv.Append(CXXFLAGS = '-Wno-non-virtual-dtor -I/usr/include/tqt -include tqt.h
66 69
 myenv.KDEaddpaths_includes('#/src/  #/')
67 70
 
68 71
 ## Necessary libraries to link against
69
-myenv.KDEaddlibs( 'qt-mt tqt kio tdecore tdeprint tdeui DCOP' )
72
+## FIXME
73
+if os.path.isfile("/usr/include/tqt3/qlayout.h"):
74
+    myenv.KDEaddlibs( 'tqt-mt tqt kio tdecore tdeprint tdeui DCOP' )
75
+else:
76
+    myenv.KDEaddlibs( 'qt-mt tqt kio tdecore tdeprint tdeui DCOP' )
70 77
 
71 78
 #############################
72 79
 ## Data to install

Loading…
Cancel
Save