From aa409e6777b784336d73c96b7353e900234617f4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 22 2018 16:05:12 +0000 Subject: backport upstream FTBFS fix (#1604768) --- diff --git a/0175-Upstreaming-compilation-patch-needed-for-Gentoo.patch b/0175-Upstreaming-compilation-patch-needed-for-Gentoo.patch new file mode 100644 index 0000000..7ed3f15 --- /dev/null +++ b/0175-Upstreaming-compilation-patch-needed-for-Gentoo.patch @@ -0,0 +1,30 @@ +From 5394481071824b39b521d67e2acd7d509e68d0f8 Mon Sep 17 00:00:00 2001 +From: Pavel Sanda +Date: Mon, 2 Apr 2018 15:39:56 +0200 +Subject: [PATCH 175/271] Upstreaming compilation patch needed for Gentoo. + +--- + src/frontends/qt4/GuiDocument.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp +index 09203781f0..74c4807878 100644 +--- a/src/frontends/qt4/GuiDocument.cpp ++++ b/src/frontends/qt4/GuiDocument.cpp +@@ -68,11 +68,12 @@ + #include "frontends/alert.h" + + #include +-#include ++#include + #include + #include + #include + #include ++#include + #include + #include + #include +-- +2.17.1 + diff --git a/lyx.spec b/lyx.spec index 68848f9..9eab08c 100644 --- a/lyx.spec +++ b/lyx.spec @@ -14,7 +14,7 @@ BuildRequires: fontpackages-devel Name: lyx Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPLv2+ Url: http://www.lyx.org/ @@ -25,6 +25,9 @@ Source1: lyxrc.dist # font metainfo file Source20: %{fontname}.metainfo.xml +## upstream patches +Patch175: 0175-Upstreaming-compilation-patch-needed-for-Gentoo.patch + ## upstreamable patches # submitted, but upstream rejected it. we currently agree to disagree. Patch50: lyx-2.3.0-xdg_open.patch @@ -163,6 +166,9 @@ A collection of Math symbol fonts for %{name}. %prep %setup -q + +%patch175 -p1 -b .0175 + %patch50 -p1 -b .xdg_open %if 0%{?autotools} @@ -277,6 +283,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %Changelog +* Sun Jul 22 2018 Rex Dieter - 2.3.0-4 +- backport upstream FTBFS fix (#1604768) + * Fri Jul 13 2018 Fedora Release Engineering - 2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild