File python-opengl-swigdetect.patch of Package python-opengl
--- setup/build_w.py
+++ setup/build_w.py
@@ -17,10 +17,11 @@
try:
if hasattr( os, 'popen3'):
sin,sout,stderr = os.popen3("%s -version" % swig_name)
- data = stderr.read()
+ data = sout.readlines()
else:
- data = os.popen( "%s -version" % swig_name).read()
- if string.find(data,"1.3.13") == -1:
+ data = os.popen( "%s -version" % swig_name).readlines()
+ data = "".join(data).strip()
+ if string.find("".join(data),"1.3.") == -1:
return 0
else:
return 1
@@ -30,7 +31,7 @@
return 0
def handle_wrong_swig_version():
- print "WARNING!!! wrong swig version. Need 1.3.13, continuing anyway."
+ print "WARNING!!! wrong swig version. Need 1.3. Or something. Continuing anyway."
time.sleep(3)
@@ -69,23 +70,6 @@
except:
pass
- # if brain dead spawn doesn't work...
- if self.swig_name is None:
- for swig_name in ('swig', 'swig1.3'):
- try:
- r = os.system("%s -version" % swig_name)
- except:
- r == 99999999
- if r == 256:
- self.swig_name = swig_name
-
- if not check_swig_version(swig_name):
- handle_wrong_swig_version()
-
- # found the swig name, stop checking.
- break
-
-
if self.swig_name is None:
self.warn("Can't find SWIG, will just have to do with the existing wrapper source.")
else: