workaround 'TRUE'/'FALSE' was not declared in this scope

epel9
Rex Dieter 4 years ago
parent 4cef673b2d
commit 3e16f741fa

@ -107,6 +107,8 @@ Patch28: qtwebengine-everywhere-src-5.15.2-#1904652.patch
Patch29: qtwebengine-everywhere-src-5.15.2-sandbox-time64-syscalls.patch
# Fix FTBFS with latest glibc, https://bugzilla.redhat.com/show_bug.cgi?id=1945595
Patch30: qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch
# FIX FTBFS with latest glibc: 'TRUE'/'FALSE' was not declared in this scope
Patch31: qtwebengine-everywhere-src-5.15.2-bool.patch
## Upstream patches:
@ -417,6 +419,7 @@ popd
%patch28 -p1 -b .rh#1904652
%patch29 -p1 -b .sandbox-time64-syscalls
%patch30 -p1 -b .SIGSTKSZ
%patch31 -p1 -b .bool
# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
# when building on older Qt releases
@ -649,6 +652,7 @@ done
%changelog
* Wed Jun 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-12
- workaround SIGSTKSZ FTBFS (#19455950
- workaround 'TRUE'/'FALSE' was not declared in this scope
* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 5.15.2-11
- Rebuild for ICU 69

@ -0,0 +1,26 @@
diff -up qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc.BOOL qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc
--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc.BOOL 2020-11-06 19:22:36.000000000 -0600
+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc 2021-06-24 12:00:52.393740774 -0500
@@ -18,8 +18,8 @@ UCollationResult CompareString16WithColl
StringPiece16 rhs) {
UErrorCode error = U_ZERO_ERROR;
UCollationResult result = collator.compare(
- icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
- icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
+ icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
+ icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
error);
DCHECK(U_SUCCESS(error));
return result;
diff -up qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc.BOOL qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc
--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc.BOOL 2020-11-06 19:22:36.000000000 -0600
+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc 2021-06-24 12:01:13.735648901 -0500
@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
measure_format.formatMeasures(measures, 3, formatted, ignore, status);
*out = i18n::UnicodeStringToString16(formatted);
- return U_SUCCESS(status) == TRUE;
+ return U_SUCCESS(status) == true;
}
string16 DateIntervalFormat(const Time& begin_time,
Loading…
Cancel
Save