Closed pgaskin closed 2 years ago
pgaskin
commented
2 years ago pgaskin
commented
2 years ago Errors:
/home/patrick/src/kobopatch-patches/src/versions/4.30.18838/libadobe.so.yaml/pgaskin.yaml: Remove PDF map widget shown during panning: could not apply patch "Remove PDF map widget shown during panning": line 9: inst 4: ReplaceBytes: could not find specified bytes
/home/patrick/src/kobopatch-patches/src/versions/4.30.18838/nickel.yaml/pgaskin.yaml: Increase size of kepub chapter progress chart: could not apply patch "Increase size of kepub chapter progress chart": line 28: inst 4: ReplaceZlib: not a zlib stream
/home/patrick/src/kobopatch-patches/src/versions/4.30.18838/nickel.yaml/pgaskin.yaml: Remove forgot pin button from lock screen: could not apply patch "Remove forgot pin button from lock screen": line 20: inst 4: ReplaceZlib: not a zlib stream
/home/patrick/src/kobopatch-patches/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/pgaskin.yaml: Customize ComfortLight settings: could not apply patch "Customize ComfortLight settings": line 551: inst 4: ReplaceInt: could not find specified bytes at offset
/home/patrick/src/kobopatch-patches/src/versions/4.30.18838/nickel.yaml/oren64.yaml: New home screen subtitle custom font: could not apply patch "New home screen subtitle custom font": line 31: inst 4: ReplaceZlib: not a zlib streamThe usual version-specific patches, nothing special.
pgaskin
commented
2 years ago Resource extraction:
./qrc2zip --output "nickel.18838.qInitResources_resources.zip" --recursive --verbose "nickel" 1 $((0x12e4540 - 0x0010000)) $((0x00272b8 - 0x0010000)) $((0x12e4028 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.18838.qInitResources_translations.zip" --recursive --verbose "nickel" 1 $((0x1679a48 - 0x0010000)) $((0x12e4940 - 0x0010000)) $((0x16797c0 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.18838.qInitResources_styles.zip" --recursive --verbose "nickel" 1 $((0x1699498 - 0x0010000)) $((0x1679b60 - 0x0010000)) $((0x16969e8 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.18838.qInitResources_certificates.zip" --recursive --verbose "nickel" 1 $((0x16c0a68 - 0x0010000)) $((0x169a098 - 0x0010000)) $((0x16bfa18 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }https://krc.storage.pgaskin.net/nickel.18838.qInitResources_certificates.zip https://krc.storage.pgaskin.net/nickel.18838.qInitResources_resources.zip https://krc.storage.pgaskin.net/nickel.18838.qInitResources_styles.zip https://krc.storage.pgaskin.net/nickel.18838.qInitResources_translations.zip
shermp
commented
2 years ago Do the custom font sizes patch and (unreleased) font scale patch require any updates for this version?
rtiangha
commented
2 years ago Do the custom font sizes patch and (unreleased) font scale patch require any updates for this version?
No to custom font size, yes to the unreleased unify size patch; I just tried them myself.
shermp
commented
2 years ago No to custom font size
Yay, that's the PITA to update
yes to the unreleased unify size patch
Boo hiss. Probably need to better handle the offset stuff in that patch.
pgaskin
commented
2 years ago Later tonight, I'm going to do some testing, commit some changes from Semwize, look through the MR threads for anything else I need to fix, then make the release. I'll also look at #96 if I have time.
shermp
commented
2 years ago yes to the unreleased unify size patch
Was that a "yes it works"? Or a "yes, it needs updating"? Because it looks like the offsets have not changed.
rtiangha
commented
2 years ago yes to the unreleased unify size patch
Was that a "yes it works"? Or a "yes, it needs updating"? Because it looks like the offsets have not changed.
To patching in. I haven't installed it yet since I'm waiting for my GloHD to finish charging first. The unify patch (which I got from here) was the one that threw errors (on the Mark 6 firmware).
APPLY `Unify font sizes`
Error: could not apply patch "Unify font sizes": line 17: inst 5: ReplaceBytes: could not find specified bytes
Error: could not apply patches: error applying patch file 'src/libnickel.so.1.0.0_custom.yaml': could not apply patch "Unify font sizes": line 17: inst 5: ReplaceBytes: could not find specified bytesYeah, found the problem. The blx instruction to QScreen::logicalDotsPerInchX() is a bit different.
@pgaskin what's the proper way to find calls to external functions? The following gives me:
- ReplaceBytes:
Offset: 0x16C2
FindInstBLX: {Sym: "_ZNK7QScreen19logicalDotsPerInchXEv"} # QScreen::logicalDotsPerInchX()
ReplaceH: B1 EE 0A 0B # vmov.f64 d0,#6.5With an error of:
/home/sherman/dev/kobopatch-patches/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/shermp.yaml: Unify font sizes: could not apply patch "Unify font sizes": line 17: inst 5: ReplaceBytes: could not find specified bytesNote this is different from the no such symbol "QScreen::logicalDotsPerInchX(void)" I was getting when I tried the demangled version.
pgaskin
commented
2 years ago @shermp, I think you forgot to use SymPLT instead of Sym.
shermp
commented
2 years ago @shermp, I think you forgot to use SymPLT instead of Sym.
Ah, that works, thanks. I'm not really sure what the difference is between the different Sym's are to be honest.
I'll be force updating my branch.
pgaskin
commented
2 years ago