summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2016-05-27 14:56:01 +0800
committerYixun Lan <dlan@gentoo.org>2016-05-27 15:16:34 +0800
commit627f44c711c355268512ec8a0b93c242b23467c1 (patch)
tree89d2b9b24de1d7923dedc49b7b5ed61bf0b74776 /app-office/lyx/files
parenta pp-office/lyx: version bump 2.2.0 (diff)
downloadgentoo-627f44c711c355268512ec8a0b93c242b23467c1.tar.gz
gentoo-627f44c711c355268512ec8a0b93c242b23467c1.tar.bz2
gentoo-627f44c711c355268512ec8a0b93c242b23467c1.zip
app-office/lyx: drop old versions
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-office/lyx/files')
-rw-r--r--app-office/lyx/files/1.6.10-gcc.patch142
-rw-r--r--app-office/lyx/files/1.6.7-python.patch26
-rw-r--r--app-office/lyx/files/2.0-python.patch26
3 files changed, 0 insertions, 194 deletions
diff --git a/app-office/lyx/files/1.6.10-gcc.patch b/app-office/lyx/files/1.6.10-gcc.patch
deleted file mode 100644
index 44e0fc94627b..000000000000
--- a/app-office/lyx/files/1.6.10-gcc.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-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
deleted file mode 100644
index 3717cc80185e..000000000000
--- a/app-office/lyx/files/1.6.7-python.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index e12f66a6970e..000000000000
--- a/app-office/lyx/files/2.0-python.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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