[packages/polkit] - drop elogind.patch, applied upstream

hawk hawk at pld-linux.org
Thu Apr 4 03:18:34 CEST 2024


commit b872ca5664b2cbdf656210950cd569abfe89ec44
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Thu Apr 4 01:28:14 2024 +0200

    - drop elogind.patch, applied upstream

 elogind.patch | 24 ------------------------
 polkit.spec   |  4 ----
 2 files changed, 28 deletions(-)
---
diff --git a/polkit.spec b/polkit.spec
index 131e176..3bd966a 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -19,7 +19,6 @@ Group:		Libraries
 Source0:	https://gitlab.freedesktop.org/polkit/polkit/-/archive/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	5cb95118e21d0cf2348069847c3879e8
 Patch0:		systemd-fallback.patch
-Patch1:		elogind.patch
 URL:		https://www.freedesktop.org/wiki/Software/polkit
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-dtd412-xml
@@ -115,9 +114,6 @@ Pliki nagłówkowe PolicyKit.
 %if %{with consolekit} && (%{with systemd} || %{with elogind})
 %patch0 -p1
 %endif
-%if %{with elogind}
-%patch1 -p1
-%endif
 
 %build
 %meson build \
diff --git a/elogind.patch b/elogind.patch
deleted file mode 100644
index 2eb5ce4..0000000
--- a/elogind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur polkit-122.orig/data/meson.build polkit-122/data/meson.build
---- polkit-122.orig/data/meson.build	2022-10-26 14:12:24.000000000 +0200
-+++ polkit-122/data/meson.build	2023-07-22 13:01:22.590545340 +0200
-@@ -26,7 +26,7 @@
-   )
- endif
- 
--if enable_logind
-+if session_tracking == 'libsystemd-login'
-   configure_file(
-     input: 'polkit.service.in',
-     output: '@BASENAME@',
-diff -ur polkit-122.orig/meson.build polkit-122/meson.build
---- polkit-122.orig/meson.build	2022-10-26 14:12:24.000000000 +0200
-+++ polkit-122/meson.build	2023-07-22 13:00:31.328819850 +0200
-@@ -204,7 +204,7 @@
- 
-   # systemd unit / service files
-   systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
--  if systemd_systemdsystemunitdir == ''
-+  if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
-     systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-     # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
-     systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/polkit.git/commitdiff/b872ca5664b2cbdf656210950cd569abfe89ec44



More information about the pld-cvs-commit mailing list