"Fossies" - the Fresh Open Source Software Archive

Member "qt-everywhere-src-6.3.1/qtwebengine/src/3rdparty/chromium/third_party/libzip/patches/0001-patch-configs.patch" (8 Jun 2022, 2854 Bytes) of package /linux/misc/qt-everywhere-src-6.3.1.tar.xz:


As a special service "Fossies" has tried to format the requested source page into HTML format using (guessed) Diff source code syntax highlighting (style: standard) with prefixed line numbers. Alternatively you can here view or download the uninterpreted source code file.

    1 From f74866358fc0b8e7b77c4603a4dd70b09e6ccbbd Mon Sep 17 00:00:00 2001
    2 From: mcrouse <mcrouse@google.com>
    3 Date: Fri, 5 Feb 2021 16:20:25 +0000
    4 Subject: [PATCH] patch configs for windows
    5 
    6 ---
    7  third_party/libzip/src/config.h  | 18 ++++++++++++++++--
    8  third_party/libzip/src/zipconf.h | 12 ++++++++++--
    9  2 files changed, 26 insertions(+), 4 deletions(-)
   10 
   11 diff --git a/third_party/libzip/src/config.h b/third_party/libzip/src/config.h
   12 index 536e20b32e6f..15dfff401971 100644
   13 --- a/third_party/libzip/src/config.h
   14 +++ b/third_party/libzip/src/config.h
   15 @@ -3,6 +3,9 @@
   16  #ifndef _HAD_ZIPCONF_H
   17  #include "zipconf.h"
   18  #endif
   19 +
   20 +#include "build/build_config.h"
   21 +
   22  /* BEGIN DEFINES */
   23  /* #undef HAVE___PROGNAME */
   24  /* #undef HAVE__CLOSE */
   25 @@ -23,28 +26,39 @@
   26  /* #undef HAVE_CRYPTO */
   27  /* #undef HAVE_FICLONERANGE */
   28  #define HAVE_FILENO
   29 +#if !defined(OS_WIN)
   30  #define HAVE_FSEEKO
   31  #define HAVE_FTELLO
   32 +#endif
   33  /* #undef HAVE_GETPROGNAME */
   34  /* #undef HAVE_GNUTLS */
   35  /* #undef HAVE_LIBBZ2 */
   36  /* #undef HAVE_LIBLZMA */
   37 +/* #undef HAVE_LOCALTIME_R */
   38 +#if !defined(OS_WIN)
   39  #define HAVE_LOCALTIME_R
   40 +#endif
   41  /* #undef HAVE_MBEDTLS */
   42  /* #undef HAVE_MKSTEMP */
   43  /* #undef HAVE_NULLABLE */
   44  /* #undef HAVE_OPENSSL */
   45  /* #undef HAVE_SETMODE */
   46  #define HAVE_SNPRINTF
   47 +#if !defined(OS_WIN)
   48  #define HAVE_STRCASECMP
   49 +#endif
   50  #define HAVE_STRDUP
   51 -/* #undef HAVE_STRICMP */
   52 +#if defined(OS_WIN)
   53 +#define HAVE_STRICMP
   54 +#endif
   55  #define HAVE_STRTOLL
   56  #define HAVE_STRTOULL
   57  /* #undef HAVE_STRUCT_TM_TM_ZONE */
   58  #define HAVE_STDBOOL_H
   59 +#if !defined(OS_WIN)
   60  #define HAVE_STRINGS_H
   61  #define HAVE_UNISTD_H
   62 +#endif
   63  /* #undef HAVE_WINDOWS_CRYPTO */
   64  #define SIZEOF_OFF_T 8
   65  #define SIZEOF_SIZE_T 8
   66 @@ -59,4 +73,4 @@
   67  #define PACKAGE "libzip"
   68  #define VERSION "1.7.3"
   69  
   70 -#endif /* HAD_CONFIG_H */
   71 \ No newline at end of file
   72 +#endif /* HAD_CONFIG_H */
   73 diff --git a/third_party/libzip/src/zipconf.h b/third_party/libzip/src/zipconf.h
   74 index 4db748234649..f79875034709 100644
   75 --- a/third_party/libzip/src/zipconf.h
   76 +++ b/third_party/libzip/src/zipconf.h
   77 @@ -8,12 +8,16 @@
   78     based on ../cmake-zipconf.h.in.
   79   */
   80  
   81 +#include "build/build_config.h"
   82 +
   83  #define LIBZIP_VERSION "1.7.3"
   84  #define LIBZIP_VERSION_MAJOR 1
   85  #define LIBZIP_VERSION_MINOR 7
   86  #define LIBZIP_VERSION_MICRO 3
   87  
   88 -/* #undef ZIP_STATIC */
   89 +#define ZIP_STATIC
   90  
   91  #define _Nullable
   92  #define _Nonnull
   93 @@ -32,6 +36,10 @@ typedef uint32_t zip_uint32_t;
   94  typedef int64_t zip_int64_t;
   95  typedef uint64_t zip_uint64_t;
   96  
   97 +#if defined(OS_WIN)
   98 +typedef int mode_t;
   99 +#endif
  100 +
  101  #define ZIP_INT8_MIN (-ZIP_INT8_MAX - 1)
  102  #define ZIP_INT8_MAX 0x7f
  103  #define ZIP_UINT8_MAX 0xff
  104 @@ -48,4 +56,4 @@ typedef uint64_t zip_uint64_t;
  105  #define ZIP_INT64_MAX 0x7fffffffffffffffLL
  106  #define ZIP_UINT64_MAX 0xffffffffffffffffULL
  107  
  108 -#endif /* zipconf.h */
  109 \ No newline at end of file
  110 +#endif /* zipconf.h */
  111 -- 
  112 2.30.0.365.g02bc693789-goog
  113