Hello community, here is the log from the commit of package lyx for openSUSE:Factory checked in at 2017-03-03 17:53:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lyx (Old) and /work/SRC/openSUSE:Factory/.lyx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lyx" Fri Mar 3 17:53:36 2017 rev:83 rq:461733 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lyx/lyx.changes 2017-02-20 13:15:47.910523675 +0100 +++ /work/SRC/openSUSE:Factory/.lyx.new/lyx.changes 2017-03-03 17:53:37.452093259 +0100 @@ -1,0 +2,5 @@ +Wed Mar 1 22:22:17 UTC 2017 - corne...@solcon.nl + +- Added Qt58.patch to fix build with Qt 5.8 + +------------------------------------------------------------------- New: ---- Qt58.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lyx.spec ++++++ --- /var/tmp/diff_new_pack.WpxTNE/_old 2017-03-03 17:53:38.391960509 +0100 +++ /var/tmp/diff_new_pack.WpxTNE/_new 2017-03-03 17:53:38.395959943 +0100 @@ -27,6 +27,8 @@ Source1: lyxrc.dist Source2: lyx.keyring Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig +# PATCH-FIX-UPSTREAM: fix for build with Qt 5.8 +Patch0: Qt58.patch #!BuildIgnore: lyx BuildRequires: autoconf BuildRequires: automake @@ -128,6 +130,7 @@ %prep %setup -q +%patch0 %build #./autogen.sh ++++++ Qt58.patch ++++++ Index: src/frontends/qt4/GuiViewSource.cpp =================================================================== --- src/frontends/qt4/GuiViewSource.cpp (revision adb00dbcf803298651609c0afac02bc4cb3db003) +++ src/frontends/qt4/GuiViewSource.cpp (revision 9f2fcf20a51af2b63161a3290cf5fb02474b42b9) @@ -224,12 +224,7 @@ // position-to-row is unavailable // we jump to the first modification - const QChar * oc = old.constData(); - const QChar * nc = qcontent.constData(); + int length = min(old.length(), qcontent.length()); int pos = 0; - while (*oc != '\0' && *nc != '\0' && *oc == *nc) { - ++oc; - ++nc; - ++pos; - } + for (; pos < length && old.at(pos) == qcontent.at(pos); ++pos) {} QTextCursor c = QTextCursor(viewSourceTV->document()); //get some space below the cursor
