gentoo resync : 29.01.2021

2 files changed, 29 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
new file mode 100644
index 000000000000..bc4476a5892e
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
@@ -0,0 +1,28 @@
+diff --git a/meson.build b/meson.build
+index a4d49a16..eff937ac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -36,8 +36,6 @@ gio_unix = dependency('gio-unix-2.0')
+ gl = dependency('gl')
+ glib_version = '2.52.0'
+ glib = dependency('glib-2.0', version: '>= ' + glib_version)
+-gstreamer = dependency('gstreamer-1.0')
+-gstreamer_base = dependency('gstreamer-base-1.0')
+ gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
+ muffin = dependency('libmuffin', version: '>= 4.0.3')
+ muffinlibdir = muffin.get_pkgconfig_variable('typelibdir')
+@@ -53,6 +51,14 @@ if has_nm
+     dependency('libnm')
+ endif
+ 
++if get_option('build_recorder')
++	gstreamer = dependency('gstreamer-1.0')
++	gstreamer_base = dependency('gstreamer-base-1.0')
++else
++	gstreamer = dependency('', required: false)
++	gstreamer_base = dependency('', required: false)
++endif
++
+ # on some systems we need to find the math lib to make sure it builds
+ cc = meson.get_compiler('c')
+ math = cc.find_library('m', required: false)
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
index 24e14f267e23..c0cccca89d58 100644
--- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
+++ b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=PolicyKit Authentication Agent
+Comment=PolicyKit Authentication Agent
 Exec=/usr/libexec/polkit-gnome-authentication-agent-1
 Terminal=false
 Type=Application