diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/java_ignore_nonexistent_files.patch | 21 | ||||
| -rw-r--r-- | debian/patches/manpages.patch | 92 | ||||
| -rw-r--r-- | debian/patches/parallel_build.patch | 38 | ||||
| -rw-r--r-- | debian/patches/remove_stale_files.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
5 files changed, 186 insertions, 0 deletions
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..5ba4713 --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files.patch @@ -0,0 +1,21 @@ +Description: Ignore nonexistent files before trying to use them in Java() +Origin: Debian +Bug-Debian: http://bugs.debian.org/338232 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2207 + +Index: scons/engine/SCons/Tool/JavaCommon.py +=================================================================== +--- scons.orig/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:19:25.394200546 +0100 ++++ scons/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:28:01.158216345 +0100 +@@ -282,7 +282,10 @@ + return self.outer_state + + def parse_java_file(fn, version=default_java_version): +- return parse_java(open(fn, 'r').read(), version) ++ try: ++ return parse_java(open(fn, 'r').read(), version) ++ except IOError: ++ return (None, []) + + def parse_java(contents, version=default_java_version, trace=None): + """Parse a .java file and return a double of package directory, diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch new file mode 100644 index 0000000..a43189a --- /dev/null +++ b/debian/patches/manpages.patch @@ -0,0 +1,92 @@ +Description: Fix spelling errors in the man pages +Author: Luca Falavigna <dktrkranz@debian.org> + +Index: scons/scons-time.1 +=================================================================== +--- scons.orig/scons-time.1 2013-03-11 22:26:44.957856419 +0100 ++++ scons/scons-time.1 2013-03-12 18:40:32.016953762 +0100 +@@ -198,7 +198,7 @@ + .B --number= + option, + and can be used to look at the +-impact of commited changes to the ++impact of committed changes to the + SCons code base on a particular + configuration over time. + .P +@@ -645,7 +645,7 @@ + Specifies the run number to be used in the names of + the log files and profile outputs generated by this run. + .IP +-When used in conjuction with the ++When used in conjunction with the + .BI --aegis= PROJECT + option, + .I NUMBER +@@ -653,7 +653,7 @@ + that will be retrieved automatically from the specified Aegis + .IR PROJECT . + .IP +-When used in conjuction with the ++When used in conjunction with the + .BI --svn= URL + option, + .I NUMBER +Index: scons/scons.1 +=================================================================== +--- scons.orig/scons.1 2013-03-11 22:26:44.957856419 +0100 ++++ scons/scons.1 2013-03-12 18:42:09.364956744 +0100 +@@ -2903,7 +2903,7 @@ + This builder method is only + provided when Microsoft Visual C++ is being used as the compiler. + The PCH builder method is generally used in +-conjuction with the PCH construction variable to force object files to use ++conjunction with the PCH construction variable to force object files to use + the precompiled header: + + .ES +@@ -3081,7 +3081,7 @@ + .I "Example 2." + The \fBPOTUpdate\fP() builder may be used with no target specified, in which + case default target \fBmessages.pot\fP will be used. The +-default target may also be overriden by setting \fB$POTDOMAIN\fP construction ++default target may also be overridden by setting \fB$POTDOMAIN\fP construction + variable or providing it as an override to \fBPOTUpdate\fP() builder: + .ES + # SConstruct script +@@ -3189,7 +3189,7 @@ + (they're \fBIgnore\fPd from \fB'.'\fP node). Instead, + they are added automatically to special \fBAlias\fP + (\fB'po-update'\fP by default). The alias name may be changed +-through the \fB$POUPDATE_ALIAS\fP construction variable. You can easilly ++through the \fB$POUPDATE_ALIAS\fP construction variable. You can easily + update \fBPO\fP files in your project by \fBscons + po-update\fP. + +@@ -3858,7 +3858,7 @@ + \fBLINGUAS\fP file. Note, that the updated + \fBPOT\fP and \fBPO\fP files are usually going to be + committed back to the repository, so they must be updated within the source +-directory (and not in variant directories). Additionaly, the file listing of ++directory (and not in variant directories). Additionally, the file listing of + \fBpo/\fP directory contains \fBLINGUAS\fP file, + so the source tree looks familiar to translators, and they may work with the + project in their usual way. +@@ -5302,7 +5302,7 @@ + will print: + + .ES +-'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES' ++\'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES' + .EE + .IP + While this SConstruct: +@@ -15403,7 +15403,7 @@ + tools, if they are both installed, regardless of the order of the bin + directories in the PATH variable. If you have both MSVC and MinGW + installed and you want to use MinGW instead of MSVC, +-then you must explictly tell SCons to use MinGW by passing ++then you must explicitly tell SCons to use MinGW by passing + + .ES + tools=['mingw'] diff --git a/debian/patches/parallel_build.patch b/debian/patches/parallel_build.patch new file mode 100644 index 0000000..3af9a90 --- /dev/null +++ b/debian/patches/parallel_build.patch @@ -0,0 +1,38 @@ +Description: Disable parallel build on sparc machines +Origin: Debian +Bug-Debian: http://bugs.debian.org/632228 +Forwarded: no + +Index: scons/engine/SCons/Job.py +=================================================================== +--- scons.orig/engine/SCons/Job.py 2011-07-02 13:09:20.281651892 +0200 ++++ scons/engine/SCons/Job.py 2011-07-02 13:12:49.925651735 +0200 +@@ -83,7 +83,7 @@ + """ + + self.job = None +- if num > 1: ++ if num > 1 and not self._check_sparc_machine(): + stack_size = explicit_stack_size + if stack_size is None: + stack_size = default_stack_size +@@ -163,6 +163,19 @@ + except AttributeError: + pass + ++ def _check_sparc_machine(self): ++ """ Check whether machine is sparc""" ++ try: ++ from platform import machine ++ except ImportError: ++ pass ++ else: ++ if 'sparc' in machine(): ++ SCons.Warnings.warn(SCons.Warnings.StackSizeWarning, ++ 'Parallel build disabled on sparc, ' ++ 'see Debian bug #632228') ++ return True ++ + class Serial(object): + """This class is used to execute tasks in series, and is more efficient + than Parallel, but is only appropriate for non-parallel builds. Only diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch new file mode 100644 index 0000000..2c86153 --- /dev/null +++ b/debian/patches/remove_stale_files.patch @@ -0,0 +1,31 @@ +Description: Remove stale files created by SCons when building Debian packages +Origin: Debian +Bug-Debian: http://bugs.debian.org/519948 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=1571 + +Index: b/engine/SCons/Script/Main.py +=================================================================== +--- a/engine/SCons/Script/Main.py 2010-01-23 15:11:19.624932557 +0100 ++++ b/engine/SCons/Script/Main.py 2010-01-23 15:11:35.084931903 +0100 +@@ -1073,6 +1073,21 @@ + if not nodes: + exit_status = 2 + ++ # Remove temporary files left by SCons ++ if options.clean: ++ if os.environ.has_key('DH_INTERNAL_OPTIONS'): ++ import shutil ++ for path in ('.sconsign.dblite', '.sconf_temp'): ++ try: ++ if os.path.isfile(path): ++ print 'Removing autogenerated file %s' % path ++ os.remove(path) ++ if os.path.isdir(path): ++ print 'Removing autogenerated directory %s' % path ++ shutil.rmtree(path) ++ except OSError: ++ pass ++ + def _build_targets(fs, options, targets, target_top): + + global this_build_status diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bb71714 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +java_ignore_nonexistent_files.patch +remove_stale_files.patch +parallel_build.patch +manpages.patch |