From 709503d3b2b964ac8ecb5655b0620ff6343e79a4549e8a2f79a38772f5d2b60b Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Mar 2019 13:50:17 +0000 Subject: [PATCH 1/4] - Add fix_boost_168.patch to fix build with boost 1.69. OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=162 --- fix_boost_169.patch | 17 +++++++++++++++++ lyx.changes | 5 +++++ lyx.spec | 7 +++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 fix_boost_169.patch diff --git a/fix_boost_169.patch b/fix_boost_169.patch new file mode 100644 index 0000000..996e85c --- /dev/null +++ b/fix_boost_169.patch @@ -0,0 +1,17 @@ +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>; + diff --git a/lyx.changes b/lyx.changes index fe6264a..3f9d1ef 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 15 13:49:18 UTC 2019 - Cor Blom + +- Add fix_boost_168.patch to fix build with boost 1.69. + ------------------------------------------------------------------- Mon Dec 10 13:15:31 UTC 2018 - Cor Blom diff --git a/lyx.spec b/lyx.spec index b27c54a..de50d10 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ # # spec file for package lyx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -32,6 +32,8 @@ Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz.sig # Upstream also made change to python3 in master. Because 2.3.1 is compatible with both # python2 and 3 we follow and switch to python3 Patch0: correct-shebang.patch +# PATCH-FIX-UPSTREAM: fix build with boost 1.69 +Patch1: fix_boost_169.patch #!BuildIgnore: lyx BuildRequires: autoconf BuildRequires: automake @@ -119,6 +121,7 @@ document under "Help" on the menubar. %prep %setup -q %patch0 -p1 +%patch1 -p0 %build #./autogen.sh From 602b52ffcf12fdb113d1183f3157d07c83520da314f427c1df2f20d6364b251c Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Mar 2019 13:59:53 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=163 --- fix_boost_169.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fix_boost_169.patch b/fix_boost_169.patch index 996e85c..2a2ed97 100644 --- a/fix_boost_169.patch +++ b/fix_boost_169.patch @@ -5,7 +5,7 @@ Index: src/support/FileName.cpp @@ -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 @@ -14,4 +14,6 @@ Index: src/support/FileName.cpp -// 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 { From 75605a4c94879df7c9de4aad8d8fdae5eb7b054a0f27f02c6d385755992eda72 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Mar 2019 14:06:14 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=164 --- fix_boost_169.patch | 38 +++++++++++++++++++------------------- lyx.spec | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) 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 From 24f1893460ffa9c2c7c09ad1c8de61eb97740404c7db1af1abc2439a4a0592f1 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Mar 2019 15:21:03 +0000 Subject: [PATCH 4/4] typo OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=165 --- lyx.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.changes b/lyx.changes index 3f9d1ef..fa3ec8a 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Mar 15 13:49:18 UTC 2019 - Cor Blom -- Add fix_boost_168.patch to fix build with boost 1.69. +- Add fix_boost_169.patch to fix build with boost 1.69. ------------------------------------------------------------------- Mon Dec 10 13:15:31 UTC 2018 - Cor Blom