#6 qtwebengine build fixes for icu 67 on fedora and epel
Closed 3 years ago by loise. Opened 3 years ago by loise.
Unknown source master  into  master

file modified
+27 -2
@@ -10,11 +10,13 @@

  # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)

  %global use_system_libvpx 1

  %endif

+ %if 0%{?fedora} || 0%{?rhel} > 7

  # need libwebp >= 0.6.0

  %global use_system_libwebp 1

+ %endif

  

- %if 0%{?fedora} > 31

- # need libicu >= 64, only currently available on f32+

+ %if 0%{?fedora} > 31 && 0%{?fedora} < 33

+ # need libicu >= 64, only currently available on f32+ but build breaks on libicu 67

  %global use_system_libicu 1

  %endif

  
@@ -34,6 +36,12 @@

  # webcore_debug v8base_debug

  %endif

  

+ # disable debug infos to allow packaging at the end of the build

+ %if 0%{?rhel} == 7

+ %global debug_config %{nil}

+ #%define debug_package %{nil}

+ %endif

+ 

  #global prerelease rc

  

  # spellchecking dictionary directory
@@ -104,7 +112,9 @@

  # qtwebengine-chromium

  

  # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches

+ %if 0%{?fedora} || 0%{?rhel} > 7

  ExclusiveArch: %{qt5_qtwebengine_arches}

+ %endif

  

  BuildRequires: qt5-qtbase-devel

  BuildRequires: qt5-qtbase-private-devel
@@ -132,7 +142,9 @@

  BuildRequires: libicu-devel >= 64

  %endif

  BuildRequires: libjpeg-devel

+ %if 0%{?fedora}

  BuildRequires: re2-devel

+ %endif

  BuildRequires: snappy-devel

  %ifarch %{ix86} x86_64

  BuildRequires: yasm
@@ -144,7 +156,9 @@

  BuildRequires: pkgconfig(freetype2)

  BuildRequires: pkgconfig(gl)

  BuildRequires: pkgconfig(egl)

+ %if 0%{?fedora}

  BuildRequires: pkgconfig(jsoncpp)

+ %endif

  BuildRequires: pkgconfig(libpng)

  BuildRequires: pkgconfig(libudev)

  %if 0%{?use_system_libwebp}
@@ -319,6 +333,9 @@

  

  %{?_qt5_version:Requires: qt5-qtbase%{?_isa} = %{_qt5_version}}

  

+ %if 0%{?rhel} == 7

+ BuildRequires: devtoolset-7-toolchain	

+ %endif

  

  %description

  %{summary}.
@@ -400,6 +417,7 @@

  

  # fix // in #include in content/renderer/gpu to avoid debugedit failure

  #sed -i -e 's!gpu//!gpu/!g' \

+ 

  #  src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc

  # and another one in 2 files in WebRTC

  sed -i -e 's!audio_processing//!audio_processing/!g' \
@@ -416,7 +434,9 @@

  

  # http://bugzilla.redhat.com/1337585

  # can't just delete, but we'll overwrite with system headers to be on the safe side

+ %if 0%{?fedora}

  cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/

+ %endif

  

  %if 0

  #ifarch x86_64
@@ -440,6 +460,11 @@

  

  

  %build

+ 

+ %if 0%{?rhel} == 7

+ . /opt/rh/devtoolset-7/enable

+ %endif

+ 

  export STRIP=strip

  export NINJAFLAGS="%{__ninja_common_opts}"

  export NINJA_PATH=%{__ninja}

no initial comment

That's alot of extra's for just the icu fix.

libwebp, re2, jsoncpp are all in EPEL. Please don't try to remove them for all RHEL/CentOS users.

I'll let others decide whether they what to have RHEL7 stuff in the rawhide spec file.

sorry, the only "real" fix is up in the first lines for the ICU fix to limit that to fc 32 where a working icu is available. As that is the only one - I'd probably go for using the shipped icu all along everywhere.

The rest of the changes can be surely dropped (I tried centos-stream but gave up to support those builds).

Looking good, 2 things if possible:
1. %changelog entry to document changes
2. can you squash the commits? (I think we're up to 19 so far, not a huge deal, but would make git history cleaner)

Pull-Request has been closed by loise

3 years ago
Metadata