[gentoo-commits] gentoo-x86 commit in app-office/kformula/files: kformula-1.6.2-gcc-4.3.patch - gentoo-commits

From:	"Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in app-office/kformula/files: kformula-1.6.2-gcc-4.3.patch
Date:	Mon, 09 Jun 2008 05:42:14
Message-Id:	`E1K5a8u-00034M-BC@stork.gentoo.org`

1

dirtyepic    08/06/09 05:42:08

2

3

  Added:                kformula-1.6.2-gcc-4.3.patch

4

  Log:

5

  Add patch to fix build w/ GCC 4.3.

6

  (Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r3 Intel(R) Core(TM)2 Duo CPU T9300 @ 2.50GHz)

7

8

Revision  Changes    Path

9

1.1                  app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch

10

11

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch?rev=1.1&view=markup

12

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch?rev=1.1&content-type=text/plain

13

14

Index: kformula-1.6.2-gcc-4.3.patch

15

===================================================================

16

--- branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:20:51	669185

17

+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:26:19	669186

18

@@ -75,7 +75,7 @@

19

      * Calculates our width and height and

20

      * our children's parentPosition.

21

*/

22

-    virtual void calcSizes( const ContextStyle& style,

23

+    virtual void calcSizes( const ContextStyle& cstyle,

24

 						    ContextStyle::TextStyle tstyle,

25

 						    ContextStyle::IndexStyle istyle,

26

 							StyleAttributes& style );

27

@@ -246,7 +246,7 @@

28

      * Calculates our width and height and

29

      * our children's parentPosition.

30

*/

31

-    virtual void calcSizes( const ContextStyle& style,

32

+    virtual void calcSizes( const ContextStyle& cstyle,

33

 						    ContextStyle::TextStyle tstyle,

34

 						    ContextStyle::IndexStyle istyle,

35

 							StyleAttributes& style );

36

--- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:20:51	669185

37

+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:26:19	669186

38

@@ -67,7 +67,7 @@

39

      * Calculates our width and height and

40

      * our children's parentPosition.

41

*/

42

-    virtual void calcSizes( const ContextStyle& style,

43

+    virtual void calcSizes( const ContextStyle& cstyle,

44

 						    ContextStyle::TextStyle tstyle,

45

 						    ContextStyle::IndexStyle istyle,

46

 							StyleAttributes& style );

47

--- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:20:51	669185

48

+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:26:19	669186

49

@@ -80,7 +80,7 @@

50

      * Calculates our width and height and

51

      * our children's parentPosition.

52

*/

53

-    virtual void calcSizes( const ContextStyle& style,

54

+    virtual void calcSizes( const ContextStyle& cstyle,

55

 						    ContextStyle::TextStyle tstyle,

56

 						    ContextStyle::IndexStyle istyle,

57

 							StyleAttributes& style );

58

--- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:20:51	669185

59

+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:26:19	669186

60

@@ -94,7 +94,7 @@

61

      * Calculates our width and height and

62

      * our children's parentPosition.

63

*/

64

-    virtual void calcSizes( const ContextStyle& style,

65

+    virtual void calcSizes( const ContextStyle& cstyle,

66

 						    ContextStyle::TextStyle tstyle,

67

 						    ContextStyle::IndexStyle istyle,

68

 							StyleAttributes& style );

69

--- branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:20:51	669185

70

+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:26:19	669186

71

@@ -68,7 +68,7 @@

72

      * Calculates our width and height and

73

      * our children's parentPosition.

74

*/

75

-    virtual void calcSizes( const ContextStyle& style,

76

+    virtual void calcSizes( const ContextStyle& cstyle,

77

 						    ContextStyle::TextStyle tstyle,

78

 						    ContextStyle::IndexStyle istyle,

79

 							StyleAttributes& style );

80

@@ -79,7 +79,7 @@

81

      * We can use our parentPosition to get our own origin then.

82

*/

83

     virtual void draw( QPainter& painter, const LuPixelRect& r,

84

-                       const ContextStyle& style,

85

+                       const ContextStyle& cstyle,

86

                        ContextStyle::TextStyle tstyle,

87

                        ContextStyle::IndexStyle istyle,

88

 					   StyleAttributes& style,

89

--- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:20:51	669185

90

+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:26:19	669186

91

@@ -34,7 +34,7 @@

92

      * Calculates our width and height and

93

      * our children's parentPosition.

94

*/

95

-    virtual void calcSizes( const ContextStyle& style,

96

+    virtual void calcSizes( const ContextStyle& cstyle,

97

 						    ContextStyle::TextStyle tstyle,

98

 						    ContextStyle::IndexStyle istyle,

99

 							StyleAttributes& style );

100

--- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:20:51	669185

101

+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:26:19	669186

102

@@ -82,7 +82,7 @@

103

      * Calculates our width and height and

104

      * our children's parentPosition.

105

*/

106

-    virtual void calcSizes( const ContextStyle& style,

107

+    virtual void calcSizes( const ContextStyle& cstyle,

108

 						    ContextStyle::TextStyle tstyle,

109

 						    ContextStyle::IndexStyle istyle,

110

 							StyleAttributes& style );

111

@@ -377,7 +377,7 @@

112

      * Calculates our width and height and

113

      * our children's parentPosition.

114

*/

115

-    virtual void calcSizes( const ContextStyle& style,

116

+    virtual void calcSizes( const ContextStyle& cstyle,

117

 						    ContextStyle::TextStyle tstyle,

118

 						    ContextStyle::IndexStyle istyle,

119

 							StyleAttributes& style );

120

--- branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:20:51	669185

121

+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:26:19	669186

122

@@ -79,7 +79,7 @@

123

      * Calculates our width and height and

124

      * our children's parentPosition.

125

*/

126

-    virtual void calcSizes( const ContextStyle& style,

127

+    virtual void calcSizes( const ContextStyle& cstyle,

128

 						    ContextStyle::TextStyle tstyle,

129

 						    ContextStyle::IndexStyle istyle,

130

 							StyleAttributes& style );

131

--- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:20:51	669185

132

+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:26:19	669186

133

@@ -33,7 +33,7 @@

134

      * Calculates our width and height and

135

      * our children's parentPosition.

136

*/

137

-    virtual void calcSizes( const ContextStyle& style,

138

+    virtual void calcSizes( const ContextStyle& cstyle,

139

 						    ContextStyle::TextStyle tstyle,

140

 						    ContextStyle::IndexStyle istyle,

141

 							StyleAttributes& style );

--

146

gentoo-commits@l.g.o mailing list

1	dirtyepic 08/06/09 05:42:08
2
3	Added: kformula-1.6.2-gcc-4.3.patch
4	Log:
5	Add patch to fix build w/ GCC 4.3.
6	(Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r3 Intel(R) Core(TM)2 Duo CPU T9300 @ 2.50GHz)
7
8	Revision Changes Path
9	1.1 app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch?rev=1.1&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/kformula/files/kformula-1.6.2-gcc-4.3.patch?rev=1.1&content-type=text/plain
13
14	Index: kformula-1.6.2-gcc-4.3.patch
15	===================================================================
16	--- branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:20:51 669185
17	+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h 2007/05/28 18:26:19 669186
18	@@ -75,7 +75,7 @@
19	* Calculates our width and height and
20	* our children's parentPosition.
21	*/
22	- virtual void calcSizes( const ContextStyle& style,
23	+ virtual void calcSizes( const ContextStyle& cstyle,
24	ContextStyle::TextStyle tstyle,
25	ContextStyle::IndexStyle istyle,
26	StyleAttributes& style );
27	@@ -246,7 +246,7 @@
28	* Calculates our width and height and
29	* our children's parentPosition.
30	*/
31	- virtual void calcSizes( const ContextStyle& style,
32	+ virtual void calcSizes( const ContextStyle& cstyle,
33	ContextStyle::TextStyle tstyle,
34	ContextStyle::IndexStyle istyle,
35	StyleAttributes& style );
36	--- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:20:51 669185
37	+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h 2007/05/28 18:26:19 669186
38	@@ -67,7 +67,7 @@
39	* Calculates our width and height and
40	* our children's parentPosition.
41	*/
42	- virtual void calcSizes( const ContextStyle& style,
43	+ virtual void calcSizes( const ContextStyle& cstyle,
44	ContextStyle::TextStyle tstyle,
45	ContextStyle::IndexStyle istyle,
46	StyleAttributes& style );
47	--- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:20:51 669185
48	+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h 2007/05/28 18:26:19 669186
49	@@ -80,7 +80,7 @@
50	* Calculates our width and height and
51	* our children's parentPosition.
52	*/
53	- virtual void calcSizes( const ContextStyle& style,
54	+ virtual void calcSizes( const ContextStyle& cstyle,
55	ContextStyle::TextStyle tstyle,
56	ContextStyle::IndexStyle istyle,
57	StyleAttributes& style );
58	--- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:20:51 669185
59	+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h 2007/05/28 18:26:19 669186
60	@@ -94,7 +94,7 @@
61	* Calculates our width and height and
62	* our children's parentPosition.
63	*/
64	- virtual void calcSizes( const ContextStyle& style,
65	+ virtual void calcSizes( const ContextStyle& cstyle,
66	ContextStyle::TextStyle tstyle,
67	ContextStyle::IndexStyle istyle,
68	StyleAttributes& style );
69	--- branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:20:51 669185
70	+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h 2007/05/28 18:26:19 669186
71	@@ -68,7 +68,7 @@
72	* Calculates our width and height and
73	* our children's parentPosition.
74	*/
75	- virtual void calcSizes( const ContextStyle& style,
76	+ virtual void calcSizes( const ContextStyle& cstyle,
77	ContextStyle::TextStyle tstyle,
78	ContextStyle::IndexStyle istyle,
79	StyleAttributes& style );
80	@@ -79,7 +79,7 @@
81	* We can use our parentPosition to get our own origin then.
82	*/
83	virtual void draw( QPainter& painter, const LuPixelRect& r,
84	- const ContextStyle& style,
85	+ const ContextStyle& cstyle,
86	ContextStyle::TextStyle tstyle,
87	ContextStyle::IndexStyle istyle,
88	StyleAttributes& style,
89	--- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:20:51 669185
90	+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h 2007/05/28 18:26:19 669186
91	@@ -34,7 +34,7 @@
92	* Calculates our width and height and
93	* our children's parentPosition.
94	*/
95	- virtual void calcSizes( const ContextStyle& style,
96	+ virtual void calcSizes( const ContextStyle& cstyle,
97	ContextStyle::TextStyle tstyle,
98	ContextStyle::IndexStyle istyle,
99	StyleAttributes& style );
100	--- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:20:51 669185
101	+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h 2007/05/28 18:26:19 669186
102	@@ -82,7 +82,7 @@
103	* Calculates our width and height and
104	* our children's parentPosition.
105	*/
106	- virtual void calcSizes( const ContextStyle& style,
107	+ virtual void calcSizes( const ContextStyle& cstyle,
108	ContextStyle::TextStyle tstyle,
109	ContextStyle::IndexStyle istyle,
110	StyleAttributes& style );
111	@@ -377,7 +377,7 @@
112	* Calculates our width and height and
113	* our children's parentPosition.
114	*/
115	- virtual void calcSizes( const ContextStyle& style,
116	+ virtual void calcSizes( const ContextStyle& cstyle,
117	ContextStyle::TextStyle tstyle,
118	ContextStyle::IndexStyle istyle,
119	StyleAttributes& style );
120	--- branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:20:51 669185
121	+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h 2007/05/28 18:26:19 669186
122	@@ -79,7 +79,7 @@
123	* Calculates our width and height and
124	* our children's parentPosition.
125	*/
126	- virtual void calcSizes( const ContextStyle& style,
127	+ virtual void calcSizes( const ContextStyle& cstyle,
128	ContextStyle::TextStyle tstyle,
129	ContextStyle::IndexStyle istyle,
130	StyleAttributes& style );
131	--- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:20:51 669185
132	+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h 2007/05/28 18:26:19 669186
133	@@ -33,7 +33,7 @@
134	* Calculates our width and height and
135	* our children's parentPosition.
136	*/
137	- virtual void calcSizes( const ContextStyle& style,
138	+ virtual void calcSizes( const ContextStyle& cstyle,
139	ContextStyle::TextStyle tstyle,
140	ContextStyle::IndexStyle istyle,
141	StyleAttributes& style );
142
143
144
145	--
146	gentoo-commits@l.g.o mailing list

Gentoo Archives: gentoo-commits