make qt5-fsarchiver to integrate better

2 files changed, 39 insertions, 3 deletions

diff --git a/app-backup/qt5-fsarchiver/files/redcorelinux.patch b/app-backup/qt5-fsarchiver/files/redcorelinux.patch
new file mode 100644
index 00000000..5d06c986
--- /dev/null
+++ b/app-backup/qt5-fsarchiver/files/redcorelinux.patch
@@ -0,0 +1,38 @@
+diff -Nur a/src/sbin/qt5-fsarchiver_polkit b/src/sbin/qt5-fsarchiver_polkit
+--- a/src/sbin/qt5-fsarchiver_polkit	2016-06-04 17:03:48.000000000 +0100
++++ b/src/sbin/qt5-fsarchiver_polkit	2017-03-20 14:38:40.103572390 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ if [ $(which pkexec) ]; then
+-	pkexec --disable-internal-agent env DISPLAY=$DISPLAY  "/usr/sbin/qt5-fsarchiver" "$@"
++	pkexec "/usr/sbin/qt5-fsarchiver" "$@"
+ else
+ 	/usr/sbin/qt5-fsarchiver "$@"
+ fi
+diff -Nur a/src/share/polkit-1/actions/org.project.pkexec.run-qt5-fsarchiver.policy b/src/share/polkit-1/actions/org.project.pkexec.run-qt5-fsarchiver.policy
+--- a/src/share/polkit-1/actions/org.project.pkexec.run-qt5-fsarchiver.policy	2016-06-04 17:03:48.000000000 +0100
++++ b/src/share/polkit-1/actions/org.project.pkexec.run-qt5-fsarchiver.policy	2017-03-20 14:42:45.408277857 +0000
+@@ -7,7 +7,7 @@
+   <action id="org.project.pkexec.run-qt5-fsarchiver">
+     <description>Run the qt5-fsarchiver program</description>
+     <message>Authentication is required to run qt5-fsarchiver</message>
+-    <icon_name>harddrive.png</icon_name>
++    <icon_name>redcore-logo.png</icon_name>
+     <defaults>
+       <allow_any>auth_admin</allow_any>
+       <allow_inactive>auth_admin</allow_inactive>
+diff -Nur a/starter/gnome-qt5-fsarchiver.desktop b/starter/gnome-qt5-fsarchiver.desktop
+--- a/starter/gnome-qt5-fsarchiver.desktop	2017-01-30 16:09:58.000000000 +0000
++++ b/starter/gnome-qt5-fsarchiver.desktop	2017-03-20 14:39:25.092435370 +0000
+@@ -3,10 +3,9 @@
+ Name[de_DE]=qt5-fsarchiver
+ Comment=Qt GUI for fsarchiver
+ Exec=/usr/sbin/qt5-fsarchiver_polkit %f
+-Icon=/usr/share/app-install/icons/harddrive.png
++Icon=/usr/share/qt5-fsarchiver/icons/harddrive.png
+ Terminal=false
+ Type=Application
+ Categories=Utility;Archiving;Qt;
+ StartupNotify=false
+-OnlyShowIn=GNOME
+ 
diff --git a/app-backup/qt5-fsarchiver/qt5-fsarchiver-0.8.1.ebuild b/app-backup/qt5-fsarchiver/qt5-fsarchiver-0.8.1-r1.ebuild
index 4757a4b9..8bf7e7a9 100644
--- a/app-backup/qt5-fsarchiver/qt5-fsarchiver-0.8.1.ebuild
+++ b/app-backup/qt5-fsarchiver/qt5-fsarchiver-0.8.1-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${CDEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	# fix icon installation location
+	epatch ${FILESDIR}/redcorelinux.patch
 	sed -i \
 		-e "/icon.path/s:app-install/icons:${PN}:" "${PN}.pro" \
 		|| die "sed on ${PN}.pro failed"
@@ -49,8 +49,6 @@ src_install() {
 	# remove gksu && kdesu enabled desktop entries
 	rm -rf ${ED}/usr/share/applications/kde-${PN}.desktop
 	rm -rf ${ED}/usr/share/applications/mate-${PN}.desktop
-	# make polkit enabled desktop entry universal
-	sed -i "s/\OnlyShowIn=GNOME//g" ${ED}/usr/share/applications/gnome-${PN}.desktop
 }
 
 pkg_postinst() {