From 5355d506a975a84a0c94f0fa6649dcfda9dea857f2a4b418b26c27d8dd4a804f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 17 Mar 2011 09:56:21 +0000 Subject: [PATCH] Accepting request 64377 from home:namtrac:branches:Publishing OBS-URL: https://build.opensuse.org/request/show/64377 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=16 --- gcc46.patch | 23 +++++++++++++++++++++++ lyx.changes | 5 +++++ lyx.spec | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 gcc46.patch diff --git a/gcc46.patch b/gcc46.patch new file mode 100644 index 0000000..43cf9e4 --- /dev/null +++ b/gcc46.patch @@ -0,0 +1,23 @@ +--- src/support/unicode.h 2009-05-19 17:28:27.000000000 +0200 ++++ src/support/unicode.h 2011-03-17 09:27:51.026012759 +0100 +@@ -15,6 +15,7 @@ + + #include "support/strfwd.h" + ++#include + #include + + +--- src/frontends/qt4/GuiIdListModel.cpp 2008-04-30 10:26:40.000000000 +0200 ++++ src/frontends/qt4/GuiIdListModel.cpp 2011-03-17 10:13:45.170012886 +0100 +@@ -76,9 +76,8 @@ + if (!rowIsValid(row)) + return false; + vector::iterator it = userData_.begin() + row; +- OurData const v; + beginInsertRows(QModelIndex(), row, row + count - 1); +- userData_.insert(it, count, v); ++ userData_.insert(it, count, OurData()); + endInsertRows(); + return true; + } diff --git a/lyx.changes b/lyx.changes index 29fb7b5..bf0e9bd 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 17 08:29:29 UTC 2011 - ismail@namtrac.org + +- Add missing include to fix compilation with gcc 4.6 + ------------------------------------------------------------------- Sun Feb 6 23:18:15 UTC 2011 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index 3461679..a672a01 100644 --- a/lyx.spec +++ b/lyx.spec @@ -38,6 +38,8 @@ Url: http://www.lyx.org/ Source: lyx-%{rversion}.tar.bz2 Source1: lyx.desktop Source2: lyx.png +# PATCH-FIX-UPSTREAM gcc46.patch -- Add missing include to fix compilation with gcc 4.6 +Patch: gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: xindy @@ -51,6 +53,7 @@ each paragraph. Of course, low level formatting is still possible. %prep %setup -q -n %{name}-%{rversion} +%patch %build #%{?suse_update_config:%{suse_update_config -f config}}