On 11/26/20 1:17 PM, Christopher Gregory via blfs-support wrote:
Sent: Friday, November 27, 2020 at 7:23 AM
From: "Bruce Dubbs via blfs-support" <blfs-support@lists.linuxfromscratch.org>
To: blfs-support@lists.linuxfromscratch.org
Cc: "Bruce Dubbs" <bruce.du...@gmail.com>
Subject: Re: [blfs-support] qtwebengine patch does not apply
On 11/26/20 12:15 PM, Christopher Gregory via blfs-support wrote:
Hello,
The provided patch does not seem to have been created correctly. When you go
to apply it, it asks which file you wish to patch. I see that Bruce modified
it, so perhaps this could be checked and corrected?
I just checked and it applies fine for me. No fuzz or offsets. Here is
the md5sum:
e2c15032fde4a12caee4c2e6215b7cef
qtwebengine-everywhere-src-5.15.2-ICU68-1.patch
-- Bruce
--
http://lists.linuxfromscratch.org/listinfo/blfs-support
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
Hello Bruce,
This is what I get when using the book instructions:
root [ /opt/qt-everywhere-src-5.15.2 ]# patch -Np1 -i
../qtwebengine-everywhere-src-5.15.2-ICU68-1.patch
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Submitted By: Marty Jack <martyj19 at comcast dot net>
|Date: 2020-11-02
|Initial Package Version: 5.15.1
|Upstream Status: Unknown
|Origin: self
|Description: Allows qtwebengine to build against system ICU_68.1 which has
|dropped the TRUE and FALSE macros.
|Comment by Ken: This code actually comes from chromium, but they only take
|bugs against their latest release, which I do not have. I have attempted
|to raise a bug at qt.
|
|Revised by Bruce Dubbs on 2020-11-20.
|Rebased and added new changes for 5.15.2
|
|
|diff -Naur
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/i18n/string_compare.cc
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc
|---
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/i18n/string_compare.cc
2020-11-06 19:22:36.000000000 -0600
|+++
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc
2020-11-20 12:37:25.321072942 -0600
--------------------------
File to patch:
It's not clear what directory you are in.
$ tar -xf qtwebengine-everywhere-src-5.15.2.tar.xz
$ cd qtwebengine-everywhere-src-5.15.2
$ patch -Np1 -i ../qtwebengine-everywhere-src-5.15.2-ICU68-1.patch
Also check md5sums:
e2c15032fde4a12caee4c2e6215b7cef
qtwebengine-everywhere-src-5.15.2-ICU68-1.patch
c88cbe3158feb20c4feb3d54262feb23 qtwebengine-everywhere-src-5.15.2.tar.xz
You may also want to try 'find -name string_compare.cc'
-- Bruce
--
http://lists.linuxfromscratch.org/listinfo/blfs-support
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
