| 1 |
commit: 30d944ac3e82fc01452eb7bd4e6d3506db1c6967 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 04:10:43 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 04:10:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d944ac |
| 7 |
|
| 8 |
net-libs/phodav: Update patch |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
.../2.5-meson-Allow-specifying-systemd-udev-directories.patch | 8 ++++---- |
| 13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch |
| 16 |
index 004adccf0da..87d4331d539 100644 |
| 17 |
--- a/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch |
| 18 |
+++ b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
https://gitlab.gnome.org/GNOME/phodav/-/merge_requests/19 |
| 21 |
|
| 22 |
-From c67bd2f698e0e1c6d0747a1be6217e6e435ef798 Mon Sep 17 00:00:00 2001 |
| 23 |
+From 5f6ca03ab91df31ede9a4435c63cf5af0ef50c06 Mon Sep 17 00:00:00 2001 |
| 24 |
From: Matt Turner <mattst88@×××××.com> |
| 25 |
Date: Mon, 3 May 2021 22:47:16 -0400 |
| 26 |
Subject: [PATCH] meson: Allow specifying systemd/udev directories |
| 27 |
@@ -12,7 +12,7 @@ Closes: https://gitlab.gnome.org/GNOME/phodav/-/issues/1 |
| 28 |
2 files changed, 24 insertions(+), 12 deletions(-) |
| 29 |
|
| 30 |
diff --git a/data/meson.build b/data/meson.build |
| 31 |
-index c466030..57ee6d1 100644 |
| 32 |
+index c466030..26ad939 100644 |
| 33 |
--- a/data/meson.build |
| 34 |
+++ b/data/meson.build |
| 35 |
@@ -1,16 +1,28 @@ |
| 36 |
@@ -20,7 +20,7 @@ index c466030..57ee6d1 100644 |
| 37 |
-if systemd.found() |
| 38 |
+systemd_systemunitdir = get_option('systemdsystemunitdir') |
| 39 |
+if systemd_systemunitdir == '' |
| 40 |
-+ systemd = dependency('systemd') |
| 41 |
++ systemd = dependency('systemd', required : false) |
| 42 |
+ if systemd.found() |
| 43 |
+ systemd_systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') |
| 44 |
+ endif |
| 45 |
@@ -37,7 +37,7 @@ index c466030..57ee6d1 100644 |
| 46 |
-if udev.found() |
| 47 |
+udev_rulesdir = get_option('udevrulesdir') |
| 48 |
+if udev_rulesdir == '' |
| 49 |
-+ udev = dependency('udev') |
| 50 |
++ udev = dependency('udev', required : false) |
| 51 |
+ if udev.found() |
| 52 |
+ udev_rulesdir = '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d') |
| 53 |
+ endif |
Archives