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
This commit is contained in:
Stephan Kulow 2011-03-17 09:56:21 +00:00 committed by Git OBS Bridge
parent 668f18abe9
commit 5355d506a9
3 changed files with 31 additions and 0 deletions

23
gcc46.patch Normal file
View File

@ -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 <cstddef>
#include <vector>
--- 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<OurData>::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;
}

View File

@ -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

View File

@ -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}}