diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-office/lyx/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-office/lyx/files')
-rw-r--r-- | app-office/lyx/files/1.6.10-gcc.patch | 142 | ||||
-rw-r--r-- | app-office/lyx/files/1.6.7-python.patch | 26 | ||||
-rw-r--r-- | app-office/lyx/files/2.0-python.patch | 26 | ||||
-rw-r--r-- | app-office/lyx/files/2.0.8-python.patch | 29 | ||||
-rw-r--r-- | app-office/lyx/files/2.1-python.patch | 29 |
5 files changed, 252 insertions, 0 deletions
diff --git a/app-office/lyx/files/1.6.10-gcc.patch b/app-office/lyx/files/1.6.10-gcc.patch new file mode 100644 index 000000000000..44e0fc94627b --- /dev/null +++ b/app-office/lyx/files/1.6.10-gcc.patch @@ -0,0 +1,142 @@ +diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp +index 68cf1d2..16a3c94 100644 +--- a/src/insets/InsetInclude.cpp ++++ b/src/insets/InsetInclude.cpp +@@ -806,7 +806,7 @@ support::FileNameList const & + tmp->setParent(&buffer); + return cache; + } +- static support::FileNameList const empty; ++ static support::FileNameList const empty = support::FileNameList(); + return empty; + } + +diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp +index 4a267e9..7a165e2 100644 +--- a/src/insets/InsetTabular.cpp ++++ b/src/insets/InsetTabular.cpp +@@ -188,62 +188,6 @@ TabularFeature tabularFeature[] = + }; + + +-template <class T> +-string const write_attribute(string const & name, T const & t) +-{ +- string const s = tostr(t); +- return s.empty() ? s : " " + name + "=\"" + s + "\""; +-} +- +-template <> +-string const write_attribute(string const & name, string const & t) +-{ +- return t.empty() ? t : " " + name + "=\"" + t + "\""; +-} +- +- +-template <> +-string const write_attribute(string const & name, docstring const & t) +-{ +- return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\""; +-} +- +- +-template <> +-string const write_attribute(string const & name, bool const & b) +-{ +- // we write only true attribute values so we remove a bit of the +- // file format bloat for tabulars. +- return b ? write_attribute(name, convert<string>(b)) : string(); +-} +- +- +-template <> +-string const write_attribute(string const & name, int const & i) +-{ +- // we write only true attribute values so we remove a bit of the +- // file format bloat for tabulars. +- return i ? write_attribute(name, convert<string>(i)) : string(); +-} +- +- +-template <> +-string const write_attribute(string const & name, Tabular::idx_type const & i) +-{ +- // we write only true attribute values so we remove a bit of the +- // file format bloat for tabulars. +- return i ? write_attribute(name, convert<string>(i)) : string(); +-} +- +- +-template <> +-string const write_attribute(string const & name, Length const & value) +-{ +- // we write only the value if we really have one same reson as above. +- return value.zero() ? string() : write_attribute(name, value.asString()); +-} +- +- + string const tostr(LyXAlignment const & num) + { + switch (num) { +@@ -503,6 +447,61 @@ void l_getline(istream & is, string & str) + } + } + ++template <class T> ++string const write_attribute(string const & name, T const & t) ++{ ++ string const s = tostr(t); ++ return s.empty() ? s : " " + name + "=\"" + s + "\""; ++} ++ ++template <> ++string const write_attribute(string const & name, string const & t) ++{ ++ return t.empty() ? t : " " + name + "=\"" + t + "\""; ++} ++ ++ ++template <> ++string const write_attribute(string const & name, docstring const & t) ++{ ++ return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\""; ++} ++ ++ ++template <> ++string const write_attribute(string const & name, bool const & b) ++{ ++ // we write only true attribute values so we remove a bit of the ++ // file format bloat for tabulars. ++ return b ? write_attribute(name, convert<string>(b)) : string(); ++} ++ ++ ++template <> ++string const write_attribute(string const & name, int const & i) ++{ ++ // we write only true attribute values so we remove a bit of the ++ // file format bloat for tabulars. ++ return i ? write_attribute(name, convert<string>(i)) : string(); ++} ++ ++ ++template <> ++string const write_attribute(string const & name, Tabular::idx_type const & i) ++{ ++ // we write only true attribute values so we remove a bit of the ++ // file format bloat for tabulars. ++ return i ? write_attribute(name, convert<string>(i)) : string(); ++} ++ ++ ++template <> ++string const write_attribute(string const & name, Length const & value) ++{ ++ // we write only the value if we really have one same reson as above. ++ return value.zero() ? string() : write_attribute(name, value.asString()); ++} ++ + } // namespace + + diff --git a/app-office/lyx/files/1.6.7-python.patch b/app-office/lyx/files/1.6.7-python.patch new file mode 100644 index 000000000000..3717cc80185e --- /dev/null +++ b/app-office/lyx/files/1.6.7-python.patch @@ -0,0 +1,26 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index 6984d2c..e6f17ff 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -26,7 +26,7 @@ string const python() + { + // Use the -tt switch so that mixed tab/whitespace indentation is + // an error +- static string const command("python -tt"); ++ static string const command("python2 -tt"); + return command; + } + diff --git a/app-office/lyx/files/2.0-python.patch b/app-office/lyx/files/2.0-python.patch new file mode 100644 index 000000000000..e12f66a6970e --- /dev/null +++ b/app-office/lyx/files/2.0-python.patch @@ -0,0 +1,26 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index f36331c..02f5a93 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -57,7 +57,7 @@ static string const python2(string const & binary, bool verbose = false) + string const python() + { + // Check whether the first python in PATH is the right one. +- static string command = python2("python -tt"); ++ static string command = python2("python2 -tt"); + + if (command.empty()) { + // It was not, so check whether we can find it elsewhere in diff --git a/app-office/lyx/files/2.0.8-python.patch b/app-office/lyx/files/2.0.8-python.patch new file mode 100644 index 000000000000..5fb21655a695 --- /dev/null +++ b/app-office/lyx/files/2.0.8-python.patch @@ -0,0 +1,29 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index 8f60c68..2f1cb91 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -63,9 +63,9 @@ int timeout_min() + string const python(bool reset) + { + // Check whether the first python in PATH is the right one. +- static string command = python2("python -tt"); ++ static string command = python2("python2 -tt"); + if (reset) { +- command = python2("python -tt"); ++ command = python2("python2 -tt"); + } + + if (command.empty()) { diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch new file mode 100644 index 000000000000..5fb21655a695 --- /dev/null +++ b/app-office/lyx/files/2.1-python.patch @@ -0,0 +1,29 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index 8f60c68..2f1cb91 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -63,9 +63,9 @@ int timeout_min() + string const python(bool reset) + { + // Check whether the first python in PATH is the right one. +- static string command = python2("python -tt"); ++ static string command = python2("python2 -tt"); + if (reset) { +- command = python2("python -tt"); ++ command = python2("python2 -tt"); + } + + if (command.empty()) { |