]> git.pld-linux.org Git - packages/libreoffice.git/blame - openoffice-system-zlib.patch
projects / packages / libreoffice.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- up
[packages/libreoffice.git] / openoffice-system-zlib.patch
CommitLineData
566aa072 1diff -Nur oo.orig/crashrep/source/unx/makefile.mk oo.chng/crashrep/source/unx/makefile.mk
2--- oo.orig/crashrep/source/unx/makefile.mk Wed Jul 16 16:05:44 2003
3+++ oo.chng/crashrep/source/unx/makefile.mk Wed Jul 30 19:44:14 2003
4@@ -115,7 +115,7 @@
5 APP2TARGET=$(TARGET2)
6 APP2OBJS=$(OBJFILES)
dc27e5fc 7
566aa072 8-APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
9+APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lz -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
10 .IF "$(OS)" == "SOLARIS"
11 APP2STDLIBS+=-lsocket
12 .ENDIF
13diff -Nur oo.orig/package/source/zipapi/Deflater.cxx oo.chng/package/source/zipapi/Deflater.cxx
14--- oo.orig/package/source/zipapi/Deflater.cxx Thu Nov 15 21:16:11 2001
15+++ oo.chng/package/source/zipapi/Deflater.cxx Wed Jul 30 19:42:34 2003
dc27e5fc
MM		 16@@ -150,7 +150,7 @@
17 pStream->avail_in = nLength;
18 pStream->avail_out = nNewLength;
19
20- nResult = z_deflateParams(pStream, nLevel, nStrategy);
21+ nResult = deflateParams(pStream, nLevel, nStrategy);
22 switch (nResult)
23 {
24 case Z_OK:
25@@ -174,7 +174,7 @@
26 pStream->avail_in = nLength;
27 pStream->avail_out = nNewLength;
28
29- nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
30+ nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
31 switch (nResult)
32 {
33 case Z_STREAM_END:
34@@ -220,7 +220,7 @@
35 {
36 // do error handling
37 }
38- sal_Int32 nResult = z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength);
39+ sal_Int32 nResult = deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength);
40 }
41 void SAL_CALL Deflater::setDictionary( const uno::Sequence< sal_Int8 >& rBuffer )
42 {
43@@ -230,7 +230,7 @@
44 VOS_DEBUG_ONLY("No stream!");
45
46 }
47- sal_Int32 nResult = z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength());
48+ sal_Int32 nResult = deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength());
49 }
50 void SAL_CALL Deflater::setStrategy( sal_Int32 nNewStrategy )
51 {
52@@ -295,7 +295,7 @@
53 }
54 void SAL_CALL Deflater::reset( )
55 {
56- z_deflateReset(pStream);
57+ deflateReset(pStream);
58 bFinish = sal_False;
59 bFinished = sal_False;
60 nOffset = nLength = 0;
61@@ -304,7 +304,7 @@
62 {
63 if (pStream != NULL)
64 {
65- z_deflateEnd(pStream);
66+ deflateEnd(pStream);
67 delete pStream;
68 }
69 pStream = NULL;
566aa072 70diff -Nur oo.orig/package/source/zipapi/Inflater.cxx oo.chng/package/source/zipapi/Inflater.cxx
71--- oo.orig/package/source/zipapi/Inflater.cxx Thu Nov 15 21:17:02 2001
72+++ oo.chng/package/source/zipapi/Inflater.cxx Wed Jul 30 19:43:20 2003
dc27e5fc
MM		 73@@ -133,7 +133,7 @@
74 {
75 // do error handling
76 }
77- z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset,
78+ inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset,
79 nNewLength);
80 }
81
82@@ -143,7 +143,7 @@
83 {
84 // do error handling
85 }
86- z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(),
87+ inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(),
88 rBuffer.getLength());
89 }
90
91@@ -202,7 +202,7 @@
92
93 void SAL_CALL Inflater::reset( )
94 {
95- z_inflateReset(pStream);
96+ inflateReset(pStream);
97 bFinish = bNeedDict = bFinished = sal_False;
98 nOffset = nLength = 0;
99 }
100@@ -211,7 +211,7 @@
101 {
102 if (pStream != NULL)
103 {
104- z_inflateEnd(pStream);
105+ inflateEnd(pStream);
106 delete pStream;
107 }
108 pStream = NULL;
109@@ -225,7 +225,7 @@
110 pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset );
111 pStream->avail_out = nNewLength;
112
113- nResult = ::z_inflate(pStream, bFinish ? Z_SYNC_FLUSH : Z_PARTIAL_FLUSH);
114+ nResult = ::inflate(pStream, bFinish ? Z_SYNC_FLUSH : Z_PARTIAL_FLUSH);
115
116 switch (nResult)
117 {
566aa072 118diff -Nur oo.orig/solenv/inc/libs.mk oo.chng/solenv/inc/libs.mk
119--- oo.orig/solenv/inc/libs.mk Wed Jul 30 19:35:35 2003
120+++ oo.chng/solenv/inc/libs.mk Wed Jul 30 19:41:03 2003
121@@ -173,7 +173,7 @@
122 LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
123 EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
124 EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
125-ZLIB3RDLIB=-lzlib
126+ZLIB3RDLIB=-lz
127 JPEG3RDLIB=-ljpeglib
128 NEON3RDLIB=-lneon
129 BERKELEYLIB=-ldb-4.1
130diff -Nur oo.orig/zlib/prj/d.lst oo.chng/zlib/prj/d.lst
131--- oo.orig/zlib/prj/d.lst Mon Aug 26 12:00:28 2002
132+++ oo.chng/zlib/prj/d.lst Wed Jul 30 19:40:21 2003
133@@ -1,10 +1,10 @@
134 mkdir: %_DEST%\inc%_EXT%\external\zlib
135
136-..\%__SRC%\inc\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
137-..\%__SRC%\inc\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
138-..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
139+\usr\include\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
140+\usr\include\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
141+\usr\include\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
142
143-..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
144+\lib\libz.so* %_DEST%\lib%_EXT%\libz.so*
145 ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
146 ..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin
0354dc6a 147
LibreOffice - powerful office suite
This page took 0.075391 seconds and 4 git commands to generate.