[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-user-share/, gnome-extra/gnome-user-share/files/

[Sam James]

commit:     1cf8135184eba1106aecd5c0636f9733333f1b70
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Sun Feb 20 19:55:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 21:12:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf81351

gnome-extra/gnome-user-share: fix build with meson 0.61

Issue was logged upstream, but I don't expect things to move
quickly or at all, so adding this patch.

Also, scrubbed the existing patch

Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://bugs.gentoo.org/831939
Closes: https://github.com/gentoo/gentoo/pull/24291
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/fix-build-with-meson-0.61.patch           | 11 +++++++++++
 .../files/gnome-user-share-3.18.1-no-prefork.patch  | 21 +++++++++++----------
 .../gnome-user-share/gnome-user-share-3.34.0.ebuild |  1 +
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
new file mode 100644
index 000000000000..2721f2ac876f
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/831939
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,7 +7,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',

diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
index 156721d286cf..ca5eff008aa0 100644
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
@@ -1,10 +1,11 @@
---- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
-+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600
-@@ -9,7 +9,6 @@
- LimitXMLRequestBody 100000
- 
- LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
--LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
- LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
- LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
- LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
\ No newline at end of file
+https://bugs.gentoo.org/551012
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+ 
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so

diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
index 21db81dec889..d18fc0340e76 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	# that is problematic for us (bug #551012)
 	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
 	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+	"${FILESDIR}"/fix-build-with-meson-0.61.patch
 )
 
 src_configure() {