[Midnightbsd-cvs] mports [20376] trunk/x11-wm/mutter: mutter 3.16.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 2 22:32:34 EDT 2015
Revision: 20376
http://svnweb.midnightbsd.org/mports/?rev=20376
Author: laffer1
Date: 2015-10-02 22:32:33 -0400 (Fri, 02 Oct 2015)
Log Message:
-----------
mutter 3.16.3
Modified Paths:
--------------
trunk/x11-wm/mutter/Makefile
trunk/x11-wm/mutter/distinfo
trunk/x11-wm/mutter/pkg-plist
Added Paths:
-----------
trunk/x11-wm/mutter/files/extra-src_core_keybindings-private.h
trunk/x11-wm/mutter/files/extra-src_ui_frames.h
Removed Paths:
-------------
trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h
trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h
Modified: trunk/x11-wm/mutter/Makefile
===================================================================
--- trunk/x11-wm/mutter/Makefile 2015-10-03 02:14:47 UTC (rev 20375)
+++ trunk/x11-wm/mutter/Makefile 2015-10-03 02:32:33 UTC (rev 20376)
@@ -4,7 +4,7 @@
# $MCom: ports/trunk/x11-wm/mutter/Makefile 20040 2014-11-03 17:21:59Z kwm $
PORTNAME= mutter
-PORTVERSION= 3.14.4
+PORTVERSION= 3.16.3
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -26,8 +26,7 @@
gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas
USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomedesktop3 gnomeprefix gtk30 intlhack \
- introspection:build
+USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \
xrender xdamage
GNU_CONFIGURE= yes
@@ -43,6 +42,11 @@
.include <bsd.mport.options.mk>
+.if ${OPSYS} == MidnightBSD
+EXTRA_PATCHES= ${FILESDIR}/extra-src_core_keybindings-private.h \
+ ${FILESDIR}/extra-src_ui_frames.h
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-Wcast-align||g' \
${WRKSRC}/configure
Modified: trunk/x11-wm/mutter/distinfo
===================================================================
--- trunk/x11-wm/mutter/distinfo 2015-10-03 02:14:47 UTC (rev 20375)
+++ trunk/x11-wm/mutter/distinfo 2015-10-03 02:32:33 UTC (rev 20376)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/mutter-3.14.4.tar.xz) = b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b
-SIZE (gnome3/mutter-3.14.4.tar.xz) = 1608836
+SHA256 (gnome3/mutter-3.16.3.tar.xz) = ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755
+SIZE (gnome3/mutter-3.16.3.tar.xz) = 1550004
Added: trunk/x11-wm/mutter/files/extra-src_core_keybindings-private.h
===================================================================
--- trunk/x11-wm/mutter/files/extra-src_core_keybindings-private.h (rev 0)
+++ trunk/x11-wm/mutter/files/extra-src_core_keybindings-private.h 2015-10-03 02:32:33 UTC (rev 20376)
@@ -0,0 +1,22 @@
+$OpenBSD: patch-src_core_keybindings-private_h,v 1.1 2015/04/13 08:14:07 jasper Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747326
+
+--- src/core/keybindings-private.h.orig Mon Mar 23 18:47:23 2015
++++ src/core/keybindings-private.h Mon Apr 13 10:06:35 2015
+@@ -30,6 +30,7 @@
+ #include <gio/gio.h>
+ #include <meta/keybindings.h>
+ #include <xkbcommon/xkbcommon.h>
++#include "meta-accel-parse.h"
+
+ typedef struct _MetaKeyHandler MetaKeyHandler;
+ struct _MetaKeyHandler
+@@ -53,7 +54,6 @@ typedef struct _MetaResolvedKeyCombo {
+ * @keycode: keycode
+ * @modifiers: modifiers
+ */
+-typedef struct _MetaKeyCombo MetaKeyCombo;
+ struct _MetaKeyCombo
+ {
+ unsigned int keysym;
Property changes on: trunk/x11-wm/mutter/files/extra-src_core_keybindings-private.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-wm/mutter/files/extra-src_ui_frames.h
===================================================================
--- trunk/x11-wm/mutter/files/extra-src_ui_frames.h (rev 0)
+++ trunk/x11-wm/mutter/files/extra-src_ui_frames.h 2015-10-03 02:32:33 UTC (rev 20376)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_ui_frames_h,v 1.1 2015/04/13 08:14:07 jasper Exp $
+--- src/ui/frames.h.orig Mon Apr 13 09:51:38 2015
++++ src/ui/frames.h Mon Apr 13 09:55:33 2015
+@@ -27,6 +27,7 @@
+ #include <meta/common.h>
+ #include <meta/types.h>
+ #include "theme-private.h"
++#include "ui.h"
+
+ typedef enum
+ {
+@@ -68,8 +69,6 @@ typedef enum
+
+ typedef struct _MetaFrames MetaFrames;
+ typedef struct _MetaFramesClass MetaFramesClass;
+-
+-typedef struct _MetaUIFrame MetaUIFrame;
+
+ struct _MetaUIFrame
+ {
Property changes on: trunk/x11-wm/mutter/files/extra-src_ui_frames.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h
===================================================================
--- trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h 2015-10-03 02:14:47 UTC (rev 20375)
+++ trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-private.h 2015-10-03 02:32:33 UTC (rev 20376)
@@ -1,12 +0,0 @@
---- src/backends/meta-cursor-private.h.orig 2014-11-23 16:45:02.933406434 +0100
-+++ src/backends/meta-cursor-private.h 2014-11-23 16:45:36.450634686 +0100
-@@ -25,7 +25,9 @@
- #include "meta-cursor.h"
-
- #include <cogl/cogl.h>
-+#if defined(HAVE_NATIVE_BACKEND)
- #include <gbm.h>
-+#endif
-
- typedef struct {
- CoglTexture2D *texture;
Deleted: trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h
===================================================================
--- trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h 2015-10-03 02:14:47 UTC (rev 20375)
+++ trunk/x11-wm/mutter/files/patch-src_backends_meta-cursor-renderer.h 2015-10-03 02:32:33 UTC (rev 20376)
@@ -1,12 +0,0 @@
---- src/backends/meta-cursor-renderer.h.orig 2014-10-02 16:29:20.000000000 +0200
-+++ src/backends/meta-cursor-renderer.h 2014-11-23 16:44:45.685535555 +0100
-@@ -30,7 +30,9 @@
- #include <meta/screen.h>
- #include "meta-cursor.h"
-
-+#if defined(HAVE_NATIVE_BACKEND)
- #include <gbm.h>
-+#endif
-
- #define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
- #define META_CURSOR_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
Modified: trunk/x11-wm/mutter/pkg-plist
===================================================================
--- trunk/x11-wm/mutter/pkg-plist 2015-10-03 02:14:47 UTC (rev 20375)
+++ trunk/x11-wm/mutter/pkg-plist 2015-10-03 02:32:33 UTC (rev 20376)
@@ -7,7 +7,6 @@
include/mutter/meta/compositor.h
include/mutter/meta/display.h
include/mutter/meta/errors.h
-include/mutter/meta/gradient.h
include/mutter/meta/group.h
include/mutter/meta/keybindings.h
include/mutter/meta/main.h
@@ -18,6 +17,7 @@
include/mutter/meta/meta-background.h
include/mutter/meta/meta-cursor-tracker.h
include/mutter/meta/meta-idle-monitor.h
+include/mutter/meta/meta-monitor-manager.h
include/mutter/meta/meta-plugin.h
include/mutter/meta/meta-shadow-factory.h
include/mutter/meta/meta-shaped-texture.h
@@ -40,49 +40,48 @@
libexec/mutter-restart-helper
man/man1/mutter.1.gz
share/GConf/gsettings/mutter-schemas.convert
+share/applications/mutter-wayland.desktop
share/applications/mutter.desktop
-share/applications/mutter-wayland.desktop
-share/doc/meta/MetaBackgroundActor.html
-share/doc/meta/MetaBarrier.html
-share/doc/meta/MetaDisplay.html
-share/doc/meta/MetaPlugin.html
-share/doc/meta/MetaRectangle.html
-share/doc/meta/MetaScreen.html
-share/doc/meta/MetaShadowFactory.html
-share/doc/meta/MetaShapedTexture.html
-share/doc/meta/MetaWindow.html
-share/doc/meta/MetaWindowActor.html
-share/doc/meta/MetaWorkspace.html
-share/doc/meta/annotation-glossary.html
-share/doc/meta/api-index-full.html
-share/doc/meta/core-reference.html
-share/doc/meta/deprecated-api-index.html
-share/doc/meta/home.png
-share/doc/meta/index.html
-share/doc/meta/index.sgml
-share/doc/meta/left-insensitive.png
-share/doc/meta/left.png
-share/doc/meta/meta-Common.html
-share/doc/meta/meta-Errors.html
-share/doc/meta/meta-Gradients.html
-share/doc/meta/meta-Main.html
-share/doc/meta/meta-MetaCompositor.html
-share/doc/meta/meta-MetaGroup.html
-share/doc/meta/meta-MetaKeybinding.html
-share/doc/meta/meta-Preferences.html
-share/doc/meta/meta-Utility-functions.html
-share/doc/meta/meta.devhelp2
-share/doc/meta/mutter-overview.html
-share/doc/meta/object-tree.html
-share/doc/meta/right-insensitive.png
-share/doc/meta/right.png
-share/doc/meta/running-mutter.html
-share/doc/meta/style.css
-share/doc/meta/up-insensitive.png
-share/doc/meta/up.png
share/gnome-control-center/keybindings/50-mutter-navigation.xml
+share/gnome-control-center/keybindings/50-mutter-system.xml
share/gnome-control-center/keybindings/50-mutter-windows.xml
-share/gnome-control-center/keybindings/50-mutter-system.xml
+share/gtk-doc/html/meta/MetaBackgroundActor.html
+share/gtk-doc/html/meta/MetaBarrier.html
+share/gtk-doc/html/meta/MetaDisplay.html
+share/gtk-doc/html/meta/MetaPlugin.html
+share/gtk-doc/html/meta/MetaRectangle.html
+share/gtk-doc/html/meta/MetaScreen.html
+share/gtk-doc/html/meta/MetaShadowFactory.html
+share/gtk-doc/html/meta/MetaShapedTexture.html
+share/gtk-doc/html/meta/MetaWindow.html
+share/gtk-doc/html/meta/MetaWindowActor.html
+share/gtk-doc/html/meta/MetaWorkspace.html
+share/gtk-doc/html/meta/annotation-glossary.html
+share/gtk-doc/html/meta/api-index-full.html
+share/gtk-doc/html/meta/core-reference.html
+share/gtk-doc/html/meta/deprecated-api-index.html
+share/gtk-doc/html/meta/home.png
+share/gtk-doc/html/meta/index.html
+share/gtk-doc/html/meta/index.sgml
+share/gtk-doc/html/meta/left-insensitive.png
+share/gtk-doc/html/meta/left.png
+share/gtk-doc/html/meta/meta-Common.html
+share/gtk-doc/html/meta/meta-Errors.html
+share/gtk-doc/html/meta/meta-Main.html
+share/gtk-doc/html/meta/meta-MetaCompositor.html
+share/gtk-doc/html/meta/meta-MetaGroup.html
+share/gtk-doc/html/meta/meta-MetaKeybinding.html
+share/gtk-doc/html/meta/meta-Preferences.html
+share/gtk-doc/html/meta/meta-Utility-functions.html
+share/gtk-doc/html/meta/meta.devhelp2
+share/gtk-doc/html/meta/mutter-overview.html
+share/gtk-doc/html/meta/object-tree.html
+share/gtk-doc/html/meta/right-insensitive.png
+share/gtk-doc/html/meta/right.png
+share/gtk-doc/html/meta/running-mutter.html
+share/gtk-doc/html/meta/style.css
+share/gtk-doc/html/meta/up-insensitive.png
+share/gtk-doc/html/meta/up.png
share/locale/am/LC_MESSAGES/mutter.mo
share/locale/ar/LC_MESSAGES/mutter.mo
share/locale/as/LC_MESSAGES/mutter.mo
More information about the Midnightbsd-cvs
mailing list