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