Patches for 4.23.15548 #72
Assignees
Labels
firmware release
Category: Updating patches for a new release.
Comments
$ diff -y <(cat 15505/symdump.out.json | jq -r '.[] | .Name' | sort) <(cat 15548/symdump.out.json | jq -r '.[] | .Name' | sort) | grep -e '<' -e '>' |
pgaskin
added a commit
that referenced
this issue
Aug 19, 2020
|
@pgaskin I've taken a quick look. There are a few changes to nickel CSS (in default.qss, ScrollableContentWidget.qss) but, as far as I can tell, nothing that was currently being patched. |
Nothing more than the usual updates for the ones with fixed offsets. |
|
Resource offsets: Resources: https://krc.storage.pgaskin.net/nickel.15548.qInitResources_resources.zip |
pgaskin
added a commit
that referenced
this issue
Aug 19, 2020
$ git diff --no-index src/versions/4.23.155{05,48}diff --git a/src/versions/4.23.15505/libnickel.so.1.0.0.yaml/geoffr.yaml b/src/versions/4.23.15548/libnickel.so.1.0.0.yaml/geoffr.yaml
index 8642af6..44ca920 100644
--- a/src/versions/4.23.15505/libnickel.so.1.0.0.yaml/geoffr.yaml
+++ b/src/versions/4.23.15548/libnickel.so.1.0.0.yaml/geoffr.yaml
@@ -317,8 +317,8 @@ Set KePub hyphenation:
will always be turned on, regardless of justification button setting.
(The publisher can still turn hyphenation off/on in the book's stylesheet.)
- - ReplaceBytes: {Offset: 0xB8F15E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
-# - ReplaceBytes: {Offset: 0xB8F15E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 00 20 00 20} # Alternative 2: Never turn KePub hyphenation on
+ - ReplaceBytes: {Offset: 0xB8FB8E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
+# - ReplaceBytes: {Offset: 0xB8FB8E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 00 20 00 20} # Alternative 2: Never turn KePub hyphenation on
Force user line spacing in KePubs:
- Enabled: no
@@ -534,5 +534,5 @@ Set font scale factor:
# Original value X=14, so original scale factor is (font size slider) / 46.
# Allowed replacement values for X: 0-15 (smaller X --> larger scale factor)
# Note: vmov.f32 s1, #15.0 before getReadingFontSizeScaleFactor
- - ReplaceInt: {Offset: 0x586A7C, Find: 14, Replace: 4} # ePub
- - ReplaceInt: {Offset: 0xB8ED34, Find: 14, Replace: 4} # KePub
+ - ReplaceInt: {Offset: 0x5874AC, Find: 14, Replace: 4} # ePub
+ - ReplaceInt: {Offset: 0xB8F764, Find: 14, Replace: 4} # KePub
diff --git a/src/versions/4.23.15505/libnickel.so.1.0.0.yaml/pgaskin.yaml b/src/versions/4.23.15548/libnickel.so.1.0.0.yaml/pgaskin.yaml
index dde0138..b2720f8 100644
--- a/src/versions/4.23.15505/libnickel.so.1.0.0.yaml/pgaskin.yaml
+++ b/src/versions/4.23.15548/libnickel.so.1.0.0.yaml/pgaskin.yaml
@@ -450,13 +450,13 @@ Allow rotation on all devices:
Unlike only the DeveloperSettings ForceAllowLandscape option, this patch
also makes the rotation icon show on the new reader as well.
# Always return true for ForceAllowLandscape:
- - ReplaceBytes: {Offset: 0x777E4E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
+ - ReplaceBytes: {Offset: 0x77887E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
# In ReadingMenuView::ReadingMenuView, replace the value of Device::hasOrientationSensor,
# which is passed to a function to hide/show the rotate icon:
- - ReplaceBytes: {Offset: 0xBA60FC, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
+ - ReplaceBytes: {Offset: 0xBA6B2C, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
# Also fix sizing of popup by doing the same in RotatePopup::RotatePopup, but
# note that this will make the Automatic option show too (and do nothing):
- - ReplaceBytes: {Offset: 0xBC29BE, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
+ - ReplaceBytes: {Offset: 0xBC340E, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
Don't uppercase header/footer text:
- Enabled: no
@@ -580,7 +580,7 @@ Customize ComfortLight settings:
# In an unnamed subroutine two layers into FrontLightPopupController::loadView
# (find it by going back from QTime::addSecs), the times for the dropdown are
# generated into a QVector<QPair<QString, QTime>> with a simple loop.
- - BaseAddress: 0xAE9B90 # find the base of the unnamed subroutine with the x-ref to _ZN5QTimeC1Eiiii
+ - BaseAddress: 0xAEA5C0 # find the base of the unnamed subroutine with the x-ref to _ZN5QTimeC1Eiiii
#
# Change the initial hour / first bedtime dropdown item passed to the QTime
# constructor (mov r1, #21):
@@ -655,7 +655,7 @@ FeatureSettings - ExportHighlights:
DeveloperSettings - AutoUsbGadget:
- Enabled: no
- Description: Automatically enable USB Storage mode when connected.
- - ReplaceBytes: {Offset: 0x777EEE, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
+ - ReplaceBytes: {Offset: 0x77891E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
PowerSettings - UnlockEnabled:
- Enabled: no
diff --git a/src/versions/4.23.15505/nickel.yaml/oren64.yaml b/src/versions/4.23.15548/nickel.yaml/oren64.yaml
index 909b027..12706bd 100644
--- a/src/versions/4.23.15505/nickel.yaml/oren64.yaml
+++ b/src/versions/4.23.15548/nickel.yaml/oren64.yaml
@@ -27,7 +27,7 @@ New home screen subtitle custom font:
- Description: |
Increase subtitle font size, font color black. Works best when used
with with patch `New home screen increasing cover size`
- - BaseAddress: 0x14AAB73 # FindZlib: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}"
+ - BaseAddress: 0x14BA095 # FindZlib: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}"
- ReplaceZlib: {Find: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}", Replace: "MetaDataLabel {\n color: #000000;\n qproperty-indent: 0;\n}"}
- ReplaceZlib:
Find: "MetaDataLabel[qApp_deviceIsTrilogy=true] {\n font-size: 13px;\n}"
@@ -42,7 +42,7 @@ New home screen subtitle custom font:
Find: "MetaDataLabel[qApp_deviceIsDaylight=true] {\n font-size: 31px;\n}"
Replace: "MetaDataLabel[qApp_deviceIsDaylight=true] {\n font-size: 34px;\n}"
# duplicate
- - BaseAddress: 0x14AF266
+ - BaseAddress: 0x14C3975
- ReplaceZlib: {Find: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}", Replace: "MetaDataLabel {\n color: #000000;\n qproperty-indent: 0;\n}"}
- ReplaceZlib:
Find: "MetaDataLabel[qApp_deviceIsTrilogy=true] {\n font-size: 13px;\n}"
diff --git a/src/versions/4.23.15505/nickel.yaml/pgaskin.yaml b/src/versions/4.23.15548/nickel.yaml/pgaskin.yaml
index 68f2054..34b1b32 100644
--- a/src/versions/4.23.15505/nickel.yaml/pgaskin.yaml
+++ b/src/versions/4.23.15548/nickel.yaml/pgaskin.yaml
@@ -15,11 +15,11 @@ Remove forgot pin button from lock screen:
Removes the Forgot PIN -> Sign Out button from the lock screen.
If this is enabled and you forget your pin, you will need to
hard reset your Kobo.
- - BaseAddress: 0x14B787C
+ - BaseAddress: 0x14AE879
- ReplaceZlib:
Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n font-size: 26px;\n}"
Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"
- - BaseAddress: 0x14BB84A
+ - BaseAddress: 0x14B5543
- ReplaceZlib:
Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n font-size: 26px;\n}"
Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}" |
$ kobo-versionextract ~/src/kobopatch-config/src/kobo7-update-4.23.15548.zip |
|
Done: v66, MR:thread-332469. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The text was updated successfully, but these errors were encountered: