From 982f3a0ca5654eec632d5db0b22798e274012198289892131de7eab5085fb5e6 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Fri, 5 Jan 2024 08:49:06 +0000 Subject: [PATCH] Accepting request 1134672 from home:michals:Calibre - On Leap build with re2-10 even when re2-11 is available (bsc#1217257). re2-11 pulls in system abseil which is incompatible with bundled abseil causing build failure. OBS-URL: https://build.opensuse.org/request/show/1134672 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-webengine?expand=0&rev=54 --- qt6-webengine.changes | 7 +++++++ qt6-webengine.spec | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qt6-webengine.changes b/qt6-webengine.changes index 9f9e972..25f1bea 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 22 09:57:26 UTC 2023 - Michal Suchanek + +- On Leap build with re2-10 even when re2-11 is available (bsc#1217257). + re2-11 pulls in system abseil which is incompatible with bundled abseil + causing build failure. + ------------------------------------------------------------------- Wed Dec 20 12:16:07 UTC 2023 - Antonio Larrosa diff --git a/qt6-webengine.spec b/qt6-webengine.spec index f2b5f7d..3c18c0d 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -1,5 +1,5 @@ # -# spec file for package qt6-webengine +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -135,7 +135,11 @@ BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(nss) >= 3.26 BuildRequires: pkgconfig(opus) >= 1.3.1 BuildRequires: pkgconfig(poppler-cpp) +%if 0%{?suse_version} <= 1500 +BuildRequires: pkgconfig(re2) < 11 +%else BuildRequires: pkgconfig(re2) +%endif BuildRequires: pkgconfig(vpx) >= 1.10.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite)