Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates-src > by-pkgid > d0e3cdee08045b3d0e6744609d743407 > files > 27

chromium-browser-stable-60.0.3112.101-1.mga5.src.rpm

--- chromium-60.0.3112.101/third_party/libxml/chromium/libxml_utils.cc.mga5	2017-08-14 21:05:34.000000000 +0200
+++ chromium-60.0.3112.101/third_party/libxml/chromium/libxml_utils.cc	2017-08-26 19:14:02.250000000 +0200
@@ -24,8 +24,7 @@
 
 bool XmlReader::Load(const std::string& input) {
   const int kParseOptions = XML_PARSE_RECOVER |  // recover on errors
-                            XML_PARSE_NONET |    // forbid network access
-                            XML_PARSE_NOXXE;     // no external entities
+                            XML_PARSE_NONET;     // forbid network access
   // TODO(evanm): Verify it's OK to pass NULL for the URL and encoding.
   // The libxml code allows for these, but it's unclear what effect is has.
   reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()),
@@ -35,8 +34,7 @@
 
 bool XmlReader::LoadFile(const std::string& file_path) {
   const int kParseOptions = XML_PARSE_RECOVER |  // recover on errors
-                            XML_PARSE_NONET |    // forbid network access
-                            XML_PARSE_NOXXE;     // no external entities
+                            XML_PARSE_NONET;     // forbid network access
   reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions);
   return reader_ != NULL;
 }
--- chromium-60.0.3112.101/v8/src/regexp/regexp-parser.cc.mga5	2017-08-14 21:06:55.000000000 +0200
+++ chromium-60.0.3112.101/v8/src/regexp/regexp-parser.cc	2017-08-26 21:16:39.130000000 +0200
@@ -1221,13 +1221,6 @@
     case UCHAR_DEFAULT_IGNORABLE_CODE_POINT:
     case UCHAR_DEPRECATED:
     case UCHAR_DIACRITIC:
-    case UCHAR_EMOJI:
-    // TODO(yangguo): Uncomment this once we upgrade to ICU 60.
-    //                See https://ssl.icu-project.org/trac/ticket/13062
-    // case UCHAR_EMOJI_COMPONENT:
-    case UCHAR_EMOJI_MODIFIER_BASE:
-    case UCHAR_EMOJI_MODIFIER:
-    case UCHAR_EMOJI_PRESENTATION:
     case UCHAR_EXTENDER:
     case UCHAR_GRAPHEME_BASE:
     case UCHAR_GRAPHEME_EXTEND:
--- chromium-60.0.3112.101/build/toolchain/gcc_toolchain.gni.mga5	2017-08-14 21:04:55.000000000 +0200
+++ chromium-60.0.3112.101/build/toolchain/gcc_toolchain.gni	2017-08-27 00:00:16.940000000 +0200
@@ -573,7 +573,7 @@
     cxx = "$prefix/clang++"
     ld = cxx
     readelf = "${toolprefix}readelf"
-    ar = "${prefix}/llvm-ar"
+    ar = "${prefix}/ar"
     nm = "${toolprefix}nm"
 
     forward_variables_from(invoker,
--- chromium-60.0.3112.101/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp.mga5	2017-08-14 21:05:32.000000000 +0200
+++ chromium-60.0.3112.101/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	2017-08-27 13:18:36.810000000 +0200
@@ -798,7 +798,7 @@
 // If you need a specific implementation for other J_COLOR_SPACE values,
 // please add a full template specialization for this function below.
 template <J_COLOR_SPACE colorSpace>
-void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column) = delete;
+void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column) { void holadiee(JSAMPARRAY, int); holadiee(samples, column); }
 
 // Used only for debugging with libjpeg (instead of libjpeg-turbo).
 template <>
--- chromium-60.0.3112.101/chrome/browser/ssl/ignore_errors_cert_verifier.cc.mga5	2017-08-14 21:04:59.000000000 +0200
+++ chromium-60.0.3112.101/chrome/browser/ssl/ignore_errors_cert_verifier.cc	2017-08-27 15:24:56.900000000 +0200
@@ -100,7 +100,7 @@
   auto whitelist_end = whitelist_.end();
   auto fingerprints_begin = spki_fingerprints.begin();
   auto fingerprints_end = spki_fingerprints.end();
-  static const SHA256HashValueLessThan sha256_lt;
+  static const SHA256HashValueLessThan sha256_lt = SHA256HashValueLessThan();
   bool ignore_errors = false;
   while (whitelist_begin != whitelist_end &&
          fingerprints_begin != fingerprints_end) {
--- chromium-60.0.3112.101/chrome/browser/ui/views/harmony/harmony_layout_provider.h.mga5	2017-08-14 21:05:00.000000000 +0200
+++ chromium-60.0.3112.101/chrome/browser/ui/views/harmony/harmony_layout_provider.h	2017-08-27 15:52:37.200000000 +0200
@@ -14,7 +14,7 @@
   // The Harmony layout unit. All distances are in terms of this unit.
   static constexpr int kHarmonyLayoutUnit = 16;
 
-  HarmonyLayoutProvider() {}
+  HarmonyLayoutProvider() : typography_provider_() {}
   ~HarmonyLayoutProvider() override {}
 
   gfx::Insets GetInsetsMetric(int metric) const override;