]> git.pld-linux.org Git - packages/libreoffice.git/blame - openoffice-remove-gpc.patch
projects / packages / libreoffice.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- taken from RH
[packages/libreoffice.git] / openoffice-remove-gpc.patch
CommitLineData
ac0ea3af
PG		 1diff -Naur OOO_STABLE_1.orig/config_office/configure.in OOO_STABLE_1/config_office/configure.in
2--- OOO_STABLE_1.orig/config_office/configure.in Wed Apr 24 20:54:58 2002
3+++ OOO_STABLE_1/config_office/configure.in Wed Apr 24 20:55:18 2002
4@@ -1073,23 +1073,23 @@
5 dnl Test for the presence of the required gpc.{c,h} files
6 dnl ===================================================================
7
8-AC_MSG_CHECKING([GPC files])
9-if test -f ../external/gpc/gpc.h; then
10- HAVE_GPC_H="yes"
11-else
12- HAVE_GPC_H="no"
13-fi
14-if test -f ../external/gpc/gpc.c; then
15- HAVE_GPC_C="yes"
16-else
17- HAVE_GPC_C="no"
18-fi
19+dnl AC_MSG_CHECKING([GPC files])
20+dnl if test -f ../external/gpc/gpc.h; then
21+dnl HAVE_GPC_H="yes"
22+dnl else
23+dnl HAVE_GPC_H="no"
24+dnl fi
25+dnl if test -f ../external/gpc/gpc.c; then
26+dnl HAVE_GPC_C="yes"
27+dnl else
28+dnl HAVE_GPC_C="no"
29+dnl fi
30
31-if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
32- AC_MSG_RESULT([GPC files found])
33-else
34- AC_MSG_ERROR([GPC files not found])
35-fi
36+dnl if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
37+dnl AC_MSG_RESULT([GPC files found])
38+dnl else
39+dnl AC_MSG_ERROR([GPC files not found])
40+dnl fi
41
42 dnl ===================================================================
43 dnl Setting up the environment.
44diff -Naur OOO_STABLE_1.orig/external/prj/build.lst OOO_STABLE_1/external/prj/build.lst
45--- OOO_STABLE_1.orig/external/prj/build.lst Fri Jan 11 19:47:18 2002
46+++ OOO_STABLE_1/external/prj/build.lst Wed Apr 24 20:50:33 2002
47@@ -8,8 +8,6 @@
48 es external\expat\rtufiles\xmltok nmake - all ex_expatxmltok NULL
49 es external\glibc nmake - all es_glibc NULL
50 es external\glibc\rtufiles nmake - all es_glibcrtu es_glibc NULL
51-es external\gpc nmake - u es_gpc NULL
52-es external\gpc nmake - w es_gpc NULL
53 es external\jpeg nmake - all es_jpeg NULL
54 es external\jpeg\rtufiles nmake - all es_jpegrtu es_jpeg NULL
55 es external\npsdk nmake - all es_npsdk NULL
56diff -Naur OOO_STABLE_1.orig/external/prj/d.lst OOO_STABLE_1/external/prj/d.lst
57--- OOO_STABLE_1.orig/external/prj/d.lst Tue Jun 26 15:07:02 2001
58+++ OOO_STABLE_1/external/prj/d.lst Wed Apr 24 20:55:24 2002
59@@ -7,7 +7,6 @@
60 mkdir: %_DEST%\inc%_EXT%\external\freetype\config
61 mkdir: %_DEST%\inc%_EXT%\external\freetype\internal
62 mkdir: %_DEST%\inc%_EXT%\external\glibc
63-mkdir: %_DEST%\inc%_EXT%\external\gpc
64 mkdir: %_DEST%\inc%_EXT%\external\jpeg
65 mkdir: %_DEST%\inc%_EXT%\external\npsdk
66 mkdir: %_DEST%\inc%_EXT%\external\odbc
67diff -Naur OOO_STABLE_1.orig/gpc.diff OOO_STABLE_1/gpc.diff
68diff -Naur OOO_STABLE_1.orig/solenv/inc/libs.mk OOO_STABLE_1/solenv/inc/libs.mk
69--- OOO_STABLE_1.orig/solenv/inc/libs.mk Fri Oct 26 17:14:41 2001
70+++ OOO_STABLE_1/solenv/inc/libs.mk Wed Apr 24 20:50:33 2002
71@@ -70,7 +70,7 @@
72 #externe libs in plattform.mk
73 #
74
75-GPC3RDLIB=-lgpc
76+GPC3RDLIB=-lgpcl
77 SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
78 XMLSCRIPTLIB =-lxcr$(UPD)$(DLLPOSTFIX)
79 COMPHELPERLIB=-lcomphelp2
80diff -Naur OOO_STABLE_1.orig/vcl/source/gdi/poly2.cxx OOO_STABLE_1/vcl/source/gdi/poly2.cxx
81--- OOO_STABLE_1.orig/vcl/source/gdi/poly2.cxx Thu Mar 22 16:20:15 2001
82+++ OOO_STABLE_1/vcl/source/gdi/poly2.cxx Wed Apr 24 20:55:25 2002
83@@ -61,12 +61,12 @@
84
85 #define _SV_POLY2_CXX
86
87-#ifndef __gpc_h
88-extern "C"
89-{
90- #include <external/gpc/gpc.h>
91-}
92-#endif
93+// #ifndef __gpc_h
94+// extern "C"
95+// {
96+// #include <external/gpc/gpc.h>
97+// }
98+// #endif
99
100 #ifdef W31
101 #include <tools/svwin.h>
102@@ -406,107 +406,108 @@
103
104 void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
105 {
106- ImplDoOperation( rPolyPoly, rResult, GPC_INT );
107+ ImplDoOperation( rPolyPoly, rResult, /* GPC_INT */ 0 );
108 }
109
110 // -----------------------------------------------------------------------
111
112 void PolyPolygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
113 {
114- ImplDoOperation( rPolyPoly, rResult, GPC_UNION );
115+ ImplDoOperation( rPolyPoly, rResult, /* GPC_UNION */ 0 );
116 }
117
118 // -----------------------------------------------------------------------
119
120 void PolyPolygon::GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
121 {
122- ImplDoOperation( rPolyPoly, rResult, GPC_DIFF );
123+ ImplDoOperation( rPolyPoly, rResult, /* GPC_DIFF */ 0 );
124 }
125
126 // -----------------------------------------------------------------------
127
128 void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
129 {
130- ImplDoOperation( rPolyPoly, rResult, GPC_XOR );
131+ ImplDoOperation( rPolyPoly, rResult, /* GPC_XOR */ 0 );
132 }
133
134 // -----------------------------------------------------------------------
135
136 void* PolyPolygon::ImplCreateGPCPolygon() const
137 {
138- gpc_polygon* pRet = new gpc_polygon;
139-
140- pRet->num_contours = 0;
141- pRet->hole = NULL;
142- pRet->contour = NULL;
143-
144- for( USHORT i = 0, nCount = Count(); i < nCount; i++ )
145- {
146- const Polygon& rPoly = GetObject( i );
147- const USHORT nSize = rPoly.GetSize();
148-
149- if( nSize > 1 )
150- {
151- gpc_vertex_list aVertexList;
152- gpc_vertex* pVertex;
153-
154- aVertexList.num_vertices = nSize;
155- aVertexList.vertex = pVertex = new gpc_vertex[ nSize ];
156-
157- for( USHORT nPos = 0; nPos < nSize; nPos++, pVertex++ )
158- {
159- const Point& rPoint = rPoly[ nPos ];
160- pVertex->x = rPoint.X();
161- pVertex->y = rPoint.Y();
162- }
163+// gpc_polygon* pRet = new gpc_polygon;
164
165- gpc_add_contour( pRet, &aVertexList, 0 );
166- delete[] aVertexList.vertex;
167- }
168- }
169+// pRet->num_contours = 0;
170+// pRet->hole = NULL;
171+// pRet->contour = NULL;
172+
173+// for( USHORT i = 0, nCount = Count(); i < nCount; i++ )
174+// {
175+// const Polygon& rPoly = GetObject( i );
176+// const USHORT nSize = rPoly.GetSize();
177+
178+// if( nSize > 1 )
179+// {
180+// gpc_vertex_list aVertexList;
181+// gpc_vertex* pVertex;
182+
183+// aVertexList.num_vertices = nSize;
184+// aVertexList.vertex = pVertex = new gpc_vertex[ nSize ];
185+
186+// for( USHORT nPos = 0; nPos < nSize; nPos++, pVertex++ )
187+// {
188+// const Point& rPoint = rPoly[ nPos ];
189+// pVertex->x = rPoint.X();
190+// pVertex->y = rPoint.Y();
191+// }
192+
193+// gpc_add_contour( pRet, &aVertexList, 0 );
194+// delete[] aVertexList.vertex;
195+// }
196+// }
197
198- return pRet;
199+// return pRet;
200+ return NULL;
201 }
202
203 // -----------------------------------------------------------------------
204
205 void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const
206 {
207- gpc_polygon* pGPCPoly1 = (gpc_polygon*) ImplCreateGPCPolygon();
208- gpc_polygon* pGPCPoly2 = (gpc_polygon*) rPolyPoly.ImplCreateGPCPolygon();
209- gpc_polygon* pResult = new gpc_polygon;
210-
211- pResult->num_contours = 0;
212- pResult->hole = NULL;
213- pResult->contour = NULL;
214+// gpc_polygon* pGPCPoly1 = (gpc_polygon*) ImplCreateGPCPolygon();
215+// gpc_polygon* pGPCPoly2 = (gpc_polygon*) rPolyPoly.ImplCreateGPCPolygon();
216+// gpc_polygon* pResult = new gpc_polygon;
217+
218+// pResult->num_contours = 0;
219+// pResult->hole = NULL;
220+// pResult->contour = NULL;
221
222- gpc_polygon_clip( (gpc_op) nOperation, pGPCPoly1, pGPCPoly2, pResult );
223+// gpc_polygon_clip( (gpc_op) nOperation, pGPCPoly1, pGPCPoly2, pResult );
224
225 rResult.Clear();
226
227- for( int i = 0; i < pResult->num_contours; i++ )
228- {
229- gpc_vertex_list& rVertexList = pResult->contour[ i ];
230- Polygon aPoly( rVertexList.num_vertices );
231-
232- for( int j = 0; j < rVertexList.num_vertices; j++ )
233- {
234- Point& rPt = aPoly[ j ];
235- rPt.X() = FRound( rVertexList.vertex[ j ].x );
236- rPt.Y() = FRound( rVertexList.vertex[ j ].y );
237- }
238-
239- rResult.Insert( aPoly );
240- }
241+// for( int i = 0; i < pResult->num_contours; i++ )
242+// {
243+// gpc_vertex_list& rVertexList = pResult->contour[ i ];
244+// Polygon aPoly( rVertexList.num_vertices );
245+
246+// for( int j = 0; j < rVertexList.num_vertices; j++ )
247+// {
248+// Point& rPt = aPoly[ j ];
249+// rPt.X() = FRound( rVertexList.vertex[ j ].x );
250+// rPt.Y() = FRound( rVertexList.vertex[ j ].y );
251+// }
252+
253+// rResult.Insert( aPoly );
254+// }
255
256- gpc_free_polygon( pGPCPoly1 );
257- delete pGPCPoly1;
258+// gpc_free_polygon( pGPCPoly1 );
259+// delete pGPCPoly1;
260
261- gpc_free_polygon( pGPCPoly2 );
262- delete pGPCPoly2;
263+// gpc_free_polygon( pGPCPoly2 );
264+// delete pGPCPoly2;
265
266- gpc_free_polygon( pResult );
267- delete pResult;
268+// gpc_free_polygon( pResult );
269+// delete pResult;
270 }
271
272 // -----------------------------------------------------------------------
273diff -Naur OOO_STABLE_1.orig/vcl/util/makefile.mk OOO_STABLE_1/vcl/util/makefile.mk
274--- OOO_STABLE_1.orig/vcl/util/makefile.mk Fri Feb 15 14:44:54 2002
275+++ OOO_STABLE_1/vcl/util/makefile.mk Wed Apr 24 20:55:25 2002
276@@ -214,8 +214,8 @@
277 $(UCBHELPERLIB) \
278 $(CPPULIB) \
279 $(UNOTOOLSLIB) \
280- $(COMPHELPERLIB) \
281- $(GPC3RDLIB)
282+ $(COMPHELPERLIB)
283+# $(GPC3RDLIB)
284
285 .IF "$(OS)$(CPU)"=="SOLARISS"
286 SHL1VERSIONMAP=libvcl641ss.so.mapfile
LibreOffice - powerful office suite
This page took 0.063693 seconds and 4 git commands to generate.