From d71a7085c57bbe84c7444eb92caac7b3b362f28e Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:46:05 -0800
Subject: [PATCH] fix: raindrop (#9531) (#9533)

(cherry picked from commit a5e81fd296df170979d74455a6feab135c562c74)

Signed-off-by: Owen-sz <owen@fyralabs.com>
Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
---
 .../raindrop/desktop-file-call-pkexec.patch   | 13 -------------
 ...pberrypi.raindrop.configure-display.policy | 19 -------------------
 anda/tools/raindrop/raindrop.spec             | 18 ++++++++----------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 anda/tools/raindrop/desktop-file-call-pkexec.patch
 delete mode 100644 anda/tools/raindrop/org.raspberrypi.raindrop.configure-display.policy

diff --git a/anda/tools/raindrop/desktop-file-call-pkexec.patch b/anda/tools/raindrop/desktop-file-call-pkexec.patch
deleted file mode 100644
index 041f51802c..0000000000
--- a/anda/tools/raindrop/desktop-file-call-pkexec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/raindrop.desktop.in b/data/raindrop.desktop.in
-index 69e66f7..a042659 100644
---- data/raindrop.desktop.in
-+++ data/raindrop.desktop.in
-@@ -3,7 +3,7 @@ Type=Application
- Name=Screen Configuration
- Comment=Configure monitor arrangement, scaling and orientation
- Icon=computer
--Exec=raindrop
-+Exec=sh -c 'pkexec /usr/bin/raindrop'
- Terminal=false
- Categories=Settings;
- StartupNotify=true
diff --git a/anda/tools/raindrop/org.raspberrypi.raindrop.configure-display.policy b/anda/tools/raindrop/org.raspberrypi.raindrop.configure-display.policy
deleted file mode 100644
index 6549a42a75..0000000000
--- a/anda/tools/raindrop/org.raspberrypi.raindrop.configure-display.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
- <policyconfig>
-
-  <action id="org.raspberrypi.raindrop.configure-display">
-    <defaults>
-      <allow_any>auth_admin</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-    <description>GTK screen configuration tool for labwc and openbox environments.</description>
-    <message>Authentication is required to configure the system's display settings.</message>
-    <icon_name>computer</icon_name>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/raindrop</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-</policyconfig>
diff --git a/anda/tools/raindrop/raindrop.spec b/anda/tools/raindrop/raindrop.spec
index 01ac06e8ea..dbc55317dc 100644
--- a/anda/tools/raindrop/raindrop.spec
+++ b/anda/tools/raindrop/raindrop.spec
@@ -10,8 +10,6 @@ License:        BSD-3-Clause
 URL:            https://github.com/raspberrypi-ui/raindrop
 Packager:       Owen Zimmerman <owen@fyralabs.com>
 Source0:        %url/archive/%commit.tar.gz
-Source1:        org.raspberrypi.raindrop.configure-display.policy
-Patch0:         desktop-file-call-pkexec.patch
 
 BuildRequires: meson
 BuildRequires: ninja-build
@@ -30,7 +28,7 @@ Screen configuration tool for Raspberry Pi Desktop,
 GTK screen configuration tool for labwc and openbox environments.
 
 %prep
-%autosetup -n raindrop-%commit -p0
+%autosetup -n raindrop-%commit
 
 %build
 %meson
@@ -38,15 +36,15 @@ GTK screen configuration tool for labwc and openbox environments.
 
 %install
 %meson_install
-install -Dm644 %{SOURCE1} %{buildroot}/%{_datadir}/polkit-1/actions/org.raspberrypi.raindrop.configure-display.policy
-%find_lang %{name}
+%find_lang rpcc_%{name}
 
-%files -f %{name}.lang
+%files -f rpcc_%{name}.lang
 %license debian/copyright
-%{_bindir}/raindrop
-%{_datadir}/polkit-1/actions/org.raspberrypi.raindrop.configure-display.policy
-%{_datadir}/applications/raindrop.desktop
-%{_datadir}/raindrop/ui/raindrop.ui
+%doc README
+%{_libdir}/rpcc/librpcc_raindrop.so
+%{_datadir}/rpcc/ui/minus.png
+%{_datadir}/rpcc/ui/plus.png
+%{_datadir}/rpcc/ui/raindrop.ui
 
 %changelog
 * Thu Aug 07 2025 Owen Zimmerman <owen@fyralabs.com>