patchport possibly broken #54

New Issue

Open

opened 2020-03-15 22:13:37 +00:00 by eatsfoobars · 2 comments

eatsfoobars commented

2020-03-15 22:13:37 +00:00

Collaborator

(porting 1062 -> 1065)

theo@theo-PC ~/cutthecord% python patchport.py /tmp/from
PORTED: disable-mobileindicator was successfully ported.
PORTED: nonearby was successfully ported.
PORTED: supplemental was successfully ported.
PORTED: experiments was successfully ported.
PORTED: customversion was successfully ported.
PORTED: noemojibutton was successfully ported.
PORTED: squareavatars was successfully ported.
PORTED: litecord was successfully ported.
PORTED: tokenlogin was successfully ported.
PORTED: customtheme was successfully ported.
PORTED: slashcommands was successfully ported.
PORTED: nospoiler was successfully ported.
POST COPIED: notrack's post script was copied.
FAILED: notrack failed, please fix by hand.
FAILED: branding failed, please fix by hand.
PORTED: noprofilestrip was successfully ported.
PORTED: mutant was successfully ported.
PORTED: noblocked was successfully ported.
PORTED: necessary was successfully ported.
PORTED: nozlib was successfully ported.
Port complete. Following patches failed: notrack, branding
theo@theo-PC ~/cutthecord% cd /tmp
theo@theo-PC /tmp% cp -R from to
theo@theo-PC /tmp% cd to
theo@theo-PC /tmp/to% patch -p1 < ~/cutthecord/patches/branding/1065.patch-failed
patching file AndroidManifest.xml
patching file apktool.yml
patching file res/values/strings.xml
Hunk #1 succeeded at 1357 (offset 10 lines).
Hunk #2 succeeded at 3540 (offset 17 lines).
Hunk #3 succeeded at 4828 (offset 24 lines).
patching file 'smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali'

(porting 1062 -> 1065) ```plaintext theo@theo-PC ~/cutthecord% python patchport.py /tmp/from PORTED: disable-mobileindicator was successfully ported. PORTED: nonearby was successfully ported. PORTED: supplemental was successfully ported. PORTED: experiments was successfully ported. PORTED: customversion was successfully ported. PORTED: noemojibutton was successfully ported. PORTED: squareavatars was successfully ported. PORTED: litecord was successfully ported. PORTED: tokenlogin was successfully ported. PORTED: customtheme was successfully ported. PORTED: slashcommands was successfully ported. PORTED: nospoiler was successfully ported. POST COPIED: notrack's post script was copied. FAILED: notrack failed, please fix by hand. FAILED: branding failed, please fix by hand. PORTED: noprofilestrip was successfully ported. PORTED: mutant was successfully ported. PORTED: noblocked was successfully ported. PORTED: necessary was successfully ported. PORTED: nozlib was successfully ported. Port complete. Following patches failed: notrack, branding theo@theo-PC ~/cutthecord% cd /tmp theo@theo-PC /tmp% cp -R from to theo@theo-PC /tmp% cd to theo@theo-PC /tmp/to% patch -p1 < ~/cutthecord/patches/branding/1065.patch-failed patching file AndroidManifest.xml patching file apktool.yml patching file res/values/strings.xml Hunk #1 succeeded at 1357 (offset 10 lines). Hunk #2 succeeded at 3540 (offset 17 lines). Hunk #3 succeeded at 4828 (offset 24 lines). patching file 'smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali' ```

eatsfoobars commented

2020-05-20 02:12:13 +00:00

Author

Collaborator

@a I took a brief look at this, it just seems that branding is being applied without necessary?

going over patch: branding
FAILED: branding failed, please fix by hand.
checking file AndroidManifest.xml
Hunk #1 FAILED at 1.
1 out of 8 hunks FAILED
checking file res/values/strings.xml
checking file 'smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali'

@a I took a brief look at this, it just seems that `branding` is being applied without `necessary`? ```plaintext going over patch: branding FAILED: branding failed, please fix by hand. checking file AndroidManifest.xml Hunk #1 FAILED at 1. 1 out of 8 hunks FAILED checking file res/values/strings.xml checking file 'smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali' ```