diff --git a/gui-wm/phosh/files/0001-Fix-for-polkit-120-and-higher.patch b/gui-wm/phosh/files/0001-Fix-for-polkit-120-and-higher.patch new file mode 100644 index 0000000..e9ec544 --- /dev/null +++ b/gui-wm/phosh/files/0001-Fix-for-polkit-120-and-higher.patch @@ -0,0 +1,29 @@ +From 19e3a56e02646308b2b78512308119811af96896 Mon Sep 17 00:00:00 2001 +From: Gerben Jan Dijkman +Date: Wed, 15 Jun 2022 18:13:55 +0200 +Subject: [PATCH] Fix for polkit 120 and higher + +--- + src/polkit-auth-agent.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/polkit-auth-agent.h b/src/polkit-auth-agent.h +index fe7e808..bd79a20 100644 +--- a/src/polkit-auth-agent.h ++++ b/src/polkit-auth-agent.h +@@ -19,7 +19,11 @@ G_BEGIN_DECLS + #if POLKIT_AGENT_MAJOR_VERSION == 0 && POLKIT_AGENT_MINOR_VERSION < 114 + G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitSubject, g_object_unref) + #endif +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAgentListener, g_object_unref) ++ ++/* libpolkit lacks these */ ++#if POLKIT_AGENT_MAJOR_VERSION == 0 && POLKIT_AGENT_MINOR_VERSION < 120 ++ G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAgentListener, g_object_unref) ++#endif + + #define PHOSH_TYPE_POLKIT_AUTH_AGENT (phosh_polkit_auth_agent_get_type()) + +-- +2.35.1 + diff --git a/gui-wm/phosh/files/polkitagent.patch b/gui-wm/phosh/files/polkitagent.patch deleted file mode 100644 index c9e120a..0000000 --- a/gui-wm/phosh/files/polkitagent.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/polkit-auth-agent.h b/src/polkit-auth-agent.h -index fe7e808..88b8a19 100644 ---- a/src/polkit-auth-agent.h -+++ b/src/polkit-auth-agent.h -@@ -19,7 +19,11 @@ G_BEGIN_DECLS - #if POLKIT_AGENT_MAJOR_VERSION == 0 && POLKIT_AGENT_MINOR_VERSION < 114 - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitSubject, g_object_unref) - #endif -+ -+/* libpolkitAgentListener lacks these */ -+#if POLKIT_AGENT_MAJOR_VERSION == 0 && POLKIT_AGENT_MINOR_VERSION < 120 - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAgentListener, g_object_unref) -+#endif - - #define PHOSH_TYPE_POLKIT_AUTH_AGENT (phosh_polkit_auth_agent_get_type()) diff --git a/gui-wm/phosh/phosh-0.20.0_beta1.ebuild b/gui-wm/phosh/phosh-0.20.0_beta1.ebuild index d41f1c8..755e5f7 100755 --- a/gui-wm/phosh/phosh-0.20.0_beta1.ebuild +++ b/gui-wm/phosh/phosh-0.20.0_beta1.ebuild @@ -53,7 +53,7 @@ src_prepare() { rm -r "${S}"/subprojects/libcall-ui || die mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die - eapply "${FILESDIR}"/polkitagent.patch + eapply "${FILESDIR}"/0001-Fix-for-polkit-120-and-higher.patch } src_install() {