Merge branch 'master' into gnome-3.28gnome-3.28

2 files changed, 20 insertions, 39 deletions

diff --git a/print/lyx/files/patch-boost-1.69 b/print/lyx/files/patch-boost-1.69
new file mode 100644
index 000000000000..e79c25cea644
--- /dev/null
+++ b/print/lyx/files/patch-boost-1.69
@@ -0,0 +1,20 @@
+https://www.lyx.org/trac/ticket/11349
+
+--- src/support/FileName.cpp.orig	2018-02-25 00:11:18 UTC
++++ src/support/FileName.cpp
+@@ -67,15 +67,6 @@
+ using namespace std;
+ using namespace lyx::support;
+ 
+-// OK, this is ugly, but it is the only workaround I found to compile
+-// with gcc (any version) on a system which uses a non-GNU toolchain.
+-// The problem is that gcc uses a weak symbol for a particular
+-// instantiation and that the system linker usually does not
+-// understand those weak symbols (seen on HP-UX, tru64, AIX and
+-// others). Thus we force an explicit instanciation of this particular
+-// template (JMarc)
+-template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+-
+ namespace lyx {
+ namespace support {
+ 
diff --git a/print/lyx/files/patch-src_TexRow.cpp b/print/lyx/files/patch-src_TexRow.cpp
deleted file mode 100644
index 74669e97c592..000000000000
--- a/print/lyx/files/patch-src_TexRow.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-Fixes the build on 10.4 with clang 3.4.1.
-
-    TexRow.cpp:271:6: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type
-                                            return text_none;
-                                            ^
-    TexRow.cpp:273:3: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type
-                    return text_none;
-                    ^
-    TexRow.cpp:288:6: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type
-                                            return last_pos;
-                                            ^
-    TexRow.cpp:290:6: error: return type 'struct TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type
-                                            return entry.text;
-                                            ^
-    TexRow.cpp:293:3: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type
-                    return last_pos;
-                    ^
-
-Not upstreamable, this seems to be a workaround for a compiler bug.
---- src/TexRow.cpp.orig	2018-02-25 00:11:18 UTC
-+++ src/TexRow.cpp
-@@ -260,7 +260,7 @@ TexRow::getEntriesFromRow(int const row) const
- 		return {text_none, text_none};
- 
- 	// find the start entry
--	TextEntry const start = [&]() {
-+	TextEntry const start = [&]() -> TextEntry const {
- 		for (size_t j = i; j > 0; --j) {
- 			if (!isNone(rowlist_[j].getTextEntry()))
- 				return rowlist_[j].getTextEntry();
-@@ -274,7 +274,7 @@ TexRow::getEntriesFromRow(int const row) const
- 	} ();
- 
- 	// find the end entry
--	TextEntry end = [&]() {
-+	TextEntry end = [&]() -> TextEntry const {
- 		if (isNone(start))
- 			return text_none;
- 		// select up to the last position of the starting paragraph as a