From add11f5b6424739748a79f0a9d6263d7b4b559c6ae7849b53182020b58bb8b8d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 29 Jan 2021 11:18:41 +0000
Subject: [PATCH] Accepting request 867693 from home:Vogtinator:qt5.15

- Bump _constraints and %limit_build, hopefully avoid occasional
  OOM and make the build quicker
- Drop obsolete conditions

OBS-URL: https://build.opensuse.org/request/show/867693
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=18
---
 _constraints               | 4 ++--
 libqt5-qtwebengine.changes | 7 +++++++
 libqt5-qtwebengine.spec    | 9 +--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_constraints b/_constraints
index 8469d37..8826782 100644
--- a/_constraints
+++ b/_constraints
@@ -4,10 +4,10 @@
    <size unit="G">12</size>
   </disk>
   <memory>
-   <size unit="G">9</size>
+   <size unit="G">12</size>
   </memory>
   <physicalmemory>
-   <size unit="G">4</size>
+   <size unit="G">10</size>
   </physicalmemory>
   <processors>4</processors>
  </hardware>
diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes
index 84ad310..5aae2da 100644
--- a/libqt5-qtwebengine.changes
+++ b/libqt5-qtwebengine.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 29 11:06:22 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Bump _constraints and %limit_build, hopefully avoid occasional
+  OOM and make the build quicker
+- Drop obsolete conditions
+
 -------------------------------------------------------------------
 Fri Jan  8 16:27:22 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec
index 2d596eb..203f96c 100644
--- a/libqt5-qtwebengine.spec
+++ b/libqt5-qtwebengine.spec
@@ -124,10 +124,6 @@ BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(jsoncpp)
-%if 0%{?suse_version} < 1330
-# It does not build with the default compiler (GCC 4.8) on Leap 42.x
-BuildRequires:  gcc7-c++
-%endif
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libevent)
@@ -315,9 +311,6 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
         QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" \
         QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \
         gn_args+="link_pulseaudio=true" \
-%if 0%{?suse_version} < 1330
-        QMAKE_CC=gcc-7 QMAKE_CXX=g++-7 CONFIG+=c++14 \
-%endif
         qtwebengine.pro -- \
         -webengine-alsa -webengine-kerberos -no-webengine-embedded-build \
 %if %{with system_icu}
@@ -330,7 +323,7 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
         -system-webengine-opus -system-webengine-webp -webengine-pepper-plugins -webengine-printing-and-pdf
 
 # Determine the right number of parallel processes based on the available memory
-%limit_build -m 2500
+%limit_build -m 2750
 
 # Ensure that also the internal chromium build follows the right number of parallel
 # processes instead of its defaults.