Closed pgaskin closed 2 years ago
pgaskin
commented
2 years ago pgaskin
commented
2 years ago Resource extraction:
./qrc2zip --output "nickel.19608.qInitResources_resources.zip" --recursive --verbose "nickel" 1 $((0x1394398 - 0x0010000)) $((0x0027278 - 0x0010000)) $((0x1393e78 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19608.qInitResources_translations.zip" --recursive --verbose "nickel" 1 $((0x17fe4e8 - 0x0010000)) $((0x1394798 - 0x0010000)) $((0x17fe200 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19608.qInitResources_styles.zip" --recursive --verbose "nickel" 1 $((0x181ee50 - 0x0010000)) $((0x17fe630 - 0x0010000)) $((0x181c328 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19608.qInitResources_certificates.zip" --recursive --verbose "nickel" 1 $((0x1846438 - 0x0010000)) $((0x181fa68 - 0x0010000)) $((0x18453e8 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }https://krc.storage.pgaskin.net/nickel.19608.qInitResources_certificates.zip https://krc.storage.pgaskin.net/nickel.19608.qInitResources_resources.zip https://krc.storage.pgaskin.net/nickel.19608.qInitResources_styles.zip https://krc.storage.pgaskin.net/nickel.19608.qInitResources_translations.zip
pgaskin
commented
2 years ago Errors:
/home/patrick/src/kobopatch-patches/src/versions/4.33.19608/libnickel.so.1.0.0.yaml/pgaskin.yaml: Remove title from reading header/footer: could not apply patch "Remove title from reading header/footer": line 343: inst 4: ReplaceBytes: could not find specified bytes at offset
/home/patrick/src/kobopatch-patches/src/versions/4.33.19608/libnickel.so.1.0.0.yaml/pgaskin.yaml: Customize ComfortLight settings: could not apply patch "Customize ComfortLight settings": line 536: inst 4: ReplaceInt: could not find specified bytes at offset
/home/patrick/src/kobopatch-patches/src/versions/4.33.19608/libnickel.so.1.0.0.yaml/pgaskin.yaml: Hide browser from beta features: could not apply patch "Hide browser from beta features": line 82: inst 3: ReplaceBytes: could not find specified bytes
/home/patrick/src/kobopatch-patches/src/versions/4.33.19608/libnickel.so.1.0.0.yaml/geoffr.yaml: Set KePub hyphenation: could not apply patch "Set KePub hyphenation": line 336: inst 3: ReplaceBytes: could not find specified bytes at offset
/home/patrick/src/kobopatch-patches/src/versions/4.33.19608/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.33.19608/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 streamPretty much the same as usual, and I suspect the first one is due to the CSS changes for setting the OpenDyslexic font throughout the UI.
shermp
commented
2 years ago Perfect timing. I'm running the new libnickel through Ghidra now.
shermp
commented
2 years ago Actually, looks like there might not be anything I need to look into this time? Font sizes and line spacing seems fine this time around?
pgaskin
commented
2 years ago Yeah, this release doesn't seem to have any changes which affect the patches other than the side-effects of the OpenDyslexic change. The most helpful thing will probably just be testing it after I push the updated patches in a few minutes, since I don't have time to fully test it tonight.
pgaskin
commented
2 years ago Remove title from reading header/footer will need a little bit more work than I thought it would. Everything else is done.
They seem to have done some refactoring:
| New | Old |
|---|---|
 |
 |
It'll need to be properly tested once I update it.
pgaskin
commented
2 years ago Untested, but it might work:
Remove title from reading header/footer:
- Enabled: no
- Description: Removes the chapter/book title from the new reading header/footer.
- BaseAddress: {Sym: "ReadingFooter::update(QString const&, QString const&, QString const&, bool)", Rel: 190}
- ReplaceBytes: {Offset: 0, FindH: 49 46, ReplaceH: 00 21} # replace MOV r1, sb with MOV r1, #0 (the MOV doesn't matter, but may to be updated to match, ensuring nothing after depends on it)
- ReplaceBytes: {Offset: 4, FindInstBLX: {SymPLT: "QString::append(QString const&)"}, ReplaceInstBLX: {SymPLT: "QString::resize(int)"}}OK, it works, and I've also done some minimal testing of the other patches.
pgaskin
commented
2 years ago It's ready for testing, and since this release is relatively simple, I'm going to do the release sometime in the next few hours unless anyone has an objection.
jackiew1
commented
2 years ago It's ready for testing, and since this release is relatively simple, I'm going to do the release sometime in the next few hours unless anyone has an objection.
I need to do quite a bit of tidying up of my libnickel and nickel.yaml patches - mainly due to the font stuff in 4.32. Do we have any version 4.33 code for me to update?
pgaskin
commented
2 years ago Nope, everything should be fine unless the OpenDyslexic font stuff affects your patches due to ordering (and even then, it won't make a difference unless it's enabled).
Do you want to tidy up those patches before the initial release? If not, I can do another one as soon as you're ready.
jackiew1
commented
2 years ago Nope, everything should be fine unless the OpenDyslexic font stuff affects your patches due to ordering (and even then, it won't make a difference unless it's enabled).
Do you want to tidy up those patches before the initial release? If not, I can do another one as soon as you're ready.
Definitely the libnickel ones because 2 need to be removed, 1 new added, and 1 update. I have these changes ready to go.
The nickel.yaml ones can wait as it's only changes to the help notes if the patches run OK as-is.
pgaskin
commented
2 years ago Do the changes you made in 9bcfa7a7ab226c086ffe434d8cce9040ee148e75 need to be backported to 4.32?
jackiew1
commented
2 years ago Do the changes you made in 9bcfa7a need to be backported to 4.32?
Up to you. The 3 commits I just finished making to libnickel should work OK in both 4.32 and 4.33.
I'm done now. The nickel.yaml stuff can wait. I've been putting it off for weeks because I don't really know what to add/remove from the notes in these patches that would be helpful.
pgaskin
commented
2 years ago OK, I'll backport the changes. After that, are you ready for a release?
jackiew1
commented
2 years ago OK, I'll backport the changes. After that, are you ready for a release?
I guess so if you're happy that your tests show no likely problems? But I haven't had time to physically install/patch v4.33 onto any of my devices yet.
pgaskin
commented
2 years ago Yes, I did most of my usual tests, with extra attention to the font and header/footer-related ones. @shermp also did some testing too.
I'll make the release in 30 - 90 minutes from now.
pgaskin
commented
2 years ago