Merge branch 'rawhide' into epel8

chromium-116-constexpr.patch

@@ -0,0 +1,65 @@
+diff -up chromium-116.0.5845.96/cc/paint/paint_op_writer.h.me chromium-116.0.5845.96/cc/paint/paint_op_writer.h
+--- chromium-116.0.5845.96/cc/paint/paint_op_writer.h.me	2023-08-16 19:09:48.998173285 +0200
++++ chromium-116.0.5845.96/cc/paint/paint_op_writer.h	2023-08-16 21:13:44.442431527 +0200
+@@ -104,7 +104,16 @@ class CC_PAINT_EXPORT PaintOpWriter {
+ 
+  private:
+   template <typename T>
+-  static constexpr size_t SerializedSizeSimple();
++  static constexpr size_t SerializedSizeSimple() {
++    static_assert(!std::is_pointer_v<T>);
++    return base::bits::AlignUp(sizeof(T), kDefaultAlignment);
++  }
++  // size_t is always serialized as uint64_t to make the serialized result
++  // portable between 32bit and 64bit processes.
++  template <>
++  constexpr size_t SerializedSizeSimple<size_t>() {
++    return base::bits::AlignUp(sizeof(uint64_t), kDefaultAlignment);
++  }
+ 
+  public:
+   // SerializedSize() returns the maximum serialized size of the given type or
+@@ -115,7 +124,10 @@ class CC_PAINT_EXPORT PaintOpWriter {
+   // deserialization, and make it possible to allow dynamic sizing for some
+   // data types (see the specialized/overloaded functions).
+   template <typename T>
+-  static constexpr size_t SerializedSize();
++  static constexpr size_t SerializedSize() {
++    static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
++    return SerializedSizeSimple<T>();
++  }
+   template <typename T>
+   static constexpr size_t SerializedSize(const T& data);
+   static size_t SerializedSize(const PaintImage& image);
+@@ -360,19 +372,6 @@ class CC_PAINT_EXPORT PaintOpWriter {
+   const bool enable_security_constraints_;
+ };
+ 
+-template <typename T>
+-constexpr size_t PaintOpWriter::SerializedSizeSimple() {
+-  static_assert(!std::is_pointer_v<T>);
+-  return base::bits::AlignUp(sizeof(T), kDefaultAlignment);
+-}
+-
+-// size_t is always serialized as two uint32_ts to make the serialized result
+-// portable between 32bit and 64bit processes.
+-template <>
+-constexpr size_t PaintOpWriter::SerializedSizeSimple<size_t>() {
+-  return base::bits::AlignUp(2 * sizeof(uint32_t), kDefaultAlignment);
+-}
+-
+ template <>
+ constexpr size_t PaintOpWriter::SerializedSize<SkGainmapInfo>() {
+   return SerializedSizeSimple<SkColor4f>() +  // fGainmapRatioMin
+@@ -386,11 +385,6 @@ constexpr size_t PaintOpWriter::Serializ
+ }
+ 
+ template <typename T>
+-constexpr size_t PaintOpWriter::SerializedSize() {
+-  static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
+-  return SerializedSizeSimple<T>();
+-}
+-template <typename T>
+ constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
+   return SerializedSizeSimple<T>();
+ }

chromium-116-el7-include-fcntl-memfd.patch

@@ -34,3 +34,14 @@ diff -up iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compati
  #include <errno.h>
  #include <signal.h>
  #include <string.h>
+diff -up chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
+--- chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me	2023-08-17 06:32:32.484538849 +0200
++++ chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc	2023-08-17 07:02:01.965168328 +0200
+@@ -5,6 +5,7 @@
+ #include "ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.h"
+ 
+ #include <sys/mman.h>
++#include <linux/memfd.h>
+ 
+ #include <string>
+ #include <utility>

chromium.spec

@@ -298,7 +298,7 @@ Patch90: chromium-113-disable-GlobalMediaControlsCastStartStop.patch
 Patch91: chromium-108-system-opus.patch
 
 # need to explicitly include a kernel header on EL7 to support MFD_CLOEXEC, F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
-Patch100: chromium-108-el7-include-fcntl-memfd.patch
+Patch100: chromium-116-el7-include-fcntl-memfd.patch
 
 # add define HAVE_STRNDUP on epel7
 Patch101: chromium-108-el7-wayland-strndup-error.patch
@@ -324,6 +324,7 @@ Patch107: chromium-99.0.4844.51-el7-extra-operator.patch
 # workaround for clang bug on el7
 Patch109: chromium-114-wireless-el7.patch
 Patch110: chromium-115-buildflag-el7.patch
+Patch111: chromium-116-constexpr.patch
 
 # system ffmpeg
 Patch114: chromium-107-ffmpeg-duration.patch
@@ -947,6 +948,7 @@ udev.
 %patch -P107 -p1 -b .el7-extra-operator-equalequal
 %patch -P109 -p1 -b .wireless
 %patch -P110 -p1 -b .buildflag-el7
+%patch -P111 -p1 -b .constexpr
 %endif
 
 %if 0%{?rhel} == 9