diff --git a/fix_boost_169.patch b/fix_boost_169.patch index 2a2ed97..15df6f8 100644 --- a/fix_boost_169.patch +++ b/fix_boost_169.patch @@ -1,19 +1,19 @@ -Index: src/support/FileName.cpp -=================================================================== ---- src/support/FileName.cpp (revision 75bfed55079cab6b73fbea6ce4ae3f10d1af3b91) -+++ src/support/FileName.cpp (revision 3a123b90af838b08680471d87170c38e56787df9) -@@ -67,13 +67,4 @@ - 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 -ur a/src/support/FileName.cpp b/src/support/FileName.cpp +--- a/src/support/FileName.cpp 2018-12-09 21:04:52.000000000 +0100 ++++ b/src/support/FileName.cpp 2019-03-15 14:56:04.220000000 +0100 +@@ -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/lyx.spec b/lyx.spec index de50d10..652eb8b 100644 --- a/lyx.spec +++ b/lyx.spec @@ -121,7 +121,7 @@ document under "Help" on the menubar. %prep %setup -q %patch0 -p1 -%patch1 -p0 +%patch1 -p1 %build #./autogen.sh