Merge branch 'master' into better-logs

sailfishos-patches · Nov 27, 2024 · 27fedd0 · 27fedd0
2 parents d9c8bf8 + 8fb48d1
commit 27fedd0
Show file tree

Hide file tree

Showing 10 changed files with 262 additions and 177 deletions.
diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec
@@ -1,4 +1,3 @@
-
 # These macros should already be defined in the RPMbuild environment, see: rpm --showrc
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
 %{!?qtc_make:%define qtc_make make}
@@ -290,12 +289,12 @@ exit 0
 %{_datadir}/jolla-settings/entries/%{name}.json
 %{_datadir}/%{name}/icons/icon-m-patchmanager.png
 
-# pre 4.6:
+# On SailfishOS < 4.6:
 # /usr/share/themes/sailfish-default/meegotouch/zX.Y/icons/*.png
-# 4.6 and higher:
+# On SailfishOS >= 4.6:
 # /usr/share/themes/sailfish-default/silica/zX.Y/icons/*.png
 # /usr/share/themes/sailfish-default/silica/zX.Y/icons-monochrome/*.png
-%{_datadir}/themes/sailfish-default/*/*/*/*.png
+%{_datadir}/themes/sailfish-default/*/z*/icons*/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog

diff --git a/src/bin/patchmanager-daemon/dbus/org.SfietKonstantin.patchmanager.xml b/src/bin/patchmanager-daemon/dbus/org.SfietKonstantin.patchmanager.xml
@@ -107,6 +107,12 @@
         <method name="getLoaded">
             <arg name="loaded" type="b" direction="out" />
         </method>
+        <method name="restorePatchList">
+            <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+        </method>
+        <method name="backupWorkingPatchList">
+            <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+        </method>
         <method name="resolveFailure">
             <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
         </method>

diff --git a/src/bin/patchmanager-daemon/main.cpp b/src/bin/patchmanager-daemon/main.cpp
@@ -57,11 +57,13 @@ void help()
 {
     std::cout << "Patchmanager " << BUILD_VERSION << std::endl;
     std::cout << "Usage:" << std::endl;
-    std::cout << "  patchmanager [--help]       : Print this help text" << std::endl;
-    std::cout << "  patchmanager -a <Patch>     : Enable and activate a Patch" << std::endl;
-    std::cout << "  patchmanager -u <Patch>     : Deactivate and disable (unapply) a Patch" << std::endl;
-    std::cout << "  patchmanager --unapply-all  : Deactivate and disable (unapply) all Patches" << std::endl;
-    std::cout << "  patchmanager --daemon       : Start Patchmanager as daemon" << std::endl;
+    std::cout << "  patchmanager [--help]          : Print this help text" << std::endl;
+    std::cout << "  patchmanager -a <Patch>        : Enable and activate a Patch" << std::endl;
+    std::cout << "  patchmanager -u <Patch>        : Deactivate and disable (unapply) a Patch" << std::endl;
+    std::cout << "  patchmanager --unapply-all     : Deactivate and disable (unapply) all Patches" << std::endl;
+    std::cout << "  patchmanager --backup-working  : Save list of enabled Patches as \"working\"" << std::endl;
+    std::cout << "  patchmanager --restore-working : Enable backup list of \"working\" Patches" << std::endl;
+    std::cout << "  patchmanager --daemon          : Start Patchmanager as daemon" << std::endl;
 }
 
 int main(int argc, char **argv)