Accepting request 68148 from Publishing

Accepted submit request 68148 from user coolo

OBS-URL: https://build.opensuse.org/request/show/68148
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=34

gcc46.patch

@@ -1,5 +1,7 @@
---- src/support/unicode.h	2009-05-19 17:28:27.000000000 +0200
+Index: src/support/unicode.h
-+++ src/support/unicode.h	2011-03-17 09:27:51.026012759 +0100
+===================================================================
+--- src/support/unicode.h.orig	2009-05-19 17:28:27.000000000 +0200
++++ src/support/unicode.h	2011-04-22 09:17:28.163344641 +0200
 @@ -15,6 +15,7 @@
  
  #include "support/strfwd.h"
@@ -8,9 +10,11 @@
  #include <vector>
  
  
---- src/frontends/qt4/GuiIdListModel.cpp	2008-04-30 10:26:40.000000000 +0200
+Index: src/frontends/qt4/GuiIdListModel.cpp
-+++ src/frontends/qt4/GuiIdListModel.cpp	2011-03-17 10:13:45.170012886 +0100
+===================================================================
-@@ -76,9 +76,8 @@
+--- src/frontends/qt4/GuiIdListModel.cpp.orig	2008-04-30 10:26:40.000000000 +0200
++++ src/frontends/qt4/GuiIdListModel.cpp	2011-04-22 09:17:28.169344377 +0200
+@@ -76,9 +76,8 @@ bool GuiIdListModel::insertRows(int row,
  	if (!rowIsValid(row))
  		return false;
  	vector<OurData>::iterator it = userData_.begin() + row;
@@ -21,3 +25,53 @@
  	endInsertRows();
  	return true;
  }
+Index: src/support/weighted_btree.h
+===================================================================
+--- src/support/weighted_btree.h.orig	2008-02-28 18:52:15.000000000 +0100
++++ src/support/weighted_btree.h	2011-04-22 09:17:59.369974111 +0200
+@@ -33,6 +33,7 @@
+ #include <istream>
+ #include <ostream>
+ #include <assert.h>
++#include <cstddef>
+ 
+ // *** Debugging Macros
+ 
+Index: src/mathed/MathData.h
+===================================================================
+--- src/mathed/MathData.h.orig	2010-01-20 03:10:29.000000000 +0100
++++ src/mathed/MathData.h	2011-04-22 09:35:57.325632825 +0200
+@@ -21,6 +21,7 @@
+ #include "support/strfwd.h"
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ 
+ namespace lyx {
+Index: src/insets/InsetCommandParams.cpp
+===================================================================
+--- src/insets/InsetCommandParams.cpp.orig	2010-03-02 16:19:12.000000000 +0100
++++ src/insets/InsetCommandParams.cpp	2011-04-22 09:49:24.304168428 +0200
+@@ -77,7 +77,7 @@ static ParamInfo const & findInfo(InsetC
+ 	default:
+ 		LASSERT(false, /**/);
+ 	}
+-	static const ParamInfo pi;
++	static ParamInfo pi;
+ 	return pi; // to silence the warning
+ }
+ 
+Index: src/insets/InsetInclude.cpp
+===================================================================
+--- src/insets/InsetInclude.cpp.orig	2010-12-21 18:28:07.000000000 +0100
++++ src/insets/InsetInclude.cpp	2011-04-22 10:03:53.606962805 +0200
+@@ -790,7 +790,7 @@ support::FileNameList const &
+ 		tmp->setParent(&buffer);
+ 		return cache;
+ 	}
+-	static support::FileNameList const empty;
++	static support::FileNameList empty;
+ 	return empty;
+ }
+ 

lyx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 22 08:25:39 UTC 2011 - coolo@opensuse.org
+
+- more gcc 4.6 issues
+
 -------------------------------------------------------------------
 Thu Mar 17 08:29:29 UTC 2011 - ismail@namtrac.org