tag 549806 + patch pending
tag 504858 + patch pending
tag 564207 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for aqsis (versioned as 1.2.0-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u aqsis-1.2.0/debian/changelog aqsis-1.2.0/debian/changelog
--- aqsis-1.2.0/debian/changelog
+++ aqsis-1.2.0/debian/changelog
@@ -1,3 +1,14 @@
+aqsis (1.2.0-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.4 (missing #include), (Closes: #504858).
+ Thanks to Martin Michlmayr who reported the issue and provided a
+ patch (added 02_gcc_4.4_fixes.patch).
+ * Use env.Clone instead of env.Copy in various SConscript files
+ (added 03_env_clone.patch) (Closes: #549806, #564207)
+
+ -- Mehdi Dogguy <me...@debian.org> Sun, 31 Jan 2010 17:47:00 +0100
+
aqsis (1.2.0-2.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -239 +249,0 @@
-
diff -u aqsis-1.2.0/debian/patches/series aqsis-1.2.0/debian/patches/series
--- aqsis-1.2.0/debian/patches/series
+++ aqsis-1.2.0/debian/patches/series
@@ -1,0 +2,2 @@
+02_gcc_4.4_fixes.patch
+03_env_clone.patch
only in patch2:
unchanged:
--- aqsis-1.2.0.orig/debian/patches/02_gcc_4.4_fixes.patch
+++ aqsis-1.2.0/debian/patches/02_gcc_4.4_fixes.patch
@@ -0,0 +1,29 @@
+--- a/aqsistypes/logging.cpp
++++ b/aqsistypes/logging.cpp
+@@ -21,6 +21,7 @@
+ #include "logging.h"
+ #include "logging_streambufs.h"
+
++#include <cstdio>
+ #include <iostream>
+ #include <sstream>
+ #include <vector>
+--- a/displays/d_xpm/aspXpm.cpp
++++ b/displays/d_xpm/aspXpm.cpp
+@@ -1,5 +1,6 @@
+ #include "aspXpm.h"
+
++#include <cstdio>
+ #include <string.h>
+
+ aspXpm::aspXpm( const char *filename, int width, int height, int bpp )
+--- a/renderer/render/condition.cpp
++++ b/renderer/render/condition.cpp
+@@ -27,6 +27,7 @@
+ \author Michel Joron (jo...@sympatico.ca)
+ */
+
++#include <cstdio>
+ #include <string.h>
+ #include "aqsis.h"
+ #include "renderer.h"
only in patch2:
unchanged:
--- aqsis-1.2.0.orig/debian/patches/03_env_clone.patch
+++ aqsis-1.2.0/debian/patches/03_env_clone.patch
@@ -0,0 +1,400 @@
+--- a/shadercompiler/aqsl/SConscript
++++ b/shadercompiler/aqsl/SConscript
+@@ -5,7 +5,7 @@
+ aqsl_sources = Split("""
+ aqslcomp.cpp""")
+
+-aqslenv = env.Copy()
++aqslenv = env.Clone()
+
+ # Set any platform specific options for this target
+ aqslenv.UseTargetOptions('aqsl')
+--- a/shadercompiler/shadervm/SConscript
++++ b/shadercompiler/shadervm/SConscript
+@@ -16,7 +16,7 @@
+ shadervm.h
+ shadervm_common.h""")
+
+-shadervmenv = env.Copy()
++shadervmenv = env.Clone()
+
+ # Set any platform specific options for this target
+ shadervmenv.UseTargetOptions('shadervm')
+--- a/shadercompiler/aqsltell/SConscript
++++ b/shadercompiler/aqsltell/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-aqsltellenv = env.Copy()
++aqsltellenv = env.Clone()
+ aqsltellenv.AppendUnique(CPPPATH=['#/shadercompiler/slxargs'])
+ aqsltell_sources = Split("""
+ aqsltell.cpp""")
+--- a/shadercompiler/slparse/SConscript
++++ b/shadercompiler/slparse/SConscript
+@@ -20,7 +20,7 @@
+ parsenode.h
+ vardef.h""")
+
+-slparseenv = env.Copy()
++slparseenv = env.Clone()
+
+ # Set any platform specific options for this target
+ slparseenv.UseTargetOptions('slparse')
+--- a/shadercompiler/slxargs/SConscript
++++ b/shadercompiler/slxargs/SConscript
+@@ -11,7 +11,7 @@
+ slxargs_install_headers = Split("""
+ slx.h""")
+
+-slxargsenv = env.Copy()
++slxargsenv = env.Clone()
+
+ slxargsenv.AppendUnique(CPPDEFINES=['SLXARGS_EXPORTS'])
+
+--- a/shadercompiler/slpp/SConscript
++++ b/shadercompiler/slpp/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-slppenv = env.Copy()
++slppenv = env.Clone()
+ slppenv.AppendUnique(CPPDEFINES=['SLPP_LIBRARY'])
+ slpp_sources = Split("""
+ pp1.c
+--- a/shadercompiler/shaderexecenv/SConscript
++++ b/shadercompiler/shaderexecenv/SConscript
+@@ -15,7 +15,7 @@
+ shaderexecenv_headers = Split("""
+ shaderexecenv.h""")
+
+-shaderexecenvenv = env.Copy()
++shaderexecenvenv = env.Clone()
+ shaderexecenvenv.AppendUnique(CPPDEFINES=['SHADERCONTEXT_EXPORTS'])
+
+ # Set any platform specific options for this target
+--- a/shadercompiler/codegenvm/SConscript
++++ b/shadercompiler/codegenvm/SConscript
+@@ -9,7 +9,7 @@
+ vmdatagather.h
+ vmoutput.h""")
+
+-codegenvmenv = env.Copy()
++codegenvmenv = env.Clone()
+
+ # Set any platform specific options for this target
+ codegenvmenv.UseTargetOptions('codegenvm')
+--- a/renderer/aqsis/SConscript
++++ b/renderer/aqsis/SConscript
+@@ -2,7 +2,7 @@
+ aqsis_sources = Split("""
+ aqsis.cpp""")
+
+-aqsisenv = env.Copy();
++aqsisenv = env.Clone();
+
+ aqsisenv.AppendUnique(LIBS = ['argparse', 'aqsistypes', 'aqsis', 'shadervm'])
+ aqsisenv.AppendUnique(CPPPATH=['$zlib_include_path'])
+--- a/renderer/render/SConscript
++++ b/renderer/render/SConscript
+@@ -79,7 +79,7 @@
+ shadeop.h
+ ''')
+
+-aqsisenv = env.Copy()
++aqsisenv = env.Clone()
+ aqsisenv.AppendUnique(CPPDEFINES=['RI_EXPORTS', 'RIB_EXPORTS'])
+ aqsisenv.AppendUnique(CPPPATH=['$tiff_include_path', '$zlib_include_path'])
+
+--- a/renderer/raytrace/SConscript
++++ b/renderer/raytrace/SConscript
+@@ -5,7 +5,7 @@
+ raytrace_headers = Split("""
+ raytrace.h""")
+
+-raytraceenv = env.Copy()
++raytraceenv = env.Clone()
+
+ # Set any platform specific options for this target
+ raytraceenv.UseTargetOptions('raytrace')
+--- a/rib/rib2/SConscript
++++ b/rib/rib2/SConscript
+@@ -14,7 +14,7 @@
+ bdec.h
+ libribtypes.h""")
+
+-rib2env = env.Copy()
++rib2env = env.Clone()
+
+ rib2env.CXXFile(target='parser.cpp', source='parser.yy')
+ rib2env.CXXFile(target='scanner.cpp', source='scanner.ll')
+--- a/rib/miqser/SConscript
++++ b/rib/miqser/SConscript
+@@ -2,7 +2,7 @@
+ miqser_sources = Split("""
+ miqser.cpp""")
+
+-miqserenv = env.Copy();
++miqserenv = env.Clone();
+ miqserenv.AppendUnique(CPPDEFINES = ['RIB_EXPORTS'])
+ miqserenv.AppendUnique(CPPPATH=['$zlib_include_path'])
+
+--- a/rib/rib2ri/SConscript
++++ b/rib/rib2ri/SConscript
+@@ -9,7 +9,7 @@
+ rib2ri_install_headers = Split("""
+ librib2ri.h""")
+
+-rib2rienv = env.Copy()
++rib2rienv = env.Clone()
+ rib2rienv.AppendUnique(CPPDEFINES=['RIB_EXPORTS'])
+
+ # Set any platform specific options for this target
+--- a/rib/rib2stream/SConscript
++++ b/rib/rib2stream/SConscript
+@@ -9,7 +9,7 @@
+ rib2stream_install_headers = Split("""
+ librib2stream.h""")
+
+-rib2streamenv = env.Copy()
++rib2streamenv = env.Clone()
+
+ # Set any platform specific options for this target
+ rib2streamenv.UseTargetOptions('rib2stream')
+--- a/rib/ri2rib/SConscript
++++ b/rib/ri2rib/SConscript
+@@ -25,7 +25,7 @@
+ outstream.h
+ plstore.h""")
+
+-ri2ribenv = env.Copy()
++ri2ribenv = env.Clone()
+ ri2ribenv.AppendUnique(CPPDEFINES = ['RI_EXPORTS'])
+ ri2ribenv.AppendUnique(CPPPATH=['$zlib_include_path'])
+
+--- a/thirdparty/pdiff/SConscript
++++ b/thirdparty/pdiff/SConscript
+@@ -15,7 +15,7 @@
+ """)
+
+ if env['with_pdiff']:
+- pdiffenv = env.Copy()
++ pdiffenv = env.Clone()
+
+ pdiffenv.AppendUnique(LIBS = ['$tiff_lib', '$z_lib'])
+ pdiffenv.AppendUnique(CPPPATH=['$tiff_include_path',
'$zlib_include_path'])
+--- a/thirdparty/dbo_plane/SConscript
++++ b/thirdparty/dbo_plane/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-dbo_planeenv = env.Copy()
++dbo_planeenv = env.Clone()
+ dbo_plane_headers=Split("""
+ implicit.h""")
+ dbo_plane_sources=Split("""
+--- a/displays/d_exr/SConscript
++++ b/displays/d_exr/SConscript
+@@ -8,7 +8,7 @@
+ dspyhlpr.h""")
+
+ if not env['no_exr']:
+- d_exrenv = env.Copy()
++ d_exrenv = env.Clone()
+ d_exrenv.AppendUnique(CPPPATH=['#/renderer/ddmanager'])
+ d_exrenv.AppendUnique(CPPPATH=['$exr_include_path'])
+ d_exrenv.AppendUnique(CPPDEFINES=['D_EXR_EXPORTS'])
+--- a/displays/display/SConscript
++++ b/displays/display/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-displayenv = env.Copy()
++displayenv = env.Clone()
+ displayenv.AppendUnique(CPPPATH=['#/renderer/ddmanager'])
+ displayenv.AppendUnique(CPPDEFINES=['DISPLAY_EXPORTS'])
+
+--- a/displays/d_sdcWin32/SConscript
++++ b/displays/d_sdcWin32/SConscript
+@@ -11,7 +11,7 @@
+ import sys
+ if sys.platform == 'win32':
+
+- d_win32env = env.Copy()
++ d_win32env = env.Clone()
+ d_win32env.AppendUnique(CPPPATH=['#/renderer/ddmanager'])
+ d_win32env.AppendUnique(CPPDEFINES=['d_win32_EXPORTS'])
+ d_win32env.AppendUnique(LIBS = ['kernel32', 'user32', 'gdi32',
'winspool'])
+--- a/displays/d_xpm/SConscript
++++ b/displays/d_xpm/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-d_xpmenv = env.Copy()
++d_xpmenv = env.Clone()
+ d_xpmenv.AppendUnique(CPPPATH=['#/renderer/ddmanager'])
+ d_xpmenv.AppendUnique(CPPDEFINES=['d_xpm_EXPORTS'])
+
+--- a/displays/d_sdcBMP/SConscript
++++ b/displays/d_sdcBMP/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-d_bmpenv = env.Copy()
++d_bmpenv = env.Clone()
+ d_bmpenv.AppendUnique(CPPPATH=['#/renderer/ddmanager'])
+ d_bmpenv.AppendUnique(CPPDEFINES=['d_bmp_EXPORTS'])
+
+--- a/texturing/plugins/pcx2tif/SConscript
++++ b/texturing/plugins/pcx2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-pcx2tifenv = env.Copy()
++pcx2tifenv = env.Clone()
+ pcx2tif_sources=Split("""
+ pcx2tif.c""")
+
+--- a/texturing/plugins/ppm2tif/SConscript
++++ b/texturing/plugins/ppm2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-ppm2tifenv = env.Copy()
++ppm2tifenv = env.Clone()
+ ppm2tif_sources=Split("""
+ ppm2tif.c""")
+
+--- a/texturing/plugins/tga2tif/SConscript
++++ b/texturing/plugins/tga2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-tga2tifenv = env.Copy()
++tga2tifenv = env.Clone()
+ tga2tif_sources=Split("""
+ tga2tif.c""")
+
+--- a/texturing/plugins/png2tif/SConscript
++++ b/texturing/plugins/png2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-png2tifenv = env.Copy()
++png2tifenv = env.Clone()
+ png2tif_sources=Split("""
+ png2tif.c""")
+
+--- a/texturing/plugins/jpg2tif/SConscript
++++ b/texturing/plugins/jpg2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-jpg2tifenv = env.Copy()
++jpg2tifenv = env.Clone()
+ jpg2tif_sources=Split("""
+ jpg2tif.c""")
+
+--- a/texturing/plugins/bake2tif/SConscript
++++ b/texturing/plugins/bake2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-bake2tifenv = env.Copy()
++bake2tifenv = env.Clone()
+ bake2tif_sources=Split("""
+ bake2tif.c""")
+
+--- a/texturing/plugins/bmp2tif/SConscript
++++ b/texturing/plugins/bmp2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-bmp2tifenv = env.Copy()
++bmp2tifenv = env.Clone()
+ bmp2tif_sources=Split("""
+ bmp2tif.c""")
+
+--- a/texturing/plugins/gif2tif/SConscript
++++ b/texturing/plugins/gif2tif/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-gif2tifenv = env.Copy()
++gif2tifenv = env.Clone()
+ gif2tif_sources=Split("""
+ gif2tif.c""")
+
+--- a/texturing/plugins/common/SConscript
++++ b/texturing/plugins/common/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-commonenv = env.Copy()
++commonenv = env.Clone()
+
+ common_sources = Split("""
+ pixelsave.c""")
+--- a/texturing/plugins/exr2tif/SConscript
++++ b/texturing/plugins/exr2tif/SConscript
+@@ -4,7 +4,7 @@
+ exr2tif.cpp""")
+
+ if not env['no_exr']:
+- exr2tifenv = env.Copy()
++ exr2tifenv = env.Clone()
+ exr2tifenv.AppendUnique(CPPPATH=['$exr_include_path'])
+
+ Import('common_objs')
+--- a/texturing/teqser/SConscript
++++ b/texturing/teqser/SConscript
+@@ -1,5 +1,5 @@
+ Import('env')
+-teqserenv = env.Copy()
++teqserenv = env.Clone()
+ teqser_sources = Split("""
+ teqser.cpp""")
+
+--- a/rib/api/SConscript
++++ b/rib/api/SConscript
+@@ -10,7 +10,7 @@
+ ri.inl
+ ''')
+
+-apienv = env.Copy()
++apienv = env.Clone()
+
+ apienv.UseTargetOptions('api')
+
+--- a/aqsistypes/SConscript
++++ b/aqsistypes/SConscript
+@@ -73,7 +73,7 @@
+ Import('platform_sources')
+ aqsistypes_sources = aqsistypes_sources + platform_sources
+
+-aqsistypesenv = env.Copy()
++aqsistypesenv = env.Clone()
+ aqsistypesenv.AppendUnique(CPPDEFINES=['COMMON_EXPORTS'])
+
+ # Set any platform specific options for this target
+--- a/argparse/SConscript
++++ b/argparse/SConscript
+@@ -9,7 +9,7 @@
+ argparse_install_headers = Split("""
+ argparse.h""")
+
+-argparseenv = env.Copy()
++argparseenv = env.Clone()
+
+ # Set any platform specific options for this target
+ argparseenv.UseTargetOptions('argparse')
+--- a/renderer/ddmanager/SConscript
++++ b/renderer/ddmanager/SConscript
+@@ -8,7 +8,7 @@
+ debugdd.h
+ ndspy.h""")
+
+-ddmanagerenv = env.Copy()
++ddmanagerenv = env.Clone()
+
+ # Set any platform specific options for this target
+ ddmanagerenv.UseTargetOptions('ddmanager')
+--- a/NSIS.py
++++ b/NSIS.py
+@@ -147,7 +147,10 @@
+ return str(item)
+
+ def runNSIS(source,target,env,for_signature):
+- ret = env['NSIS']+" "
++ if env['NSIS']:
++ ret = env['NSIS']+" "
++ else:
++ ret = " "
+ if env.has_key('NSISFLAGS'):
+ for flag in env['NSISFLAGS']:
+ ret += flag
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
