fast_excel 0.6.0 → 0.6.1

data/libxlsxwriter/src/xmlwriter.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 
@@ -27,16 +28,16 @@ STATIC char *_escape_attributes(struct xml_attribute *attribute);
 
 char *lxw_escape_data(const char *data);
 
-STATIC void _fprint_escaped_attributes(FILE * xmlfile,
+STATIC void _fprint_escaped_attributes(FILE *xmlfile,
                                        struct xml_attribute_list *attributes);
 
-STATIC void _fprint_escaped_data(FILE * xmlfile, const char *data);
+STATIC void _fprint_escaped_data(FILE *xmlfile, const char *data);
 
 /*
  * Write the XML declaration.
  */
 void
-lxw_xml_declaration(FILE * xmlfile)
+lxw_xml_declaration(FILE *xmlfile)
 {
     fprintf(xmlfile, "<?xml version=\"1.0\" "
             "encoding=\"UTF-8\" standalone=\"yes\"?>\n");
@@ -46,7 +47,7 @@ lxw_xml_declaration(FILE * xmlfile)
  * Write an XML start tag with optional attributes.
  */
 void
-lxw_xml_start_tag(FILE * xmlfile,
+lxw_xml_start_tag(FILE *xmlfile,
                   const char *tag, struct xml_attribute_list *attributes)
 {
     fprintf(xmlfile, "<%s", tag);
@@ -61,7 +62,7 @@ lxw_xml_start_tag(FILE * xmlfile,
  * This is a minor speed optimization for elements that don't need encoding.
  */
 void
-lxw_xml_start_tag_unencoded(FILE * xmlfile,
+lxw_xml_start_tag_unencoded(FILE *xmlfile,
                             const char *tag,
                             struct xml_attribute_list *attributes)
 {
@@ -82,7 +83,7 @@ lxw_xml_start_tag_unencoded(FILE * xmlfile,
  * Write an XML end tag.
  */
 void
-lxw_xml_end_tag(FILE * xmlfile, const char *tag)
+lxw_xml_end_tag(FILE *xmlfile, const char *tag)
 {
     fprintf(xmlfile, "</%s>", tag);
 }
@@ -91,7 +92,7 @@ lxw_xml_end_tag(FILE * xmlfile, const char *tag)
  * Write an empty XML tag with optional attributes.
  */
 void
-lxw_xml_empty_tag(FILE * xmlfile,
+lxw_xml_empty_tag(FILE *xmlfile,
                   const char *tag, struct xml_attribute_list *attributes)
 {
     fprintf(xmlfile, "<%s", tag);
@@ -106,7 +107,7 @@ lxw_xml_empty_tag(FILE * xmlfile,
  * This is a minor speed optimization for elements that don't need encoding.
  */
 void
-lxw_xml_empty_tag_unencoded(FILE * xmlfile,
+lxw_xml_empty_tag_unencoded(FILE *xmlfile,
                             const char *tag,
                             struct xml_attribute_list *attributes)
 {
@@ -127,7 +128,7 @@ lxw_xml_empty_tag_unencoded(FILE * xmlfile,
  * Write an XML element containing data with optional attributes.
  */
 void
-lxw_xml_data_element(FILE * xmlfile,
+lxw_xml_data_element(FILE *xmlfile,
                      const char *tag,
                      const char *data, struct xml_attribute_list *attributes)
 {
@@ -146,7 +147,7 @@ lxw_xml_data_element(FILE * xmlfile,
  * Write an XML <si> element for rich strings, without encoding.
  */
 void
-lxw_xml_rich_si_element(FILE * xmlfile, const char *string)
+lxw_xml_rich_si_element(FILE *xmlfile, const char *string)
 {
     fprintf(xmlfile, "<si>%s</si>", string);
 }
@@ -238,7 +239,7 @@ lxw_escape_data(const char *data)
 uint8_t
 lxw_has_control_characters(const char *string)
 {
-    while (string) {
+    while (*string) {
         /* 0xE0 == 0b11100000 masks values > 0x19 == 0b00011111. */
         if (!(*string & 0xE0) && *string != 0x0A && *string != 0x09)
             return LXW_TRUE;
@@ -369,7 +370,7 @@ lxw_escape_url_characters(const char *string, uint8_t escape_hash)
 
 /* Write out escaped attributes. */
 STATIC void
-_fprint_escaped_attributes(FILE * xmlfile,
+_fprint_escaped_attributes(FILE *xmlfile,
                            struct xml_attribute_list *attributes)
 {
     struct xml_attribute *attribute;
@@ -396,7 +397,7 @@ _fprint_escaped_attributes(FILE * xmlfile,
 
 /* Write out escaped XML data. */
 STATIC void
-_fprint_escaped_data(FILE * xmlfile, const char *data)
+_fprint_escaped_data(FILE *xmlfile, const char *data)
 {
     /* Escape the data section of the XML element. */
     if (!strpbrk(data, "&<>")) {
@@ -425,18 +426,12 @@ lxw_new_attribute_str(const char *key, const char *value)
 
 /* Create a new integer XML attribute. */
 struct xml_attribute *
-lxw_new_attribute_int(const char *key, uint64_t value)
+lxw_new_attribute_int(const char *key, int32_t value)
 {
     struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
 
     LXW_ATTRIBUTE_COPY(attribute->key, key);
-
-#if defined(_MSC_VER)
-    lxw_snprintf(attribute->value, LXW_MAX_ATTRIBUTE_LENGTH, "%lld", value);
-#else
-    lxw_snprintf(attribute->value, LXW_MAX_ATTRIBUTE_LENGTH, "%ld",
-                 (long) value);
-#endif
+    lxw_snprintf(attribute->value, LXW_MAX_ATTRIBUTE_LENGTH, "%d", value);
 
     return attribute;
 }

data/libxlsxwriter/third_party/minizip/Makefile.orig

@@ -1,4 +1,4 @@
-CC=cc
+CC?=cc
 CFLAGS := $(CFLAGS) -O -I../..
 
 UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a

data/libxlsxwriter/third_party/minizip/configure.ac

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.3.0], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.3.1], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT

data/libxlsxwriter/third_party/minizip/ioapi.h

@@ -29,8 +29,8 @@
 
 #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
 
-  // Linux needs this to support file operation on files larger then 4+GB
-  // But might need better if/def to select just the platforms that needs them.
+  /* Linux needs this to support file operation on files larger then 4+GB
+   * But might need better if/def to select just the platforms that needs them. */
 
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
@@ -66,7 +66,7 @@
  #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
   #define ftello64 _ftelli64
   #define fseeko64 _fseeki64
- #else // old MSC
+ #else /* old MSC */
   #define ftello64 ftell
   #define fseeko64 fseek
  #endif
@@ -150,7 +150,7 @@ typedef long     (ZCALLBACK *tell_file_func)      (voidpf opaque, voidpf stream)
 typedef long     (ZCALLBACK *seek_file_func)      (voidpf opaque, voidpf stream, uLong offset, int origin);
 
 
-/* here is the "old" 32 bits structure structure */
+/* here is the "old" 32 bits structure */
 typedef struct zlib_filefunc_def_s
 {
     open_file_func      zopen_file;
@@ -194,8 +194,8 @@ typedef struct zlib_filefunc64_32_def_s
 
 #define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
 #define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+/* #define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) */
+/* #define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) */
 #define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
 #define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
 

data/libxlsxwriter/third_party/minizip/miniunz.c

@@ -79,7 +79,7 @@
 
 /* change_file_date : change the date/time of a file
     filename : the filename of the file where date/time must be modified
-    dosdate : the new date at the MSDos format (4 bytes)
+    dosdate : the new date at the MSDOS format (4 bytes)
     tmu_date : the SAME new date at the tm_unz format */
 static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date) {
 #ifdef _WIN32
@@ -186,7 +186,7 @@ static int makedir(const char *newdir) {
 }
 
 static void do_banner(void) {
-    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("MiniUnz 1.1, demo of zLib + Unz package written by Gilles Vollant\n");
     printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
 }
 
@@ -356,6 +356,20 @@ static int do_extract_currentfile(unzFile uf, const int* popt_extract_without_pa
         else
             write_filename = filename_withoutpath;
 
+        if (write_filename[0]!='\0')
+        {
+            const char* relative_check = write_filename;
+            while (relative_check[1]!='\0')
+            {
+                if (relative_check[0]=='.' && relative_check[1]=='.')
+                    write_filename = relative_check;
+                relative_check++;
+            }
+        }
+
+        while (write_filename[0]=='/' || write_filename[0]=='.')
+            write_filename++;
+
         err = unzOpenCurrentFilePassword(uf,password);
         if (err!=UNZ_OK)
         {

data/libxlsxwriter/third_party/minizip/unzip.c

@@ -117,7 +117,7 @@
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
+/* unz_file_info64_internal contain internal info about a file in zipfile*/
 typedef struct unz_file_info64_internal_s
 {
     ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
@@ -450,7 +450,7 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
         return CENTRALDIRINVALID;
 
-    /* number of the disk with the start of the zip64 end of  central directory */
+    /* number of the disk with the start of the zip64 end of central directory */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
         return CENTRALDIRINVALID;
     if (uL != 0)
@@ -497,9 +497,9 @@ local unzFile unzOpenInternal(const void *path,
     ZPOS64_T central_pos;
     uLong   uL;
 
-    uLong number_disk;          /* number of the current dist, used for
+    uLong number_disk;          /* number of the current disk, used for
                                    spanning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+    uLong number_disk_with_CD;  /* number the disk with central dir, used
                                    for spanning ZIP, unsupported, always 0*/
     ZPOS64_T number_entry_CD;      /* total number of entries in
                                    the central dir

data/libxlsxwriter/third_party/minizip/unzip.h

@@ -306,7 +306,7 @@ extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
   Get Info about the current file
   if pfile_info!=NULL, the *pfile_info structure will contain some info about
         the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
+  if szFileName!=NULL, the filename string will be copied in szFileName
             (fileNameBufferSize is the size of the buffer)
   if extraField!=NULL, the extra field information will be copied in extraField
             (extraFieldBufferSize is the size of the buffer).

data/libxlsxwriter/third_party/minizip/zip.c

@@ -575,7 +575,7 @@ local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
     return 0;
 
-  /* number of the disk with the start of the zip64 end of  central directory */
+  /* number of the disk with the start of the zip64 end of central directory */
   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
     return 0;
   if (uL != 0)
@@ -614,9 +614,9 @@ local int LoadCentralDirectoryRecord(zip64_internal* pziinit) {
   ZPOS64_T central_pos;
   uLong uL;
 
-  uLong number_disk;          /* number of the current dist, used for
+  uLong number_disk;          /* number of the current disk, used for
                               spanning ZIP, unsupported, always 0*/
-  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+  uLong number_disk_with_CD;  /* number of the disk with central dir, used
                               for spanning ZIP, unsupported, always 0*/
   ZPOS64_T number_entry;
   ZPOS64_T number_entry_CD;      /* total number of entries in
@@ -1608,7 +1608,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
 
       if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
       {
-        // we can not write more data to the buffer that we have room for.
+        // we cannot write more data to the buffer that we have room for.
         return ZIP_BADZIPFILE;
       }
 
@@ -1872,7 +1872,7 @@ extern int ZEXPORT zipClose(zipFile file, const char* global_comment) {
     free_linkedlist(&(zi->central_dir));
 
     pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+    if(pos >= 0xffffffff || zi->number_entry >= 0xFFFF)
     {
       ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
       Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);

data/libxlsxwriter/third_party/minizip/zip.h

@@ -49,7 +49,7 @@
 extern "C" {
 #endif
 
-//#define HAVE_BZIP2
+/* #define HAVE_BZIP2 */
 
 #ifndef _ZLIB_H
 #include "zlib.h"
@@ -190,9 +190,9 @@ extern int ZEXPORT zipOpenNewFileInZip64(zipFile file,
   filename : the filename in zip (if NULL, '-' without quote will be used
   *zipfi contain supplemental information
   if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
+    contains the extrafield data for the local header
   if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
+    contains the extrafield data for the global header
   if comment != NULL, comment contain the comment string
   method contain the compression method (0 for store, Z_DEFLATED for deflate)
   level contain the level of compression (can be Z_DEFAULT_COMPRESSION)

data/libxlsxwriter/version.txt

@@ -1 +1 @@
-2023-12-29 19:18:35 +0700 e3ede9d
+2026-10-19 01:47:16 +0400 db95245

data/test/validations_test.rb

@@ -13,7 +13,7 @@ describe "FastExcel validations" do
     end
 
     assert_equal(ArgumentError, error.class)
-    assert_equal("Invalid worksheet name 'Payments Report': (17 - error_sheetname_already_used) Worksheet name is already in use.", error.message)
+    assert_equal("Invalid worksheet name 'Payments Report': (19 - error_sheetname_already_used) Worksheet name is already in use.", error.message)
   end
 
   it "should not raise error when worksheet name is null" do
@@ -31,7 +31,7 @@ describe "FastExcel validations" do
     end
 
     assert_equal(ArgumentError, error.class)
-    assert_equal("Invalid worksheet name 'ABCDEFGHIJKLMNOPQRSTUVWXYZ012345': (14 - error_sheetname_length_exceeded) Worksheet name exceeds Excel's limit of 31 characters.", error.message)
+    assert_equal("Invalid worksheet name 'ABCDEFGHIJKLMNOPQRSTUVWXYZ012345': (16 - error_sheetname_length_exceeded) Worksheet name exceeds Excel's limit of 31 characters.", error.message)
   end
 
   it "should not raise error when the sheet name is at maximum length" do
@@ -48,7 +48,7 @@ describe "FastExcel validations" do
     end
 
     assert_equal(ArgumentError, error.class)
-    assert_equal("Invalid worksheet name 'a?': (15 - error_invalid_sheetname_character) Worksheet name cannot contain invalid characters: '[ ] : * ? / \\'", error.message)
+    assert_equal("Invalid worksheet name 'a?': (17 - error_invalid_sheetname_character) Worksheet name cannot contain invalid characters: '[ ] : * ? / \\'", error.message)
   end
 
   it "should raise error when reopening workbook" do

data/test/worksheet_test.rb

@@ -87,10 +87,18 @@ describe "FastExcel::WorksheetExt append_row" do
   it "should set name correctly" do
     workbook = FastExcel.open(constant_memory: true)
     ws1 = workbook.add_worksheet("foo")
-    ws2 = workbook.add_worksheet("")
+    ws2 = workbook.add_worksheet
 
     assert_equal("foo", ws1[:name])
-    assert_equal("", ws2[:name])
+    assert_equal("Sheet2", ws2[:name])
+  end
+
+  it "should raise error when sheet name is empty string" do
+    workbook = FastExcel.open(constant_memory: true)
+    error = assert_raises(ArgumentError) do
+      workbook.add_worksheet("")
+    end
+    assert_match(/error_parameter_is_empty/, error.message)
   end
 
   it "should map fields correctly" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_excel
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Pavel Evstigneev
@@ -99,12 +99,14 @@ files:
 - lib/fast_excel/binding/format.rb
 - lib/fast_excel/binding/workbook.rb
 - lib/fast_excel/binding/worksheet.rb
+- libxlsxwriter/.cirrus.yml
 - libxlsxwriter/.github/FUNDING.yml
 - libxlsxwriter/.github/ISSUE_TEMPLATE.md
 - libxlsxwriter/.github/PULL_REQUEST_TEMPLATE.md
 - libxlsxwriter/.github/workflows/cmake_actions.yml
 - libxlsxwriter/.github/workflows/code_style.yml
 - libxlsxwriter/.github/workflows/coverity.yml
+- libxlsxwriter/.github/workflows/make_32_actions.yml
 - libxlsxwriter/.github/workflows/make_actions.yml
 - libxlsxwriter/.github/workflows/valgrind.yml
 - libxlsxwriter/.github/workflows/windows_build.yml
@@ -120,9 +122,6 @@ files:
 - libxlsxwriter/Readme.md
 - libxlsxwriter/build.zig
 - libxlsxwriter/build.zig.zon
-- libxlsxwriter/cmake/FindMINIZIP.cmake
-- libxlsxwriter/cmake/FindPackage.cmake
-- libxlsxwriter/cmake/i686-toolchain.cmake
 - libxlsxwriter/cocoapods/libxlsxwriter-umbrella.h
 - libxlsxwriter/cocoapods/libxlsxwriter.modulemap
 - libxlsxwriter/include/xlsxwriter.h
@@ -140,6 +139,10 @@ files:
 - libxlsxwriter/include/xlsxwriter/metadata.h
 - libxlsxwriter/include/xlsxwriter/packager.h
 - libxlsxwriter/include/xlsxwriter/relationships.h
+- libxlsxwriter/include/xlsxwriter/rich_value.h
+- libxlsxwriter/include/xlsxwriter/rich_value_rel.h
+- libxlsxwriter/include/xlsxwriter/rich_value_structure.h
+- libxlsxwriter/include/xlsxwriter/rich_value_types.h
 - libxlsxwriter/include/xlsxwriter/shared_strings.h
 - libxlsxwriter/include/xlsxwriter/styles.h
 - libxlsxwriter/include/xlsxwriter/table.h
@@ -172,6 +175,10 @@ files:
 - libxlsxwriter/src/metadata.c
 - libxlsxwriter/src/packager.c
 - libxlsxwriter/src/relationships.c
+- libxlsxwriter/src/rich_value.c
+- libxlsxwriter/src/rich_value_rel.c
+- libxlsxwriter/src/rich_value_structure.c
+- libxlsxwriter/src/rich_value_types.c
 - libxlsxwriter/src/shared_strings.c
 - libxlsxwriter/src/styles.c
 - libxlsxwriter/src/table.c

data/libxlsxwriter/cmake/FindMINIZIP.cmake

@@ -1,121 +0,0 @@
-#  :copyright: (c) 2017 Alex Huszagh.
-#  :license: FreeBSD, see LICENSE.txt for more details.
-
-# FindMINIZIP
-# -----------
-#
-# Find MINIZIP include dirs and libraries
-#
-# Use this module by invoking find_package with the form::
-#
-#   find_package(MINIZIP
-#     [version] [EXACT]      # Minimum or EXACT version e.g. 1.0.6
-#     [REQUIRED]             # Fail with error if MINIZIP is not found
-#     )
-#
-# You may also set `MINIZIP_USE_STATIC_LIBS` to prefer static libraries
-# to shared ones.
-#
-# If found, `MINIZIP_FOUND` will be set to true, and `MINIZIP_LIBRARIES`
-# and `MINIZIP_INCLUDE_DIRS` will both be set.
-#
-# You may optionally set `MINIZIP_ROOT` to specify a custom root directory
-# for the MINIZIP installation.
-#
-
-include(CheckCXXSourceCompiles)
-include(FindPackage)
-
-# PATHS
-# -----
-
-set(MINIZIP_SEARCH_PATHS)
-
-if(MINIZIP_ROOT)
-    list(APPEND MINIZIP_SEARCH_PATHS ${MINIZIP_ROOT})
-endif()
-
-if(WIN32)
-    list(APPEND ZLIB_SEARCH_PATHS
-        "$ENV{PROGRAMFILES}/minizip"
-    )
-endif()
-
-unset(MINIZIP_SYSTEM_ROOT)
-unset(MINIZIP_CUSTOM_ROOT)
-unset(MINIZIP_SEARCH_HKEY)
-
-# FIND
-# ----
-
-# INCLUDE DIRECTORY
-SetSuffixes(MINIZIP)
-foreach(search ${MINIZIP_SEARCH_PATHS})
-    FIND_PATH(MINIZIP_INCLUDE_DIR
-        NAMES minizip/zip.h
-        PATHS ${search}
-        PATH_SUFFIXES include
-    )
-endforeach(search)
-
-if(NOT MINIZIP_INCLUDE_DIR)
-    FIND_PATH(MINIZIP_INCLUDE_DIR minizip/zip.h PATH_SUFFIXES include)
-endif()
-
-# LIBRARY PATHS
-set(MINIZIP_LIBRARY_NAMES minizip)
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-    list(APPEND MINIZIP_LIBRARY_NAMES minizipd)
-endif()
-
-foreach(search ${MINIZIP_SEARCH_PATHS})
-    FIND_LIBRARY(MINIZIP_LIBRARY
-        NAMES ${MINIZIP_LIBRARY_NAMES}
-        PATHS ${search}
-        PATH_SUFFIXES lib
-    )
-endforeach(search)
-
-if(NOT MINIZIP_LIBRARY)
-    FIND_LIBRARY(MINIZIP_LIBRARY NAMES ${MINIZIP_LIBRARY_NAMES} PATH_SUFFIXES lib)
-endif()
-
-set(MINIZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIR})
-set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARY})
-
-CheckFound(MINIZIP)
-FindStaticLibs(MINIZIP)
-
-# VERSION
-# -------
-
-if(MINIZIP_FOUND)
-    file(STRINGS "${MINIZIP_INCLUDE_DIRS}/zlib.h" MINIZIP_VERSION_CONTENTS REGEX "version [0-9]+\\.[0-9]+(\\.[0-9]+)?")
-    string(REGEX REPLACE ".*version ([0-9]+)\\.[0-9]+" "\\1" MINIZIP_VERSION_MAJOR "${MINIZIP_VERSION_CONTENTS}")
-    string(REGEX REPLACE ".*version [0-9]+\\.([0-9]+)" "\\1" MINIZIP_VERSION_MINOR "${MINIZIP_VERSION_CONTENTS}")
-    set(MINIZIP_VERSION_PATCH 0)
-
-    set(MINIZIP_VERSION_STRING "${MINIZIP_VERSION_MAJOR}.${MINIZIP_VERSION_MINOR}.${MINIZIP_VERSION_PATCH}")
-    set(MINIZIP_VERSION ${MINIZIP_VERSION_STRING})
-
-    MatchVersion(MINIZIP)
-endif()
-
-# COMPILATION
-# -----------
-
-set(MINIZIP_CODE "
-#include <minizip/zip.h>
-int main(void)
-{
-    zip_fileinfo zipfile_info;
-
-    return 0;
-}
-"
-)
-
-if(MINIZIP_FOUND)
-    CheckCompiles(MINIZIP)
-endif()
-RequiredPackageFound(MINIZIP)