Patches by nephros

I created/maintain a handful of patches on both the Patchmanager Web Catalog [1] and partially as RPMs on Openrepos [2].

This thread shall serve as a discussion/support thread for those, and especially please report issues you may have as I don’t always update to the newest SFOS versions.

Here’s an (possibly incomplete] list, see [1] for the definitive version:

  • Glass Popups
  • Custom SIM Names
  • Email Account in Folder header
  • Finer Volume Control
  • Dimmed Launcher Icons
  • Glass Handles
  • Improved App Chooser
  • Quickddit: Accounts on top of Settings
  • Return old button style 4.x
  • Topmenu Favorite Ambiences Only
  • Fuzzy Time
  • Restart BT in SF Utilities
  • Remove cross icon from remorse timer [3.3]

[1] Web Catalog: nephros projects
[2] Fuzzy Time: Patch: Fuzzy Time | OpenRepos.net — Community Repository System

10 Likes

old button style fails for me:

----------------------------------
PM APPLY Sat Oct  9 13:49:09 CEST 2021
----------------------------------

return-old-pulley-menu-iv
  contains text patch


----------------------------------
Test if already applied patch
----------------------------------

can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml.orig,
which does not exist!  Ignore -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 480
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
3 out of 3 hunks ignored
The next patch, when reversed, would delete the file usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml.orig,
which does not exist!  Ignore -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 665
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
2 out of 2 hunks ignored
The next patch, when reversed, would delete the file usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml.orig,
which does not exist!  Ignore -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 905
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml.orig,
which does not exist!  Ignore -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 1108
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
3 out of 3 hunks ignored
The next patch, when reversed, would delete the file usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml.orig,
which does not exist!  Ignore -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored

----------------------------------
Dry running patch
----------------------------------

can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
checking file usr/lib/qt5/qml/Sailfish/Silica/ContextMenu.qml.orig
can't find file to patch at input line 480
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
3 out of 3 hunks ignored
checking file usr/lib/qt5/qml/Sailfish/Silica/HighlightBar.qml.orig
can't find file to patch at input line 665
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
2 out of 2 hunks ignored
checking file usr/lib/qt5/qml/Sailfish/Silica/PullDownMenu.qml.orig
can't find file to patch at input line 905
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
checking file usr/lib/qt5/qml/Sailfish/Silica/PushUpMenu.qml.orig
can't find file to patch at input line 1108
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml
|+++ /usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
3 out of 3 hunks ignored
checking file usr/lib/qt5/qml/Sailfish/Silica/private/PulleyMenuBase.qml.orig

*** FAILED ***

Return old button style 4.x works for me on 4.2.
I think you meant old pulley menu?

Yes, sorry. Of course I meant old pulley

1 Like

Is that a 64bit (xperia x10Ii) system?

Because there’s a general problem about library path with 64bit systens.

1 Like

Yes exactly, its on a X10ii.

1 Like

Alright, the underlying problem is that on x86 and arm, 32bit systems, many things that are manipulated by patches are located in /usr/lib while in aarch64 (which the X10ii uses) in /usr/lib64.
No big deal, except patches written for one platform will not apply on the other because patch can’t find the files, even though they will be exactly the same.

For any patch that doesn’t apply for this reason, you will have to edit the patch file and find all lines that look like this:

--- /usr/lib/qt5/qml/Sailfish/Silica/...
+++ /usr/lib/qt5/qml/Sailfish/Silica/...

and replace the /usr/lib by /usr/lib64.

Then it should apply.

I have decided against distributing a separate patch for 64bits, for one it’s useless duplication and generates more maintenance work, and also we’re looking into a general solution over at Patchmanager’s Issue #71 .

3 Likes

Thanks for the effort. The solution via patchmanager is definitely better than quirking around with each patch.