1 |
commit: 1f9bfd6586f227a8b5f845adb1031de9fb3ac99e |
2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Thu Dec 24 07:07:08 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 05:06:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9bfd65 |
7 |
|
8 |
x11-wm/muffin: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
x11-wm/muffin/Manifest | 1 - |
15 |
x11-wm/muffin/files/muffin-4.4-gir-fixes.patch | 65 --- |
16 |
.../muffin-4.4-gobject-introspection-fixes.patch | 529 --------------------- |
17 |
x11-wm/muffin/muffin-4.4.3.ebuild | 87 ---- |
18 |
4 files changed, 682 deletions(-) |
19 |
|
20 |
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest |
21 |
index cbe739adfae..f79bbf2e607 100644 |
22 |
--- a/x11-wm/muffin/Manifest |
23 |
+++ b/x11-wm/muffin/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3 |
26 |
DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5 |
27 |
|
28 |
diff --git a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch |
29 |
deleted file mode 100644 |
30 |
index 46613194be1..00000000000 |
31 |
--- a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch |
32 |
+++ /dev/null |
33 |
@@ -1,65 +0,0 @@ |
34 |
-From eaacd664855b03517a0406024b18eb9f5a597a9d Mon Sep 17 00:00:00 2001 |
35 |
-From: Michael Webster <miketwebster@×××××.com> |
36 |
-Date: Tue, 14 Jan 2020 12:12:13 -0500 |
37 |
-Subject: [PATCH] display.c: Remove meta_display_get_atom() - it is unused, and |
38 |
- breaks the build when g-ir-scanner (with gobject-introspection ~1.62) |
39 |
- |
40 |
-ref: |
41 |
-https://gitlab.gnome.org/GNOME/mutter/commit/edeac1de09473809debc4d0b8c416f79dde8f500 |
42 |
---- |
43 |
- src/core/display.c | 14 -------------- |
44 |
- src/meta/display.h | 9 --------- |
45 |
- 2 files changed, 23 deletions(-) |
46 |
- |
47 |
-diff --git a/src/core/display.c b/src/core/display.c |
48 |
-index 6c186e87..6baf2cc2 100644 |
49 |
---- a/src/core/display.c |
50 |
-+++ b/src/core/display.c |
51 |
-@@ -5640,20 +5640,6 @@ meta_display_get_shape_event_base (MetaDisplay *display) |
52 |
- } |
53 |
- #endif |
54 |
- |
55 |
--/** |
56 |
-- * meta_display_get_atom: (skip) |
57 |
-- * |
58 |
-- * Gets up an X atom that Muffin prefetched at startup. |
59 |
-- * |
60 |
-- * Return value: the X atom corresponding to the given atom enumeration |
61 |
-- */ |
62 |
--Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom) |
63 |
--{ |
64 |
-- Atom *atoms = & display->atom_WM_PROTOCOLS; |
65 |
-- |
66 |
-- return atoms[meta_atom - 1]; |
67 |
--} |
68 |
-- |
69 |
- /** |
70 |
- * meta_display_get_leader_window: |
71 |
- * @display: a #MetaDisplay |
72 |
-diff --git a/src/meta/display.h b/src/meta/display.h |
73 |
-index 3f82c32b..434296f1 100644 |
74 |
---- a/src/meta/display.h |
75 |
-+++ b/src/meta/display.h |
76 |
-@@ -56,14 +56,6 @@ GType meta_display_get_type (void) G_GNUC_CONST; |
77 |
- |
78 |
- #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) |
79 |
- |
80 |
--typedef enum |
81 |
--{ |
82 |
-- META_ATOM_FIRST = 0, |
83 |
--#define item(x) META_ATOM_##x, |
84 |
--#include "atomnames.h" |
85 |
--#undef item |
86 |
--}MetaAtom; |
87 |
-- |
88 |
- typedef enum { |
89 |
- META_LIST_DEFAULT = 0, /* normal windows */ |
90 |
- META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */ |
91 |
-@@ -90,7 +82,6 @@ gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display, |
92 |
- |
93 |
- int meta_display_get_damage_event_base (MetaDisplay *display); |
94 |
- int meta_display_get_shape_event_base (MetaDisplay *display); |
95 |
--Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom); |
96 |
- |
97 |
- gboolean meta_display_xserver_time_is_before (MetaDisplay *display, |
98 |
- guint32 time1, |
99 |
|
100 |
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 |
101 |
deleted file mode 100644 |
102 |
index 053319d5c42..00000000000 |
103 |
--- a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch |
104 |
+++ /dev/null |
105 |
@@ -1,529 +0,0 @@ |
106 |
-From a452ec976f22b1ffba51e934f2d771d0680f6cca Mon Sep 17 00:00:00 2001 |
107 |
-From: Michael Webster <miketwebster@×××××.com> |
108 |
-Date: Tue, 14 Jan 2020 11:29:54 -0500 |
109 |
-Subject: [PATCH] muffin: Use glib for gettext |
110 |
- |
111 |
-This was also breaking the build under gobject-introspection ~1.62 |
112 |
- |
113 |
-ref: |
114 |
-https://gitlab.gnome.org/GNOME/mutter/commit/6ceddd626a20f5c3d92ddd9318338626f4be4a4d |
115 |
-https://gitlab.gnome.org/GNOME/mutter/commit/5298a834efef5eeacaea24a9752468277782cb04 |
116 |
---- |
117 |
- ChangeLog | 2 +- |
118 |
- src/Makefile.am | 3 ++- |
119 |
- src/compositor/compositor.c | 1 + |
120 |
- src/compositor/meta-background.c | 1 + |
121 |
- src/compositor/plugins/default.c | 8 +++---- |
122 |
- src/core/core.c | 1 + |
123 |
- src/core/delete.c | 2 +- |
124 |
- src/core/display.c | 4 ++-- |
125 |
- src/core/keybindings.c | 2 +- |
126 |
- src/core/main.c | 2 +- |
127 |
- src/core/muffin.c | 1 + |
128 |
- src/core/prefs.c | 2 +- |
129 |
- src/core/screen.c | 2 +- |
130 |
- src/core/session.c | 1 + |
131 |
- src/core/stack.c | 2 +- |
132 |
- src/core/util-private.h | 36 ++++++++++++++++++++++++++++++++ |
133 |
- src/core/util.c | 2 +- |
134 |
- src/core/window-props.c | 1 + |
135 |
- src/core/window.c | 2 +- |
136 |
- src/core/xprops.c | 2 +- |
137 |
- src/meta/common.h | 2 +- |
138 |
- src/meta/util.h | 5 ----- |
139 |
- src/ui/frames.c | 24 ++++++++++----------- |
140 |
- src/ui/menu.c | 2 +- |
141 |
- src/ui/metaaccellabel.c | 2 +- |
142 |
- src/ui/resizepopup.c | 2 +- |
143 |
- src/ui/theme-parser.c | 2 +- |
144 |
- src/ui/theme.c | 2 +- |
145 |
- 28 files changed, 77 insertions(+), 41 deletions(-) |
146 |
- create mode 100644 src/core/util-private.h |
147 |
- |
148 |
-diff --git a/ChangeLog b/ChangeLog |
149 |
-index e68822de..7123e9cf 100644 |
150 |
---- a/ChangeLog |
151 |
-+++ b/ChangeLog |
152 |
-@@ -13015,7 +13015,7 @@ Mon Jun 3 15:12:11 2002 HideToshi Tajima <hidetoshi.tajima@×××.com> |
153 |
- |
154 |
- Patch from Erwann Chenede for raise_or_lower keybinding |
155 |
- |
156 |
-- * src/display.c, src/common.h: POINT_IN_RECT moved to a common |
157 |
-+ * src/display.c, src/common.h: META_POINT_IN_RECT moved to a common |
158 |
- location, removed from here |
159 |
- (meta_rectangle_intersect): move here and make it public |
160 |
- |
161 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
162 |
-index cbb5b3af..9cb3af14 100644 |
163 |
---- a/src/Makefile.am |
164 |
-+++ b/src/Makefile.am |
165 |
-@@ -142,6 +142,7 @@ libmuffin_la_SOURCES = \ |
166 |
- core/stack-tracker.h \ |
167 |
- core/util.c \ |
168 |
- meta/util.h \ |
169 |
-+ meta/util-private.h \ |
170 |
- core/window-props.c \ |
171 |
- core/window-props.h \ |
172 |
- core/window.c \ |
173 |
-@@ -281,7 +282,7 @@ Meta-$(api_version).gir: libmuffin.la |
174 |
- muffin-enum-types.h \ |
175 |
- $(libmuffininclude_base_headers) \ |
176 |
- $(filter %.c,$(libmuffin_la_SOURCES)) |
177 |
--@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error |
178 |
-+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error --identifier-prefix=Meta |
179 |
- |
180 |
- endif |
181 |
- |
182 |
-diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c |
183 |
-index 0556f743..a8bc6db8 100644 |
184 |
---- a/src/compositor/compositor.c |
185 |
-+++ b/src/compositor/compositor.c |
186 |
-@@ -74,6 +74,7 @@ |
187 |
- #include "meta-background-actor-private.h" |
188 |
- #include "window-private.h" /* to check window->hidden */ |
189 |
- #include "display-private.h" /* for meta_display_lookup_x_window() */ |
190 |
-+#include "util-private.h" |
191 |
- #include <X11/extensions/shape.h> |
192 |
- #include <X11/extensions/Xcomposite.h> |
193 |
- #include "meta-sync-ring.h" |
194 |
-diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c |
195 |
-index 95917429..33bce084 100644 |
196 |
---- a/src/compositor/meta-background.c |
197 |
-+++ b/src/compositor/meta-background.c |
198 |
-@@ -28,6 +28,7 @@ |
199 |
- #include <clutter/clutter.h> |
200 |
- #include "cogl-utils.h" |
201 |
- #include <meta/errors.h> |
202 |
-+// #include "util-private.h" |
203 |
- #include "meta-background-actor-private.h" |
204 |
- |
205 |
- struct _MetaBackgroundPrivate |
206 |
-diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c |
207 |
-index 1d223465..f69563bc 100644 |
208 |
---- a/src/compositor/plugins/default.c |
209 |
-+++ b/src/compositor/plugins/default.c |
210 |
-@@ -20,14 +20,12 @@ |
211 |
- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA |
212 |
- * 02110-1335, USA. |
213 |
- */ |
214 |
-- |
215 |
-+#include <config.h> |
216 |
- #include <meta/meta-plugin.h> |
217 |
- #include <meta/window.h> |
218 |
- |
219 |
--#include <libintl.h> |
220 |
--#define _(x) dgettext (GETTEXT_PACKAGE, x) |
221 |
--#define N_(x) x |
222 |
-- |
223 |
-+#include <meta/util.h> |
224 |
-+#include <glib/gi18n-lib.h> |
225 |
- #include <clutter/clutter.h> |
226 |
- #include <gmodule.h> |
227 |
- #include <string.h> |
228 |
-diff --git a/src/core/core.c b/src/core/core.c |
229 |
-index 43962825..77228aac 100644 |
230 |
---- a/src/core/core.c |
231 |
-+++ b/src/core/core.c |
232 |
-@@ -29,6 +29,7 @@ |
233 |
- #include "workspace-private.h" |
234 |
- #include <meta/prefs.h> |
235 |
- #include <meta/errors.h> |
236 |
-+#include "util-private.h" |
237 |
- |
238 |
- /* Looks up the MetaWindow representing the frame of the given X window. |
239 |
- * Used as a helper function by a bunch of the functions below. |
240 |
-diff --git a/src/core/delete.c b/src/core/delete.c |
241 |
-index 5c1e4bb6..5ef767c2 100644 |
242 |
---- a/src/core/delete.c |
243 |
-+++ b/src/core/delete.c |
244 |
-@@ -25,7 +25,7 @@ |
245 |
- #define _XOPEN_SOURCE /* for kill() */ |
246 |
- |
247 |
- #include <config.h> |
248 |
--#include <meta/util.h> |
249 |
-+#include "util-private.h" |
250 |
- #include "window-private.h" |
251 |
- #include <meta/errors.h> |
252 |
- #include <meta/workspace.h> |
253 |
-diff --git a/src/core/display.c b/src/core/display.c |
254 |
-index 691a8ed1..6c186e87 100644 |
255 |
---- a/src/core/display.c |
256 |
-+++ b/src/core/display.c |
257 |
-@@ -1568,8 +1568,8 @@ window_raise_with_delay_callback (void *data) |
258 |
- meta_error_trap_pop (window->display); |
259 |
- |
260 |
- point_in_window = |
261 |
-- (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) || |
262 |
-- (window->frame == NULL && POINT_IN_RECT (root_x, root_y, window->rect)); |
263 |
-+ (window->frame && META_POINT_IN_RECT (root_x, root_y, window->frame->rect)) || |
264 |
-+ (window->frame == NULL && META_POINT_IN_RECT (root_x, root_y, window->rect)); |
265 |
- if (same_screen && point_in_window) |
266 |
- meta_window_raise (window); |
267 |
- #ifdef WITH_VERBOSE_MODE |
268 |
-diff --git a/src/core/keybindings.c b/src/core/keybindings.c |
269 |
-index 6b1c1cdf..50658880 100644 |
270 |
---- a/src/core/keybindings.c |
271 |
-+++ b/src/core/keybindings.c |
272 |
-@@ -44,7 +44,7 @@ |
273 |
- #include "frame.h" |
274 |
- #include "place.h" |
275 |
- #include <meta/prefs.h> |
276 |
--#include <meta/util.h> |
277 |
-+#include "util-private.h" |
278 |
- |
279 |
- #include <X11/keysym.h> |
280 |
- #include <string.h> |
281 |
-diff --git a/src/core/main.c b/src/core/main.c |
282 |
-index 71c78526..a16bee1e 100644 |
283 |
---- a/src/core/main.c |
284 |
-+++ b/src/core/main.c |
285 |
-@@ -49,7 +49,7 @@ |
286 |
- |
287 |
- #include <config.h> |
288 |
- #include <meta/main.h> |
289 |
--#include <meta/util.h> |
290 |
-+#include "util-private.h" |
291 |
- #include "display-private.h" |
292 |
- #include <meta/errors.h> |
293 |
- #include "ui.h" |
294 |
-diff --git a/src/core/muffin.c b/src/core/muffin.c |
295 |
-index 26d98f02..8665797a 100644 |
296 |
---- a/src/core/muffin.c |
297 |
-+++ b/src/core/muffin.c |
298 |
-@@ -26,6 +26,7 @@ |
299 |
- #include <meta/main.h> |
300 |
- #include <meta/util.h> |
301 |
- #include "meta-plugin-manager.h" |
302 |
-+#include <glib/gi18n-lib.h> |
303 |
- |
304 |
- #include <glib.h> |
305 |
- |
306 |
-diff --git a/src/core/prefs.c b/src/core/prefs.c |
307 |
-index d146902d..d92826a1 100644 |
308 |
---- a/src/core/prefs.c |
309 |
-+++ b/src/core/prefs.c |
310 |
-@@ -33,7 +33,7 @@ |
311 |
- #include <config.h> |
312 |
- #include <meta/prefs.h> |
313 |
- #include "ui.h" |
314 |
--#include <meta/util.h> |
315 |
-+#include "util-private.h" |
316 |
- #include "meta-plugin-manager.h" |
317 |
- #include <glib.h> |
318 |
- #include <gio/gio.h> |
319 |
-diff --git a/src/core/screen.c b/src/core/screen.c |
320 |
-index 8ba26a06..cdcbcab9 100644 |
321 |
---- a/src/core/screen.c |
322 |
-+++ b/src/core/screen.c |
323 |
-@@ -33,7 +33,7 @@ |
324 |
- #include <config.h> |
325 |
- #include "screen-private.h" |
326 |
- #include <meta/main.h> |
327 |
--#include <meta/util.h> |
328 |
-+#include "util-private.h" |
329 |
- #include <meta/errors.h> |
330 |
- #include "window-private.h" |
331 |
- #include "frame.h" |
332 |
-diff --git a/src/core/session.c b/src/core/session.c |
333 |
-index 8e0ded3a..f45e1a63 100644 |
334 |
---- a/src/core/session.c |
335 |
-+++ b/src/core/session.c |
336 |
-@@ -25,6 +25,7 @@ |
337 |
- |
338 |
- #include <config.h> |
339 |
- |
340 |
-+#include "util-private.h" |
341 |
- #include "session.h" |
342 |
- #include <X11/Xatom.h> |
343 |
- |
344 |
-diff --git a/src/core/stack.c b/src/core/stack.c |
345 |
-index 7404a59e..49ff24b4 100644 |
346 |
---- a/src/core/stack.c |
347 |
-+++ b/src/core/stack.c |
348 |
-@@ -1424,7 +1424,7 @@ window_contains_point (MetaWindow *window, |
349 |
- |
350 |
- meta_window_get_outer_rect (window, &rect); |
351 |
- |
352 |
-- return POINT_IN_RECT (root_x, root_y, rect); |
353 |
-+ return META_POINT_IN_RECT (root_x, root_y, rect); |
354 |
- } |
355 |
- |
356 |
- static MetaWindow* |
357 |
-diff --git a/src/core/util-private.h b/src/core/util-private.h |
358 |
-new file mode 100644 |
359 |
-index 00000000..8e51b42f |
360 |
---- /dev/null |
361 |
-+++ b/src/core/util-private.h |
362 |
-@@ -0,0 +1,36 @@ |
363 |
-+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ |
364 |
-+ |
365 |
-+/* Mutter utilities */ |
366 |
-+ |
367 |
-+/* |
368 |
-+ * Copyright (C) 2001 Havoc Pennington |
369 |
-+ * Copyright (C) 2005 Elijah Newren |
370 |
-+ * |
371 |
-+ * This program is free software; you can redistribute it and/or |
372 |
-+ * modify it under the terms of the GNU General Public License as |
373 |
-+ * published by the Free Software Foundation; either version 2 of the |
374 |
-+ * License, or (at your option) any later version. |
375 |
-+ * |
376 |
-+ * This program is distributed in the hope that it will be useful, but |
377 |
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of |
378 |
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
379 |
-+ * General Public License for more details. |
380 |
-+ * |
381 |
-+ * You should have received a copy of the GNU General Public License |
382 |
-+ * along with this program; if not, write to the Free Software |
383 |
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA |
384 |
-+ * 02111-1307, USA. |
385 |
-+ */ |
386 |
-+ |
387 |
-+#ifndef META_UTIL_PRIVATE_H |
388 |
-+#define META_UTIL_PRIVATE_H |
389 |
-+ |
390 |
-+#include <meta/util.h> |
391 |
-+#include <glib/gi18n-lib.h> |
392 |
-+ |
393 |
-+void meta_set_verbose (gboolean setting); |
394 |
-+void meta_set_debugging (gboolean setting); |
395 |
-+void meta_set_syncing (gboolean setting); |
396 |
-+void meta_set_replace_current_wm (gboolean setting); |
397 |
-+ |
398 |
-+#endif |
399 |
-diff --git a/src/core/util.c b/src/core/util.c |
400 |
-index c1d84520..896c7195 100644 |
401 |
---- a/src/core/util.c |
402 |
-+++ b/src/core/util.c |
403 |
-@@ -35,7 +35,7 @@ |
404 |
- |
405 |
- #include <config.h> |
406 |
- #include <meta/common.h> |
407 |
--#include <meta/util.h> |
408 |
-+#include "util-private.h" |
409 |
- #include <meta/main.h> |
410 |
- |
411 |
- #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */ |
412 |
-diff --git a/src/core/window-props.c b/src/core/window-props.c |
413 |
-index 911b9a10..e5306838 100644 |
414 |
---- a/src/core/window-props.c |
415 |
-+++ b/src/core/window-props.c |
416 |
-@@ -50,6 +50,7 @@ |
417 |
- #include <X11/Xatom.h> |
418 |
- #include <unistd.h> |
419 |
- #include <string.h> |
420 |
-+#include "util-private.h" |
421 |
- #ifndef HOST_NAME_MAX |
422 |
- /* Solaris headers apparently don't define this so do so manually; #326745 */ |
423 |
- #define HOST_NAME_MAX 255 |
424 |
-diff --git a/src/core/window.c b/src/core/window.c |
425 |
-index 500eaac0..1a080887 100644 |
426 |
---- a/src/core/window.c |
427 |
-+++ b/src/core/window.c |
428 |
-@@ -32,7 +32,7 @@ |
429 |
- #include "window-private.h" |
430 |
- #include "boxes-private.h" |
431 |
- #include "edge-resistance.h" |
432 |
--#include <meta/util.h> |
433 |
-+#include "util-private.h" |
434 |
- #include "frame.h" |
435 |
- #include <meta/errors.h> |
436 |
- #include "workspace-private.h" |
437 |
-diff --git a/src/core/xprops.c b/src/core/xprops.c |
438 |
-index 01df70a6..bcf11f21 100644 |
439 |
---- a/src/core/xprops.c |
440 |
-+++ b/src/core/xprops.c |
441 |
-@@ -83,7 +83,7 @@ from The Open Group. |
442 |
- #include <config.h> |
443 |
- #include "xprops.h" |
444 |
- #include <meta/errors.h> |
445 |
--#include <meta/util.h> |
446 |
-+#include "util-private.h" |
447 |
- #include "async-getprop.h" |
448 |
- #include "ui.h" |
449 |
- #include "muffin-Xatomtype.h" |
450 |
-diff --git a/src/meta/common.h b/src/meta/common.h |
451 |
-index 46bf3461..55426589 100644 |
452 |
---- a/src/meta/common.h |
453 |
-+++ b/src/meta/common.h |
454 |
-@@ -398,7 +398,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self); |
455 |
- |
456 |
- /************************************************************/ |
457 |
- |
458 |
--#define POINT_IN_RECT(xcoord, ycoord, rect) \ |
459 |
-+#define META_POINT_IN_RECT(xcoord, ycoord, rect) \ |
460 |
- ((xcoord) >= (rect).x && \ |
461 |
- (xcoord) < ((rect).x + (rect).width) && \ |
462 |
- (ycoord) >= (rect).y && \ |
463 |
-diff --git a/src/meta/util.h b/src/meta/util.h |
464 |
-index cce79ed5..ea10f16a 100644 |
465 |
---- a/src/meta/util.h |
466 |
-+++ b/src/meta/util.h |
467 |
-@@ -31,12 +31,8 @@ |
468 |
- #include <meta/common.h> |
469 |
- |
470 |
- gboolean meta_is_verbose (void); |
471 |
--void meta_set_verbose (gboolean setting); |
472 |
- gboolean meta_is_debugging (void); |
473 |
--void meta_set_debugging (gboolean setting); |
474 |
- gboolean meta_is_syncing (void); |
475 |
--void meta_set_syncing (gboolean setting); |
476 |
--void meta_set_replace_current_wm (gboolean setting); |
477 |
- |
478 |
- void meta_debug_spew_real (const char *format, |
479 |
- ...) G_GNUC_PRINTF (1, 2); |
480 |
-@@ -97,7 +93,6 @@ const char* meta_gravity_to_string (int gravity); |
481 |
- |
482 |
- #include <libintl.h> |
483 |
- #define _(x) dgettext (GETTEXT_PACKAGE, x) |
484 |
--#define N_(x) x |
485 |
- |
486 |
- char* meta_g_utf8_strndup (const gchar *src, gsize n); |
487 |
- |
488 |
-diff --git a/src/ui/frames.c b/src/ui/frames.c |
489 |
-index c1ae7a1d..be075134 100644 |
490 |
---- a/src/ui/frames.c |
491 |
-+++ b/src/ui/frames.c |
492 |
-@@ -2495,16 +2495,16 @@ get_control (MetaFrames *frames, |
493 |
- meta_frames_calc_geometry (frames, frame, &fgeom); |
494 |
- get_client_rect (&fgeom, fgeom.width, fgeom.height, &client); |
495 |
- |
496 |
-- if (POINT_IN_RECT (x, y, client)) |
497 |
-+ if (META_POINT_IN_RECT (x, y, client)) |
498 |
- return META_FRAME_CONTROL_CLIENT_AREA; |
499 |
- |
500 |
-- if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable)) |
501 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable)) |
502 |
- return META_FRAME_CONTROL_DELETE; |
503 |
- |
504 |
-- if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable)) |
505 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable)) |
506 |
- return META_FRAME_CONTROL_MINIMIZE; |
507 |
- |
508 |
-- if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable)) |
509 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable)) |
510 |
- return META_FRAME_CONTROL_MENU; |
511 |
- |
512 |
- meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), |
513 |
-@@ -2521,7 +2521,7 @@ get_control (MetaFrames *frames, |
514 |
- has_right = (flags & META_FRAME_ALLOWS_RIGHT_RESIZE) != 0; |
515 |
- has_bottom = (flags & META_FRAME_ALLOWS_BOTTOM_RESIZE) != 0; |
516 |
- |
517 |
-- if (POINT_IN_RECT (x, y, fgeom.title_rect)) |
518 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.title_rect)) |
519 |
- { |
520 |
- if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize) |
521 |
- return META_FRAME_CONTROL_RESIZE_N; |
522 |
-@@ -2529,7 +2529,7 @@ get_control (MetaFrames *frames, |
523 |
- return META_FRAME_CONTROL_TITLE; |
524 |
- } |
525 |
- |
526 |
-- if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable)) |
527 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable)) |
528 |
- { |
529 |
- if (flags & META_FRAME_MAXIMIZED && |
530 |
- (META_WINDOW_TILED_TOP (window) || |
531 |
-@@ -2542,32 +2542,32 @@ get_control (MetaFrames *frames, |
532 |
- return META_FRAME_CONTROL_MAXIMIZE; |
533 |
- } |
534 |
- |
535 |
-- if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable)) |
536 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.shade_rect.clickable)) |
537 |
- { |
538 |
- return META_FRAME_CONTROL_SHADE; |
539 |
- } |
540 |
- |
541 |
-- if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable)) |
542 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable)) |
543 |
- { |
544 |
- return META_FRAME_CONTROL_UNSHADE; |
545 |
- } |
546 |
- |
547 |
-- if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable)) |
548 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.above_rect.clickable)) |
549 |
- { |
550 |
- return META_FRAME_CONTROL_ABOVE; |
551 |
- } |
552 |
- |
553 |
-- if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable)) |
554 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable)) |
555 |
- { |
556 |
- return META_FRAME_CONTROL_UNABOVE; |
557 |
- } |
558 |
- |
559 |
-- if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable)) |
560 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.stick_rect.clickable)) |
561 |
- { |
562 |
- return META_FRAME_CONTROL_STICK; |
563 |
- } |
564 |
- |
565 |
-- if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable)) |
566 |
-+ if (META_POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable)) |
567 |
- { |
568 |
- return META_FRAME_CONTROL_UNSTICK; |
569 |
- } |
570 |
-diff --git a/src/ui/menu.c b/src/ui/menu.c |
571 |
-index c0b94a1e..5d1155e7 100644 |
572 |
---- a/src/ui/menu.c |
573 |
-+++ b/src/ui/menu.c |
574 |
-@@ -28,7 +28,7 @@ |
575 |
- #include <string.h> |
576 |
- #include "menu.h" |
577 |
- #include <meta/main.h> |
578 |
--#include <meta/util.h> |
579 |
-+#include "util-private.h" |
580 |
- #include "core.h" |
581 |
- #include "metaaccellabel.h" |
582 |
- #include "ui.h" |
583 |
-diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c |
584 |
-index fd5c6e6c..097b45b4 100644 |
585 |
---- a/src/ui/metaaccellabel.c |
586 |
-+++ b/src/ui/metaaccellabel.c |
587 |
-@@ -35,7 +35,7 @@ |
588 |
- #include "metaaccellabel.h" |
589 |
- #include <gtk/gtk.h> |
590 |
- #include <string.h> |
591 |
--#include <meta/util.h> |
592 |
-+#include "util-private.h" |
593 |
- |
594 |
- static void meta_accel_label_destroy (GtkWidget *object); |
595 |
- static void meta_accel_label_finalize (GObject *object); |
596 |
-diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c |
597 |
-index 18c395d2..56742fd7 100644 |
598 |
---- a/src/ui/resizepopup.c |
599 |
-+++ b/src/ui/resizepopup.c |
600 |
-@@ -23,7 +23,7 @@ |
601 |
- |
602 |
- #include <config.h> |
603 |
- #include "resizepopup.h" |
604 |
--#include <meta/util.h> |
605 |
-+#include "util-private.h" |
606 |
- #include <gtk/gtk.h> |
607 |
- #include <gdk/gdkx.h> |
608 |
- |
609 |
-diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c |
610 |
-index 0151f362..628bf73e 100644 |
611 |
---- a/src/ui/theme-parser.c |
612 |
-+++ b/src/ui/theme-parser.c |
613 |
-@@ -23,7 +23,7 @@ |
614 |
- |
615 |
- #include <config.h> |
616 |
- #include "theme-private.h" |
617 |
--#include <meta/util.h> |
618 |
-+#include "util-private.h" |
619 |
- #include <meta/prefs.h> |
620 |
- #include <string.h> |
621 |
- #include <stdlib.h> |
622 |
-diff --git a/src/ui/theme.c b/src/ui/theme.c |
623 |
-index cb717bbb..99ea519c 100644 |
624 |
---- a/src/ui/theme.c |
625 |
-+++ b/src/ui/theme.c |
626 |
-@@ -55,7 +55,7 @@ |
627 |
- |
628 |
- #include <config.h> |
629 |
- #include "theme-private.h" |
630 |
--#include <meta/util.h> |
631 |
-+#include "util-private.h" |
632 |
- #include <meta/gradient.h> |
633 |
- #include <meta/prefs.h> |
634 |
- #include <gtk/gtk.h> |
635 |
|
636 |
diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild |
637 |
deleted file mode 100644 |
638 |
index b77326d5863..00000000000 |
639 |
--- a/x11-wm/muffin/muffin-4.4.3.ebuild |
640 |
+++ /dev/null |
641 |
@@ -1,87 +0,0 @@ |
642 |
-# Copyright 1999-2020 Gentoo Authors |
643 |
-# Distributed under the terms of the GNU General Public License v2 |
644 |
- |
645 |
-EAPI=6 |
646 |
-inherit autotools eutils gnome2 |
647 |
- |
648 |
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" |
649 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
650 |
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
651 |
- |
652 |
-LICENSE="GPL-2+" |
653 |
-SLOT="0" |
654 |
-IUSE="+introspection test xinerama" |
655 |
-KEYWORDS="~amd64 ~x86" |
656 |
- |
657 |
-RESTRICT="test" |
658 |
- |
659 |
-COMMON_DEPEND=" |
660 |
- >=x11-libs/pango-1.2[X,introspection?] |
661 |
- >=x11-libs/cairo-1.14:=[X] |
662 |
- x11-libs/gdk-pixbuf:2[introspection?] |
663 |
- >=x11-libs/gtk+-3.9.12:3[X,introspection?] |
664 |
- >=dev-libs/glib-2.37.3:2[dbus] |
665 |
- >=dev-libs/json-glib-1.0 |
666 |
- >=gnome-extra/cinnamon-desktop-4.4:0= |
667 |
- >=media-libs/libcanberra-0.26[gtk3] |
668 |
- >=x11-libs/libXcomposite-0.3 |
669 |
- >=x11-libs/startup-notification-0.7:= |
670 |
- |
671 |
- x11-libs/libICE |
672 |
- x11-libs/libSM |
673 |
- x11-libs/libX11 |
674 |
- x11-libs/libXcomposite |
675 |
- x11-libs/libXcursor |
676 |
- x11-libs/libXdamage |
677 |
- x11-libs/libXext |
678 |
- x11-libs/libXfixes |
679 |
- x11-libs/libXrandr |
680 |
- x11-libs/libXrender |
681 |
- x11-libs/libxkbcommon |
682 |
- virtual/opengl |
683 |
- |
684 |
- gnome-extra/zenity |
685 |
- |
686 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) |
687 |
- xinerama? ( x11-libs/libXinerama ) |
688 |
-" |
689 |
-# needs gtk-doc, not just -am, for gtk-doc.make |
690 |
-DEPEND="${COMMON_DEPEND} |
691 |
- ${PYTHON_DEPS} |
692 |
- dev-util/glib-utils |
693 |
- >=app-text/gnome-doc-utils-0.8 |
694 |
- sys-devel/gettext |
695 |
- dev-util/gtk-doc |
696 |
- dev-util/gtk-doc-am |
697 |
- >=dev-util/intltool-0.35 |
698 |
- virtual/pkgconfig |
699 |
- x11-base/xorg-proto |
700 |
- test? ( app-text/docbook-xml-dtd:4.5 ) |
701 |
-" |
702 |
-RDEPEND="${COMMON_DEPEND} |
703 |
- !x11-misc/expocity |
704 |
-" |
705 |
- |
706 |
-src_prepare() { |
707 |
- # Fixes from 4.6.0. |
708 |
- eapply "${FILESDIR}"/muffin-4.4-{gobject-introspection,gir}-fixes.patch |
709 |
- |
710 |
- eautoreconf |
711 |
- gnome2_src_prepare |
712 |
-} |
713 |
- |
714 |
-# Wayland is not supported upstream. Disabled by default in 4.6.0. |
715 |
-src_configure() { |
716 |
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt" |
717 |
- gnome2_src_configure \ |
718 |
- --disable-static \ |
719 |
- --disable-wayland-egl-server \ |
720 |
- --enable-shape \ |
721 |
- --enable-sm \ |
722 |
- --enable-startup-notification \ |
723 |
- --enable-xsync \ |
724 |
- --enable-verbose-mode \ |
725 |
- --with-libcanberra \ |
726 |
- $(use_enable introspection) \ |
727 |
- $(use_enable xinerama) |
728 |
-} |