summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0100-parallel_build.patch38
-rw-r--r--debian/patches/0105-java_ignore_nonexistent_files.patch21
-rw-r--r--debian/patches/0110-remove_stale_files.patch31
-rw-r--r--debian/patches/0115-secure_script_scons.patch21
-rw-r--r--debian/patches/0120-fix-bibtex-call.patch40
-rw-r--r--debian/patches/0600-manpage-spelling.patch19
-rw-r--r--debian/patches/series6
7 files changed, 176 insertions, 0 deletions
diff --git a/debian/patches/0100-parallel_build.patch b/debian/patches/0100-parallel_build.patch
new file mode 100644
index 0000000..3af9a90
--- /dev/null
+++ b/debian/patches/0100-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/0105-java_ignore_nonexistent_files.patch b/debian/patches/0105-java_ignore_nonexistent_files.patch
new file mode 100644
index 0000000..6cf704e
--- /dev/null
+++ b/debian/patches/0105-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/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch
new file mode 100644
index 0000000..2c1273c
--- /dev/null
+++ b/debian/patches/0110-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
+@@ -1105,6 +1105,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/0115-secure_script_scons.patch b/debian/patches/0115-secure_script_scons.patch
new file mode 100644
index 0000000..7463f32
--- /dev/null
+++ b/debian/patches/0115-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/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch
new file mode 100644
index 0000000..ea82ca5
--- /dev/null
+++ b/debian/patches/0120-fix-bibtex-call.patch
@@ -0,0 +1,40 @@
+Description: Create Bibtex bibliography always
+Author: Alvaro G. M. <alvaro.gamez@hazent.com>
+Bug: http://scons.tigris.org/issues/show_bug.cgi?id=2967
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749716
+Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2967
+Last-Update: 2016-01-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/engine/SCons/Tool/tex.py
+===================================================================
+--- trunk.orig/engine/SCons/Tool/tex.py
++++ trunk/engine/SCons/Tool/tex.py
+@@ -346,6 +346,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+ if result != 0:
+ check_file_error_message(env['BIBTEX'], 'blg')
+ must_rerun_latex = True
++ if Verbose:
++ print "Need to run bibtex on ",auxfilename
++ bibfile = env.fs.File(SCons.Util.splitext(target_aux)[0])
++ result = BibTeXAction(bibfile, bibfile, env)
++ if result != 0:
++ check_file_error_message(env['BIBTEX'], 'blg')
++ must_rerun_latex = True
+
+ # Now decide if biber will need to be run.
+ # When the backend for biblatex is biber (by choice or default) the
+@@ -369,6 +376,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+ if result != 0:
+ check_file_error_message(env['BIBER'], 'blg')
+ must_rerun_latex = True
++ if Verbose:
++ print "Need to run biber on ",bcffilename
++ bibfile = env.fs.File(SCons.Util.splitext(target_bcf)[0])
++ result = BiberAction(bibfile, bibfile, env)
++ if result != 0:
++ check_file_error_message(env['BIBER'], 'blg')
++ must_rerun_latex = True
+
+ # Now decide if latex will need to be run again due to index.
+ if check_MD5(suffix_nodes['.idx'],'.idx') or (count == 1 and run_makeindex):
diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
new file mode 100644
index 0000000..13936c6
--- /dev/null
+++ b/debian/patches/0600-manpage-spelling.patch
@@ -0,0 +1,19 @@
+Description: Correct manpage spelling errors
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Last-Update: 2015-11-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scons.1
+===================================================================
+--- trunk.orig/scons.1
++++ trunk/scons.1
+@@ -6576,7 +6576,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/series b/debian/patches/series
new file mode 100644
index 0000000..3b82bac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+0600-manpage-spelling.patch
+0115-secure_script_scons.patch
+0105-java_ignore_nonexistent_files.patch
+0110-remove_stale_files.patch
+0100-parallel_build.patch
+0120-fix-bibtex-call.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 22:33:32 +0000