diff options
author | Matthew Turnbull <sparky@bluefang-logic.com> | 2020-05-12 21:00:31 -0400 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2020-05-28 17:10:44 -0700 |
commit | b62de74f817576b0c5b4c658c69963d90785cc05 (patch) | |
tree | e4fe191bc4307661cc7eff8c5a31e229224cc6ba /x11-wm/muffin/files/muffin-4.4-gir-fixes.patch | |
parent | gnome-extra/cjs: 4.4.0 version bump (diff) | |
download | gentoo-b62de74f817576b0c5b4c658c69963d90785cc05.tar.gz gentoo-b62de74f817576b0c5b4c658c69963d90785cc05.tar.bz2 gentoo-b62de74f817576b0c5b4c658c69963d90785cc05.zip |
x11-wm/muffin: 4.4.3 version bump
Update muffin to 4.4.3. Add patches for compat
with newer gobject-introspection versions.
Bug: https://bugs.gentoo.org/704532
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-wm/muffin/files/muffin-4.4-gir-fixes.patch')
-rw-r--r-- | x11-wm/muffin/files/muffin-4.4-gir-fixes.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch new file mode 100644 index 000000000000..46613194be15 --- /dev/null +++ b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch @@ -0,0 +1,65 @@ +From eaacd664855b03517a0406024b18eb9f5a597a9d Mon Sep 17 00:00:00 2001 +From: Michael Webster <miketwebster@gmail.com> +Date: Tue, 14 Jan 2020 12:12:13 -0500 +Subject: [PATCH] display.c: Remove meta_display_get_atom() - it is unused, and + breaks the build when g-ir-scanner (with gobject-introspection ~1.62) + +ref: +https://gitlab.gnome.org/GNOME/mutter/commit/edeac1de09473809debc4d0b8c416f79dde8f500 +--- + src/core/display.c | 14 -------------- + src/meta/display.h | 9 --------- + 2 files changed, 23 deletions(-) + +diff --git a/src/core/display.c b/src/core/display.c +index 6c186e87..6baf2cc2 100644 +--- a/src/core/display.c ++++ b/src/core/display.c +@@ -5640,20 +5640,6 @@ meta_display_get_shape_event_base (MetaDisplay *display) + } + #endif + +-/** +- * meta_display_get_atom: (skip) +- * +- * Gets up an X atom that Muffin prefetched at startup. +- * +- * Return value: the X atom corresponding to the given atom enumeration +- */ +-Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom) +-{ +- Atom *atoms = & display->atom_WM_PROTOCOLS; +- +- return atoms[meta_atom - 1]; +-} +- + /** + * meta_display_get_leader_window: + * @display: a #MetaDisplay +diff --git a/src/meta/display.h b/src/meta/display.h +index 3f82c32b..434296f1 100644 +--- a/src/meta/display.h ++++ b/src/meta/display.h +@@ -56,14 +56,6 @@ GType meta_display_get_type (void) G_GNUC_CONST; + + #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) + +-typedef enum +-{ +- META_ATOM_FIRST = 0, +-#define item(x) META_ATOM_##x, +-#include "atomnames.h" +-#undef item +-}MetaAtom; +- + typedef enum { + META_LIST_DEFAULT = 0, /* normal windows */ + META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */ +@@ -90,7 +82,6 @@ gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display, + + int meta_display_get_damage_event_base (MetaDisplay *display); + int meta_display_get_shape_event_base (MetaDisplay *display); +-Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom); + + gboolean meta_display_xserver_time_is_before (MetaDisplay *display, + guint32 time1, |