gjdwebserver/gjdwebserver-overlay
gjdwebserver/gjdwebserver-overlay
3
0
Fork 0
Code Pull Requests Releases Activity

Updated the patch

Browse Source
This commit is contained in:
Gerben Jan Dijkman 2022-06-15 18:16:32 +02:00
parent 5980466d9b
commit 289480db7e
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gui-wm/phosh/files/0001-Fix-for-polkit-120-and-higher.patch Normal file
View File

@ -0,0 +1,29 @@
From 19e3a56e02646308b2b78512308119811af96896 Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>
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

15
gui-wm/phosh/files/polkitagent.patch
View File

@ -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())

2
gui-wm/phosh/phosh-0.20.0_beta1.ebuild
View File

@ -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() {