Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patches for 4.22.15268 #67

Closed
10 tasks done
pgaskin opened this issue Jul 15, 2020 · 14 comments
Closed
10 tasks done

Patches for 4.22.15268 #67

pgaskin opened this issue Jul 15, 2020 · 14 comments
Assignees
Labels
firmware release Category: Updating patches for a new release.

Comments

@pgaskin
Copy link
Owner

pgaskin commented Jul 15, 2020

@pgaskin pgaskin added the firmware release Category: Updating patches for a new release. label Jul 15, 2020
@pgaskin pgaskin self-assigned this Jul 15, 2020
pgaskin added a commit that referenced this issue Jul 15, 2020
@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

Not too much to update for the patches.

  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/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.22.15268/libnickel.so.1.0.0.yaml/pgaskin.yaml: Customize ComfortLight settings: could not apply patch "Customize ComfortLight settings": line 641: inst 4: ReplaceInt: could not find specified bytes at offset
  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/pgaskin.yaml: DeveloperSettings - AutoUsbGadget: could not apply patch "DeveloperSettings - AutoUsbGadget": line 712: inst 3: ReplaceBytes: could not find specified bytes
  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/pgaskin.yaml: Allow rotation on all devices: could not apply patch "Allow rotation on all devices": line 521: inst 3: ReplaceBytes: could not find specified bytes at offset
  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/geoffr.yaml: Set KePub hyphenation: could not apply patch "Set KePub hyphenation": line 320: inst 3: ReplaceBytes: could not find specified bytes
  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/geoffr.yaml: Set font scale factor: could not apply patch "Set font scale factor": line 537: inst 3: ReplaceInt: could not find specified bytes at offset
  /home/patrick/src/kobopatch-patches/src/versions/4.22.15268/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 stream

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

So, this release only adds Nia-specific stuff and possible some bugfixes, but almost certainly not new features (other than for the Nia itself, as this firmware version is probably to bring the factory version up to date with the current features). And, the Nia is Luna.

$ diff -y <(cat 15190/symdump.out.json | jq -r '.[] | .Name' | sort) <(cat 15268/symdump.out.json | jq -r '.[] | .Name' | sort) | grep -e '<' -e '>'
_ZN13EventInfoImpl12acsmReminderEv			      <
_ZN13EventInfoImpl18searchLanguageListEv		      <
							      >	_ZN13EventInfoImpl19searchLanguageCountEv
							      >	_ZN13EventInfoImpl20signedInWithFacebookEv
_ZN14ReviewWorkflow12getSyncStateEv			      <
							      >	_ZN16QCoreApplication11aboutToQuitENS_14QPrivateSignalE
							      >	_ZN16QCoreApplication16staticMetaObjectE
_ZN5QListIiEaSERKS0_					      <
							      >	_ZN7QLocale16languageToStringENS_8LanguageE
							      >	_ZN7QVectorIiE5clearEv
							      >	_ZN7QVectorIiE6appendERKi
							      >	_ZN7QVectorIiE6detachEv
							      >	_ZN7QVectorIiEaSERKS0_
							      >	_ZN7QVectorIiED1Ev
							      >	_ZN7QVectorIiED2Ev
							      >	_ZNK6Device6isLunaEv

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

