diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch | |
parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) |
gentoo resync : 16.09.2020
Diffstat (limited to 'gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch')
-rw-r--r-- | gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch new file mode 100644 index 000000000000..e3240a010012 --- /dev/null +++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch @@ -0,0 +1,49 @@ +From 13575ae3f332e33a1952a803f2392d6d70df2028 Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Wed, 2 Sep 2020 17:59:45 -0400 +Subject: [PATCH] Fix meson syntax error when xinerama support is disabled. + +Fixes #346 +--- + libcscreensaver/meson.build | 7 ++++++- + meson.build | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/libcscreensaver/meson.build b/libcscreensaver/meson.build +index 1800c46..c2c3757 100644 +--- a/libcscreensaver/meson.build ++++ b/libcscreensaver/meson.build +@@ -145,13 +145,18 @@ gir_sources = [ + dbus_built + ] + ++libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m] ++if use_xinerama ++ libcscreensaver_deps += xinerama ++endif ++ + libcscreensaver = library( + 'cscreensaver', + cscreensaver_sources + gir_sources, + version: '0.0.0', + include_directories: inc, + cpp_args: '-DG_LOG_DOMAIN="CScreensaver"', +- dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m], ++ dependencies: libcscreensaver_deps, + install: true + ) + +diff --git a/meson.build b/meson.build +index b15c3fb..2f9a9a5 100644 +--- a/meson.build ++++ b/meson.build +@@ -61,7 +61,8 @@ foreach sym : [ + endif + endforeach + +-if get_option('xinerama') ++use_xinerama = get_option('xinerama') ++if use_xinerama + if host_machine.system() == 'solaris' + xinerama = cc.find_library('Xext') + xinerama_h = cc.has_header('X11/extensions/xinerama.h') |