Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
f3eea214
Kaydet (Commit)
f3eea214
authored
Agu 16, 2011
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix libgsf build with internal zlib that uses Z_PREFIX
üst
ff7ee4a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
104 additions
and
0 deletions
+104
-0
libgsf-1.14.19.patch
libgsf/libgsf-1.14.19.patch
+52
-0
libgsf-1.14.19.windows.patch
libgsf/libgsf-1.14.19.windows.patch
+52
-0
No files found.
libgsf/libgsf-1.14.19.patch
Dosyayı görüntüle @
f3eea214
...
...
@@ -36,3 +36,55 @@
_pkg_min_version=0.9.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
--- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c
+++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c
@@ -30,6 +30,10 @@
#include <string.h>
#include <zlib.h>
+
+#if defined(Z_PREFIX) && defined(crc32)
+#undef crc32
+#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "libgsf:zip"
--- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c
+++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c
@@ -29,6 +29,11 @@
#include <string.h>
#include <time.h>
#include <zlib.h>
+
+#if defined(Z_PREFIX) && defined(crc32)
+#define CRC32_WAS_DEFINED_AS_Z_CRC32
+#undef crc32
+#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "libgsf:zip"
@@ -345,7 +345,11 @@
zip_header_write (zip);
zip->writing = TRUE;
zip->root->writing = TRUE;
+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
+ dirent->crc32 = z_crc32 (0L, Z_NULL, 0);
+#else
dirent->crc32 = crc32 (0L, Z_NULL, 0);
+#endif
if (zip->compression_method == GSF_ZIP_DEFLATED) {
if (!zip->stream) {
zip->stream = g_new0 (z_stream, 1);
@@ -544,7 +544,11 @@
return FALSE;
dirent->csize += num_bytes;
}
+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
+ dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes);
+#else
dirent->crc32 = crc32 (dirent->crc32, data, num_bytes);
+#endif
dirent->usize += num_bytes;
return TRUE;
libgsf/libgsf-1.14.19.windows.patch
Dosyayı görüntüle @
f3eea214
...
...
@@ -136,3 +136,55 @@
+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
+ @echo CLEAR_THE_FILE > $@
+
--- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c
+++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c
@@ -30,6 +30,10 @@
#include <string.h>
#include <zlib.h>
+
+#if defined(Z_PREFIX) && defined(crc32)
+#undef crc32
+#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "libgsf:zip"
--- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c
+++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c
@@ -29,6 +29,11 @@
#include <string.h>
#include <time.h>
#include <zlib.h>
+
+#if defined(Z_PREFIX) && defined(crc32)
+#define CRC32_WAS_DEFINED_AS_Z_CRC32
+#undef crc32
+#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "libgsf:zip"
@@ -345,7 +345,11 @@
zip_header_write (zip);
zip->writing = TRUE;
zip->root->writing = TRUE;
+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
+ dirent->crc32 = z_crc32 (0L, Z_NULL, 0);
+#else
dirent->crc32 = crc32 (0L, Z_NULL, 0);
+#endif
if (zip->compression_method == GSF_ZIP_DEFLATED) {
if (!zip->stream) {
zip->stream = g_new0 (z_stream, 1);
@@ -544,7 +544,11 @@
return FALSE;
dirent->csize += num_bytes;
}
+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
+ dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes);
+#else
dirent->crc32 = crc32 (dirent->crc32, data, num_bytes);
+#endif
dirent->usize += num_bytes;
return TRUE;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment