summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-07-08 17:04:15 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-07-08 17:07:51 +0200
commit6aae3342a2b4735778c95c35ba1d8cc39bb3b936 (patch)
tree2dfd73cb31e2fdf27f4da029a134c787ba9c0829 /x11-apps
parentx11-apps/radeon-profile-daemon: Synced live ebuild (diff)
downloadgentoo-6aae3342a2b4735778c95c35ba1d8cc39bb3b936.tar.gz
gentoo-6aae3342a2b4735778c95c35ba1d8cc39bb3b936.tar.bz2
gentoo-6aae3342a2b4735778c95c35ba1d8cc39bb3b936.zip
x11-apps/radeon-profile: Revbump for new daemon socket location.
Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch30
-rw-r--r--x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild (renamed from x11-apps/radeon-profile/radeon-profile-20200504.ebuild)8
2 files changed, 37 insertions, 1 deletions
diff --git a/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch b/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch
new file mode 100644
index 000000000000..052a143e793f
--- /dev/null
+++ b/x11-apps/radeon-profile/files/radeon-profile-20200504-run_subdir.patch
@@ -0,0 +1,30 @@
+From 576d03da0e33cdc31535cd724daaf1cdde3ac902 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 8 Jul 2020 16:33:38 +0200
+Subject: [PATCH] Read radeon-profile-daemon-server socket from
+ /run/radeon-profile-daemon/
+
+Gentoo has moved the radeon-profile-daemon-server socket file into that
+subdir in order to provide secure access permissions.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ radeon-profile/daemonComm.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/radeon-profile/daemonComm.cpp b/radeon-profile/daemonComm.cpp
+index 21ec38f..dff00a0 100644
+--- a/radeon-profile/daemonComm.cpp
++++ b/radeon-profile/daemonComm.cpp
+@@ -34,7 +34,7 @@ void DaemonComm::sendConnectionConfirmation() {
+ void DaemonComm::connectToDaemon() {
+ qDebug() << "Connecting to daemon...";
+ signalSender->abort();
+- signalSender->connectToServer("/run/radeon-profile-daemon-server");
++ signalSender->connectToServer("/run/radeon-profile-daemon/radeon-profile-daemon-server");
+ }
+
+ void DaemonComm::disconnectDaemon() {
+--
+2.27.0
+
diff --git a/x11-apps/radeon-profile/radeon-profile-20200504.ebuild b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild
index 830f17504e3f..d836b3ad1f83 100644
--- a/x11-apps/radeon-profile/radeon-profile-20200504.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild
@@ -22,6 +22,7 @@ IUSE=""
S="${WORKDIR}/${P}/${PN}"
RDEPEND="
+ !<x11-apps/radeon-profile-daemon-20190603-r1
dev-qt/qtcharts:5
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -38,8 +39,13 @@ DEPEND="
x11-libs/libdrm
"
+PATCHES=(
+ "${FILESDIR}/${PN}-20200504-run_subdir.patch"
+)
+
src_prepare() {
- default
+ eapply -p2 "${PATCHES[@]}"
+ eapply_user
sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die
}