Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0

* Wed Jul 20 2022 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.15.9-3
- Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0

If you look closely at the patch, you will see that the code that is
removed does not actually mention the offending icudtl.dat anywhere.
This upstream code snippet was fixed back in 5.11.0 to check for
qtwebengine_resources.pak instead, which is always installed. (Compare
my original patch with the version rebased by Rex Dieter for 5.11.0.)

Searching for alternate resource paths is still pointless in packaged
QtWebEngine, mind you. (The file installed by the package should always
be found.) So the patch did not hurt. But still, it is no longer
necessary to patch this out.

qt5-qtwebengine.spec

@@ -62,7 +62,7 @@
 Summary: Qt5 - QtWebEngine components
 Name:    qt5-qtwebengine
 Version: 5.15.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -92,11 +92,6 @@ Source100: python2.7-2.7.18-19.el9.1.src.rpm
 Source101: python2.7-2.7.18-19.el9.1.aarch64.rpm
 Source102: python2.7-2.7.18-19.el9.1.x86_64.rpm
 
-# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
-# resulting warnings - not upstreamable as is because it removes the fallback
-# mechanism for the ICU data directory (which is not used in our builds because
-# we use the system ICU, which embeds the data statically) completely
-Patch1:  qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
 # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
 # ARM flags with our %%qmake_qt5 macro, including for the next patch
 Patch2:  qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
@@ -430,9 +425,6 @@ rpm2cpio %{SOURCE102} | cpio -idm
 popd
 %endif
 
-%if 0%{?use_system_libicu}
-%patch1 -p1 -b .no-icudtl-dat
-%endif
 %patch2 -p1 -b .fix-extractcflag
 %if !0%{?arm_neon}
 %patch3 -p1 -b .no-neon
@@ -675,6 +667,9 @@ done
 
 
 %changelog
+* Wed Jul 20 2022 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.15.9-3
+- Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0
+
 * Thu Jul 14 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.9-2
 - Rebuild (Qt 5.15.5)
 

qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch

@@ -1,33 +0,0 @@
-diff -up qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp
---- qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat	2021-06-24 07:26:58.976486102 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp	2021-06-24 07:32:19.272863523 -0500
-@@ -273,7 +273,6 @@ QString dictionariesPath()
- 
- QString resourcesDataPath()
- {
--    static bool initialized = false;
-     static QString potentialResourcesPath =
- #if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD)
-             getResourcesPath(frameworkBundle());
-@@ -282,21 +281,6 @@ QString resourcesDataPath()
- #else
-             QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
- #endif
--    if (!initialized) {
--        initialized = true;
--        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
--            qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
--            potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
--        }
--        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
--            qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
--            potentialResourcesPath = QCoreApplication::applicationDirPath();
--        }
--        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) {
--            qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
--            potentialResourcesPath = fallbackDir();
--        }
--    }
- 
-     return potentialResourcesPath;
- }