Nia stuff (pgaskin/kobo-plugin-experiments#11):

Device ID: 482
Hardware: kobo7
Processor: i.MX6ULL
PCB: E60U2
USB ID: 0x4230
Codename 1: Phoenix
Codename 2: Luna
Codename 3: N/A
Same cover size as Kraken, Star.
Same touch tolerance as Star (30px).
No exclusive firmware features.
Most hardware-related quirks should be identical to Star.

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

There isn't anything new in the CSS other than doing the same thing with the games as the other newer devices.

$ diff <(sort 15190/cssextract.out.css) <(sort 15268/cssextract.out.css)
5564a5565
> }
6116a6118
> #boggleContainer[devModeOn=false][qApp_deviceIsLuna=true],
18438a18441
>   qproperty-visible: false;
19182a19186
> #rushHourContainer[devModeOn=false][qApp_deviceIsLuna=true],
19571a19576
> #sketchPadContainer[devModeOn=false][qApp_deviceIsLuna=true],
19710a19716
> #solitaireContainer[devModeOn=false][qApp_deviceIsLuna=true],
19725a19732
> #spacerWidget[devModeOn=false][qApp_deviceIsLuna=true] {
19969a19977
> #sudokuContainer[devModeOn=false][qApp_deviceIsLuna=true],
21046,21184c21054,21192
< /* zlib stream: offset_hex(0x13F6E72) offset_int32(20934258) len_int32(1721) sha1(b692bf3f0b61437c3826a456f8c13a49790377ba) */
< /* zlib stream: offset_hex(0x13F703B) offset_int32(20934715) len_int32(5293) sha1(c6bffd1ac4f79934e0a4943446326268b5afaaea) */
< /* zlib stream: offset_hex(0x13F77F5) offset_int32(20936693) len_int32(3142) sha1(7c1345e6979de6854cf9f5eddc9f1907923e8e58) */
< /* zlib stream: offset_hex(0x13F7D0B) offset_int32(20937995) len_int32(600) sha1(4aa031bca11cb057ea734c4e7ac25998210f0cf7) */
< /* zlib stream: offset_hex(0x13F7DBC) offset_int32(20938172) len_int32(1225) sha1(dffbd5aa73d437b25d583e050b9f7a5d7e11eb5b) */
< /* zlib stream: offset_hex(0x13F8083) offset_int32(20938883) len_int32(3111) sha1(e0a7d230c70b1ed2ef86bcd13842d79712cd77ce) */
< /* zlib stream: offset_hex(0x13F8290) offset_int32(20939408) len_int32(1574) sha1(e6ea4e5492e3985ebf80094bf9916e20860c2a0e) */
< /* zlib stream: offset_hex(0x13F87A0) offset_int32(20940704) len_int32(878) sha1(31d66ceb0f1533ae4f18badfc979e81d5aaa16a7) */
< /* zlib stream: offset_hex(0x13F8B4B) offset_int32(20941643) len_int32(644) sha1(7b8c995acc9bc6c3995dad260fc39a5686715091) */
< /* zlib stream: offset_hex(0x13F8C09) offset_int32(20941833) len_int32(4518) sha1(621813b96fc0b901b58bb000f82599a146c58e97) */
< /* zlib stream: offset_hex(0x13F90C3) offset_int32(20943043) len_int32(1882) sha1(71061566e7dd8496fb60b3e9a5453b7b5b3b6e78) */
< /* zlib stream: offset_hex(0x13F939C) offset_int32(20943772) len_int32(2022) sha1(be61292509323cbd094a36a0b502add1d110ab2e) */
< /* zlib stream: offset_hex(0x13F956F) offset_int32(20944239) len_int32(806) sha1(a01b83011d67a4bd5df400760bbec556ba600cc6) */
< /* zlib stream: offset_hex(0x13F9638) offset_int32(20944440) len_int32(4282) sha1(fe5f756b45c03caa7b407f80280b2a4cfa14b218) */
< /* zlib stream: offset_hex(0x13F9941) offset_int32(20945217) len_int32(1826) sha1(40081e0f8bfe1a75ca902530476d0e2e57299e0b) */
< /* zlib stream: offset_hex(0x13F9AB1) offset_int32(20945585) len_int32(1403) sha1(fcda4476088252d8dddb4b78d38648d2f02ad907) */
< /* zlib stream: offset_hex(0x13F9BF7) offset_int32(20945911) len_int32(6935) sha1(844a059d2e6cd081923931d58ce3074d4fffa3e7) */
< /* zlib stream: offset_hex(0x13FA01B) offset_int32(20946971) len_int32(3420) sha1(50cb3395d4ab84910a36e464a694ce3035e72bb1) */
< /* zlib stream: offset_hex(0x13FA2A3) offset_int32(20947619) len_int32(2821) sha1(be5d28feb431d1b70fce28221ca14731fc8e6adb) */
< /* zlib stream: offset_hex(0x13FA4C9) offset_int32(20948169) len_int32(1155) sha1(3af580725df180d41a70b3bf7ca509e7194ff065) */
< /* zlib stream: offset_hex(0x13FA60D) offset_int32(20948493) len_int32(1486) sha1(1298739b28a95e138a7cc190d39ab29f183fcf0e) */
< /* zlib stream: offset_hex(0x13FA758) offset_int32(20948824) len_int32(5427) sha1(faa474813b2e68b148fcb79b99a4a9d4a9efcefe) */
< /* zlib stream: offset_hex(0x13FAABA) offset_int32(20949690) len_int32(2601) sha1(683a4bc712a73e5327197c5324d34f6627295c3a) */
< /* zlib stream: offset_hex(0x13FB155) offset_int32(20951381) len_int32(7201) sha1(1ba1a59bdb0ba565a954106f4b3eea6d8b651e03) */
< /* zlib stream: offset_hex(0x13FB869) offset_int32(20953193) len_int32(1487) sha1(c34a42ecc0e9a450c19fb29d997662c7eb85ca6f) */
< /* zlib stream: offset_hex(0x13FBBD1) offset_int32(20954065) len_int32(5686) sha1(754171734e70d8497cc82aab67781e934f6e2289) */
< /* zlib stream: offset_hex(0x13FBF43) offset_int32(20954947) len_int32(2635) sha1(afa8d8fc7822825acc49bd11dd0c943d0fc56a47) */
< /* zlib stream: offset_hex(0x13FC1BA) offset_int32(20955578) len_int32(872) sha1(0f5274e8cca32cf5b5f121b5193283c33e0fbc38) */
< /* zlib stream: offset_hex(0x13FC28F) offset_int32(20955791) len_int32(959) sha1(7cc0dd862d89cb85d3d11bd513deddebda9ecc93) */
< /* zlib stream: offset_hex(0x13FC375) offset_int32(20956021) len_int32(3305) sha1(4bd31a4d27b76d63b360af850013d166d656c7df) */
< /* zlib stream: offset_hex(0x13FC5D2) offset_int32(20956626) len_int32(9615) sha1(47f2a18c2a5ac2dee9018ab7096d0063684e6f22) */
< /* zlib stream: offset_hex(0x13FCB01) offset_int32(20957953) len_int32(5367) sha1(cc9e528b9743e08a209b1bdf3dc98fb38e9c1940) */
< /* zlib stream: offset_hex(0x13FCE9E) offset_int32(20958878) len_int32(2088) sha1(27bacba66560d9edd5c011f8e29ddf3c3b79079f) */
< /* zlib stream: offset_hex(0x13FD02C) offset_int32(20959276) len_int32(1133) sha1(2f0c2cc225365ac23ca0444e3798a9ca940c7f38) */
< /* zlib stream: offset_hex(0x13FD156) offset_int32(20959574) len_int32(4346) sha1(a4f2f40d496af56f04b26fa787850a868c4f966f) */
< /* zlib stream: offset_hex(0x13FD5C8) offset_int32(20960712) len_int32(11724) sha1(aba09b7ed39dd3359d6e54b95369ac6844fcb012) */
< /* zlib stream: offset_hex(0x13FDE03) offset_int32(20962819) len_int32(6776) sha1(c24603904c97e71832b2f7829c0b184dfe46db4e) */
< /* zlib stream: offset_hex(0x13FE237) offset_int32(20963895) len_int32(1322) sha1(7c1f5304c626e1b07600208a7a6dad4bfa0640c1) */
< /* zlib stream: offset_hex(0x13FE38B) offset_int32(20964235) len_int32(2940) sha1(28a8517ec7fd787f84b6e2cf72e438d501f6ee7a) */
< /* zlib stream: offset_hex(0x13FE87F) offset_int32(20965503) len_int32(1352) sha1(e0e5f454576480aa55185d2212288fa095718009) */
< /* zlib stream: offset_hex(0x13FEF77) offset_int32(20967287) len_int32(2150) sha1(1236c8097391071de71585457cd0f171e74da98d) */
< /* zlib stream: offset_hex(0x13FF1AB) offset_int32(20967851) len_int32(10971) sha1(ac7b07b54255e095013c06265f5bada35cb946b8) */
< /* zlib stream: offset_hex(0x13FF7B0) offset_int32(20969392) len_int32(1028) sha1(d1424ffe78633f8f2a9f479ed7955609cd0c130c) */
< /* zlib stream: offset_hex(0x13FF8C4) offset_int32(20969668) len_int32(4122) sha1(182d39043364478b1e6607fc607a6dccadf01efa) */
< /* zlib stream: offset_hex(0x13FFB91) offset_int32(20970385) len_int32(3848) sha1(875c2ae919f98fdd2a50b74a4dd4e68d13139529) */
< /* zlib stream: offset_hex(0x13FFDA6) offset_int32(20970918) len_int32(2155) sha1(3d45b6732423933f9354d96c801640848028060e) */
< /* zlib stream: offset_hex(0x13FFF5C) offset_int32(20971356) len_int32(1637) sha1(e966b37a8a6b3d1232a65005dd01fde2ff2fee66) */
< /* zlib stream: offset_hex(0x14000D7) offset_int32(20971735) len_int32(4140) sha1(63109096fd445d5ece0a7459e74836eb729283d4) */
< /* zlib stream: offset_hex(0x1400338) offset_int32(20972344) len_int32(1039) sha1(9233dc80da21fefee0430192e7a746bb71b6dea9) */
< /* zlib stream: offset_hex(0x140044D) offset_int32(20972621) len_int32(1827) sha1(2df949760265e1c1196d1d24c3eb983fbd3ea372) */
< /* zlib stream: offset_hex(0x14009A2) offset_int32(20973986) len_int32(1759) sha1(2b67dd4560de9576899115a19619adff5d7c8436) */
< /* zlib stream: offset_hex(0x1400B41) offset_int32(20974401) len_int32(1238) sha1(028aa78bb03f41d89c665e9255ed2cf51ffe41d6) */
< /* zlib stream: offset_hex(0x1400C98) offset_int32(20974744) len_int32(3064) sha1(709d9c521424e79c5f7415bc744a0ae5cb533938) */
< /* zlib stream: offset_hex(0x1400EB5) offset_int32(20975285) len_int32(5394) sha1(d2f1dcb37535da39e9be39146057f7bc9394e720) */
< /* zlib stream: offset_hex(0x1401667) offset_int32(20977255) len_int32(4722) sha1(fb0fc32e137a96d14c0dda09b17447dbbe0cdc7b) */
< /* zlib stream: offset_hex(0x14018CF) offset_int32(20977871) len_int32(3850) sha1(bf0ddec84fc6171d4c89507b15ad64f48ba6a83c) */
< /* zlib stream: offset_hex(0x1401BA0) offset_int32(20978592) len_int32(2628) sha1(bee107024345a32448177b7387281d14c80be9c2) */
< /* zlib stream: offset_hex(0x1401D88) offset_int32(20979080) len_int32(3152) sha1(8e9097782a60efddb48324914eca52c919bec6ff) */
< /* zlib stream: offset_hex(0x140227E) offset_int32(20980350) len_int32(1842) sha1(6640a9eabd43b596309cb44472f1479a4e272570) */
< /* zlib stream: offset_hex(0x140244C) offset_int32(20980812) len_int32(3634) sha1(ac912714f8c902cb1450d945dab4a8c9ef9ea5f4) */
< /* zlib stream: offset_hex(0x14026BD) offset_int32(20981437) len_int32(3513) sha1(bb90182ef1975979e6e1a79c9b1a7c699789fbb2) */
< /* zlib stream: offset_hex(0x1402AD4) offset_int32(20982484) len_int32(2855) sha1(678245be39c499e1ec6b9a386f9a8e6209773dd5) */
< /* zlib stream: offset_hex(0x1402C82) offset_int32(20982914) len_int32(4836) sha1(eeb9d48ccbe1144a2d2c83d9521932d6b20002ce) */
< /* zlib stream: offset_hex(0x1402FE5) offset_int32(20983781) len_int32(1581) sha1(e2da12447cfb58f2f48e7d8b5ebef70fb507314a) */
< /* zlib stream: offset_hex(0x140317C) offset_int32(20984188) len_int32(2720) sha1(c51212125c54b22050d0ba33edf16b6953090021) */
< /* zlib stream: offset_hex(0x140339E) offset_int32(20984734) len_int32(1681) sha1(b350e2f92df5ce3b8f1f1ade63296cc990a4a88b) */
< /* zlib stream: offset_hex(0x1403508) offset_int32(20985096) len_int32(3449) sha1(82153f31c715948733955da0941f66c819874709) */
< /* zlib stream: offset_hex(0x14036AE) offset_int32(20985518) len_int32(1739) sha1(130e31da0c5133c010b4cb7a4dfcb16c745da593) */
< /* zlib stream: offset_hex(0x1403830) offset_int32(20985904) len_int32(2558) sha1(2095fb00a4b3a58e6c46293a5909a20fa23bf380) */
< /* zlib stream: offset_hex(0x140409E) offset_int32(20988062) len_int32(2629) sha1(539ef22ff7bb87acb0350e0b8c60789f3365318f) */
< /* zlib stream: offset_hex(0x14042CD) offset_int32(20988621) len_int32(7386) sha1(8717c06f385e88bdfce3b6ffb9f12f94d18599f7) */
< /* zlib stream: offset_hex(0x1404714) offset_int32(20989716) len_int32(880) sha1(72c873b2dc71663ad79c960526654425a5969411) */
< /* zlib stream: offset_hex(0x14047DF) offset_int32(20989919) len_int32(3990) sha1(a1e7598b69f34f560c0d09fd761345c5a09b6c4a) */
< /* zlib stream: offset_hex(0x1404A84) offset_int32(20990596) len_int32(6475) sha1(e6285d9133b924acc39c698f1738a6974d2d675e) */
< /* zlib stream: offset_hex(0x1404E58) offset_int32(20991576) len_int32(1451) sha1(8d7cd8462e376ccf7e01b6d0875f1f754ee648f1) */
< /* zlib stream: offset_hex(0x1405678) offset_int32(20993656) len_int32(1140) sha1(68b86941a332386da95f17dbd3273466e62d6329) */
< /* zlib stream: offset_hex(0x14057B7) offset_int32(20993975) len_int32(1425) sha1(01a7784fe062e554fa95a2c67ea4ff93a0a12136) */
< /* zlib stream: offset_hex(0x1405B73) offset_int32(20994931) len_int32(918) sha1(c517eff333b369dbe5ec7c4cdfb7ab7c656d6f70) */
< /* zlib stream: offset_hex(0x1405C77) offset_int32(20995191) len_int32(2005) sha1(1ed42ea0520277e3376da01957db6de5056f0fcd) */
< /* zlib stream: offset_hex(0x1405E16) offset_int32(20995606) len_int32(1343) sha1(de940976776ebc2f3373d8bcbe26fb2c5dc46023) */
< /* zlib stream: offset_hex(0x1405F69) offset_int32(20995945) len_int32(6973) sha1(0dc5712016c24b79c74c5e04f23b273c83383c12) */
< /* zlib stream: offset_hex(0x14062E6) offset_int32(20996838) len_int32(4661) sha1(2089ebca82db7e70929a37a29e9a02b155c98283) */
< /* zlib stream: offset_hex(0x140661E) offset_int32(20997662) len_int32(1415) sha1(0ec0849942386e73da9d40a5b873206b7720a6ff) */
< /* zlib stream: offset_hex(0x1406751) offset_int32(20997969) len_int32(1976) sha1(5fb2f0ce4ca5271c852bc426ba28ed7f27412650) */
< /* zlib stream: offset_hex(0x1406D1C) offset_int32(20999452) len_int32(6183) sha1(0e68541549435b7b6737aba9678976be4cf62a1a) */
< /* zlib stream: offset_hex(0x140705E) offset_int32(21000286) len_int32(2544) sha1(87a2e675f191c8833a58f53664226e06c285c8c2) */
< /* zlib stream: offset_hex(0x140723B) offset_int32(21000763) len_int32(2947) sha1(01c187c801add2dc7aa1b1199ba27300816a74ba) */
< /* zlib stream: offset_hex(0x1407418) offset_int32(21001240) len_int32(2782) sha1(9ea0075ae97f9738501aaf6872ff6a36e492fcd9) */
< /* zlib stream: offset_hex(0x14075B9) offset_int32(21001657) len_int32(11929) sha1(35a40696dac777a68b4fb4fdfb1100d1b1e8ae55) */
< /* zlib stream: offset_hex(0x1407DA4) offset_int32(21003684) len_int32(4501) sha1(e12254dd2077a3e054ee7249f64dc893f27dd092) */
< /* zlib stream: offset_hex(0x1408036) offset_int32(21004342) len_int32(3650) sha1(008dad8f2a5c65b80d6a33979ba533ef6d6c837c) */
< /* zlib stream: offset_hex(0x14082D5) offset_int32(21005013) len_int32(2439) sha1(4495ec8f054c8a37770a76fe797d0f938724161f) */
< /* zlib stream: offset_hex(0x14084EA) offset_int32(21005546) len_int32(753) sha1(a6c49a0e09e2ab71160c2877642250a2266e97c7) */
< /* zlib stream: offset_hex(0x14085C1) offset_int32(21005761) len_int32(3230) sha1(e3721287dee92b78243ee0550a0cf27e4ab83397) */
< /* zlib stream: offset_hex(0x1408829) offset_int32(21006377) len_int32(1532) sha1(08483873663e3aef868cb87904dd8eced534b442) */
< /* zlib stream: offset_hex(0x14089F6) offset_int32(21006838) len_int32(1948) sha1(dbcb06e7c4c653a925ed18b901a09c027d93baf5) */
< /* zlib stream: offset_hex(0x1408C8F) offset_int32(21007503) len_int32(1619) sha1(aaf26c1231cbfbaa9a856a4389e0fcd55e28e9e1) */
< /* zlib stream: offset_hex(0x1408FF2) offset_int32(21008370) len_int32(2322) sha1(b0379025638d1635127d844c2cd2775aff55f1ef) */
< /* zlib stream: offset_hex(0x1409191) offset_int32(21008785) len_int32(951) sha1(bd661edaeb5ba1f24642562bb053e7a950430381) */
< /* zlib stream: offset_hex(0x140929C) offset_int32(21009052) len_int32(1400) sha1(e44baa2f847e8a9b796e2c256718b6fa7dbb176f) */
< /* zlib stream: offset_hex(0x14093E8) offset_int32(21009384) len_int32(1289) sha1(cab0349b44a115d57a69eb24410200e89b0ff945) */
< /* zlib stream: offset_hex(0x14096AA) offset_int32(21010090) len_int32(864) sha1(45e298c8c9174be5dbb67ef214ffa296476d3950) */
< /* zlib stream: offset_hex(0x1409CDC) offset_int32(21011676) len_int32(1415) sha1(0ec0849942386e73da9d40a5b873206b7720a6ff) */
< /* zlib stream: offset_hex(0x1409FC8) offset_int32(21012424) len_int32(4663) sha1(6cdc635d9272c5f35016e254d5dee383a04e00d1) */
< /* zlib stream: offset_hex(0x140A28B) offset_int32(21013131) len_int32(2866) sha1(58fb90644f63b941cddf79e191ad6adfaadae567) */
< /* zlib stream: offset_hex(0x140A4CC) offset_int32(21013708) len_int32(2175) sha1(840c7f9923f5eadcfe466a8289d79c8ea5befadd) */
< /* zlib stream: offset_hex(0x140A741) offset_int32(21014337) len_int32(2850) sha1(d1fd974ad1a54f2acbe3910a7ed439efda2d43dc) */
< /* zlib stream: offset_hex(0x140AE32) offset_int32(21016114) len_int32(2888) sha1(eac7d284fc86d26493884dad10aa74fbc0088b39) */
< /* zlib stream: offset_hex(0x140B474) offset_int32(21017716) len_int32(1123) sha1(d3ec9ef26e759416a56d54309552dd37d9184abb) */
< /* zlib stream: offset_hex(0x140B5A3) offset_int32(21018019) len_int32(765) sha1(c118bfd1861ab48f5ffd19a8355852925621ce89) */
< /* zlib stream: offset_hex(0x140B687) offset_int32(21018247) len_int32(1229) sha1(074921af3ce609b8dadd450e2201d574a5664d84) */
< /* zlib stream: offset_hex(0x140B7C1) offset_int32(21018561) len_int32(2247) sha1(2937cc08822af4826553ba670c0e61eeed73f823) */
< /* zlib stream: offset_hex(0x140B96C) offset_int32(21018988) len_int32(1654) sha1(be8e71400dc4cb0370534f2a4a1fd43b181f3729) */
< /* zlib stream: offset_hex(0x140BC5D) offset_int32(21019741) len_int32(1052) sha1(c476923cd9bd4a47855a988b4b5c200205200176) */
< /* zlib stream: offset_hex(0x140BD89) offset_int32(21020041) len_int32(4646) sha1(182e3dc69c4d7e91340b1e03cf901a94a6ced20e) */
< /* zlib stream: offset_hex(0x140C0B9) offset_int32(21020857) len_int32(959) sha1(a5cb75752d488b721d74ecf0dc4a3960e89255a8) */
< /* zlib stream: offset_hex(0x140C193) offset_int32(21021075) len_int32(9456) sha1(afa39b6c7593414390cae8d6c4511e121046c436) */
< /* zlib stream: offset_hex(0x140C6C7) offset_int32(21022407) len_int32(6836) sha1(cec6d4f617568a7501a4a0fe04ad1467e016181d) */
< /* zlib stream: offset_hex(0x140CF98) offset_int32(21024664) len_int32(2847) sha1(8ef5ec41fa99149540a1ab5b16daa8ba6cc39426) */
< /* zlib stream: offset_hex(0x140D1A2) offset_int32(21025186) len_int32(4151) sha1(34220ab18f999e20ac98ffd684aee3019b2ad4d5) */
< /* zlib stream: offset_hex(0x140D400) offset_int32(21025792) len_int32(6390) sha1(ca44af2b010ae605dc370b7f61671a89c4340506) */
< /* zlib stream: offset_hex(0x140D7BF) offset_int32(21026751) len_int32(3257) sha1(14398b1a9deb3083583c9158a87079c28cb25217) */
< /* zlib stream: offset_hex(0x140DA4E) offset_int32(21027406) len_int32(4292) sha1(ef47c2722891dda5bd69eadbd43fe92d055d1e27) */
< /* zlib stream: offset_hex(0x140DD14) offset_int32(21028116) len_int32(1440) sha1(a834781bead679c49ce6ff64bb641d162c1c77eb) */
< /* zlib stream: offset_hex(0x140DE66) offset_int32(21028454) len_int32(1539) sha1(141a46e4bc04882f8f1fcd756b03e90906320795) */
< /* zlib stream: offset_hex(0x140DF93) offset_int32(21028755) len_int32(915) sha1(d9fcf67bd1d1f47e9f157a4ed353d4671e994569) */
< /* zlib stream: offset_hex(0x140E30B) offset_int32(21029643) len_int32(2574) sha1(e03313dfda787adf3fe6f3c23938cc91756a2b35) */
< /* zlib stream: offset_hex(0x140E68E) offset_int32(21030542) len_int32(3414) sha1(dea3cf8455a23e2db3c1e5fbaab912592b02eba1) */
< /* zlib stream: offset_hex(0x140E8E4) offset_int32(21031140) len_int32(1404) sha1(d5ce70b3818e0a58efef327d4bf08c8acb8b6ecf) */
< /* zlib stream: offset_hex(0x140E9E4) offset_int32(21031396) len_int32(1149) sha1(6ad92a7afeda3ee3265ce75f4f70482db5992d8d) */
< /* zlib stream: offset_hex(0x140EAFE) offset_int32(21031678) len_int32(8705) sha1(b25ffe1658be3689153d01bd1a65303d1e803a49) */
< /* zlib stream: offset_hex(0x140F78B) offset_int32(21034891) len_int32(3104) sha1(e011d05bb6493a0f31e878dba8e14854905fa49d) */
< /* zlib stream: offset_hex(0x140FC4D) offset_int32(21036109) len_int32(4963) sha1(6b371a0dad36d570be4da9a03e742b7e9aea912b) */
< /* zlib stream: offset_hex(0x140FEFD) offset_int32(21036797) len_int32(2515) sha1(592c00aea420ebcce654810da7896b37cf7da805) */
< /* zlib stream: offset_hex(0x14100D3) offset_int32(21037267) len_int32(1629) sha1(472bdf531027640805081daadb84dc9303644075) */
< /* zlib stream: offset_hex(0x15C20) offset_int32(89120) len_int32(78810) sha1(b3ccd2d78fe76ba1e839654b35f833729ba416d7) */
< /* zlib stream: offset_hex(0x17671) offset_int32(95857) len_int32(3744) sha1(2ff51c25daf4c135c9aeda24e110677892616a6a) */
< /* zlib stream: offset_hex(0x9831C4) offset_int32(9974212) len_int32(17588) sha1(a0e7230b9214a010f0cd94bd11ba5ce54a1dc907) */
< /* zlib stream: offset_hex(0x983CEA) offset_int32(9977066) len_int32(5429) sha1(78b1dc5005c5d97476629900f7016ec1506de111) */
---
> /* zlib stream: offset_hex(0x109941F) offset_int32(17404959) len_int32(3744) sha1(2ff51c25daf4c135c9aeda24e110677892616a6a) */
> /* zlib stream: offset_hex(0x1480918) offset_int32(21498136) len_int32(1574) sha1(e6ea4e5492e3985ebf80094bf9916e20860c2a0e) */
> /* zlib stream: offset_hex(0x1480A83) offset_int32(21498499) len_int32(2022) sha1(be61292509323cbd094a36a0b502add1d110ab2e) */
> /* zlib stream: offset_hex(0x1480EC4) offset_int32(21499588) len_int32(2821) sha1(be5d28feb431d1b70fce28221ca14731fc8e6adb) */
> /* zlib stream: offset_hex(0x14810EA) offset_int32(21500138) len_int32(4518) sha1(621813b96fc0b901b58bb000f82599a146c58e97) */
> /* zlib stream: offset_hex(0x14817F4) offset_int32(21501940) len_int32(2940) sha1(28a8517ec7fd787f84b6e2cf72e438d501f6ee7a) */
> /* zlib stream: offset_hex(0x1481A7D) offset_int32(21502589) len_int32(6390) sha1(ca44af2b010ae605dc370b7f61671a89c4340506) */
> /* zlib stream: offset_hex(0x1481E3C) offset_int32(21503548) len_int32(3420) sha1(50cb3395d4ab84910a36e464a694ce3035e72bb1) */
> /* zlib stream: offset_hex(0x148245A) offset_int32(21505114) len_int32(600) sha1(4aa031bca11cb057ea734c4e7ac25998210f0cf7) */
> /* zlib stream: offset_hex(0x148250B) offset_int32(21505291) len_int32(1826) sha1(40081e0f8bfe1a75ca902530476d0e2e57299e0b) */
> /* zlib stream: offset_hex(0x1482856) offset_int32(21506134) len_int32(878) sha1(31d66ceb0f1533ae4f18badfc979e81d5aaa16a7) */
> /* zlib stream: offset_hex(0x1482DF3) offset_int32(21507571) len_int32(3848) sha1(875c2ae919f98fdd2a50b74a4dd4e68d13139529) */
> /* zlib stream: offset_hex(0x1483008) offset_int32(21508104) len_int32(4122) sha1(182d39043364478b1e6607fc607a6dccadf01efa) */
> /* zlib stream: offset_hex(0x148370A) offset_int32(21509898) len_int32(7201) sha1(1ba1a59bdb0ba565a954106f4b3eea6d8b651e03) */
> /* zlib stream: offset_hex(0x1483B17) offset_int32(21510935) len_int32(959) sha1(7cc0dd862d89cb85d3d11bd513deddebda9ecc93) */
> /* zlib stream: offset_hex(0x1483BFD) offset_int32(21511165) len_int32(1225) sha1(dffbd5aa73d437b25d583e050b9f7a5d7e11eb5b) */
> /* zlib stream: offset_hex(0x1483D6D) offset_int32(21511533) len_int32(8705) sha1(b25ffe1658be3689153d01bd1a65303d1e803a49) */
> /* zlib stream: offset_hex(0x14845D8) offset_int32(21513688) len_int32(872) sha1(0f5274e8cca32cf5b5f121b5193283c33e0fbc38) */
> /* zlib stream: offset_hex(0x14846AD) offset_int32(21513901) len_int32(6776) sha1(c24603904c97e71832b2f7829c0b184dfe46db4e) */
> /* zlib stream: offset_hex(0x1484AE1) offset_int32(21514977) len_int32(1415) sha1(0ec0849942386e73da9d40a5b873206b7720a6ff) */
> /* zlib stream: offset_hex(0x1484C14) offset_int32(21515284) len_int32(9615) sha1(47f2a18c2a5ac2dee9018ab7096d0063684e6f22) */
> /* zlib stream: offset_hex(0x1485467) offset_int32(21517415) len_int32(1289) sha1(cab0349b44a115d57a69eb24410200e89b0ff945) */
> /* zlib stream: offset_hex(0x148559C) offset_int32(21517724) len_int32(1133) sha1(2f0c2cc225365ac23ca0444e3798a9ca940c7f38) */
> /* zlib stream: offset_hex(0x14856C6) offset_int32(21518022) len_int32(2635) sha1(afa8d8fc7822825acc49bd11dd0c943d0fc56a47) */
> /* zlib stream: offset_hex(0x14858A1) offset_int32(21518497) len_int32(11724) sha1(aba09b7ed39dd3359d6e54b95369ac6844fcb012) */
> /* zlib stream: offset_hex(0x14860DC) offset_int32(21520604) len_int32(1352) sha1(e0e5f454576480aa55185d2212288fa095718009) */
> /* zlib stream: offset_hex(0x1486229) offset_int32(21520937) len_int32(2175) sha1(840c7f9923f5eadcfe466a8289d79c8ea5befadd) */
> /* zlib stream: offset_hex(0x14863C5) offset_int32(21521349) len_int32(2150) sha1(1236c8097391071de71585457cd0f171e74da98d) */
> /* zlib stream: offset_hex(0x14865F9) offset_int32(21521913) len_int32(2155) sha1(3d45b6732423933f9354d96c801640848028060e) */
> /* zlib stream: offset_hex(0x1486C77) offset_int32(21523575) len_int32(4140) sha1(63109096fd445d5ece0a7459e74836eb729283d4) */
> /* zlib stream: offset_hex(0x1486ED8) offset_int32(21524184) len_int32(10971) sha1(ac7b07b54255e095013c06265f5bada35cb946b8) */
> /* zlib stream: offset_hex(0x14874DD) offset_int32(21525725) len_int32(1882) sha1(71061566e7dd8496fb60b3e9a5453b7b5b3b6e78) */
> /* zlib stream: offset_hex(0x1487C98) offset_int32(21527704) len_int32(5427) sha1(faa474813b2e68b148fcb79b99a4a9d4a9efcefe) */
> /* zlib stream: offset_hex(0x1487FFA) offset_int32(21528570) len_int32(1487) sha1(c34a42ecc0e9a450c19fb29d997662c7eb85ca6f) */
> /* zlib stream: offset_hex(0x1488170) offset_int32(21528944) len_int32(1759) sha1(2b67dd4560de9576899115a19619adff5d7c8436) */
> /* zlib stream: offset_hex(0x148830F) offset_int32(21529359) len_int32(5394) sha1(d2f1dcb37535da39e9be39146057f7bc9394e720) */
> /* zlib stream: offset_hex(0x148896D) offset_int32(21530989) len_int32(3305) sha1(4bd31a4d27b76d63b360af850013d166d656c7df) */
> /* zlib stream: offset_hex(0x1488BCA) offset_int32(21531594) len_int32(2847) sha1(8ef5ec41fa99149540a1ab5b16daa8ba6cc39426) */
> /* zlib stream: offset_hex(0x1488DD4) offset_int32(21532116) len_int32(2088) sha1(27bacba66560d9edd5c011f8e29ddf3c3b79079f) */
> /* zlib stream: offset_hex(0x1488F62) offset_int32(21532514) len_int32(1155) sha1(3af580725df180d41a70b3bf7ca509e7194ff065) */
> /* zlib stream: offset_hex(0x14890A6) offset_int32(21532838) len_int32(1486) sha1(1298739b28a95e138a7cc190d39ab29f183fcf0e) */
> /* zlib stream: offset_hex(0x14891F1) offset_int32(21533169) len_int32(1028) sha1(d1424ffe78633f8f2a9f479ed7955609cd0c130c) */
> /* zlib stream: offset_hex(0x148957F) offset_int32(21534079) len_int32(951) sha1(bd661edaeb5ba1f24642562bb053e7a950430381) */
> /* zlib stream: offset_hex(0x148968A) offset_int32(21534346) len_int32(6475) sha1(e6285d9133b924acc39c698f1738a6974d2d675e) */
> /* zlib stream: offset_hex(0x1489A5E) offset_int32(21535326) len_int32(4292) sha1(ef47c2722891dda5bd69eadbd43fe92d055d1e27) */
> /* zlib stream: offset_hex(0x1489D24) offset_int32(21536036) len_int32(4722) sha1(fb0fc32e137a96d14c0dda09b17447dbbe0cdc7b) */
> /* zlib stream: offset_hex(0x148A293) offset_int32(21537427) len_int32(1229) sha1(074921af3ce609b8dadd450e2201d574a5664d84) */
> /* zlib stream: offset_hex(0x148A3CD) offset_int32(21537741) len_int32(2855) sha1(678245be39c499e1ec6b9a386f9a8e6209773dd5) */
> /* zlib stream: offset_hex(0x148A57F) offset_int32(21538175) len_int32(2322) sha1(b0379025638d1635127d844c2cd2775aff55f1ef) */
> /* zlib stream: offset_hex(0x148A71E) offset_int32(21538590) len_int32(5367) sha1(cc9e528b9743e08a209b1bdf3dc98fb38e9c1940) */
> /* zlib stream: offset_hex(0x148AABB) offset_int32(21539515) len_int32(6836) sha1(cec6d4f617568a7501a4a0fe04ad1467e016181d) */
> /* zlib stream: offset_hex(0x148AF35) offset_int32(21540661) len_int32(2628) sha1(bee107024345a32448177b7387281d14c80be9c2) */
> /* zlib stream: offset_hex(0x148B364) offset_int32(21541732) len_int32(4346) sha1(a4f2f40d496af56f04b26fa787850a868c4f966f) */
> /* zlib stream: offset_hex(0x148B655) offset_int32(21542485) len_int32(918) sha1(c517eff333b369dbe5ec7c4cdfb7ab7c656d6f70) */
> /* zlib stream: offset_hex(0x148B912) offset_int32(21543186) len_int32(1581) sha1(e2da12447cfb58f2f48e7d8b5ebef70fb507314a) */
> /* zlib stream: offset_hex(0x148BAA5) offset_int32(21543589) len_int32(7386) sha1(8717c06f385e88bdfce3b6ffb9f12f94d18599f7) */
> /* zlib stream: offset_hex(0x148BEEC) offset_int32(21544684) len_int32(3850) sha1(bf0ddec84fc6171d4c89507b15ad64f48ba6a83c) */
> /* zlib stream: offset_hex(0x148C1BD) offset_int32(21545405) len_int32(1739) sha1(130e31da0c5133c010b4cb7a4dfcb16c745da593) */
> /* zlib stream: offset_hex(0x148C33F) offset_int32(21545791) len_int32(1451) sha1(8d7cd8462e376ccf7e01b6d0875f1f754ee648f1) */
> /* zlib stream: offset_hex(0x148C4CD) offset_int32(21546189) len_int32(1827) sha1(2df949760265e1c1196d1d24c3eb983fbd3ea372) */
> /* zlib stream: offset_hex(0x148C669) offset_int32(21546601) len_int32(3634) sha1(ac912714f8c902cb1450d945dab4a8c9ef9ea5f4) */
> /* zlib stream: offset_hex(0x148D3AD) offset_int32(21549997) len_int32(1721) sha1(b692bf3f0b61437c3826a456f8c13a49790377ba) */
> /* zlib stream: offset_hex(0x148D576) offset_int32(21550454) len_int32(2439) sha1(4495ec8f054c8a37770a76fe797d0f938724161f) */
> /* zlib stream: offset_hex(0x148DB39) offset_int32(21551929) len_int32(3111) sha1(e0a7d230c70b1ed2ef86bcd13842d79712cd77ce) */
> /* zlib stream: offset_hex(0x148DD46) offset_int32(21552454) len_int32(4661) sha1(2089ebca82db7e70929a37a29e9a02b155c98283) */
> /* zlib stream: offset_hex(0x148E07E) offset_int32(21553278) len_int32(4836) sha1(eeb9d48ccbe1144a2d2c83d9521932d6b20002ce) */
> /* zlib stream: offset_hex(0x148E3E1) offset_int32(21554145) len_int32(2629) sha1(539ef22ff7bb87acb0350e0b8c60789f3365318f) */
> /* zlib stream: offset_hex(0x148E610) offset_int32(21554704) len_int32(1948) sha1(dbcb06e7c4c653a925ed18b901a09c027d93baf5) */
> /* zlib stream: offset_hex(0x148E756) offset_int32(21555030) len_int32(9456) sha1(afa39b6c7593414390cae8d6c4511e121046c436) */
> /* zlib stream: offset_hex(0x148EE3C) offset_int32(21556796) len_int32(959) sha1(a5cb75752d488b721d74ecf0dc4a3960e89255a8) */
> /* zlib stream: offset_hex(0x148EF16) offset_int32(21557014) len_int32(880) sha1(72c873b2dc71663ad79c960526654425a5969411) */
> /* zlib stream: offset_hex(0x148EFE1) offset_int32(21557217) len_int32(1654) sha1(be8e71400dc4cb0370534f2a4a1fd43b181f3729) */
> /* zlib stream: offset_hex(0x148F120) offset_int32(21557536) len_int32(11929) sha1(35a40696dac777a68b4fb4fdfb1100d1b1e8ae55) */
> /* zlib stream: offset_hex(0x148F6D9) offset_int32(21559001) len_int32(3513) sha1(bb90182ef1975979e6e1a79c9b1a7c699789fbb2) */
> /* zlib stream: offset_hex(0x148FAF2) offset_int32(21560050) len_int32(3064) sha1(709d9c521424e79c5f7415bc744a0ae5cb533938) */
> /* zlib stream: offset_hex(0x148FD0F) offset_int32(21560591) len_int32(1400) sha1(e44baa2f847e8a9b796e2c256718b6fa7dbb176f) */
> /* zlib stream: offset_hex(0x148FE5B) offset_int32(21560923) len_int32(7363) sha1(7e1004a7aae5d5cd99cf8a40784dfaa4b4a93d76) */
> /* zlib stream: offset_hex(0x14901F1) offset_int32(21561841) len_int32(2866) sha1(58fb90644f63b941cddf79e191ad6adfaadae567) */
> /* zlib stream: offset_hex(0x1490432) offset_int32(21562418) len_int32(915) sha1(d9fcf67bd1d1f47e9f157a4ed353d4671e994569) */
> /* zlib stream: offset_hex(0x149053C) offset_int32(21562684) len_int32(3152) sha1(8e9097782a60efddb48324914eca52c919bec6ff) */
> /* zlib stream: offset_hex(0x14907CD) offset_int32(21563341) len_int32(2601) sha1(683a4bc712a73e5327197c5324d34f6627295c3a) */
> /* zlib stream: offset_hex(0x1490B98) offset_int32(21564312) len_int32(1842) sha1(6640a9eabd43b596309cb44472f1479a4e272570) */
> /* zlib stream: offset_hex(0x1490D66) offset_int32(21564774) len_int32(3230) sha1(e3721287dee92b78243ee0550a0cf27e4ab83397) */
> /* zlib stream: offset_hex(0x1490FCE) offset_int32(21565390) len_int32(1532) sha1(08483873663e3aef868cb87904dd8eced534b442) */
> /* zlib stream: offset_hex(0x149119B) offset_int32(21565851) len_int32(4282) sha1(fe5f756b45c03caa7b407f80280b2a4cfa14b218) */
> /* zlib stream: offset_hex(0x14915BD) offset_int32(21566909) len_int32(3449) sha1(82153f31c715948733955da0941f66c819874709) */
> /* zlib stream: offset_hex(0x1491763) offset_int32(21567331) len_int32(2544) sha1(87a2e675f191c8833a58f53664226e06c285c8c2) */
> /* zlib stream: offset_hex(0x1491940) offset_int32(21567808) len_int32(2247) sha1(2937cc08822af4826553ba670c0e61eeed73f823) */
> /* zlib stream: offset_hex(0x1491D93) offset_int32(21568915) len_int32(1681) sha1(b350e2f92df5ce3b8f1f1ade63296cc990a4a88b) */
> /* zlib stream: offset_hex(0x1491EFD) offset_int32(21569277) len_int32(2558) sha1(2095fb00a4b3a58e6c46293a5909a20fa23bf380) */
> /* zlib stream: offset_hex(0x14920D6) offset_int32(21569750) len_int32(1343) sha1(de940976776ebc2f3373d8bcbe26fb2c5dc46023) */
> /* zlib stream: offset_hex(0x1492263) offset_int32(21570147) len_int32(1976) sha1(5fb2f0ce4ca5271c852bc426ba28ed7f27412650) */
> /* zlib stream: offset_hex(0x14923FE) offset_int32(21570558) len_int32(3990) sha1(a1e7598b69f34f560c0d09fd761345c5a09b6c4a) */
> /* zlib stream: offset_hex(0x14926A3) offset_int32(21571235) len_int32(2720) sha1(c51212125c54b22050d0ba33edf16b6953090021) */
> /* zlib stream: offset_hex(0x14928C5) offset_int32(21571781) len_int32(3142) sha1(7c1345e6979de6854cf9f5eddc9f1907923e8e58) */
> /* zlib stream: offset_hex(0x1492AC0) offset_int32(21572288) len_int32(1425) sha1(01a7784fe062e554fa95a2c67ea4ff93a0a12136) */
> /* zlib stream: offset_hex(0x1492C35) offset_int32(21572661) len_int32(864) sha1(45e298c8c9174be5dbb67ef214ffa296476d3950) */
> /* zlib stream: offset_hex(0x1492D0C) offset_int32(21572876) len_int32(2850) sha1(d1fd974ad1a54f2acbe3910a7ed439efda2d43dc) */
> /* zlib stream: offset_hex(0x14932CF) offset_int32(21574351) len_int32(1149) sha1(6ad92a7afeda3ee3265ce75f4f70482db5992d8d) */
> /* zlib stream: offset_hex(0x14933E9) offset_int32(21574633) len_int32(2005) sha1(1ed42ea0520277e3376da01957db6de5056f0fcd) */
> /* zlib stream: offset_hex(0x14939B8) offset_int32(21576120) len_int32(1415) sha1(0ec0849942386e73da9d40a5b873206b7720a6ff) */
> /* zlib stream: offset_hex(0x1493AEB) offset_int32(21576427) len_int32(1539) sha1(141a46e4bc04882f8f1fcd756b03e90906320795) */
> /* zlib stream: offset_hex(0x1493C18) offset_int32(21576728) len_int32(4663) sha1(6cdc635d9272c5f35016e254d5dee383a04e00d1) */
> /* zlib stream: offset_hex(0x14942E0) offset_int32(21578464) len_int32(2888) sha1(eac7d284fc86d26493884dad10aa74fbc0088b39) */
> /* zlib stream: offset_hex(0x14944AC) offset_int32(21578924) len_int32(1140) sha1(68b86941a332386da95f17dbd3273466e62d6329) */
> /* zlib stream: offset_hex(0x14945EB) offset_int32(21579243) len_int32(1322) sha1(7c1f5304c626e1b07600208a7a6dad4bfa0640c1) */
> /* zlib stream: offset_hex(0x1494BB5) offset_int32(21580725) len_int32(3257) sha1(14398b1a9deb3083583c9158a87079c28cb25217) */
> /* zlib stream: offset_hex(0x1494E44) offset_int32(21581380) len_int32(6183) sha1(0e68541549435b7b6737aba9678976be4cf62a1a) */
> /* zlib stream: offset_hex(0x14953F1) offset_int32(21582833) len_int32(2782) sha1(9ea0075ae97f9738501aaf6872ff6a36e492fcd9) */
> /* zlib stream: offset_hex(0x1495592) offset_int32(21583250) len_int32(1637) sha1(e966b37a8a6b3d1232a65005dd01fde2ff2fee66) */
> /* zlib stream: offset_hex(0x149570D) offset_int32(21583629) len_int32(4501) sha1(e12254dd2077a3e054ee7249f64dc893f27dd092) */
> /* zlib stream: offset_hex(0x149599F) offset_int32(21584287) len_int32(1039) sha1(9233dc80da21fefee0430192e7a746bb71b6dea9) */
> /* zlib stream: offset_hex(0x1495AB4) offset_int32(21584564) len_int32(4646) sha1(182e3dc69c4d7e91340b1e03cf901a94a6ced20e) */
> /* zlib stream: offset_hex(0x1495DAD) offset_int32(21585325) len_int32(753) sha1(a6c49a0e09e2ab71160c2877642250a2266e97c7) */
> /* zlib stream: offset_hex(0x1495FE1) offset_int32(21585889) len_int32(1619) sha1(aaf26c1231cbfbaa9a856a4389e0fcd55e28e9e1) */
> /* zlib stream: offset_hex(0x1496131) offset_int32(21586225) len_int32(2947) sha1(01c187c801add2dc7aa1b1199ba27300816a74ba) */
> /* zlib stream: offset_hex(0x14964FB) offset_int32(21587195) len_int32(3650) sha1(008dad8f2a5c65b80d6a33979ba533ef6d6c837c) */
> /* zlib stream: offset_hex(0x1496C74) offset_int32(21589108) len_int32(1404) sha1(d5ce70b3818e0a58efef327d4bf08c8acb8b6ecf) */
> /* zlib stream: offset_hex(0x14971A2) offset_int32(21590434) len_int32(3414) sha1(dea3cf8455a23e2db3c1e5fbaab912592b02eba1) */
> /* zlib stream: offset_hex(0x14973F8) offset_int32(21591032) len_int32(1238) sha1(028aa78bb03f41d89c665e9255ed2cf51ffe41d6) */
> /* zlib stream: offset_hex(0x149754F) offset_int32(21591375) len_int32(5293) sha1(c6bffd1ac4f79934e0a4943446326268b5afaaea) */
> /* zlib stream: offset_hex(0x1497894) offset_int32(21592212) len_int32(2574) sha1(e03313dfda787adf3fe6f3c23938cc91756a2b35) */
> /* zlib stream: offset_hex(0x1497A9C) offset_int32(21592732) len_int32(3104) sha1(e011d05bb6493a0f31e878dba8e14854905fa49d) */
> /* zlib stream: offset_hex(0x1497D1F) offset_int32(21593375) len_int32(4151) sha1(34220ab18f999e20ac98ffd684aee3019b2ad4d5) */
> /* zlib stream: offset_hex(0x1497F7D) offset_int32(21593981) len_int32(6935) sha1(844a059d2e6cd081923931d58ce3074d4fffa3e7) */
> /* zlib stream: offset_hex(0x14983A1) offset_int32(21595041) len_int32(765) sha1(c118bfd1861ab48f5ffd19a8355852925621ce89) */
> /* zlib stream: offset_hex(0x1498895) offset_int32(21596309) len_int32(4963) sha1(6b371a0dad36d570be4da9a03e742b7e9aea912b) */
> /* zlib stream: offset_hex(0x1498E4D) offset_int32(21597773) len_int32(1123) sha1(d3ec9ef26e759416a56d54309552dd37d9184abb) */
> /* zlib stream: offset_hex(0x14992E5) offset_int32(21598949) len_int32(2515) sha1(592c00aea420ebcce654810da7896b37cf7da805) */
> /* zlib stream: offset_hex(0x14994BB) offset_int32(21599419) len_int32(1629) sha1(472bdf531027640805081daadb84dc9303644075) */
> /* zlib stream: offset_hex(0x1499677) offset_int32(21599863) len_int32(806) sha1(a01b83011d67a4bd5df400760bbec556ba600cc6) */
> /* zlib stream: offset_hex(0x1499819) offset_int32(21600281) len_int32(1052) sha1(c476923cd9bd4a47855a988b4b5c200205200176) */
> /* zlib stream: offset_hex(0x1499CCE) offset_int32(21601486) len_int32(5686) sha1(754171734e70d8497cc82aab67781e934f6e2289) */
> /* zlib stream: offset_hex(0x149A040) offset_int32(21602368) len_int32(1403) sha1(fcda4476088252d8dddb4b78d38648d2f02ad907) */
> /* zlib stream: offset_hex(0x149A186) offset_int32(21602694) len_int32(1440) sha1(a834781bead679c49ce6ff64bb641d162c1c77eb) */
> /* zlib stream: offset_hex(0x149A4DF) offset_int32(21603551) len_int32(644) sha1(7b8c995acc9bc6c3995dad260fc39a5686715091) */
> /* zlib stream: offset_hex(0x8CC1C3) offset_int32(9224643) len_int32(5429) sha1(78b1dc5005c5d97476629900f7016ec1506de111) */
> /* zlib stream: offset_hex(0x8CC76E) offset_int32(9226094) len_int32(17588) sha1(a0e7230b9214a010f0cd94bd11ba5ce54a1dc907) */
> /* zlib stream: offset_hex(0x9FF336) offset_int32(10482486) len_int32(78810) sha1(b3ccd2d78fe76ba1e839654b35f833729ba416d7) */
$ grep -C3 deviceIsLuna 15268/cssextract.out.css
#spacerWidget[devModeOn=false][qApp_deviceIsPika=true] {
  qproperty-visible: false;
}
#boggleContainer[devModeOn=false][qApp_deviceIsLuna=true],
#solitaireContainer[devModeOn=false][qApp_deviceIsLuna=true],
#rushHourContainer[devModeOn=false][qApp_deviceIsLuna=true],
#sudokuContainer[devModeOn=false][qApp_deviceIsLuna=true],
#sketchPadContainer[devModeOn=false][qApp_deviceIsLuna=true],
#spacerWidget[devModeOn=false][qApp_deviceIsLuna=true] {
  qproperty-visible: false;
}
#boggleContainer[devModeOn=false][qApp_deviceIsAlyssum=true],

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

