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
This commit is contained in:
Christophe Marin 2024-01-05 08:49:06 +00:00 committed by Git OBS Bridge
parent 97d1b8b8c4
commit 982f3a0ca5
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 22 09:57:26 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
- 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 <alarrosa@suse.com>

View File

@ -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)