"Fossies" - the Fresh Open Source Software Archive

Member "qt-everywhere-src-6.3.1/qtwebengine/src/3rdparty/chromium/third_party/maldoca/patches/0001-correcting-include-paths.patch" (8 Jun 2022, 4030 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 547dcecf54197d5beee0e1c1b5ce908b23b61042 Mon Sep 17 00:00:00 2001
    2 From: Olabode Anise <anise@chromium.org>
    3 Date: Mon, 14 Jun 2021 16:19:57 +0000
    4 Subject: [PATCH] correcting include paths
    5 
    6 ---
    7  third_party/maldoca/src/maldoca/base/logging.h    | 15 ++++++++++++---
    8  third_party/maldoca/src/maldoca/ole/mso.cc        |  4 ++++
    9  third_party/maldoca/src/maldoca/ole/oss_utils.h   |  4 ++++
   10  third_party/maldoca/src/maldoca/ole/ppt.cc        |  4 ++++
   11  .../src/third_party/zlibwrapper/gzipheader.cc     |  4 ++++
   12  5 files changed, 28 insertions(+), 3 deletions(-)
   13 
   14 diff --git a/third_party/maldoca/src/maldoca/base/logging.h b/third_party/maldoca/src/maldoca/base/logging.h
   15 index 518d96661888..b863e44bf9e3 100644
   16 --- a/third_party/maldoca/src/maldoca/base/logging.h
   17 +++ b/third_party/maldoca/src/maldoca/base/logging.h
   18 @@ -15,9 +15,18 @@
   19  #ifndef MALDOCA_BASE_LOGGING_H_
   20  #define MALDOCA_BASE_LOGGING_H_
   21  
   22 -#ifdef MALDOCA_CHROME
   23 +#if defined(MALDOCA_IN_CHROMIUM)
   24 +#include "base/check.h"
   25 +#include "base/check_op.h"
   26 +#include "base/logging.h"
   27 +
   28 +#elif defined(MALDOCA_CHROME)
   29  #include "mini_chromium/base/logging.h"
   30  
   31 +#endif
   32 +
   33 +#if defined(MALDOCA_CHROME) || defined(MALDOCA_IN_CHROMIUM)
   34 +
   35  namespace maldoca {
   36  
   37  inline bool InitLogging() {
   38 @@ -26,7 +35,7 @@ inline bool InitLogging() {
   39  }
   40  }  // namespace maldoca
   41  
   42 -#else  // MALDOCA_CHROME
   43 +#else  // defined(MALDOCA_CHROME) || defined(MALDOCA_IN_CHROMIUM)
   44  
   45  #include "zetasql/base/logging.h"
   46  
   47 @@ -38,5 +47,5 @@ using ::zetasql_base::get_vlog_level;
   48  using ::zetasql_base::InitLogging;
   49  }  // namespace maldoca
   50  
   51 -#endif  // MALDOCA_CHROME
   52 +#endif
   53  #endif  // MALDOCA_BASE_LOGGING_H_
   54 diff --git a/third_party/maldoca/src/maldoca/ole/mso.cc b/third_party/maldoca/src/maldoca/ole/mso.cc
   55 index 6b422199718b..7b0943285061 100644
   56 --- a/third_party/maldoca/src/maldoca/ole/mso.cc
   57 +++ b/third_party/maldoca/src/maldoca/ole/mso.cc
   58 @@ -27,7 +27,11 @@
   59  #include "libxml/xpath.h"
   60  #include "maldoca/ole/endian_reader.h"
   61  #include "maldoca/ole/oss_utils.h"
   62 +#ifdef MALDOCA_IN_CHROMIUM
   63 +#include "third_party/zlib/zlib.h"
   64 +#else
   65  #include "zlib/include/zlib.h"
   66 +#endif
   67  
   68  ABSL_FLAG(int32_t, mso_deflated_max_file_size, 2 << 20,
   69            "The maximum deflated MSO file size (in bytes) we are willing to "
   70 diff --git a/third_party/maldoca/src/maldoca/ole/oss_utils.h b/third_party/maldoca/src/maldoca/ole/oss_utils.h
   71 index 14df9a893c5c..41594fbe78c6 100644
   72 --- a/third_party/maldoca/src/maldoca/ole/oss_utils.h
   73 +++ b/third_party/maldoca/src/maldoca/ole/oss_utils.h
   74 @@ -30,7 +30,11 @@
   75  #include "absl/strings/escaping.h"
   76  #include "absl/strings/string_view.h"
   77  #include "google/protobuf/io/tokenizer.h"
   78 +#ifdef MALDOCA_IN_CHROMIUM
   79 +#include "third_party/libxml/src/include/libxml/tree.h"
   80 +#else
   81  #include "libxml/tree.h"
   82 +#endif
   83  #include "maldoca/base/file.h"
   84  #include "maldoca/base/logging.h"
   85  
   86 diff --git a/third_party/maldoca/src/maldoca/ole/ppt.cc b/third_party/maldoca/src/maldoca/ole/ppt.cc
   87 index 5302366bd759..5ff55eeb3289 100644
   88 --- a/third_party/maldoca/src/maldoca/ole/ppt.cc
   89 +++ b/third_party/maldoca/src/maldoca/ole/ppt.cc
   90 @@ -25,7 +25,11 @@
   91  #include "maldoca/ole/fat.h"
   92  #include "maldoca/ole/header.h"
   93  #include "maldoca/ole/oss_utils.h"
   94 +#ifdef MALDOCA_IN_CHROMIUM
   95 +#include "third_party/zlib/zlib.h"
   96 +#else
   97  #include "zlib/include/zlib.h"
   98 +#endif
   99  #include "zlibwrapper/zlibwrapper.h"
  100  
  101  ABSL_FLAG(
  102 diff --git a/third_party/maldoca/src/third_party/zlibwrapper/gzipheader.cc b/third_party/maldoca/src/third_party/zlibwrapper/gzipheader.cc
  103 index cd3df3e2d840..ed27503f3175 100644
  104 --- a/third_party/maldoca/src/third_party/zlibwrapper/gzipheader.cc
  105 +++ b/third_party/maldoca/src/third_party/zlibwrapper/gzipheader.cc
  106 @@ -22,7 +22,11 @@
  107  
  108  #include "base/compiler_specific.h"
  109  #include "maldoca/base/logging.h"
  110 +#ifdef MALDOCA_IN_CHROMIUM
  111 +#include "third_party/zlib/zlib.h"  // for Z_DEFAULT_COMPRESSION
  112 +#else
  113  #include "zlib/include/zlib.h"  // for Z_DEFAULT_COMPRESSION
  114 +#endif
  115  
  116  const uint8_t GZipHeader::magic[] = {0x1f, 0x8b};
  117  
  118 -- 
  119 2.32.0.272.g935e593368-goog
  120