Hello community, here is the log from the commit of package lyx for openSUSE:Factory checked in at 2019-03-18 10:40:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lyx (Old) and /work/SRC/openSUSE:Factory/.lyx.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lyx" Mon Mar 18 10:40:45 2019 rev:91 rq:685416 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lyx/lyx.changes 2018-12-12 17:31:39.894635640 +0100 +++ /work/SRC/openSUSE:Factory/.lyx.new.28833/lyx.changes 2019-03-18 10:40:51.943309156 +0100 @@ -1,0 +2,5 @@ +Fri Mar 15 13:49:18 UTC 2019 - Cor Blom <[email protected]> + +- Add fix_boost_169.patch to fix build with boost 1.69. + +------------------------------------------------------------------- New: ---- fix_boost_169.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lyx.spec ++++++ --- /var/tmp/diff_new_pack.WT5F2Y/_old 2019-03-18 10:40:52.871308022 +0100 +++ /var/tmp/diff_new_pack.WT5F2Y/_new 2019-03-18 10:40:52.871308022 +0100 @@ -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 @@ # 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 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build #./autogen.sh ++++++ fix_boost_169.patch ++++++ 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 {
