From fc82273776d462cedc36567349a276c2f7502615e6d5de931200c15b6adfd4a2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 5 Jun 2018 17:26:28 +0000 Subject: [PATCH] Accepting request 614340 from home:wolfi323:branches:Publishing - Added fix-build-with-Qt5.11.patch to fix build with Qt 5.11 OBS-URL: https://build.opensuse.org/request/show/614340 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=144 --- fix-build-with-Qt5.11.patch | 16 ++++++++++++++++ lyx.changes | 5 +++++ lyx.spec | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 fix-build-with-Qt5.11.patch diff --git a/fix-build-with-Qt5.11.patch b/fix-build-with-Qt5.11.patch new file mode 100644 index 0000000..7328022 --- /dev/null +++ b/fix-build-with-Qt5.11.patch @@ -0,0 +1,16 @@ +Index: src/frontends/qt4/GuiDocument.cpp +=================================================================== +--- src/frontends/qt4/GuiDocument.cpp (revision b4d885ac6968df4a705d395069ea2310f10c122b) ++++ src/frontends/qt4/GuiDocument.cpp (revision 1a4404944bf5830164435b0dedb6f6bee9c7371b) +@@ -69,9 +69,10 @@ + + #include +-#include ++#include + #include + #include + #include + #include ++#include + #include + #include diff --git a/lyx.changes b/lyx.changes index bd103dc..6cbb1bd 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 5 12:58:58 UTC 2018 - wbauer@tmo.at + +- Added fix-build-with-Qt5.11.patch to fix build with Qt 5.11 + ------------------------------------------------------------------- Tue Feb 27 09:40:37 UTC 2018 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index 04ec61e..e0dda7a 100644 --- a/lyx.spec +++ b/lyx.spec @@ -27,6 +27,8 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz Source1: lyxrc.dist Source2: lyx.keyring Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz.sig +# PATCH-FIX-UPSTREAM fix-build-with-Qt5.11.patch -- fixes compilation with Qt 5.11 +Patch: fix-build-with-Qt5.11.patch #!BuildIgnore: lyx BuildRequires: autoconf BuildRequires: automake @@ -112,6 +114,7 @@ document under "Help" on the menubar. %prep %setup -q +%patch -p0 %build #./autogen.sh