summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0020-secure_script_scons.patch21
-rw-r--r--debian/patches/java_ignore_nonexistent_files.patch21
-rw-r--r--debian/patches/manpage-spelling.patch45
-rw-r--r--debian/patches/parallel_build.patch38
-rw-r--r--debian/patches/remove_stale_files.patch31
-rw-r--r--debian/patches/scons-isystem.patch43
-rw-r--r--debian/patches/series6
7 files changed, 205 insertions, 0 deletions
diff --git a/debian/patches/0020-secure_script_scons.patch b/debian/patches/0020-secure_script_scons.patch
new file mode 100644
index 0000000..7463f32
--- /dev/null
+++ b/debian/patches/0020-secure_script_scons.patch
@@ -0,0 +1,21 @@
+Description: Comment out the search for libs in local source dirs
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://pairlist2.pair.net/pipermail/scons-dev/2014-November/002008.html
+Last-Update: 2015-02-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/script/scons
+===================================================================
+--- trunk.orig/script/scons
++++ trunk/script/scons
+@@ -75,8 +75,8 @@ if "SCONS_LIB_DIR" in os.environ:
+
+ # - running from source takes priority (since 2.3.2), excluding SCONS_LIB_DIR settings
+ script_path = os.path.abspath(os.path.dirname(__file__))
+-source_path = os.path.join(script_path, '..', 'engine')
+-libs.append(source_path)
++# source_path = os.path.join(script_path, '..', 'engine')
++# libs.append(source_path)
+
+ local_version = 'scons-local-' + __version__
+ local = 'scons-local'
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch
new file mode 100644
index 0000000..6cf704e
--- /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: trunk/engine/SCons/Tool/JavaCommon.py
+===================================================================
+--- trunk.orig/engine/SCons/Tool/JavaCommon.py
++++ trunk/engine/SCons/Tool/JavaCommon.py
+@@ -283,7 +283,10 @@ if java_parsing:
+ 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/manpage-spelling.patch b/debian/patches/manpage-spelling.patch
new file mode 100644
index 0000000..dc92ae7
--- /dev/null
+++ b/debian/patches/manpage-spelling.patch
@@ -0,0 +1,45 @@
+Description: typo in man-page
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-07-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scons.1
+===================================================================
+--- trunk.orig/scons.1
++++ trunk/scons.1
+@@ -4970,7 +4970,7 @@ env\&.Package( NAME = \*(Aqfoo
+ .PP
+ \fBPCH()\fR, \fBenv\&.PCH()\fR
+ .RS 4
+-Builds a Microsoft Visual C++ precompiled header\&. Calling this builder method returns a list of two targets: the PCH as the first element, and the object file as the second element\&. Normally the object file is ignored\&. 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 the precompiled header:
++Builds a Microsoft Visual C++ precompiled header\&. Calling this builder method returns a list of two targets: the PCH as the first element, and the object file as the second element\&. Normally the object file is ignored\&. This builder method is only provided when Microsoft Visual C++ is being used as the compiler\&. The PCH builder method is generally used in conjunction with the PCH construction variable to force object files to use the precompiled header:
+ .sp
+ .if n \{\
+ .RS 4
+@@ -5307,7 +5307,7 @@ The
+ \fBPOTUpdate\fR
+ builder may be used with no target specified, in which case default target
+ messages\&.pot
+-will be used\&. The default target may also be overriden by setting
++will be used\&. The default target may also be overridden by setting
+ \fB$POTDOMAIN\fR
+ construction variable or providing it as an override to
+ \fBPOTUpdate\fR
+@@ -5522,7 +5522,7 @@ Alias
+ (\*(Aqpo\-update\*(Aq
+ by default)\&. The alias name may be changed through the
+ \fB$POUPDATE_ALIAS\fR
+-construction variable\&. You can easilly update
++construction variable\&. You can easily update
+ PO
+ files in your project by
+ \fBscons po\-update\fR\&.
+@@ -6348,7 +6348,7 @@ file\&. Note, that the updated
+ POT
+ and
+ PO
+-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
++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)\&. Additionally, the file listing of
+ po/
+ directory contains
+ LINGUAS
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..6b59283
--- /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: trunk/engine/SCons/Script/Main.py
+===================================================================
+--- trunk.orig/engine/SCons/Script/Main.py
++++ trunk/engine/SCons/Script/Main.py
+@@ -1102,6 +1102,21 @@ def _main(parser):
+ print 'Found nothing to build'
+ 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/scons-isystem.patch b/debian/patches/scons-isystem.patch
new file mode 100644
index 0000000..d3b6b60
--- /dev/null
+++ b/debian/patches/scons-isystem.patch
@@ -0,0 +1,43 @@
+Description: add -isystem support to scons
+Author: James McCoy <jamessan@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760804
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761565
+Forwarded: https://bitbucket.org/scons/scons/pull-request/184/support-isystem-in-parseflags/diff
+Last-Update: 2014-09-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scons.1
+===================================================================
+--- trunk.orig/scons.1 2014-09-16 07:55:07.618419159 +0200
++++ trunk/scons.1 2014-09-16 07:55:07.550416614 +0200
+@@ -8549,6 +8549,7 @@
+ \-framework FRAMEWORKS
+ \-frameworkdir= FRAMEWORKPATH
+ \-include CCFLAGS
++\-isystem CPPFLAGS
+ \-isysroot CCFLAGS, LINKFLAGS
+ \-I CPPPATH
+ \-l LIBS
+Index: trunk/engine/SCons/Environment.py
+===================================================================
+--- trunk.orig/engine/SCons/Environment.py 2014-09-15 20:30:32.000000000 +0200
++++ trunk/engine/SCons/Environment.py 2014-09-16 07:57:55.260656356 +0200
+@@ -719,6 +719,9 @@
+ t = ('-isysroot', arg)
+ dict['CCFLAGS'].append(t)
+ dict['LINKFLAGS'].append(t)
++ elif append_next_arg_to == '-isystem':
++ t = ('-isystem', arg)
++ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-arch':
+ t = ('-arch', arg)
+ dict['CCFLAGS'].append(t)
+@@ -791,7 +794,7 @@
+ elif arg[0] == '+':
+ dict['CCFLAGS'].append(arg)
+ dict['LINKFLAGS'].append(arg)
+- elif arg in ['-include', '-isysroot', '-arch']:
++ elif arg in ['-include', '-isysroot', '-isystem', '-arch']:
+ append_next_arg_to = arg
+ else:
+ dict['CCFLAGS'].append(arg)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..815c651
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+0020-secure_script_scons.patch
+#manpage-spelling.patch
+java_ignore_nonexistent_files.patch
+remove_stale_files.patch
+parallel_build.patch
+#scons-isystem.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 16:16:01 +0000