#2 Fix so it builds on RHEL 9
Merged a year ago by jgrulich. Opened a year ago by tdawson.
rpms/ tdawson/qt6-qtwebengine fix-rhel9  into  rawhide

file modified
+7 -4
@@ -8,12 +8,12 @@ 

  %global use_system_libwebp 1

  %global use_system_jsoncpp 1

  %if 0%{?rhel} && 0%{?rhel} == 9

- %global use_system_re2 0

+ %global use_system_libicu 0

  %else

- %global use_system_re2 1

+ %global use_system_libicu 1

  %endif

  

- %global use_system_libicu 1

+ %global use_system_re2 1

  

  # NEON support on ARM (detected at runtime) - disable this if you are hitting

  # FTBFS due to e.g. GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
@@ -118,7 +118,7 @@ 

  BuildRequires: gperf

  BuildRequires: krb5-devel

  %if 0%{?use_system_libicu}

- BuildRequires: libicu-devel >= 65

+ BuildRequires: libicu-devel >= 68

  %endif

  BuildRequires: libjpeg-devel

  BuildRequires: nodejs
@@ -475,6 +475,9 @@ 

  %{_qt6_datadir}/resources/qtwebengine_resources.pak

  %{_qt6_datadir}/resources/qtwebengine_resources_100p.pak

  %{_qt6_datadir}/resources/qtwebengine_resources_200p.pak

+ %if ! 0%{?use_system_libicu}

+ %{_qt6_datadir}/resources/icudtl.dat

+ %endif

  %dir %{_qtwebengine_dictionaries_dir}

  %dir %{_qt6_translationdir}/qtwebengine_locales

  %lang(am) %{_qt6_translationdir}/qtwebengine_locales/am.pak

  • epel9 now has re2, use it
  • libicu now has a minimum requirement of 68
  • rhel9 libicu is too old, use built in one
  • non-system libicu generates an extra file

Signed-off-by: Troy Dawson tdawson@redhat.com

Pull-Request has been merged by jgrulich

a year ago
Metadata