From 9ea38b8142cf334784dc0bc94ff87c15f40a7276 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Feb 12 2011 00:08:20 +0000
Subject: - Get gcc46 fixes from svn


---

diff --git a/lyx-2.0.0beta3-gcc46.patch b/lyx-2.0.0beta3-gcc46.patch
deleted file mode 100644
index eb25bf7..0000000
--- a/lyx-2.0.0beta3-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up lyx-2.0.0beta3/src/support/unicode.h.gcc46 lyx-2.0.0beta3/src/support/unicode.h
---- lyx-2.0.0beta3/src/support/unicode.h.gcc46	2010-03-11 00:50:43.000000000 -0600
-+++ lyx-2.0.0beta3/src/support/unicode.h	2011-02-07 07:45:09.693198552 -0600
-@@ -15,6 +15,7 @@
- 
- #include "support/strfwd.h"
- 
-+#include <cstddef>
- #include <vector>
- 
- 
diff --git a/lyx-2.0.0beta4-gcc46.patch b/lyx-2.0.0beta4-gcc46.patch
new file mode 100644
index 0000000..3a84376
--- /dev/null
+++ b/lyx-2.0.0beta4-gcc46.patch
@@ -0,0 +1,25 @@
+diff -up lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp.gcc46 lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp
+--- lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp.gcc46	2010-03-10 23:50:36.000000000 -0700
++++ lyx-2.0.0beta4/src/frontends/qt4/GuiIdListModel.cpp	2011-02-11 17:07:07.255272169 -0700
+@@ -76,9 +76,8 @@ bool GuiIdListModel::insertRows(int row,
+ 	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;
+ }
+diff -up lyx-2.0.0beta4/src/support/unicode.h.gcc46 lyx-2.0.0beta4/src/support/unicode.h
+--- lyx-2.0.0beta4/src/support/unicode.h.gcc46	2010-03-10 23:50:43.000000000 -0700
++++ lyx-2.0.0beta4/src/support/unicode.h	2011-02-11 17:05:44.033986352 -0700
+@@ -15,6 +15,7 @@
+ 
+ #include "support/strfwd.h"
+ 
++#include <cstddef>
+ #include <vector>
+ 
+ 
diff --git a/lyx.spec b/lyx.spec
index 822501c..19d7400 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -15,7 +15,7 @@ BuildRequires: fontpackages-devel
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 2.0.0
-Release: 0.14.%{pre}%{?dist}
+Release: 0.15.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -30,8 +30,8 @@ Source10: lyx.desktop
 ## upstreamable patches
 # submitted, but upstream rejected it.  we currently agree to disagree.
 Patch50: lyx-2.0.0beta3-xdg_open.patch
-# gcc46 fix(es) (stddef includes mostly)
-Patch51: lyx-2.0.0beta3-gcc46.patch
+# gcc46 fix(es) (stddef includes mostly), from svn
+Patch51: lyx-2.0.0beta4-gcc46.patch
 
 %if 0%{?autotools}
 BuildRequires: automake libtool
@@ -270,6 +270,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Fri Feb 11 2011 Orion Poplawski <orion@cora.nwra.com> 2.0.0.-15.beta4
+- Get gcc46 fixes from svn
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-0.14.beta4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild