From 67f5e5e4908b978c7eaf385c0b9cbda1f69d777c Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 19 Jun 2020 11:30:42 -0400
Subject: [PATCH] fix(core): second pass at libzip compat

---
 SoObjects/SOGo/SOGoZipArchiver.m | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/SoObjects/SOGo/SOGoZipArchiver.m b/SoObjects/SOGo/SOGoZipArchiver.m
index f26b90902..27e0337de 100644
--- a/SoObjects/SOGo/SOGoZipArchiver.m
+++ b/SoObjects/SOGo/SOGoZipArchiver.m
@@ -56,10 +56,14 @@
             int errorp;
             self->z = zip_open([file cString], ZIP_CREATE | ZIP_EXCL, &errorp);
             if (self->z == NULL) {
+#ifdef LIBZIP_VERSION
                 zip_error_t ziperror;
                 zip_error_init_with_code(&ziperror, errorp);
                 NSLog(@"Failed to open zip output file %@: %@", file,
                         [NSString stringWithCString: zip_error_strerror(&ziperror)]);
+#else
+                NSLog(@"Failed to open zip output file %@: %@", file, zip_strerror(self->z));
+#endif
             } else {
                 ret = self;
             }
@@ -76,16 +80,23 @@
         return NO;
     }
 
-    zip_source_t *source = zip_source_buffer(self->z, [data bytes], [data length], 0);
+    struct zip_source *source = zip_source_buffer(self->z, [data bytes], [data length], 0);
     if (source == NULL) {
         NSLog(@"Failed to create zip source from buffer: %@", [NSString stringWithCString: zip_strerror(self->z)]);
         return NO;
     }
 
+#ifdef ZIP_FL_ENC_UTF_8
     if (zip_file_add(self->z, [filename UTF8String], source, ZIP_FL_ENC_UTF_8) < 0) {
         NSLog(@"Failed to add file %@: %@", filename, [NSString stringWithCString: zip_strerror(self->z)]);
         zip_source_free(source);
     }
+#else
+    if (zip_add(self->z, [filename UTF8String], source) < 0) {
+      NSLog(@"Failed to add file %@: %@", filename, [NSString stringWithCString: zip_strerror(self->z)]);
+      zip_source_free(source);
+    }
+#endif
 
     return YES;
 }