* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2020-05-29 0:11 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-05-29 0:11 UTC (permalink / raw
To: gentoo-commits
commit: b62de74f817576b0c5b4c658c69963d90785cc05
Author: Matthew Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed May 13 01:00:31 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 29 00:10:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62de74f
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 <AT> bluefang-logic.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-wm/muffin/Manifest | 1 +
x11-wm/muffin/files/muffin-4.4-gir-fixes.patch | 65 +++
.../muffin-4.4-gobject-introspection-fixes.patch | 529 +++++++++++++++++++++
x11-wm/muffin/metadata.xml | 8 +
x11-wm/muffin/muffin-4.4.3.ebuild | 84 ++++
5 files changed, 687 insertions(+)
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 2a4ff0ea1b7..7a57532ecf2 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1 +1,2 @@
DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
+DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
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 00000000000..46613194be1
--- /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,
diff --git a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
new file mode 100644
index 00000000000..053319d5c42
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
@@ -0,0 +1,529 @@
+From a452ec976f22b1ffba51e934f2d771d0680f6cca Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 14 Jan 2020 11:29:54 -0500
+Subject: [PATCH] muffin: Use glib for gettext
+
+This was also breaking the build under gobject-introspection ~1.62
+
+ref:
+https://gitlab.gnome.org/GNOME/mutter/commit/6ceddd626a20f5c3d92ddd9318338626f4be4a4d
+https://gitlab.gnome.org/GNOME/mutter/commit/5298a834efef5eeacaea24a9752468277782cb04
+---
+ ChangeLog | 2 +-
+ src/Makefile.am | 3 ++-
+ src/compositor/compositor.c | 1 +
+ src/compositor/meta-background.c | 1 +
+ src/compositor/plugins/default.c | 8 +++----
+ src/core/core.c | 1 +
+ src/core/delete.c | 2 +-
+ src/core/display.c | 4 ++--
+ src/core/keybindings.c | 2 +-
+ src/core/main.c | 2 +-
+ src/core/muffin.c | 1 +
+ src/core/prefs.c | 2 +-
+ src/core/screen.c | 2 +-
+ src/core/session.c | 1 +
+ src/core/stack.c | 2 +-
+ src/core/util-private.h | 36 ++++++++++++++++++++++++++++++++
+ src/core/util.c | 2 +-
+ src/core/window-props.c | 1 +
+ src/core/window.c | 2 +-
+ src/core/xprops.c | 2 +-
+ src/meta/common.h | 2 +-
+ src/meta/util.h | 5 -----
+ src/ui/frames.c | 24 ++++++++++-----------
+ src/ui/menu.c | 2 +-
+ src/ui/metaaccellabel.c | 2 +-
+ src/ui/resizepopup.c | 2 +-
+ src/ui/theme-parser.c | 2 +-
+ src/ui/theme.c | 2 +-
+ 28 files changed, 77 insertions(+), 41 deletions(-)
+ create mode 100644 src/core/util-private.h
+
+diff --git a/ChangeLog b/ChangeLog
+index e68822de..7123e9cf 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -13015,7 +13015,7 @@ Mon Jun 3 15:12:11 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
+
+ Patch from Erwann Chenede for raise_or_lower keybinding
+
+- * src/display.c, src/common.h: POINT_IN_RECT moved to a common
++ * src/display.c, src/common.h: META_POINT_IN_RECT moved to a common
+ location, removed from here
+ (meta_rectangle_intersect): move here and make it public
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cbb5b3af..9cb3af14 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -142,6 +142,7 @@ libmuffin_la_SOURCES = \
+ core/stack-tracker.h \
+ core/util.c \
+ meta/util.h \
++ meta/util-private.h \
+ core/window-props.c \
+ core/window-props.h \
+ core/window.c \
+@@ -281,7 +282,7 @@ Meta-$(api_version).gir: libmuffin.la
+ muffin-enum-types.h \
+ $(libmuffininclude_base_headers) \
+ $(filter %.c,$(libmuffin_la_SOURCES))
+-@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
++@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error --identifier-prefix=Meta
+
+ endif
+
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 0556f743..a8bc6db8 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -74,6 +74,7 @@
+ #include "meta-background-actor-private.h"
+ #include "window-private.h" /* to check window->hidden */
+ #include "display-private.h" /* for meta_display_lookup_x_window() */
++#include "util-private.h"
+ #include <X11/extensions/shape.h>
+ #include <X11/extensions/Xcomposite.h>
+ #include "meta-sync-ring.h"
+diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
+index 95917429..33bce084 100644
+--- a/src/compositor/meta-background.c
++++ b/src/compositor/meta-background.c
+@@ -28,6 +28,7 @@
+ #include <clutter/clutter.h>
+ #include "cogl-utils.h"
+ #include <meta/errors.h>
++// #include "util-private.h"
+ #include "meta-background-actor-private.h"
+
+ struct _MetaBackgroundPrivate
+diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
+index 1d223465..f69563bc 100644
+--- a/src/compositor/plugins/default.c
++++ b/src/compositor/plugins/default.c
+@@ -20,14 +20,12 @@
+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+ * 02110-1335, USA.
+ */
+-
++#include <config.h>
+ #include <meta/meta-plugin.h>
+ #include <meta/window.h>
+
+-#include <libintl.h>
+-#define _(x) dgettext (GETTEXT_PACKAGE, x)
+-#define N_(x) x
+-
++#include <meta/util.h>
++#include <glib/gi18n-lib.h>
+ #include <clutter/clutter.h>
+ #include <gmodule.h>
+ #include <string.h>
+diff --git a/src/core/core.c b/src/core/core.c
+index 43962825..77228aac 100644
+--- a/src/core/core.c
++++ b/src/core/core.c
+@@ -29,6 +29,7 @@
+ #include "workspace-private.h"
+ #include <meta/prefs.h>
+ #include <meta/errors.h>
++#include "util-private.h"
+
+ /* Looks up the MetaWindow representing the frame of the given X window.
+ * Used as a helper function by a bunch of the functions below.
+diff --git a/src/core/delete.c b/src/core/delete.c
+index 5c1e4bb6..5ef767c2 100644
+--- a/src/core/delete.c
++++ b/src/core/delete.c
+@@ -25,7 +25,7 @@
+ #define _XOPEN_SOURCE /* for kill() */
+
+ #include <config.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "window-private.h"
+ #include <meta/errors.h>
+ #include <meta/workspace.h>
+diff --git a/src/core/display.c b/src/core/display.c
+index 691a8ed1..6c186e87 100644
+--- a/src/core/display.c
++++ b/src/core/display.c
+@@ -1568,8 +1568,8 @@ window_raise_with_delay_callback (void *data)
+ meta_error_trap_pop (window->display);
+
+ point_in_window =
+- (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
+- (window->frame == NULL && POINT_IN_RECT (root_x, root_y, window->rect));
++ (window->frame && META_POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
++ (window->frame == NULL && META_POINT_IN_RECT (root_x, root_y, window->rect));
+ if (same_screen && point_in_window)
+ meta_window_raise (window);
+ #ifdef WITH_VERBOSE_MODE
+diff --git a/src/core/keybindings.c b/src/core/keybindings.c
+index 6b1c1cdf..50658880 100644
+--- a/src/core/keybindings.c
++++ b/src/core/keybindings.c
+@@ -44,7 +44,7 @@
+ #include "frame.h"
+ #include "place.h"
+ #include <meta/prefs.h>
+-#include <meta/util.h>
++#include "util-private.h"
+
+ #include <X11/keysym.h>
+ #include <string.h>
+diff --git a/src/core/main.c b/src/core/main.c
+index 71c78526..a16bee1e 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -49,7 +49,7 @@
+
+ #include <config.h>
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "display-private.h"
+ #include <meta/errors.h>
+ #include "ui.h"
+diff --git a/src/core/muffin.c b/src/core/muffin.c
+index 26d98f02..8665797a 100644
+--- a/src/core/muffin.c
++++ b/src/core/muffin.c
+@@ -26,6 +26,7 @@
+ #include <meta/main.h>
+ #include <meta/util.h>
+ #include "meta-plugin-manager.h"
++#include <glib/gi18n-lib.h>
+
+ #include <glib.h>
+
+diff --git a/src/core/prefs.c b/src/core/prefs.c
+index d146902d..d92826a1 100644
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -33,7 +33,7 @@
+ #include <config.h>
+ #include <meta/prefs.h>
+ #include "ui.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "meta-plugin-manager.h"
+ #include <glib.h>
+ #include <gio/gio.h>
+diff --git a/src/core/screen.c b/src/core/screen.c
+index 8ba26a06..cdcbcab9 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -33,7 +33,7 @@
+ #include <config.h>
+ #include "screen-private.h"
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/errors.h>
+ #include "window-private.h"
+ #include "frame.h"
+diff --git a/src/core/session.c b/src/core/session.c
+index 8e0ded3a..f45e1a63 100644
+--- a/src/core/session.c
++++ b/src/core/session.c
+@@ -25,6 +25,7 @@
+
+ #include <config.h>
+
++#include "util-private.h"
+ #include "session.h"
+ #include <X11/Xatom.h>
+
+diff --git a/src/core/stack.c b/src/core/stack.c
+index 7404a59e..49ff24b4 100644
+--- a/src/core/stack.c
++++ b/src/core/stack.c
+@@ -1424,7 +1424,7 @@ window_contains_point (MetaWindow *window,
+
+ meta_window_get_outer_rect (window, &rect);
+
+- return POINT_IN_RECT (root_x, root_y, rect);
++ return META_POINT_IN_RECT (root_x, root_y, rect);
+ }
+
+ static MetaWindow*
+diff --git a/src/core/util-private.h b/src/core/util-private.h
+new file mode 100644
+index 00000000..8e51b42f
+--- /dev/null
++++ b/src/core/util-private.h
+@@ -0,0 +1,36 @@
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
++
++/* Mutter utilities */
++
++/*
++ * Copyright (C) 2001 Havoc Pennington
++ * Copyright (C) 2005 Elijah Newren
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef META_UTIL_PRIVATE_H
++#define META_UTIL_PRIVATE_H
++
++#include <meta/util.h>
++#include <glib/gi18n-lib.h>
++
++void meta_set_verbose (gboolean setting);
++void meta_set_debugging (gboolean setting);
++void meta_set_syncing (gboolean setting);
++void meta_set_replace_current_wm (gboolean setting);
++
++#endif
+diff --git a/src/core/util.c b/src/core/util.c
+index c1d84520..896c7195 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -35,7 +35,7 @@
+
+ #include <config.h>
+ #include <meta/common.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/main.h>
+
+ #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */
+diff --git a/src/core/window-props.c b/src/core/window-props.c
+index 911b9a10..e5306838 100644
+--- a/src/core/window-props.c
++++ b/src/core/window-props.c
+@@ -50,6 +50,7 @@
+ #include <X11/Xatom.h>
+ #include <unistd.h>
+ #include <string.h>
++#include "util-private.h"
+ #ifndef HOST_NAME_MAX
+ /* Solaris headers apparently don't define this so do so manually; #326745 */
+ #define HOST_NAME_MAX 255
+diff --git a/src/core/window.c b/src/core/window.c
+index 500eaac0..1a080887 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -32,7 +32,7 @@
+ #include "window-private.h"
+ #include "boxes-private.h"
+ #include "edge-resistance.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "frame.h"
+ #include <meta/errors.h>
+ #include "workspace-private.h"
+diff --git a/src/core/xprops.c b/src/core/xprops.c
+index 01df70a6..bcf11f21 100644
+--- a/src/core/xprops.c
++++ b/src/core/xprops.c
+@@ -83,7 +83,7 @@ from The Open Group.
+ #include <config.h>
+ #include "xprops.h"
+ #include <meta/errors.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "async-getprop.h"
+ #include "ui.h"
+ #include "muffin-Xatomtype.h"
+diff --git a/src/meta/common.h b/src/meta/common.h
+index 46bf3461..55426589 100644
+--- a/src/meta/common.h
++++ b/src/meta/common.h
+@@ -398,7 +398,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
+
+ /************************************************************/
+
+-#define POINT_IN_RECT(xcoord, ycoord, rect) \
++#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
+ ((xcoord) >= (rect).x && \
+ (xcoord) < ((rect).x + (rect).width) && \
+ (ycoord) >= (rect).y && \
+diff --git a/src/meta/util.h b/src/meta/util.h
+index cce79ed5..ea10f16a 100644
+--- a/src/meta/util.h
++++ b/src/meta/util.h
+@@ -31,12 +31,8 @@
+ #include <meta/common.h>
+
+ gboolean meta_is_verbose (void);
+-void meta_set_verbose (gboolean setting);
+ gboolean meta_is_debugging (void);
+-void meta_set_debugging (gboolean setting);
+ gboolean meta_is_syncing (void);
+-void meta_set_syncing (gboolean setting);
+-void meta_set_replace_current_wm (gboolean setting);
+
+ void meta_debug_spew_real (const char *format,
+ ...) G_GNUC_PRINTF (1, 2);
+@@ -97,7 +93,6 @@ const char* meta_gravity_to_string (int gravity);
+
+ #include <libintl.h>
+ #define _(x) dgettext (GETTEXT_PACKAGE, x)
+-#define N_(x) x
+
+ char* meta_g_utf8_strndup (const gchar *src, gsize n);
+
+diff --git a/src/ui/frames.c b/src/ui/frames.c
+index c1ae7a1d..be075134 100644
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -2495,16 +2495,16 @@ get_control (MetaFrames *frames,
+ meta_frames_calc_geometry (frames, frame, &fgeom);
+ get_client_rect (&fgeom, fgeom.width, fgeom.height, &client);
+
+- if (POINT_IN_RECT (x, y, client))
++ if (META_POINT_IN_RECT (x, y, client))
+ return META_FRAME_CONTROL_CLIENT_AREA;
+
+- if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
+ return META_FRAME_CONTROL_DELETE;
+
+- if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
+ return META_FRAME_CONTROL_MINIMIZE;
+
+- if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
+ return META_FRAME_CONTROL_MENU;
+
+ meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+@@ -2521,7 +2521,7 @@ get_control (MetaFrames *frames,
+ has_right = (flags & META_FRAME_ALLOWS_RIGHT_RESIZE) != 0;
+ has_bottom = (flags & META_FRAME_ALLOWS_BOTTOM_RESIZE) != 0;
+
+- if (POINT_IN_RECT (x, y, fgeom.title_rect))
++ if (META_POINT_IN_RECT (x, y, fgeom.title_rect))
+ {
+ if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
+ return META_FRAME_CONTROL_RESIZE_N;
+@@ -2529,7 +2529,7 @@ get_control (MetaFrames *frames,
+ return META_FRAME_CONTROL_TITLE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
+ {
+ if (flags & META_FRAME_MAXIMIZED &&
+ (META_WINDOW_TILED_TOP (window) ||
+@@ -2542,32 +2542,32 @@ get_control (MetaFrames *frames,
+ return META_FRAME_CONTROL_MAXIMIZE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
+ {
+ return META_FRAME_CONTROL_SHADE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
+ {
+ return META_FRAME_CONTROL_UNSHADE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
+ {
+ return META_FRAME_CONTROL_ABOVE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
+ {
+ return META_FRAME_CONTROL_UNABOVE;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
+ {
+ return META_FRAME_CONTROL_STICK;
+ }
+
+- if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
++ if (META_POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
+ {
+ return META_FRAME_CONTROL_UNSTICK;
+ }
+diff --git a/src/ui/menu.c b/src/ui/menu.c
+index c0b94a1e..5d1155e7 100644
+--- a/src/ui/menu.c
++++ b/src/ui/menu.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "menu.h"
+ #include <meta/main.h>
+-#include <meta/util.h>
++#include "util-private.h"
+ #include "core.h"
+ #include "metaaccellabel.h"
+ #include "ui.h"
+diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
+index fd5c6e6c..097b45b4 100644
+--- a/src/ui/metaaccellabel.c
++++ b/src/ui/metaaccellabel.c
+@@ -35,7 +35,7 @@
+ #include "metaaccellabel.h"
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <meta/util.h>
++#include "util-private.h"
+
+ static void meta_accel_label_destroy (GtkWidget *object);
+ static void meta_accel_label_finalize (GObject *object);
+diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
+index 18c395d2..56742fd7 100644
+--- a/src/ui/resizepopup.c
++++ b/src/ui/resizepopup.c
+@@ -23,7 +23,7 @@
+
+ #include <config.h>
+ #include "resizepopup.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+
+diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
+index 0151f362..628bf73e 100644
+--- a/src/ui/theme-parser.c
++++ b/src/ui/theme-parser.c
+@@ -23,7 +23,7 @@
+
+ #include <config.h>
+ #include "theme-private.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/prefs.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index cb717bbb..99ea519c 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -55,7 +55,7 @@
+
+ #include <config.h>
+ #include "theme-private.h"
+-#include <meta/util.h>
++#include "util-private.h"
+ #include <meta/gradient.h>
+ #include <meta/prefs.h>
+ #include <gtk/gtk.h>
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 7b5976166a1..34a28b9277a 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -5,6 +5,14 @@
<email>cinnamon@gentoo.org</email>
<name>Cinnamon Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/muffin</remote-id>
</upstream>
diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild
new file mode 100644
index 00000000000..f8d8c2d3a9c
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.4.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=x11-libs/pango-1.2[X,introspection?]
+ >=x11-libs/cairo-1.14:=[X]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ >=x11-libs/gtk+-3.9.12:3[X,introspection?]
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=gnome-extra/cinnamon-desktop-4.4:0=
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/libXcomposite-0.3
+ >=x11-libs/startup-notification-0.7:=
+
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/opengl
+
+ gnome-extra/zenity
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+ xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=app-text/gnome-doc-utils-0.8
+ sys-devel/gettext
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !x11-misc/expocity
+"
+
+src_prepare() {
+ # Fixes from 4.6.0.
+ eapply "${FILESDIR}"/muffin-4.4-{gobject-introspection,gir}-fixes.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+# Wayland is not supported upstream. Disabled by default in 4.6.0.
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+ gnome2_src_configure \
+ --disable-static \
+ --disable-wayland-egl-server \
+ --enable-shape \
+ --enable-sm \
+ --enable-startup-notification \
+ --enable-xsync \
+ --enable-verbose-mode \
+ --with-libcanberra \
+ $(use_enable introspection) \
+ $(use_enable xinerama)
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2020-05-31 19:05 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-05-31 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 963730a86fba237bdc6dbc3bf573917727de501e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 19:01:50 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:04:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963730a8
x11-wm/muffin: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-wm/muffin/Manifest | 1 -
.../files/muffin-4.0-clutter-configure.patch | 13 ----
.../muffin/files/muffin-4.0-cogl-configure.patch | 25 -------
x11-wm/muffin/muffin-4.0.3.ebuild | 81 ----------------------
4 files changed, 120 deletions(-)
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 7a57532ecf2..59b28ebff37 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1 @@
-DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
deleted file mode 100644
index f5ab1de9af2..00000000000
--- a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/clutter/configure.ac b/clutter/configure.ac
-index 0b3c3e5..9c0e6cd 100644
---- a/clutter/configure.ac
-+++ b/clutter/configure.ac
-@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
- [wayland-egl-server],
- [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
- [],
-- enable_wayland_egl_server=yes
-+ enable_wayland_egl_server=no
- )
-
- AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
deleted file mode 100644
index 1e9721dd1bf..00000000000
--- a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <k_f@gentoo.org>
-Date: Wed, 28 Nov 2018 19:57:20 +0100
-Subject: [PATCH] Fix
-
----
- cogl/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/configure.ac b/cogl/configure.ac
-index b06677a..209f449 100644
---- a/cogl/configure.ac
-+++ b/cogl/configure.ac
-@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
- [wayland-egl-server],
- [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
- [],
-- enable_wayland_egl_server=yes
-+ enable_wayland_egl_server=no
- )
- AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
- [
---
-2.18.1
-
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
deleted file mode 100644
index 47f849d8b75..00000000000
--- a/x11-wm/muffin/muffin-4.0.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 x86"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.14:=[X]
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.9.12:3[X,introspection?]
- >=dev-libs/glib-2.37.3:2[dbus]
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
- >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/libXcomposite-0.3
- >=x11-libs/startup-notification-0.7:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/opengl
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=app-text/gnome-doc-utils-0.8
- sys-devel/gettext
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- x11-base/xorg-proto
- test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !x11-misc/expocity
-"
-
-src_prepare() {
- eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
- gnome2_src_configure \
- --disable-static \
- --enable-shape \
- --enable-sm \
- --enable-startup-notification \
- --enable-xsync \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable xinerama)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2020-12-27 5:06 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-12-27 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 1f9bfd6586f227a8b5f845adb1031de9fb3ac99e
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Dec 24 07:07:08 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 05:06:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9bfd65
x11-wm/muffin: Remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/muffin/Manifest | 1 -
x11-wm/muffin/files/muffin-4.4-gir-fixes.patch | 65 ---
.../muffin-4.4-gobject-introspection-fixes.patch | 529 ---------------------
x11-wm/muffin/muffin-4.4.3.ebuild | 87 ----
4 files changed, 682 deletions(-)
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index cbe739adfae..f79bbf2e607 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1 @@
-DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
diff --git a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch
deleted file mode 100644
index 46613194be1..00000000000
--- a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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,
diff --git a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
deleted file mode 100644
index 053319d5c42..00000000000
--- a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-From a452ec976f22b1ffba51e934f2d771d0680f6cca Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 14 Jan 2020 11:29:54 -0500
-Subject: [PATCH] muffin: Use glib for gettext
-
-This was also breaking the build under gobject-introspection ~1.62
-
-ref:
-https://gitlab.gnome.org/GNOME/mutter/commit/6ceddd626a20f5c3d92ddd9318338626f4be4a4d
-https://gitlab.gnome.org/GNOME/mutter/commit/5298a834efef5eeacaea24a9752468277782cb04
----
- ChangeLog | 2 +-
- src/Makefile.am | 3 ++-
- src/compositor/compositor.c | 1 +
- src/compositor/meta-background.c | 1 +
- src/compositor/plugins/default.c | 8 +++----
- src/core/core.c | 1 +
- src/core/delete.c | 2 +-
- src/core/display.c | 4 ++--
- src/core/keybindings.c | 2 +-
- src/core/main.c | 2 +-
- src/core/muffin.c | 1 +
- src/core/prefs.c | 2 +-
- src/core/screen.c | 2 +-
- src/core/session.c | 1 +
- src/core/stack.c | 2 +-
- src/core/util-private.h | 36 ++++++++++++++++++++++++++++++++
- src/core/util.c | 2 +-
- src/core/window-props.c | 1 +
- src/core/window.c | 2 +-
- src/core/xprops.c | 2 +-
- src/meta/common.h | 2 +-
- src/meta/util.h | 5 -----
- src/ui/frames.c | 24 ++++++++++-----------
- src/ui/menu.c | 2 +-
- src/ui/metaaccellabel.c | 2 +-
- src/ui/resizepopup.c | 2 +-
- src/ui/theme-parser.c | 2 +-
- src/ui/theme.c | 2 +-
- 28 files changed, 77 insertions(+), 41 deletions(-)
- create mode 100644 src/core/util-private.h
-
-diff --git a/ChangeLog b/ChangeLog
-index e68822de..7123e9cf 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -13015,7 +13015,7 @@ Mon Jun 3 15:12:11 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
-
- Patch from Erwann Chenede for raise_or_lower keybinding
-
-- * src/display.c, src/common.h: POINT_IN_RECT moved to a common
-+ * src/display.c, src/common.h: META_POINT_IN_RECT moved to a common
- location, removed from here
- (meta_rectangle_intersect): move here and make it public
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index cbb5b3af..9cb3af14 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -142,6 +142,7 @@ libmuffin_la_SOURCES = \
- core/stack-tracker.h \
- core/util.c \
- meta/util.h \
-+ meta/util-private.h \
- core/window-props.c \
- core/window-props.h \
- core/window.c \
-@@ -281,7 +282,7 @@ Meta-$(api_version).gir: libmuffin.la
- muffin-enum-types.h \
- $(libmuffininclude_base_headers) \
- $(filter %.c,$(libmuffin_la_SOURCES))
--@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
-+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error --identifier-prefix=Meta
-
- endif
-
-diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
-index 0556f743..a8bc6db8 100644
---- a/src/compositor/compositor.c
-+++ b/src/compositor/compositor.c
-@@ -74,6 +74,7 @@
- #include "meta-background-actor-private.h"
- #include "window-private.h" /* to check window->hidden */
- #include "display-private.h" /* for meta_display_lookup_x_window() */
-+#include "util-private.h"
- #include <X11/extensions/shape.h>
- #include <X11/extensions/Xcomposite.h>
- #include "meta-sync-ring.h"
-diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
-index 95917429..33bce084 100644
---- a/src/compositor/meta-background.c
-+++ b/src/compositor/meta-background.c
-@@ -28,6 +28,7 @@
- #include <clutter/clutter.h>
- #include "cogl-utils.h"
- #include <meta/errors.h>
-+// #include "util-private.h"
- #include "meta-background-actor-private.h"
-
- struct _MetaBackgroundPrivate
-diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
-index 1d223465..f69563bc 100644
---- a/src/compositor/plugins/default.c
-+++ b/src/compositor/plugins/default.c
-@@ -20,14 +20,12 @@
- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
- * 02110-1335, USA.
- */
--
-+#include <config.h>
- #include <meta/meta-plugin.h>
- #include <meta/window.h>
-
--#include <libintl.h>
--#define _(x) dgettext (GETTEXT_PACKAGE, x)
--#define N_(x) x
--
-+#include <meta/util.h>
-+#include <glib/gi18n-lib.h>
- #include <clutter/clutter.h>
- #include <gmodule.h>
- #include <string.h>
-diff --git a/src/core/core.c b/src/core/core.c
-index 43962825..77228aac 100644
---- a/src/core/core.c
-+++ b/src/core/core.c
-@@ -29,6 +29,7 @@
- #include "workspace-private.h"
- #include <meta/prefs.h>
- #include <meta/errors.h>
-+#include "util-private.h"
-
- /* Looks up the MetaWindow representing the frame of the given X window.
- * Used as a helper function by a bunch of the functions below.
-diff --git a/src/core/delete.c b/src/core/delete.c
-index 5c1e4bb6..5ef767c2 100644
---- a/src/core/delete.c
-+++ b/src/core/delete.c
-@@ -25,7 +25,7 @@
- #define _XOPEN_SOURCE /* for kill() */
-
- #include <config.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include "window-private.h"
- #include <meta/errors.h>
- #include <meta/workspace.h>
-diff --git a/src/core/display.c b/src/core/display.c
-index 691a8ed1..6c186e87 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -1568,8 +1568,8 @@ window_raise_with_delay_callback (void *data)
- meta_error_trap_pop (window->display);
-
- point_in_window =
-- (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
-- (window->frame == NULL && POINT_IN_RECT (root_x, root_y, window->rect));
-+ (window->frame && META_POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
-+ (window->frame == NULL && META_POINT_IN_RECT (root_x, root_y, window->rect));
- if (same_screen && point_in_window)
- meta_window_raise (window);
- #ifdef WITH_VERBOSE_MODE
-diff --git a/src/core/keybindings.c b/src/core/keybindings.c
-index 6b1c1cdf..50658880 100644
---- a/src/core/keybindings.c
-+++ b/src/core/keybindings.c
-@@ -44,7 +44,7 @@
- #include "frame.h"
- #include "place.h"
- #include <meta/prefs.h>
--#include <meta/util.h>
-+#include "util-private.h"
-
- #include <X11/keysym.h>
- #include <string.h>
-diff --git a/src/core/main.c b/src/core/main.c
-index 71c78526..a16bee1e 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -49,7 +49,7 @@
-
- #include <config.h>
- #include <meta/main.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include "display-private.h"
- #include <meta/errors.h>
- #include "ui.h"
-diff --git a/src/core/muffin.c b/src/core/muffin.c
-index 26d98f02..8665797a 100644
---- a/src/core/muffin.c
-+++ b/src/core/muffin.c
-@@ -26,6 +26,7 @@
- #include <meta/main.h>
- #include <meta/util.h>
- #include "meta-plugin-manager.h"
-+#include <glib/gi18n-lib.h>
-
- #include <glib.h>
-
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index d146902d..d92826a1 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -33,7 +33,7 @@
- #include <config.h>
- #include <meta/prefs.h>
- #include "ui.h"
--#include <meta/util.h>
-+#include "util-private.h"
- #include "meta-plugin-manager.h"
- #include <glib.h>
- #include <gio/gio.h>
-diff --git a/src/core/screen.c b/src/core/screen.c
-index 8ba26a06..cdcbcab9 100644
---- a/src/core/screen.c
-+++ b/src/core/screen.c
-@@ -33,7 +33,7 @@
- #include <config.h>
- #include "screen-private.h"
- #include <meta/main.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include <meta/errors.h>
- #include "window-private.h"
- #include "frame.h"
-diff --git a/src/core/session.c b/src/core/session.c
-index 8e0ded3a..f45e1a63 100644
---- a/src/core/session.c
-+++ b/src/core/session.c
-@@ -25,6 +25,7 @@
-
- #include <config.h>
-
-+#include "util-private.h"
- #include "session.h"
- #include <X11/Xatom.h>
-
-diff --git a/src/core/stack.c b/src/core/stack.c
-index 7404a59e..49ff24b4 100644
---- a/src/core/stack.c
-+++ b/src/core/stack.c
-@@ -1424,7 +1424,7 @@ window_contains_point (MetaWindow *window,
-
- meta_window_get_outer_rect (window, &rect);
-
-- return POINT_IN_RECT (root_x, root_y, rect);
-+ return META_POINT_IN_RECT (root_x, root_y, rect);
- }
-
- static MetaWindow*
-diff --git a/src/core/util-private.h b/src/core/util-private.h
-new file mode 100644
-index 00000000..8e51b42f
---- /dev/null
-+++ b/src/core/util-private.h
-@@ -0,0 +1,36 @@
-+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-+
-+/* Mutter utilities */
-+
-+/*
-+ * Copyright (C) 2001 Havoc Pennington
-+ * Copyright (C) 2005 Elijah Newren
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+#ifndef META_UTIL_PRIVATE_H
-+#define META_UTIL_PRIVATE_H
-+
-+#include <meta/util.h>
-+#include <glib/gi18n-lib.h>
-+
-+void meta_set_verbose (gboolean setting);
-+void meta_set_debugging (gboolean setting);
-+void meta_set_syncing (gboolean setting);
-+void meta_set_replace_current_wm (gboolean setting);
-+
-+#endif
-diff --git a/src/core/util.c b/src/core/util.c
-index c1d84520..896c7195 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -35,7 +35,7 @@
-
- #include <config.h>
- #include <meta/common.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include <meta/main.h>
-
- #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */
-diff --git a/src/core/window-props.c b/src/core/window-props.c
-index 911b9a10..e5306838 100644
---- a/src/core/window-props.c
-+++ b/src/core/window-props.c
-@@ -50,6 +50,7 @@
- #include <X11/Xatom.h>
- #include <unistd.h>
- #include <string.h>
-+#include "util-private.h"
- #ifndef HOST_NAME_MAX
- /* Solaris headers apparently don't define this so do so manually; #326745 */
- #define HOST_NAME_MAX 255
-diff --git a/src/core/window.c b/src/core/window.c
-index 500eaac0..1a080887 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -32,7 +32,7 @@
- #include "window-private.h"
- #include "boxes-private.h"
- #include "edge-resistance.h"
--#include <meta/util.h>
-+#include "util-private.h"
- #include "frame.h"
- #include <meta/errors.h>
- #include "workspace-private.h"
-diff --git a/src/core/xprops.c b/src/core/xprops.c
-index 01df70a6..bcf11f21 100644
---- a/src/core/xprops.c
-+++ b/src/core/xprops.c
-@@ -83,7 +83,7 @@ from The Open Group.
- #include <config.h>
- #include "xprops.h"
- #include <meta/errors.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include "async-getprop.h"
- #include "ui.h"
- #include "muffin-Xatomtype.h"
-diff --git a/src/meta/common.h b/src/meta/common.h
-index 46bf3461..55426589 100644
---- a/src/meta/common.h
-+++ b/src/meta/common.h
-@@ -398,7 +398,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
-
- /************************************************************/
-
--#define POINT_IN_RECT(xcoord, ycoord, rect) \
-+#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
- ((xcoord) >= (rect).x && \
- (xcoord) < ((rect).x + (rect).width) && \
- (ycoord) >= (rect).y && \
-diff --git a/src/meta/util.h b/src/meta/util.h
-index cce79ed5..ea10f16a 100644
---- a/src/meta/util.h
-+++ b/src/meta/util.h
-@@ -31,12 +31,8 @@
- #include <meta/common.h>
-
- gboolean meta_is_verbose (void);
--void meta_set_verbose (gboolean setting);
- gboolean meta_is_debugging (void);
--void meta_set_debugging (gboolean setting);
- gboolean meta_is_syncing (void);
--void meta_set_syncing (gboolean setting);
--void meta_set_replace_current_wm (gboolean setting);
-
- void meta_debug_spew_real (const char *format,
- ...) G_GNUC_PRINTF (1, 2);
-@@ -97,7 +93,6 @@ const char* meta_gravity_to_string (int gravity);
-
- #include <libintl.h>
- #define _(x) dgettext (GETTEXT_PACKAGE, x)
--#define N_(x) x
-
- char* meta_g_utf8_strndup (const gchar *src, gsize n);
-
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index c1ae7a1d..be075134 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -2495,16 +2495,16 @@ get_control (MetaFrames *frames,
- meta_frames_calc_geometry (frames, frame, &fgeom);
- get_client_rect (&fgeom, fgeom.width, fgeom.height, &client);
-
-- if (POINT_IN_RECT (x, y, client))
-+ if (META_POINT_IN_RECT (x, y, client))
- return META_FRAME_CONTROL_CLIENT_AREA;
-
-- if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
- return META_FRAME_CONTROL_DELETE;
-
-- if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
- return META_FRAME_CONTROL_MINIMIZE;
-
-- if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
- return META_FRAME_CONTROL_MENU;
-
- meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-@@ -2521,7 +2521,7 @@ get_control (MetaFrames *frames,
- has_right = (flags & META_FRAME_ALLOWS_RIGHT_RESIZE) != 0;
- has_bottom = (flags & META_FRAME_ALLOWS_BOTTOM_RESIZE) != 0;
-
-- if (POINT_IN_RECT (x, y, fgeom.title_rect))
-+ if (META_POINT_IN_RECT (x, y, fgeom.title_rect))
- {
- if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
- return META_FRAME_CONTROL_RESIZE_N;
-@@ -2529,7 +2529,7 @@ get_control (MetaFrames *frames,
- return META_FRAME_CONTROL_TITLE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
- {
- if (flags & META_FRAME_MAXIMIZED &&
- (META_WINDOW_TILED_TOP (window) ||
-@@ -2542,32 +2542,32 @@ get_control (MetaFrames *frames,
- return META_FRAME_CONTROL_MAXIMIZE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
- {
- return META_FRAME_CONTROL_SHADE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
- {
- return META_FRAME_CONTROL_UNSHADE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
- {
- return META_FRAME_CONTROL_ABOVE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
- {
- return META_FRAME_CONTROL_UNABOVE;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
- {
- return META_FRAME_CONTROL_STICK;
- }
-
-- if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
-+ if (META_POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
- {
- return META_FRAME_CONTROL_UNSTICK;
- }
-diff --git a/src/ui/menu.c b/src/ui/menu.c
-index c0b94a1e..5d1155e7 100644
---- a/src/ui/menu.c
-+++ b/src/ui/menu.c
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include "menu.h"
- #include <meta/main.h>
--#include <meta/util.h>
-+#include "util-private.h"
- #include "core.h"
- #include "metaaccellabel.h"
- #include "ui.h"
-diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
-index fd5c6e6c..097b45b4 100644
---- a/src/ui/metaaccellabel.c
-+++ b/src/ui/metaaccellabel.c
-@@ -35,7 +35,7 @@
- #include "metaaccellabel.h"
- #include <gtk/gtk.h>
- #include <string.h>
--#include <meta/util.h>
-+#include "util-private.h"
-
- static void meta_accel_label_destroy (GtkWidget *object);
- static void meta_accel_label_finalize (GObject *object);
-diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
-index 18c395d2..56742fd7 100644
---- a/src/ui/resizepopup.c
-+++ b/src/ui/resizepopup.c
-@@ -23,7 +23,7 @@
-
- #include <config.h>
- #include "resizepopup.h"
--#include <meta/util.h>
-+#include "util-private.h"
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-
-diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
-index 0151f362..628bf73e 100644
---- a/src/ui/theme-parser.c
-+++ b/src/ui/theme-parser.c
-@@ -23,7 +23,7 @@
-
- #include <config.h>
- #include "theme-private.h"
--#include <meta/util.h>
-+#include "util-private.h"
- #include <meta/prefs.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/src/ui/theme.c b/src/ui/theme.c
-index cb717bbb..99ea519c 100644
---- a/src/ui/theme.c
-+++ b/src/ui/theme.c
-@@ -55,7 +55,7 @@
-
- #include <config.h>
- #include "theme-private.h"
--#include <meta/util.h>
-+#include "util-private.h"
- #include <meta/gradient.h>
- #include <meta/prefs.h>
- #include <gtk/gtk.h>
diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild
deleted file mode 100644
index b77326d5863..00000000000
--- a/x11-wm/muffin/muffin-4.4.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.14:=[X]
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.9.12:3[X,introspection?]
- >=dev-libs/glib-2.37.3:2[dbus]
- >=dev-libs/json-glib-1.0
- >=gnome-extra/cinnamon-desktop-4.4:0=
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/libXcomposite-0.3
- >=x11-libs/startup-notification-0.7:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libxkbcommon
- virtual/opengl
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- dev-util/glib-utils
- >=app-text/gnome-doc-utils-0.8
- sys-devel/gettext
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- x11-base/xorg-proto
- test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !x11-misc/expocity
-"
-
-src_prepare() {
- # Fixes from 4.6.0.
- eapply "${FILESDIR}"/muffin-4.4-{gobject-introspection,gir}-fixes.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-# Wayland is not supported upstream. Disabled by default in 4.6.0.
-src_configure() {
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
- gnome2_src_configure \
- --disable-static \
- --disable-wayland-egl-server \
- --enable-shape \
- --enable-sm \
- --enable-startup-notification \
- --enable-xsync \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable xinerama)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2021-03-19 3:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-03-19 3:32 UTC (permalink / raw
To: gentoo-commits
commit: e766fbdd933ac97759340151764860aeca00a1cc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 03:31:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 03:31:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e766fbdd
x11-wm/muffin: fix build with slibtool
Closes: https://bugs.gentoo.org/767139
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/muffin/files/muffin-4.8.1-slibtool.patch | 146 ++++++++++++++++++++++++
x11-wm/muffin/muffin-4.8.1.ebuild | 4 +
2 files changed, 150 insertions(+)
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
new file mode 100644
index 00000000000..65f70b22023
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
@@ -0,0 +1,146 @@
+https://github.com/linuxmint/muffin/pull/577
+https://bugs.gentoo.org/767139
+
+From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:35 -0800
+Subject: [PATCH 1/2] build: Add missing libtool depedencies.
+
+This fixes the build with slibtool.
+---
+ clutter/clutter/Makefile.am | 18 +++++++++++++++---
+ src/Makefile.am | 9 +++++++--
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
+index a6366f4f2..ecfa568b7 100644
+--- a/clutter/clutter/Makefile.am
++++ b/clutter/clutter/Makefile.am
+@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE
+
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
+ $(clutter_include_HEADERS) \
+ $(clutter_deprecated_HEADERS) \
+@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI
+
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_
+
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
+-ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9cb3af14e..37274a4bd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la
+ @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0
+ @META_GIR@_PACKAGES = gtk+-3.0
+ @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
+-@META_GIR@_LIBS = libmuffin.la
++@META_GIR@_LIBS = \
++ libmuffin.la \
++ $(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++ $(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ @META_GIR@_FILES = \
+ muffin-enum-types.h \
+ $(libmuffininclude_base_headers) \
+@@ -383,4 +388,4 @@ install-exec-local:
+ { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \
+ } \
+ ) ; \
+- done
+\ No newline at end of file
++ done
+
+From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:44 -0800
+Subject: [PATCH 2/2] build: Fix undefined references with slibtool.
+
+---
+ Makefile.am | 2 +-
+ src/Makefile.am | 2 +-
+ src/compositor/plugins/Makefile.am | 9 ++++++---
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cf8382b67..c5d589ff7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+
+-SUBDIRS=cogl clutter src po doc data
++SUBDIRS=cogl clutter src src/compositor/plugins po doc data
+
+ EXTRA_DIST = HACKING MAINTAINERS rationales.txt
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 37274a4bd..b75b1879f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,7 @@
+
+ lib_LTLIBRARIES = libmuffin.la
+
+-SUBDIRS=wm-tester tools compositor/plugins
++SUBDIRS=wm-tester tools
+
+ NULL =
+
+diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
+index 09ab325a5..241b514c3 100644
+--- a/src/compositor/plugins/Makefile.am
++++ b/src/compositor/plugins/Makefile.am
+@@ -2,9 +2,9 @@
+ pkglibdir=@MUFFIN_PLUGIN_DIR@
+
+ AM_CPPFLAGS= \
+- $(WARN_CFLAGS) \
++ $(WARN_CFLAGS) \
+ $(MUFFIN_CFLAGS) \
+- -I$(top_builddir)/src \
++ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/cogl \
+ -I$(top_builddir)/cogl \
+@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
+ default_la_CFLAGS = $(WARN_CFLAGS) -fPIC
+ default_la_SOURCES = default.c
+ default_la_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
+-default_la_LIBADD = $(CLUTTER_LIBS)
++default_la_LIBADD = \
++ $(CLUTTER_LIBS) \
++ $(top_builddir)/src/libmuffin.la \
++ $(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+
+ pkglib_LTLIBRARIES = default.la
+
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 28b45d8ec77..2e14e5cfece 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.1-slibtool.patch
+)
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2023-04-28 6:05 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-28 6:05 UTC (permalink / raw
To: gentoo-commits
commit: 09fe218fd1d1f287087cca0b0c280e7271b37174
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 05:44:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 06:04:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fe218f
x11-wm/muffin: fix build w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/muffin/files/muffin-5.6.2-clang16.patch | 18 ++++
x11-wm/muffin/muffin-5.6.2-r1.ebuild | 121 +++++++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/x11-wm/muffin/files/muffin-5.6.2-clang16.patch b/x11-wm/muffin/files/muffin-5.6.2-clang16.patch
new file mode 100644
index 000000000000..e2dc748071e2
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-5.6.2-clang16.patch
@@ -0,0 +1,18 @@
+https://github.com/linuxmint/muffin/commit/63c7161bc0513db5727bc883269a356f64229572
+
+From 63c7161bc0513db5727bc883269a356f64229572 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Wed, 1 Mar 2023 09:24:04 -0500
+Subject: [PATCH] place.c: Add missing import.
+
+--- a/src/core/place.c
++++ b/src/core/place.c
+@@ -36,6 +36,7 @@
+ #include "meta/meta-backend.h"
+ #include "meta/prefs.h"
+ #include "meta/workspace.h"
++#include "meta/meta-cursor-tracker.h"
+
+ typedef enum
+ {
+
diff --git a/x11-wm/muffin/muffin-5.6.2-r1.ebuild b/x11-wm/muffin/muffin-5.6.2-r1.ebuild
new file mode 100644
index 000000000000..2b54d8cdd867
--- /dev/null
+++ b/x11-wm/muffin/muffin-5.6.2-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg-utils virtualx
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
+SLOT="0"
+IUSE="input_devices_wacom +introspection screencast sysprof test udev"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+# Dependencies listed in meson order
+COMDEPEND="
+ x11-libs/libX11
+ >=media-libs/graphene-1.9.3[introspection?]
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ >=x11-libs/pango-1.20.0[introspection?]
+ >=x11-libs/cairo-1.10.0:=[X]
+ >=dev-libs/fribidi-1.0.0
+ >=dev-libs/glib-2.61.1:2
+ >=dev-libs/json-glib-0.12.0[introspection?]
+ >=gnome-extra/cinnamon-desktop-5.6:0=
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-3
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-libs/libXrender
+ >=x11-libs/libXrandr-1.5.0
+ x11-libs/libxcb:=
+ x11-libs/libXinerama
+ x11-libs/libXau
+ x11-libs/libICE
+ >=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
+ >=media-libs/libcanberra-0.26
+ sys-apps/dbus
+ media-libs/libglvnd[X]
+ media-libs/mesa[X(+),egl(+)]
+ x11-libs/libSM
+ >=x11-libs/startup-notification-0.7:=
+
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.41.3:= )
+ screencast? ( >=media-video/pipewire-0.3.0:= )
+ sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+ udev? ( >=virtual/libudev-228:=
+ >=dev-libs/libgudev-232 )
+"
+RDEPEND="${COMDEPEND}
+ gnome-extra/zenity
+"
+DEPEND="${COMDEPEND}
+ x11-base/xorg-proto
+
+ sysprof? ( dev-util/sysprof-common )
+"
+BDEPEND="
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.6.2-clang16.patch
+)
+
+# Wayland is not supported upstream.
+src_configure() {
+ local emesonargs=(
+ -Dopengl=true
+ #opengl_libname
+ #gles2_libname
+ -Dgles2=false # wayland
+ -Degl=true
+ -Dglx=true
+ $(meson_use screencast remote_desktop)
+ $(meson_use udev)
+ $(meson_use input_devices_wacom libwacom)
+ -Dpango_ft2=true
+ -Dstartup_notification=true
+ -Dsm=true
+ $(meson_use introspection)
+ $(meson_use test cogl_tests)
+ $(meson_use test clutter_tests)
+ -Dcore_tests=false # wayland
+ $(meson_use test tests)
+ $(meson_use sysprof profiler)
+ -Dinstalled_tests=false
+ #verbose
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+ glib-compile-schemas "${BUILD_DIR}"/data
+ GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
@ 2023-05-07 22:14 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-07 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 6348b1d564dfc6bfb16c5e226457cc094ba3a4dd
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun May 7 18:45:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 7 22:13:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6348b1d5
x11-wm/muffin: drop 5.2.1, 5.6.2-r1
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/muffin/Manifest | 1 -
x11-wm/muffin/files/muffin-5.6.2-clang16.patch | 18 ----
x11-wm/muffin/muffin-5.2.1.ebuild | 108 ----------------------
x11-wm/muffin/muffin-5.6.2-r1.ebuild | 121 -------------------------
4 files changed, 248 deletions(-)
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 3fafb488a30f..462658443f65 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,2 @@
-DIST muffin-5.2.1.tar.gz 5197177 BLAKE2B 9703a2e2c5ef75c7d4da3e201b60033a7ba549d94106df33aa9b89d0029f52c06fb4be00dd4c4d996bb083a790635a8227c8ff729dc43940f70b679e1b46924d SHA512 fa88a88f77a1cb84c2159fac8ab3ed38ae1054d3a01bb100aa264e8b91493a744da6e83ffad9190f0f7a07bd26022fea12d13a60e213d57f289685fba1810eb6
DIST muffin-5.6.2.tar.gz 4517162 BLAKE2B 95d4599f59838e1b281683ddcfb06eb152274482991ae2eea4e5c47056072df5714fc187967bdd58342ce660e3874c606de29f0e9f089d5b8511f116e703aca4 SHA512 14f71e15cedc7956f50a6b84d78ffcd1d20dba194206dd0df68147bcf60d2143eccaa1b23bf70675f4017cadd03698b6f79abedb754a04be20d73bbdbe724458
DIST muffin-5.6.4.tar.gz 4518694 BLAKE2B 25658e858939cd6046ccfeee6fefba3f62b96555703259eb4d4706eebee43466832b161a8be7b29e360fa3cc26fb0cdceb9f10f26f79177268e61eec11ab6857 SHA512 da779f12c2a3965d0e84324bcb0d96a787d95d6b441696b595f739dfa6fd0f1ecd4f700a1a4b1d6f6842594077544f145782ddddf5961132e313962f77a4150e
diff --git a/x11-wm/muffin/files/muffin-5.6.2-clang16.patch b/x11-wm/muffin/files/muffin-5.6.2-clang16.patch
deleted file mode 100644
index e2dc748071e2..000000000000
--- a/x11-wm/muffin/files/muffin-5.6.2-clang16.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/linuxmint/muffin/commit/63c7161bc0513db5727bc883269a356f64229572
-
-From 63c7161bc0513db5727bc883269a356f64229572 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Wed, 1 Mar 2023 09:24:04 -0500
-Subject: [PATCH] place.c: Add missing import.
-
---- a/src/core/place.c
-+++ b/src/core/place.c
-@@ -36,6 +36,7 @@
- #include "meta/meta-backend.h"
- #include "meta/prefs.h"
- #include "meta/workspace.h"
-+#include "meta/meta-cursor-tracker.h"
-
- typedef enum
- {
-
diff --git a/x11-wm/muffin/muffin-5.2.1.ebuild b/x11-wm/muffin/muffin-5.2.1.ebuild
deleted file mode 100644
index cc08f772038b..000000000000
--- a/x11-wm/muffin/muffin-5.2.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils xdg-utils virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-1 GPL-2+ LGPL-2+ MIT || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-IUSE="input_devices_wacom +introspection test xinerama"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
- >=dev-libs/glib-2.37.3:2[dbus]
- >=dev-libs/json-glib-1.0
- >=gnome-extra/cinnamon-desktop-5.2:0=
- gnome-extra/zenity
- >=media-libs/libcanberra-0.26[gtk3]
- media-libs/libglvnd
- >=x11-libs/cairo-1.14:=[X]
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.9.12:3[X,introspection?]
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb
- >=x11-libs/libXcomposite-0.3
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.6.0
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- >=x11-libs/pango-1.14.0[X,introspection?]
- >=x11-libs/startup-notification-0.7:=
- x11-misc/xkeyboard-config
-
- input_devices_wacom? ( >=dev-libs/libwacom-0.7:= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-
- test? ( app-text/docbook-xml-dtd:4.5 )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-BDEPEND="
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- eautoreconf
- gnome2_disable_deprecation_warning
-}
-
-# Wayland is not supported upstream.
-src_configure() {
- econf \
- --disable-gtk-doc \
- --disable-maintainer-mode \
- --disable-schemas-compile \
- --enable-compile-warnings=minimum \
- --disable-static \
- --enable-shape \
- --enable-sm \
- --enable-startup-notification \
- --enable-xsync \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_with input_devices_wacom libwacom ) \
- $(use_enable introspection) \
- $(use_enable xinerama)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
- dodoc HACKING MAINTAINERS *.txt doc/*.txt
-}
-
-src_test() {
- virtx default
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
diff --git a/x11-wm/muffin/muffin-5.6.2-r1.ebuild b/x11-wm/muffin/muffin-5.6.2-r1.ebuild
deleted file mode 100644
index 2b54d8cdd867..000000000000
--- a/x11-wm/muffin/muffin-5.6.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson xdg-utils virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
-SLOT="0"
-IUSE="input_devices_wacom +introspection screencast sysprof test udev"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-# Dependencies listed in meson order
-COMDEPEND="
- x11-libs/libX11
- >=media-libs/graphene-1.9.3[introspection?]
- >=x11-libs/gtk+-3.19.8:3[X,introspection?]
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/pango-1.20.0[introspection?]
- >=x11-libs/cairo-1.10.0:=[X]
- >=dev-libs/fribidi-1.0.0
- >=dev-libs/glib-2.61.1:2
- >=dev-libs/json-glib-0.12.0[introspection?]
- >=gnome-extra/cinnamon-desktop-5.6:0=
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXi-1.7.4
- x11-libs/libXtst
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-libs/libXrender
- >=x11-libs/libXrandr-1.5.0
- x11-libs/libxcb:=
- x11-libs/libXinerama
- x11-libs/libXau
- x11-libs/libICE
- >=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
- >=media-libs/libcanberra-0.26
- sys-apps/dbus
- media-libs/libglvnd[X]
- media-libs/mesa[X(+),egl(+)]
- x11-libs/libSM
- >=x11-libs/startup-notification-0.7:=
-
- input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
- introspection? ( >=dev-libs/gobject-introspection-1.41.3:= )
- screencast? ( >=media-video/pipewire-0.3.0:= )
- sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
- udev? ( >=virtual/libudev-228:=
- >=dev-libs/libgudev-232 )
-"
-RDEPEND="${COMDEPEND}
- gnome-extra/zenity
-"
-DEPEND="${COMDEPEND}
- x11-base/xorg-proto
-
- sysprof? ( dev-util/sysprof-common )
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.6.2-clang16.patch
-)
-
-# Wayland is not supported upstream.
-src_configure() {
- local emesonargs=(
- -Dopengl=true
- #opengl_libname
- #gles2_libname
- -Dgles2=false # wayland
- -Degl=true
- -Dglx=true
- $(meson_use screencast remote_desktop)
- $(meson_use udev)
- $(meson_use input_devices_wacom libwacom)
- -Dpango_ft2=true
- -Dstartup_notification=true
- -Dsm=true
- $(meson_use introspection)
- $(meson_use test cogl_tests)
- $(meson_use test clutter_tests)
- -Dcore_tests=false # wayland
- $(meson_use test tests)
- $(meson_use sysprof profiler)
- -Dinstalled_tests=false
- #verbose
- )
-
- meson_src_configure
-}
-
-src_test() {
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
- glib-compile-schemas "${BUILD_DIR}"/data
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-07 22:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-07 22:14 [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-28 6:05 Sam James
2021-03-19 3:32 Sam James
2020-12-27 5:06 Sam James
2020-05-31 19:05 Matt Turner
2020-05-29 0:11 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox