Patchmanager patches in Koli 4.0.1

Applications
#22

/usr/share/patches … does not exist on my machine
then i did install one patch
the path still does not exist

i can only do the call on that path /usr/share/patchmanager/patches/launcher-combined/uniffied…

did that and then i saw 4 unreversed files:
patching file usr/share/lipstick-jolla-home-qt5/launcher/Launcher.qml
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherFolder.qml
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml
patching file usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml

this works exactly one time, then again i need to confirm every single…

#23

okay, it should now apply in patchmanager

#24

i did reboot and now the launcher is invisible :slight_smile:
could that be a conflict with ok board ?
disabling okboard did not fixed that

rebooting and not applying neither

i was able to reach patchmanager via top menu-> utilities go back to setting and he showed no patches installed

then i did try force cover size patch – installation failed …
something is really broken

#25

okay just reinstall lipstick and other packages changed by patches. you modified your filesystem somehow.

#26

just :smiley:

can i do that with pkcon or do i need something else ?

found that on tjc

pkcon install lipstick-jolla-home-qt5
#27

yes, pkcon install package. Find package to reinstall with rpm -qf /usr/share/changed/file

#28

ok now i got it: you mean i.e.:
rpm -qf ‘path to conflicting file’ like /usr/share/lipstick…/launcher/Launcherfolder.qml

i will try now to re-install
thanks !

in case it helps others:

pkcon install --allow-reinstall lipstick-jolla-home-qt5

did reinstall lipstick, reboot, all same as before. will leave it for today. phone is operable

#29

if i apply patch i get the unres error
if i then do patch -R and then do apply i still get an apply error the the patch info now does not complain about unreversed patch buth shows:

test if already applied patch

checking this file
checking that file
eof

#30

Show full output of apply process

#31

when i do path -R i always get the question: ignore -R

yesterday i said y

was that correct ?

cause today i said no and then i get a second question : apply anyway

which i did

todays log of patch -R

[root@Xperia10-DualSIM patches]# patch -R -p1 -d / -i /usr/share/patchmanager/patches/launcher-combined/unified_diff.patch
patching file usr/share/lipstick-jolla-home-qt5/launcher/Launcher.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
5 out of 5 hunks ignored – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/Launcher.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherFolder.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
11 out of 11 hunks ignored – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherFolder.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
4 out of 4 hunks ignored – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored – saving rejects to file usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml.rej
[root@Xperia10-DualSIM patches]#
[root@Xperia10-DualSIM patches]# patch -R -p1 -d / -i /usr/share/patchmanager/patches/launcher-combined/unified_diff.patch
patching file usr/share/lipstick-jolla-home-qt5/launcher/Launcher.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 44.
Hunk #3 FAILED at 166.
Hunk #4 FAILED at 249.
Hunk #5 FAILED at 270.
5 out of 5 hunks FAILED – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/Launcher.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherFolder.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 12.
Hunk #2 FAILED at 73.
Hunk #3 FAILED at 82.
Hunk #4 FAILED at 95.
Hunk #5 FAILED at 129.
Hunk #6 FAILED at 163.
Hunk #7 FAILED at 181.
Hunk #8 FAILED at 197.
Hunk #9 FAILED at 219.
Hunk #10 FAILED at 247.
Hunk #11 FAILED at 310.
11 out of 11 hunks FAILED – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherFolder.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 112.
Hunk #3 FAILED at 297.
Hunk #4 FAILED at 375.
4 out of 4 hunks FAILED – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml
Unreversed patch detected! Ignore -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 10.
Hunk #2 FAILED at 25.
2 out of 2 hunks FAILED – saving rejects to file usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml.rej
patching file usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml
Unreversed patch detected! Ignore -R? [n] y

#32

Snimek_20210219_001
Snimek_20210219_0011080×2520 1.09 MB

log after patch -R with

what i do not get:
re-install lipstick does not help it

when i do apply the patch with -N and it results in no errors, just the list of files, the launcher is broken.
but my main point would be: why do i get after re-install still the reversed patch error ?

update:
i can apply force-large-cover from commandline with -N and it works, i can also reverse it with -R
however i can not install the patch from patchmanager.
after installing it from cmdline patch manager will not show it as install, not even after reboot, but it works, so it is installed

the launcher patch installed from commandline, will also not show up and result is: launcher is invisible only the tiny white handle is visible

#33

applied=@Invalid()

this shows pm2.conf

is that ok ?

#34

Hi @coderus,

I can confirm that patchmanager isn’t working properly in Koli (even the latest one taken from your PR on github): no way to install any patch in the list.

My system is clear (unaltered) from any previous patch (confirmed by: 1. I have reverse any patch manually before upgrading to SFOS 4.0; 2. reinstalling lipstick didn’t help; 3. the output of patch -R).

Also applying the latest version of your (excellent) launcher-combined patch manually (with patch cli) leads to the same issue reported by @pawel.spoon

Anyway, thanks a lot for all the time you have spent around patchmanager and various patches over past years :kissing_heart:

2 Likes
#35

I n my case , I cant even get the web catalog upload. It doesnt show anything.

#36

Downloaded and installed the artifact and Patchmanager is working again(XA2, 4.0.1.45). Thank you! Only your Launcher Combined patch crashes patchmanager after restarting lipstick. All patches are unapplied and i have to select Resolv Failure from patchmanager pulley.

1 Like
#37

My C, X and XA2 (4.0.1.48) started working after removing busybox-symlinks-bash and installing gnu-bash.

Launcher Combined same as miau.

1 Like
#38

I also removed busybox-symlinks-bash and installed gnu-bash.

1 Like
#39

hu i cant find the artifact can you send me a working link

#40

You need to be logged in to Github, so sign up, verify account, sign in, download the file output-rpms in Actions, unzip and install

2 Likes
#41

Links for the artifact works on my PC, doesn’t on Jolla browser.

Edit: indeed, logging in is the clue.