I'm going to start working on the patches themselves now.

pgaskin added a commit that referenced this issue Jul 15, 2020
@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

This was probably the simplest update so far:

$ git diff --no-index src/versions/4.22.*

diff --git a/src/versions/4.22.15190/libnickel.so.1.0.0.yaml/geoffr.yaml b/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/geoffr.yaml
index ea3f795..bfd5815 100644
--- a/src/versions/4.22.15190/libnickel.so.1.0.0.yaml/geoffr.yaml
+++ b/src/versions/4.22.15268/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: 0xB7FEEA, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
-# - ReplaceBytes: {Offset: 0xB7FEEA, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 00 20 00 20} # Alternative 2: Never turn KePub hyphenation on
+  - ReplaceBytes: {Offset: 0xB801D2, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
+# - ReplaceBytes: {Offset: 0xB801D2, 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: 0x5773AC, Find: 14, Replace: 4} # ePub
-  - ReplaceInt: {Offset: 0xB7FAC0, Find: 14, Replace: 4} # KePub
+  - ReplaceInt: {Offset: 0x577624, Find: 14, Replace: 4} # ePub
+  - ReplaceInt: {Offset: 0xB7FDA8, Find: 14, Replace: 4} # KePub
diff --git a/src/versions/4.22.15190/libnickel.so.1.0.0.yaml/pgaskin.yaml b/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/pgaskin.yaml
index 6da7e6d..369560f 100644
--- a/src/versions/4.22.15190/libnickel.so.1.0.0.yaml/pgaskin.yaml
+++ b/src/versions/4.22.15268/libnickel.so.1.0.0.yaml/pgaskin.yaml
@@ -518,13 +518,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: 0x76745E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
+  - ReplaceBytes: {Offset: 0x76783E, 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: 0xB96E72, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
+  - ReplaceBytes: {Offset: 0xB971BA, 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: 0xBB30CE, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
+  - ReplaceBytes: {Offset: 0xBB33DE, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
 
 Don't uppercase header/footer text:
   - Enabled: no
@@ -634,7 +634,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: 0xADA8B0 # find by the x-ref to _ZN5QTimeC1Eiiii from an unnamed sub
+  - BaseAddress: 0xADAF98 # 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):
@@ -709,7 +709,7 @@ FeatureSettings - ExportHighlights:
 DeveloperSettings - AutoUsbGadget:
   - Enabled: no
   - Description: Automatically enable USB Storage mode when connected.
-  - ReplaceBytes: {Offset: 0x7674FE, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
+  - ReplaceBytes: {Offset: 0x7678DE, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
 
 PowerSettings - UnlockEnabled:
   - Enabled: no
diff --git a/src/versions/4.22.15190/nickel.yaml/oren64.yaml b/src/versions/4.22.15268/nickel.yaml/oren64.yaml
index c8d0cee..fb50526 100644
--- a/src/versions/4.22.15190/nickel.yaml/oren64.yaml
+++ b/src/versions/4.22.15268/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: 0x1400C98 # FindZlib: "MetaDataLabel {\n  color: #666666;\n  qproperty-indent: 0;\n}"
+  - BaseAddress: 0x1485467 # 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: 0x14093E8
+  - BaseAddress: 0x148FAF2
   - 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.22.15190/nickel.yaml/pgaskin.yaml b/src/versions/4.22.15268/nickel.yaml/pgaskin.yaml
index 18caf6e..25a7bc3 100644
--- a/src/versions/4.22.15190/nickel.yaml/pgaskin.yaml
+++ b/src/versions/4.22.15268/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: 0x140661E
+  - BaseAddress: 0x1484AE1
   - ReplaceZlib:
       Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n  font-size: 26px;\n}"
       Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"
-  - BaseAddress: 0x1409CDC
+  - BaseAddress: 0x14939B8
   - ReplaceZlib:
       Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n  font-size: 26px;\n}"
       Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

When booting for the first time after the update, there's a pop-up about a free 30-day Kobo+ trial. There's also a new row for it in the account settings.

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

I'm not sure if this is new or not (it's the first time I've seen it), but the top-right of the homescreen with <2 books is showing the current author rather than recommendations for me right now.

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

The bug where the PIN entry would change sizes after entering the first digit has been fixed.

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

Kobo Plus also now has it's own item in the menu.

pgaskin added a commit that referenced this issue Jul 15, 2020
@pgaskin
Copy link
Owner Author

pgaskin commented Jul 15, 2020

Released in v64.

@pgaskin pgaskin closed this as completed Jul 15, 2020
@jackiew1
Copy link
Collaborator

@pgaskin
Sorry, I've only just seen the new fw release as I've been offline all day.

Reading this post it doesn't look as if I have much (or even anything???) to do but I'll do my standard new fw routine tomorrow, but it probably won't be until the afternoon.

@pgaskin
Copy link
Owner Author

pgaskin commented Jul 16, 2020

Reading this post it doesn't look as if I have much (or even anything???) to do

Yes, that's correct.

@jackiew1
Copy link
Collaborator

There isn't anything new in the CSS other than doing the same thing with the games as the other newer devices.

$ grep -C3 deviceIsLuna 15268/cssextract.out.css
#spacerWidget[devModeOn=false][qApp_deviceIsPika=true] {
  qproperty-visible: false;
}
#boggleContainer[devModeOn=false][qApp_deviceIsLuna=true],
#solitaireContainer[devModeOn=false][qApp_deviceIsLuna=true],
#rushHourContainer[devModeOn=false][qApp_deviceIsLuna=true],
#sudokuContainer[devModeOn=false][qApp_deviceIsLuna=true],
#sketchPadContainer[devModeOn=false][qApp_deviceIsLuna=true],
#spacerWidget[devModeOn=false][qApp_deviceIsLuna=true] {
  qproperty-visible: false;
}
#boggleContainer[devModeOn=false][qApp_deviceIsAlyssum=true],

This is the only change of any kind I can see in the whole 193 css streams (zlib and nozlib) in nickel.

Nothing to see here, move along. I suppose there may be another fw update when the Nia actually ships.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
firmware release Category: Updating patches for a new release.
Projects
None yet
Development

No branches or pull requests

2 participants